diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/GConf2.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/GConf2.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/GConf2.po	2013-01-29 09:33:53.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/GConf2.po	2014-01-07 06:37:01.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:13+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:17+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: no\n"
 
 #: ../backends/evoldap-backend.c:162
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/NetworkManager-pptp.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/NetworkManager-pptp.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/NetworkManager-pptp.po	2013-01-29 09:33:49.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/NetworkManager-pptp.po	2014-01-07 06:37:27.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 14:43+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 15:18+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../auth-dialog/vpn-password-dialog.c:95
@@ -257,109 +257,109 @@
 msgid "Not Required"
 msgstr "Ikke krevet"
 
-#: ../src/nm-pptp-service.c:160
+#: ../src/nm-pptp-service.c:161
 #, c-format
 msgid "couldn't convert PPTP VPN gateway IP address '%s' (%d)"
 msgstr ""
 
-#: ../src/nm-pptp-service.c:178
+#: ../src/nm-pptp-service.c:179
 #, c-format
 msgid "couldn't look up PPTP VPN gateway IP address '%s' (%d)"
 msgstr ""
 
-#: ../src/nm-pptp-service.c:202
+#: ../src/nm-pptp-service.c:203
 #, c-format
 msgid "no usable addresses returned for PPTP VPN gateway '%s'"
 msgstr ""
 
-#: ../src/nm-pptp-service.c:213
+#: ../src/nm-pptp-service.c:214
 #, c-format
 msgid "no usable addresses returned for PPTP VPN gateway '%s' (%d)"
 msgstr ""
 
-#: ../src/nm-pptp-service.c:240
+#: ../src/nm-pptp-service.c:241
 msgid "Could not find secrets (connection invalid, no vpn setting)."
 msgstr ""
 
-#: ../src/nm-pptp-service.c:252
+#: ../src/nm-pptp-service.c:253
 msgid "Invalid VPN username."
 msgstr "Ugyldig brukernavn for VPN."
 
-#: ../src/nm-pptp-service.c:261
+#: ../src/nm-pptp-service.c:262
 msgid "Missing VPN username."
 msgstr "Mangler brukernavn for VPN."
 
-#: ../src/nm-pptp-service.c:271
+#: ../src/nm-pptp-service.c:272
 msgid "Missing or invalid VPN password."
 msgstr "Passord for VPN mangler eller er ugyldig."
 
-#: ../src/nm-pptp-service.c:429
+#: ../src/nm-pptp-service.c:430
 msgid "No cached credentials."
 msgstr "Ingen mellomlagret påloggingsinformasjon."
 
-#: ../src/nm-pptp-service.c:575
+#: ../src/nm-pptp-service.c:576
 #, c-format
 msgid "invalid gateway '%s'"
 msgstr "ugyldig gateway «%s»"
 
-#: ../src/nm-pptp-service.c:589
+#: ../src/nm-pptp-service.c:590
 #, c-format
 msgid "invalid integer property '%s'"
 msgstr "ugyldig heltallsegenskap «%s»"
 
-#: ../src/nm-pptp-service.c:599
+#: ../src/nm-pptp-service.c:600
 #, c-format
 msgid "invalid boolean property '%s' (not yes or no)"
 msgstr ""
 
-#: ../src/nm-pptp-service.c:606
+#: ../src/nm-pptp-service.c:607
 #, c-format
 msgid "unhandled property '%s' type %s"
 msgstr ""
 
-#: ../src/nm-pptp-service.c:617
+#: ../src/nm-pptp-service.c:618
 #, c-format
 msgid "property '%s' invalid or not supported"
 msgstr ""
 
-#: ../src/nm-pptp-service.c:635
+#: ../src/nm-pptp-service.c:636
 msgid "No VPN configuration options."
 msgstr "Ingen konfigurasjonsvalg for VPN."
 
-#: ../src/nm-pptp-service.c:655
+#: ../src/nm-pptp-service.c:656
 #, c-format
 msgid "Missing required option '%s'."
 msgstr "Mangler obligatorisk valg «%s»."
 
-#: ../src/nm-pptp-service.c:675
+#: ../src/nm-pptp-service.c:676
 msgid "No VPN secrets!"
 msgstr "Ingen hemmeligheter for VPN!"
 
-#: ../src/nm-pptp-service.c:816
+#: ../src/nm-pptp-service.c:817
 msgid "Could not find pptp client binary."
 msgstr "Kunne ikke finne kjørbar fil for pptp-klient."
 
-#: ../src/nm-pptp-service.c:829
+#: ../src/nm-pptp-service.c:830
 msgid "Missing VPN gateway."
 msgstr "Mangler VPN-gateway."
 
-#: ../src/nm-pptp-service.c:982
+#: ../src/nm-pptp-service.c:983
 msgid "Could not find the pppd binary."
 msgstr "Fant ikke pppd-binærfilen."
 
-#: ../src/nm-pptp-service.c:1112
+#: ../src/nm-pptp-service.c:1113
 msgid "Invalid or missing PPTP gateway."
 msgstr "Ugyldig eller manglende PPTP-gateway."
 
-#: ../src/nm-pptp-service.c:1311
+#: ../src/nm-pptp-service.c:1312
 msgid "Don't quit when VPN connection terminates"
 msgstr "Ikke avslutt når VPN-forbindelsen termineres"
 
-#: ../src/nm-pptp-service.c:1312
+#: ../src/nm-pptp-service.c:1313
 msgid "Enable verbose debug logging (may expose passwords)"
 msgstr ""
 
-#: ../src/nm-pptp-service.c:1333
+#: ../src/nm-pptp-service.c:1336
 msgid ""
 "nm-pptp-service provides integrated PPTP VPN capability (compatible with "
 "Microsoft and other implementations) to NetworkManager."
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/activity-log-manager.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/activity-log-manager.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/activity-log-manager.po	2013-01-29 09:33:48.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/activity-log-manager.po	2014-01-07 06:37:52.000000000 +0000
@@ -14,33 +14,33 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:41+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 21:13+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../data/activity-log-manager-ccpanel.desktop.in.h:1
 msgid "Privacy"
 msgstr "Personvern"
 
-#: ../data/activity-log-manager-ccpanel.desktop.in.h:2
+#: ../data/gnome-activity-log-manager-panel.desktop.in.h:2
 msgid "Privacy and Activity Manager"
 msgstr "Personvern- og aktivitetsbehandling"
 
 #. These keywords are used when searching for applications in dashes, etc.
 #: ../data/activity-log-manager-ccpanel.desktop.in.h:4
 msgid "privacy;activity;log;zeitgeist;"
-msgstr ""
+msgstr "personvern;aktivitet;logg;zeitgeist;"
 
 #: ../data/activity-log-manager.desktop.in.h:1 ../src/alm.vala:30
 msgid "Activity Log Manager"
-msgstr ""
+msgstr "Aktivitetslogg-behandler"
 
 #: ../data/activity-log-manager.desktop.in.h:2
 msgid "Configure what gets logged in your Zeitgeist activity log"
-msgstr ""
+msgstr "Velg hva som skal lagres i din Zeitgeist-aktivitetslogg"
 
 #: ../data/activity-log-manager.desktop.in.h:3
 msgid "Activities and Privacy Manager Tool"
-msgstr ""
+msgstr "Aktivitets- og personvernshåndtering"
 
 #: ../src/activity-log-manager.vala:62
 msgid "Recent Items"
@@ -57,9 +57,9 @@
 #: ../src/activity-log-manager.vala:78
 #, c-format
 msgid "Record Activity"
-msgstr ""
+msgstr "Ta opp aktivitet"
 
-#: ../src/alm-cc.c:63
+#: ../src/activity-log-manager.vala:66
 msgid "Diagnostics"
 msgstr "Diagnostikk"
 
@@ -74,44 +74,46 @@
 #: ../src/applications-widget.vala:101
 #, c-format
 msgid "Do not log activity from the following applications:"
-msgstr ""
+msgstr "Ikke loggfør aktivitet fra følgende programmer:"
 
-#: ../src/applications-widget.vala:120 ../src/applications-widget.vala:559
+#: ../src/unified-privacy-applications.vala:412
+#: ../src/unified-privacy.vala:427
 msgid "Select Application"
 msgstr "Velg program"
 
-#: ../src/applications-widget.vala:180
+#: ../src/unified-privacy-applications.vala:228
 msgid "No description available"
 msgstr "Ingen beskrivelse tilgjengelig"
 
-#: ../src/applications-widget.vala:331 ../src/applications-widget.vala:489
-#: ../src/files-widget.vala:365
+#: ../src/unified-privacy-applications.vala:175
+#: ../src/unified-privacy-applications.vala:342
+#: ../src/unified-privacy.vala:274
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/applications-widget.vala:504
+#: ../src/unified-privacy-applications.vala:357
 msgid "Last Used"
 msgstr "Sist brukt"
 
-#: ../src/applications-widget.vala:517
+#: ../src/unified-privacy-applications.vala:370
 msgid "Activity"
 msgstr "Aktivitet"
 
 #. Today
-#: ../src/applications-widget.vala:614
+#: ../src/unified-privacy-applications.vala:467
 msgid "Today, %H:%M"
 msgstr "I dag, %H:%M"
 
 #. Yesterday
-#: ../src/applications-widget.vala:616
+#: ../src/unified-privacy-applications.vala:469
 msgid "Yesterday, %H:%M"
 msgstr "I går, %H:%M"
 
-#: ../src/applications-widget.vala:618
+#: ../src/unified-privacy-applications.vala:471
 msgid "%e %B %Y, %H:%M"
-msgstr ""
+msgstr "%e %B %Y, %H:%M"
 
-#: ../src/applications-widget.vala:625
+#: ../src/unified-privacy-applications.vala:478
 msgid "Never"
 msgstr "Aldri"
 
@@ -145,7 +147,7 @@
 
 #: ../src/files-widget.vala:261
 msgid "E-mail"
-msgstr ""
+msgstr "E-post"
 
 #: ../src/files-widget.vala:262
 msgid "Website"
@@ -154,7 +156,7 @@
 #: ../src/files-widget.vala:299
 #, c-format
 msgid "Don't record activity for following type of files:"
-msgstr ""
+msgstr "Ikke loggfør aktivitet for følgende filtyper:"
 
 #: ../src/files-widget.vala:351
 #, c-format
@@ -171,7 +173,7 @@
 
 #: ../src/files-widget.vala:416
 msgid "Select a directory to blacklist"
-msgstr ""
+msgstr "Velg en mappe som skal svartelistes"
 
 #: ../src/history-widget.vala:45
 msgid "The past hour"
@@ -196,7 +198,7 @@
 #: ../src/history-widget.vala:61
 #, c-format
 msgid "Forget activities"
-msgstr ""
+msgstr "Glem aktiviteter"
 
 #: ../src/history-widget.vala:68
 #, c-format
@@ -205,33 +207,39 @@
 "This activity can be used to retrieve files during searches or as history in "
 "applications."
 msgstr ""
+"Hver gang en fil eller et program brukes, kan informasjon om bruken lagres. "
+"Denne aktiviteten kan brukes til å hente frem filer ved søk, eller som "
+"historikk i programmer."
 
 #: ../src/history-widget.vala:103
 msgid "Delete history"
 msgstr "Slett historikk"
 
-#: ../src/history-widget.vala:148
+#: ../src/unified-privacy.vala:874
 msgid ""
 "This operation cannot be undone, are you sure you want to delete this "
 "activity?"
 msgstr ""
+"Denne handlingen kan ikke angres. Er du sikker på at du vil slette denne "
+"aktiviteten?"
 
-#: ../src/history-widget.vala:285
+#: ../src/unified-privacy-history.vala:93 ../src/unified-privacy.vala:793
 msgid "From:"
 msgstr "Fra:"
 
-#: ../src/history-widget.vala:289
+#: ../src/unified-privacy-history.vala:97
 msgid "To:"
 msgstr "Til:"
 
-#: ../src/history-widget.vala:300
+#: ../src/unified-privacy-history.vala:108
 #, c-format
 msgid "Invalid Timerange"
 msgstr "Ugyldig tidsrom"
 
-#: ../src/history-widget.vala:346 ../src/history-widget.vala:379
+#: ../src/unified-privacy-history.vala:154
+#: ../src/unified-privacy-history.vala:187
 msgid "%d %B %Y"
-msgstr ""
+msgstr "%d %B %Y"
 
 #: ../src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in.h:1
 msgid "Privacy settings"
@@ -239,29 +247,35 @@
 
 #: ../src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in.h:2
 msgid "To change your privacy settings you need to authenticate."
-msgstr ""
+msgstr "Du må autentisere deg for å endre personverninnstillingene dine."
 
-#: ../src/diagnostics/whoopsie.ui.h:1
+#: ../data/whoopsie.ui.h:1
 msgid ""
 "Ubuntu can collect anonymous information that helps developers improve it. "
 "All information collected is covered by our privacy policy."
 msgstr ""
+"Ubuntu kan samle inn anonym informasjon som hjelper utviklerne med å "
+"forbedre systemet. All informasjon som samles inn er underlagt våre "
+"retningslinjer for personvern."
 
-#: ../src/diagnostics/whoopsie.ui.h:2
+#: ../data/whoopsie.ui.h:2
 msgid "Privacy Policy"
-msgstr ""
+msgstr "Retningslinjer for personvern"
 
-#: ../src/diagnostics/whoopsie.ui.h:3
+#: ../data/whoopsie.ui.h:3
 msgid "People using this computer can:"
 msgstr "Personer som bruker denne datamaskinen kan:"
 
-#: ../src/diagnostics/whoopsie.ui.h:4
+#: ../data/whoopsie.ui.h:4
 msgid "Send error reports to Canonical"
 msgstr "Send feilrapporter til Canonical"
 
-#: ../src/diagnostics/whoopsie.ui.h:5
+#: ../data/whoopsie.ui.h:5
 msgid ""
 "<small>Error reports include information about what a program was doing when "
 "it failed. You always have the choice to send or cancel an error "
 "report.</small>"
 msgstr ""
+"<small>Feilrapporter inneholder informasjon om hva et program gjorde da "
+"feilen oppstod. Du vil alltid få valget mellom å sende eller avbryte "
+"rapporteringen.</small>"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/aisleriot.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/aisleriot.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/aisleriot.po	2013-01-29 09:33:48.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/aisleriot.po	2014-01-07 06:37:51.000000000 +0000
@@ -15,12 +15,11 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:32+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 20:59+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
-#: ../data/freecell.desktop.in.in.h:1 ../src/sol.c:154 ../src/window.c:388
-#: ../src/window.c:392
+#: ../src/sol.c:117
 msgid "FreeCell Solitaire"
 msgstr "FreeCell Solitaire"
 
@@ -109,80 +108,80 @@
 msgstr "En liste med nylig spilte spill."
 
 #. Now construct the window contents
-#: ../src/ar-game-chooser.c:187 ../src/window.c:2188
+#: ../src/ar-game-chooser.c:312 ../src/window.c:2194
 msgid "Select Game"
 msgstr "Velg spill"
 
-#: ../src/ar-game-chooser.c:201
+#: ../src/ar-game-chooser.c:326
 msgid "_Select"
 msgstr "_Velg"
 
 #. Translators: this is the name of a type of card slot
-#: ../src/game.c:1357
+#: ../src/game.c:1437
 msgctxt "slot type"
 msgid "foundation"
 msgstr "fundament"
 
 #. Translators: this is the name of a type of card slot
-#: ../src/game.c:1361
+#: ../src/game.c:1441
 msgctxt "slot type"
 msgid "reserve"
 msgstr "reserve"
 
 #. Translators: this is the name of a type of card slot
-#: ../src/game.c:1365
+#: ../src/game.c:1445
 msgctxt "slot type"
 msgid "stock"
 msgstr "stokk"
 
 #. Translators: this is the name of a type of card slot
-#: ../src/game.c:1369
+#: ../src/game.c:1449
 msgctxt "slot type"
 msgid "tableau"
 msgstr "tablå"
 
 #. Translators: this is the name of a type of card slot
-#: ../src/game.c:1373
+#: ../src/game.c:1453
 msgctxt "slot type"
 msgid "waste"
 msgstr "kast"
 
 #. Translators: %s is the name of the card; "foundation" is the name of a type of card slot
-#: ../src/game.c:1405
+#: ../src/game.c:1485
 #, c-format
 msgctxt "slot hint"
 msgid "%s on foundation"
 msgstr "%s på fundamentet"
 
 #. Translators: %s is the name of the card; "reserve" is the name of a type of card slot
-#: ../src/game.c:1409
+#: ../src/game.c:1489
 #, c-format
 msgctxt "slot hint"
 msgid "%s on reserve"
 msgstr "%s på reserve"
 
 #. Translators: %s is the name of the card; "stock" is the name of a type of card slot
-#: ../src/game.c:1413
+#: ../src/game.c:1493
 #, c-format
 msgctxt "slot hint"
 msgid "%s on stock"
 msgstr "%s i stokken"
 
 #. Translators: %s is the name of the card; "tableau" is the name of a type of card slot
-#: ../src/game.c:1417
+#: ../src/game.c:1497
 #, c-format
 msgctxt "slot hint"
 msgid "%s on tableau"
 msgstr "%s på tablå"
 
 #. Translators: %s is the name of the card; "waste" is the name of a type of card slot
-#: ../src/game.c:1421
+#: ../src/game.c:1501
 #, c-format
 msgctxt "slot hint"
 msgid "%s on waste"
 msgstr "%s på kast"
 
-#: ../src/game.c:2101
+#: ../src/game.c:2168
 msgid "This game does not have hint support yet."
 msgstr "Dette spillet støtter ikke hint ennå"
 
@@ -190,7 +189,7 @@
 #. The first %s is a card name, the 2nd %s a sentence fragment.
 #. * Yes, we know this is bad for i18n.
 #. 
-#: ../src/game.c:2136 ../src/game.c:2162
+#: ../src/game.c:2203 ../src/game.c:2229
 #, c-format
 msgid "Move %s onto %s."
 msgstr "Flytt %s på %s."
@@ -200,7 +199,7 @@
 msgid "You are searching for a %s."
 msgstr "Du søker etter en %s."
 
-#: ../src/game.c:2187
+#: ../src/game.c:2249
 msgid "This game is unable to provide a hint."
 msgstr "Dette spillet kan ikke gi deg et hint."
 
@@ -904,7 +903,7 @@
 #. freely, literally, or not at all, at your option.
 #. 
 #. Translators: this string is the name of a variant of this game. If there is an established standard name for this game or game variant in your locale, use that; otherwise you can translate this string freely or literally, at your option.
-#: ../src/game-names.h:546 ../games/terrace.scm:37
+#: ../src/game-names.h:546 ../games/terrace.scm:39
 msgid "Terrace"
 msgstr "Terrasse"
 
@@ -1026,27 +1025,27 @@
 msgstr "Zebra"
 
 #. String reserve
-#: ../src/sol.c:47
+#: ../src/sol.c:51
 msgid "Solitaire"
 msgstr "Solitaire"
 
-#: ../src/sol.c:48
+#: ../src/sol.c:52
 msgid "GNOME Solitaire"
 msgstr "GNOME Solitaire"
 
-#: ../src/sol.c:49
+#: ../src/sol.c:53
 msgid "About Solitaire"
 msgstr "Om Solitaire"
 
-#: ../src/sol.c:105
+#: ../src/sol.c:68
 msgid "Select the game type to play"
 msgstr "Velg type spill som skal spilles"
 
-#: ../src/sol.c:105
+#: ../src/sol.c:68
 msgid "NAME"
 msgstr "NAVN"
 
-#: ../src/sol.c:154 ../src/window.c:393 ../src/window.c:1834
+#: ../src/sol.c:117 ../src/window.c:420
 msgid "AisleRiot"
 msgstr "AisleRiot"
 
@@ -1089,7 +1088,7 @@
 msgid "Time"
 msgstr "Tid:"
 
-#: ../src/stats-dialog.c:199
+#: ../src/ar-application.c:221 ../src/stats-dialog.c:199
 msgid "Statistics"
 msgstr "Statistikk"
 
@@ -1126,40 +1125,40 @@
 msgid "%d:%02d"
 msgstr "%d:%02d"
 
-#: ../src/util.c:86 ../src/util.c:90 ../src/lib/ar-help.c:146
+#: ../src/lib/ar-help.c:146 ../src/util.c:86 ../src/util.c:90
 #, c-format
 msgid "Could not show help for “%s”"
 msgstr "Kunne ikke vise hjelp for «%s»"
 
-#: ../src/window.c:207
+#: ../src/window.c:215
 msgid "Congratulations, you have won!"
 msgstr "Gratulerer. Du har vunnet!"
 
-#: ../src/window.c:211
+#: ../src/window.c:219
 msgid "There are no more moves"
 msgstr "Ingen flere trekk"
 
-#: ../src/window.c:344
+#: ../src/window.c:370
 msgid "Main game:"
 msgstr "Hovedspill:"
 
-#: ../src/window.c:352
+#: ../src/window.c:378
 msgid "Card games:"
 msgstr "Kortspill:"
 
-#: ../src/window.c:367
+#: ../src/window.c:393
 msgid "Card themes:"
 msgstr "Tema for kort:"
 
-#: ../src/window.c:395
+#: ../src/window.c:416
 msgid "About FreeCell Solitaire"
 msgstr "Om FreeCell Solitaire"
 
-#: ../src/window.c:396
+#: ../src/window.c:422
 msgid "About AisleRiot"
 msgstr "Om AisleRiot"
 
-#: ../src/window.c:400
+#: ../src/window.c:424
 msgid ""
 "AisleRiot provides a rule-based solitaire card engine that allows many "
 "different games to be played."
@@ -1167,7 +1166,7 @@
 "AislerRiot gir deg en regelbasert solitaire-kabalmotor som lar deg spille "
 "mange forskjellige spill."
 
-#: ../src/window.c:409
+#: ../src/window.c:433
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -1175,18 +1174,19 @@
 "Torstein Adolf Winterseth <kvikende@fsfe.org>\n"
 "\n"
 "Launchpad Contributions:\n"
+"  Frode Holen https://launchpad.net/~hanfrode\n"
 "  Kjartan Maraas https://launchpad.net/~kmaraas"
 
-#: ../src/window.c:413
+#: ../src/window.c:436
 msgid "GNOME Games web site"
 msgstr "GNOME spill nettsted"
 
-#: ../src/window.c:1259
+#: ../src/window.c:1302
 #, c-format
 msgid "Play “%s”"
 msgstr "Spill «%s»"
 
-#: ../src/window.c:1420
+#: ../src/window.c:1464
 #, c-format
 msgid "Display cards with “%s” card theme"
 msgstr "Vis kort med korttema «%s»"
@@ -1201,165 +1201,166 @@
 msgid "%6d"
 msgstr "%6d"
 
-#: ../src/window.c:1725
+#: ../src/window.c:1758
 msgid "A scheme exception occurred"
 msgstr "Et unntak oppsto med schema"
 
-#: ../src/window.c:1728
+#: ../src/window.c:1761
 msgid "Please report this bug to the developers."
 msgstr "Vennligst rapporter denne feilen til utviklerene."
 
-#: ../src/window.c:1734
+#: ../src/window.c:1767
 msgid "_Don't report"
 msgstr "_Ikke send rapport"
 
-#: ../src/window.c:1735
+#: ../src/window.c:1768
 msgid "_Report"
 msgstr "Send _rapport"
 
-#: ../src/window.c:1832
+#: ../src/window.c:1871
 msgid "Freecell Solitaire"
 msgstr "Freecell Solitaire"
 
 #. Menu actions
-#: ../src/window.c:1923
+#: ../src/window.c:1975
 msgid "_Game"
 msgstr "_Spill"
 
-#: ../src/window.c:1924
+#: ../src/window.c:1976
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/window.c:1925
+#: ../src/window.c:1977
 msgid "_Control"
 msgstr "_Kontroll"
 
-#: ../src/window.c:1927
+#: ../src/window.c:1979
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/window.c:1932
+#: ../src/window.c:1984
 msgid "Start a new game"
 msgstr "Start et nytt spill"
 
-#: ../src/window.c:1935
+#: ../src/window.c:1987
 msgid "Restart the game"
 msgstr "Start spillet på nytt"
 
-#: ../src/window.c:1937
+#: ../src/window.c:1989
 msgid "_Select Game…"
 msgstr "_Velg spill …"
 
-#: ../src/window.c:1939
+#: ../src/window.c:1991
 msgid "Play a different game"
 msgstr "Spill et annet spill"
 
-#: ../src/window.c:1941
+#: ../src/window.c:1993
 msgid "_Recently Played"
 msgstr "Sist s_pilt"
 
-#: ../src/window.c:1942
+#: ../src/window.c:1994
 msgid "S_tatistics"
 msgstr "S_tatistikk"
 
-#: ../src/window.c:1943
+#: ../src/window.c:1995
 msgid "Show gameplay statistics"
 msgstr "Vis spillstatistikk"
 
-#: ../src/window.c:1946
+#: ../src/window.c:1998
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: ../src/window.c:1949
+#: ../src/window.c:2001
 msgid "Undo the last move"
 msgstr "Angre forrige trekk"
 
-#: ../src/window.c:1952
+#: ../src/window.c:2004
 msgid "Redo the undone move"
 msgstr "Gjenopprett angret trekk"
 
-#: ../src/window.c:1955
+#: ../src/window.c:2007
 msgid "Deal next card or cards"
 msgstr "Del ut kort"
 
-#: ../src/window.c:1958
+#: ../src/window.c:2010
 msgid "Get a hint for your next move"
 msgstr "Hint for ditt neste trekk"
 
-#: ../src/window.c:1961
+#: ../src/window.c:2013
 msgid "View help for Aisleriot"
 msgstr "Vis hjelp for Aisleriot"
 
-#: ../src/window.c:1965
+#: ../src/window.c:2017
 msgid "View help for this game"
 msgstr "Vis hjelp for dette spillet"
 
-#: ../src/window.c:1968
+#: ../src/window.c:2020
 msgid "About this game"
 msgstr "Om dette spillet"
 
-#: ../src/window.c:1970
+#: ../src/window.c:2022
 msgid "Install card themes…"
 msgstr "Installer tema for kort …"
 
-#: ../src/window.c:1971
+#: ../src/window.c:2023
 msgid "Install new card themes from the distribution packages repositories"
 msgstr "Installer nye tema for kortstokken fra distribusjonens pakkelager"
 
-#: ../src/window.c:1977
+#: ../src/window.c:2029
 msgid "_Card Style"
 msgstr "_Kortstil"
 
-#: ../src/window.c:2011
+#: ../src/window.c:2063
 msgid "_Toolbar"
 msgstr "_Verktøylinje"
 
-#: ../src/window.c:2012
+#: ../src/window.c:2064
 msgid "Show or hide the toolbar"
 msgstr "Vis eller skjul verktøylinjen"
 
-#: ../src/window.c:2016
+#: ../src/window.c:2068
 msgid "_Statusbar"
 msgstr "_Statuslinje"
 
-#: ../src/window.c:2017
+#: ../src/window.c:2069
 msgid "Show or hide statusbar"
 msgstr "Vis eller skjul statuslinjen"
 
-#: ../src/window.c:2021
+#: ../src/window.c:2073
 msgid "_Click to Move"
 msgstr "_Klikk for å flytte"
 
-#: ../src/window.c:2022
+#: ../src/window.c:2074
 msgid "Pick up and drop cards by clicking"
 msgstr "Plukk opp og slipp kort ved å klikke"
 
-#: ../src/window.c:2026
+#. not active by default
+#: ../src/window.c:2077
 msgid "_Sound"
 msgstr "_Lyd"
 
-#: ../src/window.c:2027
+#: ../src/window.c:2078
 msgid "Whether or not to play event sounds"
 msgstr "Om lyder skal spilles av for hendelser"
 
-#: ../src/window.c:2207
+#: ../src/window.c:2218
 msgid "Score:"
 msgstr "Poeng:"
 
-#: ../src/window.c:2219
+#: ../src/window.c:2230
 msgid "Time:"
 msgstr "Tid:"
 
-#: ../src/window.c:2507
+#: ../src/window.c:2528
 #, c-format
 msgid "Cannot start the game “%s”"
 msgstr "Kan ikke starte spill «%s»"
 
-#: ../src/window.c:2520
+#: ../src/window.c:2535
 msgid "Aisleriot cannot find the last game you played."
 msgstr "Aisleriot kan ikke finne det siste spillet du spilte."
 
-#: ../src/window.c:2521
+#: ../src/window.c:2536
 msgid ""
 "This usually occurs when you run an older version of Aisleriot which does "
 "not have the game you last played. The default game, Klondike, is being "
@@ -1421,7 +1422,7 @@
 msgstr "_Pause"
 
 #. %s is replaced with the name of the game in gnome-games.
-#: ../src/ar-stock.c:263
+#: ../src/ar-stock.c:267
 #, c-format
 msgid ""
 "%s is free software; you can redistribute it and/or modify it under the "
@@ -1434,7 +1435,7 @@
 "Foundation; enten versjon %d av lisensen, eller (hvis du ønsker det) enhver "
 "senere versjon."
 
-#: ../src/ar-stock.c:268
+#: ../src/ar-stock.c:272
 #, c-format
 msgid ""
 "%s is distributed in the hope that it will be useful, but WITHOUT ANY "
@@ -1488,308 +1489,308 @@
 msgstr "Vindushøyde"
 
 #. Translators: this is the symbol that's on a Joker card
-#: ../src/lib/ar-card.c:181
+#: ../src/lib/ar-card.c:237
 msgctxt "card symbol"
 msgid "JOKER"
 msgstr "JOKER"
 
 #. Translators: this is the symbol that's on an Ace card
-#: ../src/lib/ar-card.c:183 ../src/lib/ar-card.c:207
+#: ../src/lib/ar-card.c:239 ../src/lib/ar-card.c:263
 msgctxt "card symbol"
 msgid "A"
 msgstr "A"
 
 #. Translators: this is the symbol that's on a 2 card
-#: ../src/lib/ar-card.c:185
+#: ../src/lib/ar-card.c:241
 msgctxt "card symbol"
 msgid "2"
 msgstr "2"
 
 #. Translators: this is the symbol that's on a 3 card
-#: ../src/lib/ar-card.c:187
+#: ../src/lib/ar-card.c:243
 msgctxt "card symbol"
 msgid "3"
 msgstr "3"
 
 #. Translators: this is the symbol that's on a 4 card
-#: ../src/lib/ar-card.c:189
+#: ../src/lib/ar-card.c:245
 msgctxt "card symbol"
 msgid "4"
 msgstr "4"
 
 #. Translators: this is the symbol that's on a 5 card
-#: ../src/lib/ar-card.c:191
+#: ../src/lib/ar-card.c:247
 msgctxt "card symbol"
 msgid "5"
 msgstr "5"
 
 #. Translators: this is the symbol that's on a 6 card
-#: ../src/lib/ar-card.c:193
+#: ../src/lib/ar-card.c:249
 msgctxt "card symbol"
 msgid "6"
 msgstr "6"
 
 #. Translators: this is the symbol that's on a 7 card
-#: ../src/lib/ar-card.c:195
+#: ../src/lib/ar-card.c:251
 msgctxt "card symbol"
 msgid "7"
 msgstr "7"
 
 #. Translators: this is the symbol that's on a 8 card
-#: ../src/lib/ar-card.c:197
+#: ../src/lib/ar-card.c:253
 msgctxt "card symbol"
 msgid "8"
 msgstr "8"
 
 #. Translators: this is the symbol that's on a 9 card
-#: ../src/lib/ar-card.c:199
+#: ../src/lib/ar-card.c:255
 msgctxt "card symbol"
 msgid "9"
 msgstr "9"
 
 #. Translators: this is the symbol that's on a Jack card
-#: ../src/lib/ar-card.c:201
+#: ../src/lib/ar-card.c:257
 msgctxt "card symbol"
 msgid "J"
 msgstr "J"
 
 #. Translators: this is the symbol that's on a Queen card
-#: ../src/lib/ar-card.c:203
+#: ../src/lib/ar-card.c:259
 msgctxt "card symbol"
 msgid "Q"
 msgstr "Q"
 
 #. Translators: this is the symbol that's on a King card
-#: ../src/lib/ar-card.c:205
+#: ../src/lib/ar-card.c:261
 msgctxt "card symbol"
 msgid "K"
 msgstr "K"
 
 #. Translators: this is the symbol that's on a 1 card
-#: ../src/lib/ar-card.c:209
+#: ../src/lib/ar-card.c:265
 msgctxt "card symbol"
 msgid "1"
 msgstr "1"
 
-#: ../src/lib/ar-card.c:243
+#: ../src/lib/ar-card.c:299
 msgid "ace of clubs"
 msgstr "kløver ess"
 
-#: ../src/lib/ar-card.c:244
+#: ../src/lib/ar-card.c:300
 msgid "two of clubs"
 msgstr "kløver to"
 
-#: ../src/lib/ar-card.c:245
+#: ../src/lib/ar-card.c:301
 msgid "three of clubs"
 msgstr "kløver tre"
 
-#: ../src/lib/ar-card.c:246
+#: ../src/lib/ar-card.c:302
 msgid "four of clubs"
 msgstr "kløver fire"
 
-#: ../src/lib/ar-card.c:247
+#: ../src/lib/ar-card.c:303
 msgid "five of clubs"
 msgstr "kløver fem"
 
-#: ../src/lib/ar-card.c:248
+#: ../src/lib/ar-card.c:304
 msgid "six of clubs"
 msgstr "kløver seks"
 
-#: ../src/lib/ar-card.c:249
+#: ../src/lib/ar-card.c:305
 msgid "seven of clubs"
 msgstr "kløver sju"
 
-#: ../src/lib/ar-card.c:250
+#: ../src/lib/ar-card.c:306
 msgid "eight of clubs"
 msgstr "kløver åtte"
 
-#: ../src/lib/ar-card.c:251
+#: ../src/lib/ar-card.c:307
 msgid "nine of clubs"
 msgstr "kløver ni"
 
-#: ../src/lib/ar-card.c:252
+#: ../src/lib/ar-card.c:308
 msgid "ten of clubs"
 msgstr "kløver ti"
 
-#: ../src/lib/ar-card.c:253
+#: ../src/lib/ar-card.c:309
 msgid "jack of clubs"
 msgstr "kløver knekt"
 
-#: ../src/lib/ar-card.c:254
+#: ../src/lib/ar-card.c:310
 msgid "queen of clubs"
-msgstr "kløver dronning"
+msgstr "kløver dame"
 
-#: ../src/lib/ar-card.c:255
+#: ../src/lib/ar-card.c:311
 msgid "king of clubs"
 msgstr "kløver konge"
 
-#: ../src/lib/ar-card.c:256
+#: ../src/lib/ar-card.c:312
 msgid "ace of diamonds"
 msgstr "ruter ess"
 
-#: ../src/lib/ar-card.c:257
+#: ../src/lib/ar-card.c:313
 msgid "two of diamonds"
 msgstr "ruter to"
 
-#: ../src/lib/ar-card.c:258
+#: ../src/lib/ar-card.c:314
 msgid "three of diamonds"
 msgstr "ruter tre"
 
-#: ../src/lib/ar-card.c:259
+#: ../src/lib/ar-card.c:315
 msgid "four of diamonds"
 msgstr "ruter fire"
 
-#: ../src/lib/ar-card.c:260
+#: ../src/lib/ar-card.c:316
 msgid "five of diamonds"
 msgstr "ruter fem"
 
-#: ../src/lib/ar-card.c:261
+#: ../src/lib/ar-card.c:317
 msgid "six of diamonds"
 msgstr "ruter seks"
 
-#: ../src/lib/ar-card.c:262
+#: ../src/lib/ar-card.c:318
 msgid "seven of diamonds"
 msgstr "ruter sju"
 
-#: ../src/lib/ar-card.c:263
+#: ../src/lib/ar-card.c:319
 msgid "eight of diamonds"
 msgstr "ruter åtte"
 
-#: ../src/lib/ar-card.c:264
+#: ../src/lib/ar-card.c:320
 msgid "nine of diamonds"
 msgstr "ruter ni"
 
-#: ../src/lib/ar-card.c:265
+#: ../src/lib/ar-card.c:321
 msgid "ten of diamonds"
 msgstr "ruter ti"
 
-#: ../src/lib/ar-card.c:266
+#: ../src/lib/ar-card.c:322
 msgid "jack of diamonds"
 msgstr "ruter knekt"
 
-#: ../src/lib/ar-card.c:267
+#: ../src/lib/ar-card.c:323
 msgid "queen of diamonds"
-msgstr "ruter dronning"
+msgstr "ruter dame"
 
-#: ../src/lib/ar-card.c:268
+#: ../src/lib/ar-card.c:324
 msgid "king of diamonds"
 msgstr "ruter konge"
 
-#: ../src/lib/ar-card.c:269
+#: ../src/lib/ar-card.c:325
 msgid "ace of hearts"
 msgstr "hjerter ess"
 
-#: ../src/lib/ar-card.c:270
+#: ../src/lib/ar-card.c:326
 msgid "two of hearts"
 msgstr "hjerter to"
 
-#: ../src/lib/ar-card.c:271
+#: ../src/lib/ar-card.c:327
 msgid "three of hearts"
 msgstr "hjerter tre"
 
-#: ../src/lib/ar-card.c:272
+#: ../src/lib/ar-card.c:328
 msgid "four of hearts"
 msgstr "hjerter fire"
 
-#: ../src/lib/ar-card.c:273
+#: ../src/lib/ar-card.c:329
 msgid "five of hearts"
 msgstr "hjerter fem"
 
-#: ../src/lib/ar-card.c:274
+#: ../src/lib/ar-card.c:330
 msgid "six of hearts"
 msgstr "hjerter seks"
 
-#: ../src/lib/ar-card.c:275
+#: ../src/lib/ar-card.c:331
 msgid "seven of hearts"
 msgstr "hjerter sju"
 
-#: ../src/lib/ar-card.c:276
+#: ../src/lib/ar-card.c:332
 msgid "eight of hearts"
 msgstr "hjerter åtte"
 
-#: ../src/lib/ar-card.c:277
+#: ../src/lib/ar-card.c:333
 msgid "nine of hearts"
 msgstr "hjerter ni"
 
-#: ../src/lib/ar-card.c:278
+#: ../src/lib/ar-card.c:334
 msgid "ten of hearts"
 msgstr "hjerter ti"
 
-#: ../src/lib/ar-card.c:279
+#: ../src/lib/ar-card.c:335
 msgid "jack of hearts"
 msgstr "hjerter knekt"
 
-#: ../src/lib/ar-card.c:280
+#: ../src/lib/ar-card.c:336
 msgid "queen of hearts"
-msgstr "hjerter dronning"
+msgstr "hjerter dame"
 
-#: ../src/lib/ar-card.c:281
+#: ../src/lib/ar-card.c:337
 msgid "king of hearts"
 msgstr "hjerter konge"
 
-#: ../src/lib/ar-card.c:282
+#: ../src/lib/ar-card.c:338
 msgid "ace of spades"
 msgstr "spar ess"
 
-#: ../src/lib/ar-card.c:283
+#: ../src/lib/ar-card.c:339
 msgid "two of spades"
 msgstr "spar to"
 
-#: ../src/lib/ar-card.c:284
+#: ../src/lib/ar-card.c:340
 msgid "three of spades"
 msgstr "spar tre"
 
-#: ../src/lib/ar-card.c:285
+#: ../src/lib/ar-card.c:341
 msgid "four of spades"
 msgstr "spar fire"
 
-#: ../src/lib/ar-card.c:286
+#: ../src/lib/ar-card.c:342
 msgid "five of spades"
 msgstr "spar fem"
 
-#: ../src/lib/ar-card.c:287
+#: ../src/lib/ar-card.c:343
 msgid "six of spades"
 msgstr "spar seks"
 
-#: ../src/lib/ar-card.c:288
+#: ../src/lib/ar-card.c:344
 msgid "seven of spades"
 msgstr "spar sju"
 
-#: ../src/lib/ar-card.c:289
+#: ../src/lib/ar-card.c:345
 msgid "eight of spades"
 msgstr "spar åtte"
 
-#: ../src/lib/ar-card.c:290
+#: ../src/lib/ar-card.c:346
 msgid "nine of spades"
 msgstr "spar ni"
 
-#: ../src/lib/ar-card.c:291
+#: ../src/lib/ar-card.c:347
 msgid "ten of spades"
 msgstr "spar ti"
 
-#: ../src/lib/ar-card.c:292
+#: ../src/lib/ar-card.c:348
 msgid "jack of spades"
 msgstr "spar knekt"
 
-#: ../src/lib/ar-card.c:293
+#: ../src/lib/ar-card.c:349
 msgid "queen of spades"
-msgstr "spar dronning"
+msgstr "spar dame"
 
-#: ../src/lib/ar-card.c:294
+#: ../src/lib/ar-card.c:350
 msgid "king of spades"
 msgstr "spar konge"
 
-#: ../src/lib/ar-card.c:311
+#: ../src/lib/ar-card.c:367
 msgid "face-down card"
 msgstr "ukjent kort"
 
 #. A black joker.
-#: ../src/lib/ar-card.c:322 ../games/sol.scm:394
+#: ../src/lib/ar-card.c:378
 msgid "black joker"
 msgstr "sort joker"
 
 #. A red joker.
-#: ../src/lib/ar-card.c:325 ../games/sol.scm:394
+#: ../src/lib/ar-card.c:381
 msgid "red joker"
 msgstr "rød joker"
 
@@ -1857,137 +1858,130 @@
 msgid "Show session management options"
 msgstr "Vis alternativer for økthåndtering"
 
-#: ../games/agnes.scm:68 ../games/terrace.scm:137
+#: ../games/agnes.scm:72 ../games/terrace.scm:139
 #, scheme-format
 msgid "Base Card: ~a"
 msgstr "Basiskort: ~a"
 
-#: ../games/agnes.scm:70 ../games/bear_river.scm:90 ../games/canfield.scm:79
-#: ../games/chessboard.scm:92 ../games/eagle_wing.scm:96
-#: ../games/glenwood.scm:82 ../games/kansas.scm:80 ../games/lady_jane.scm:103
-#: ../games/plait.scm:243 ../games/royal_east.scm:78 ../games/terrace.scm:139
+#: ../games/agnes.scm:74 ../games/bear-river.scm:90 ../games/canfield.scm:81
+#: ../games/chessboard.scm:94 ../games/eagle-wing.scm:104
+#: ../games/glenwood.scm:87 ../games/kansas.scm:88 ../games/lady-jane.scm:111
+#: ../games/plait.scm:242 ../games/royal-east.scm:85 ../games/terrace.scm:141
 msgid "Base Card: Ace"
 msgstr "Basiskort: Ess"
 
-#: ../games/agnes.scm:72 ../games/bear_river.scm:92 ../games/canfield.scm:81
-#: ../games/chessboard.scm:94 ../games/eagle_wing.scm:98
-#: ../games/glenwood.scm:84 ../games/kansas.scm:82 ../games/lady_jane.scm:105
-#: ../games/plait.scm:245 ../games/royal_east.scm:80 ../games/terrace.scm:141
+#: ../games/agnes.scm:76 ../games/bear-river.scm:92 ../games/canfield.scm:83
+#: ../games/chessboard.scm:96 ../games/eagle-wing.scm:106
+#: ../games/glenwood.scm:89 ../games/kansas.scm:90 ../games/lady-jane.scm:113
+#: ../games/plait.scm:244 ../games/royal-east.scm:87 ../games/terrace.scm:143
 msgid "Base Card: Jack"
 msgstr "Basiskort: Knekt"
 
-#: ../games/agnes.scm:74 ../games/bear_river.scm:94 ../games/canfield.scm:83
-#: ../games/chessboard.scm:96 ../games/eagle_wing.scm:100
-#: ../games/glenwood.scm:86 ../games/kansas.scm:84 ../games/lady_jane.scm:107
-#: ../games/plait.scm:247 ../games/royal_east.scm:82 ../games/terrace.scm:143
+#: ../games/agnes.scm:78 ../games/bear-river.scm:94 ../games/canfield.scm:85
+#: ../games/chessboard.scm:98 ../games/eagle-wing.scm:108
+#: ../games/glenwood.scm:91 ../games/kansas.scm:92 ../games/lady-jane.scm:115
+#: ../games/plait.scm:246 ../games/royal-east.scm:89 ../games/terrace.scm:145
 msgid "Base Card: Queen"
-msgstr "Basiskort: Dronning"
+msgstr "Basiskort: Dame"
 
-#: ../games/agnes.scm:76 ../games/bear_river.scm:96 ../games/canfield.scm:85
-#: ../games/chessboard.scm:98 ../games/eagle_wing.scm:102
-#: ../games/glenwood.scm:88 ../games/kansas.scm:86 ../games/lady_jane.scm:109
-#: ../games/plait.scm:249 ../games/royal_east.scm:84 ../games/terrace.scm:145
+#: ../games/agnes.scm:80 ../games/bear-river.scm:96 ../games/canfield.scm:87
+#: ../games/chessboard.scm:100 ../games/eagle-wing.scm:110
+#: ../games/glenwood.scm:93 ../games/kansas.scm:94 ../games/lady-jane.scm:117
+#: ../games/plait.scm:248 ../games/royal-east.scm:91 ../games/terrace.scm:147
 msgid "Base Card: King"
 msgstr "Basiskort: Konge"
 
-#: ../games/agnes.scm:81 ../games/auld_lang_syne.scm:51
-#: ../games/backbone.scm:129 ../games/block_ten.scm:52 ../games/bristol.scm:76
-#: ../games/camelot.scm:75 ../games/canfield.scm:67 ../games/carpet.scm:101
-#: ../games/cover.scm:40 ../games/doublets.scm:65 ../games/eagle_wing.scm:84
-#: ../games/easthaven.scm:54 ../games/elevator.scm:96
-#: ../games/escalator.scm:121 ../games/first_law.scm:40
-#: ../games/fortunes.scm:41 ../games/forty_thieves.scm:90
-#: ../games/glenwood.scm:70 ../games/gypsy.scm:61 ../games/helsinki.scm:51
-#: ../games/hopscotch.scm:53 ../games/jamestown.scm:52 ../games/jumbo.scm:70
-#: ../games/kansas.scm:68 ../games/klondike.scm:84 ../games/labyrinth.scm:72
-#: ../games/lady_jane.scm:114 ../games/monte_carlo.scm:73
-#: ../games/napoleons_tomb.scm:353 ../games/neighbor.scm:73
-#: ../games/plait.scm:235 ../games/quatorze.scm:73 ../games/royal_east.scm:70
-#: ../games/scuffle.scm:57 ../games/sir_tommy.scm:47
-#: ../games/straight_up.scm:62 ../games/terrace.scm:157
-#: ../games/thieves.scm:46 ../games/thirteen.scm:103
-#: ../games/thumb_and_pouch.scm:59 ../games/treize.scm:100
-#: ../games/triple_peaks.scm:102 ../games/union_square.scm:89
-#: ../games/westhaven.scm:59 ../games/whitehead.scm:54 ../games/yield.scm:106
-#: ../games/zebra.scm:69
+#: ../games/agnes.scm:85 ../games/auld-lang-syne.scm:53
+#: ../games/backbone.scm:131 ../games/block-ten.scm:54 ../games/bristol.scm:78
+#: ../games/camelot.scm:77 ../games/canfield.scm:69 ../games/carpet.scm:103
+#: ../games/cover.scm:42 ../games/doublets.scm:67 ../games/eagle-wing.scm:92
+#: ../games/easthaven.scm:56 ../games/elevator.scm:98
+#: ../games/escalator.scm:123 ../games/first-law.scm:42
+#: ../games/fortunes.scm:43 ../games/forty-thieves.scm:97
+#: ../games/glenwood.scm:75 ../games/gypsy.scm:65 ../games/helsinki.scm:53
+#: ../games/hopscotch.scm:55 ../games/jamestown.scm:54 ../games/jumbo.scm:72
+#: ../games/kansas.scm:76 ../games/klondike.scm:87 ../games/labyrinth.scm:74
+#: ../games/lady-jane.scm:122 ../games/monte-carlo.scm:75
+#: ../games/napoleons-tomb.scm:339 ../games/neighbor.scm:75
+#: ../games/plait.scm:234 ../games/quatorze.scm:75 ../games/royal-east.scm:77
+#: ../games/scuffle.scm:59 ../games/sir-tommy.scm:49
+#: ../games/straight-up.scm:64 ../games/terrace.scm:159
+#: ../games/thieves.scm:48 ../games/thirteen.scm:105
+#: ../games/thumb-and-pouch.scm:61 ../games/treize.scm:102
+#: ../games/triple-peaks.scm:104 ../games/union-square.scm:96
+#: ../games/westhaven.scm:66 ../games/whitehead.scm:58 ../games/yield.scm:108
+#: ../games/zebra.scm:71
 msgid "Stock left:"
 msgstr "Igjen i stokken:"
 
-#: ../games/agnes.scm:83 ../games/lady_jane.scm:116
+#: ../games/agnes.scm:87 ../games/lady-jane.scm:124
 msgid "Stock left: 0"
 msgstr "Igjen i stokken: 0"
 
-#: ../games/agnes.scm:222 ../games/bristol.scm:193 ../games/lady_jane.scm:251
-#: ../games/royal_east.scm:216 ../games/thumb_and_pouch.scm:195
+#: ../games/lady-jane.scm:253
 msgid "an empty foundation pile"
 msgstr "en tom fundamenthaug"
 
-#: ../games/agnes.scm:266 ../games/easthaven.scm:227
-#: ../games/labyrinth.scm:195 ../games/monte_carlo.scm:198
-#: ../games/monte_carlo.scm:203 ../games/valentine.scm:136
+#: ../games/agnes.scm:264 ../games/easthaven.scm:232
+#: ../games/labyrinth.scm:189 ../games/monte-carlo.scm:196
+#: ../games/monte-carlo.scm:201 ../games/valentine.scm:136
 msgid "Deal more cards"
 msgstr "Del ut flere kort"
 
-#: ../games/agnes.scm:272 ../games/backbone.scm:293
-#: ../games/bakers_dozen.scm:195 ../games/beleaguered_castle.scm:169
-#: ../games/canfield.scm:304 ../games/jumbo.scm:356
-#: ../games/king_albert.scm:290 ../games/lady_jane.scm:426
-#: ../games/streets_and_alleys.scm:180
+#: ../games/agnes.scm:270 ../games/backbone.scm:288
+#: ../games/bakers-dozen.scm:194 ../games/beleaguered-castle.scm:169
+#: ../games/canfield.scm:303 ../games/jumbo.scm:333
+#: ../games/king-albert.scm:286 ../games/lady-jane.scm:422
+#: ../games/streets-and-alleys.scm:180
 msgid "Try rearranging the cards"
 msgstr "Prøv å omarrangere kortene"
 
-#: ../games/athena.scm:78 ../games/klondike.scm:287
-#: ../games/napoleons_tomb.scm:368 ../games/osmosis.scm:220
-#: ../games/saratoga.scm:78
+#: ../games/athena.scm:80 ../games/klondike.scm:293
+#: ../games/napoleons-tomb.scm:354 ../games/osmosis.scm:221
+#: ../games/saratoga.scm:80
 msgid "Three card deals"
 msgstr "Del tre kort om gangen"
 
-#: ../games/auld_lang_syne.scm:122 ../games/bristol.scm:268
-#: ../games/first_law.scm:125 ../games/fortunes.scm:159
-#: ../games/lady_jane.scm:231 ../games/scuffle.scm:138 ../games/spider.scm:280
-#: ../games/thumb_and_pouch.scm:258 ../games/zebra.scm:215
+#: ../games/auld-lang-syne.scm:122 ../games/bristol.scm:262
+#: ../games/first-law.scm:127 ../games/fortunes.scm:157
+#: ../games/lady-jane.scm:239 ../games/scuffle.scm:138 ../games/spider.scm:290
+#: ../games/thumb-and-pouch.scm:258 ../games/zebra.scm:212
 msgid "Deal another round"
 msgstr "Del ut en ny runde"
 
-#: ../games/backbone.scm:125 ../games/doublets.scm:69
-#: ../games/eagle_wing.scm:106 ../games/gaps.scm:104 ../games/glenwood.scm:74
-#: ../games/jumbo.scm:66 ../games/klondike.scm:80
-#: ../games/napoleons_tomb.scm:349 ../games/plait.scm:253
-#: ../games/scuffle.scm:53 ../games/straight_up.scm:70
-#: ../games/terrace.scm:151 ../games/thumb_and_pouch.scm:63
-#: ../games/zebra.scm:73
+#: ../games/backbone.scm:127 ../games/doublets.scm:71
+#: ../games/eagle-wing.scm:114 ../games/gaps.scm:106 ../games/glenwood.scm:79
+#: ../games/jumbo.scm:68 ../games/klondike.scm:83
+#: ../games/napoleons-tomb.scm:335 ../games/plait.scm:252
+#: ../games/scuffle.scm:55 ../games/straight-up.scm:72
+#: ../games/terrace.scm:153 ../games/thumb-and-pouch.scm:65
+#: ../games/zebra.scm:75
 msgid "Redeals left:"
 msgstr "Omdelinger igjen:"
 
-#: ../games/backbone.scm:232 ../games/terrace.scm:353
+#: ../games/backbone.scm:234
 msgid "an empty slot on the tableau"
 msgstr "en tom plass på tablået"
 
-#: ../games/backbone.scm:233 ../games/terrace.scm:291
+#: ../games/backbone.scm:235
 msgid "an empty slot on the foundation"
 msgstr "en tom plass på fundamentet"
 
-#: ../games/backbone.scm:291 ../games/camelot.scm:230
-#: ../games/canfield.scm:226 ../games/carpet.scm:173 ../games/glenwood.scm:248
-#: ../games/klondike.scm:261 ../games/napoleons_tomb.scm:337
-#: ../games/osmosis.scm:214 ../games/plait.scm:104
-#: ../games/straight_up.scm:257 ../games/terrace.scm:359
+#: ../games/backbone.scm:286 ../games/camelot.scm:209
+#: ../games/canfield.scm:228 ../games/carpet.scm:173 ../games/glenwood.scm:253
+#: ../games/klondike.scm:267 ../games/napoleons-tomb.scm:323
+#: ../games/osmosis.scm:215 ../games/plait.scm:103
+#: ../games/straight-up.scm:240 ../games/terrace.scm:358
 msgid "Deal a new card from the deck"
 msgstr "Del ut et nytt kort fra stokken"
 
-#: ../games/bakers_dozen.scm:154 ../games/chessboard.scm:209
-#: ../games/easthaven.scm:186 ../games/eight_off.scm:178
-#: ../games/fortress.scm:164 ../games/forty_thieves.scm:381
-#: ../games/gypsy.scm:233 ../games/jumbo.scm:295 ../games/kansas.scm:235
-#: ../games/king_albert.scm:256 ../games/seahaven.scm:243
-#: ../games/streets_and_alleys.scm:156 ../games/westhaven.scm:200
-#: ../games/whitehead.scm:155 ../games/yukon.scm:242
+#: ../games/seahaven.scm:245
 msgid "an empty foundation"
 msgstr "et tomt fundament"
 
-#: ../games/bear_river.scm:88 ../games/canfield.scm:77
-#: ../games/chessboard.scm:90 ../games/eagle_wing.scm:94
-#: ../games/glenwood.scm:80 ../games/kansas.scm:78 ../games/plait.scm:241
+#: ../games/bear-river.scm:88 ../games/canfield.scm:79
+#: ../games/chessboard.scm:92 ../games/eagle-wing.scm:102
+#: ../games/glenwood.scm:85 ../games/kansas.scm:86 ../games/plait.scm:240
 msgid "Base Card: "
 msgstr "Basiskort: "
 
@@ -1995,13 +1989,11 @@
 msgid "an empty foundation slot"
 msgstr "en tom fundamentplass"
 
-#: ../games/bear_river.scm:209
+#: ../games/bear-river.scm:207
 msgid "Move something onto an empty right-hand tableau slot"
 msgstr "Plasser noe på den tomme tablåplassen til høyre"
 
-#: ../games/camelot.scm:183 ../games/helsinki.scm:114
-#: ../games/neighbor.scm:140 ../games/thirteen.scm:389 ../games/treize.scm:283
-#: ../games/yield.scm:299
+#: ../games/thirteen.scm:391
 msgid "itself"
 msgstr "selv"
 
@@ -2025,26 +2017,19 @@
 msgid "an empty right slot"
 msgstr "en tom høyre plass"
 
-#: ../games/camelot.scm:212 ../games/diamond_mine.scm:242
-#: ../games/diamond_mine.scm:294 ../games/klondike.scm:199
-#: ../games/klondike.scm:205 ../games/klondike.scm:235 ../games/odessa.scm:178
-#: ../games/odessa.scm:212 ../games/osmosis.scm:181 ../games/pileon.scm:156
-#: ../games/pileon.scm:158 ../games/scorpion.scm:181
-#: ../games/ten_across.scm:178 ../games/ten_across.scm:225
-#: ../games/union_square.scm:451 ../games/union_square.scm:454
-#: ../games/union_square.scm:456 ../games/yukon.scm:202
+#: ../games/pileon.scm:158 ../games/pileon.scm:160
 msgid "an empty slot"
 msgstr "en tom plass"
 
-#: ../games/canfield.scm:71 ../games/eagle_wing.scm:88 ../games/kansas.scm:72
-#: ../games/straight_up.scm:66
+#: ../games/canfield.scm:73 ../games/eagle-wing.scm:96 ../games/kansas.scm:80
+#: ../games/straight-up.scm:68
 msgid "Reserve left:"
 msgstr "Reserver venstre:"
 
-#: ../games/canfield.scm:227 ../games/eagle_wing.scm:335
-#: ../games/glenwood.scm:251 ../games/plait.scm:107
-#: ../games/straight_up.scm:260 ../games/thumb_and_pouch.scm:261
-#: ../games/zebra.scm:218
+#: ../games/canfield.scm:229 ../games/eagle-wing.scm:335
+#: ../games/glenwood.scm:256 ../games/plait.scm:106
+#: ../games/straight-up.scm:243 ../games/thumb-and-pouch.scm:261
+#: ../games/zebra.scm:215
 msgid "Move waste back to stock"
 msgstr "Flytt kast tilbake til stokken"
 
@@ -2056,16 +2041,16 @@
 msgid "empty space on tableau"
 msgstr "tom plass på tablået"
 
-#: ../games/chessboard.scm:196
+#: ../games/chessboard.scm:198
 msgid "Move a card to the Foundation"
 msgstr "Flytt et kort til fundamentet"
 
-#: ../games/chessboard.scm:264 ../games/fortress.scm:213
+#: ../games/chessboard.scm:260
 msgid "Move something into the empty Tableau slot"
 msgstr "Plasser noe på den tomme tablåplassen"
 
 #. Translators: This is one of the sentences that are used when the user wants to get a hint. Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute anything you like here; you don't have to translate the original sentence!
-#: ../games/clock.scm:221
+#: ../games/clock.scm:173
 msgid ""
 "Just because a crosswalk looks like a hopscotch board doesn't mean it is one"
 msgstr ""
@@ -2073,67 +2058,67 @@
 "er et"
 
 #. Translators: This is one of the sentences that are used when the user wants to get a hint. Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute anything you like here; you don't have to translate the original sentence!
-#: ../games/clock.scm:223
+#: ../games/clock.scm:175
 msgid "Look both ways before you cross the street"
 msgstr "Se begge veier før du krysser veien"
 
 #. Translators: This is one of the sentences that are used when the user wants to get a hint. Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute anything you like here; you don't have to translate the original sentence!
-#: ../games/clock.scm:225
+#: ../games/clock.scm:177
 msgid "Have you read the help file?"
 msgstr "Har du lest hjelpfilen?"
 
 #. Translators: This is one of the sentences that are used when the user wants to get a hint. Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute anything you like here; you don't have to translate the original sentence!
-#: ../games/clock.scm:227
+#: ../games/clock.scm:179
 msgid "Odessa is a better game.  Really."
 msgstr "Odessa er et bedre spill. Virkelig."
 
 #. Translators: This is one of the sentences that are used when the user wants to get a hint. Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute anything you like here; you don't have to translate the original sentence!
-#: ../games/clock.scm:229
+#: ../games/clock.scm:181
 msgid "Tourniquets are not recommended unless in the direst emergency"
 msgstr "Turnikéer er ikke å anbefale foruten i værste nødstilfelle"
 
 #. Translators: This is one of the sentences that are used when the user wants to get a hint. Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute anything you like here; you don't have to translate the original sentence!
-#: ../games/clock.scm:231
+#: ../games/clock.scm:183
 msgid "I could sure use a backrub right about now..."
 msgstr "Jeg kunne virkelig trengt en ryggmassasje nå …"
 
 #. Translators: This is one of the sentences that are used when the user wants to get a hint. Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute anything you like here; you don't have to translate the original sentence!
-#: ../games/clock.scm:233
+#: ../games/clock.scm:185
 msgid "Monitors won't give you Vitamin D -- but sunlight will..."
 msgstr "Monitorer gir deg ikke D-vitamin -- men sollys gjør det …"
 
 #. Translators: This is one of the sentences that are used when the user wants to get a hint. Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute anything you like here; you don't have to translate the original sentence!
-#: ../games/clock.scm:235
+#: ../games/clock.scm:187
 msgid "If you're ever lost and alone in the woods, hug a tree"
 msgstr "Hvis du noen gang har gått deg vill alene i skogen, klem et tre"
 
 #. Translators: This is one of the sentences that are used when the user wants to get a hint. Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute anything you like here; you don't have to translate the original sentence!
-#: ../games/clock.scm:237
+#: ../games/clock.scm:189
 msgid "Fishing wire makes bad dental floss"
 msgstr "Fiskeline er dårlig tanntråd"
 
 #. Translators: This is one of the sentences that are used when the user wants to get a hint. Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute anything you like here; you don't have to translate the original sentence!
-#: ../games/clock.scm:239
+#: ../games/clock.scm:191
 msgid "Consistency is key"
 msgstr "Konsistens er nøkkelen"
 
 #. Translators: This is one of the sentences that are used when the user wants to get a hint. Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute anything you like here; you don't have to translate the original sentence!
-#: ../games/clock.scm:241
+#: ../games/clock.scm:193
 msgid "When without a stapler, a staple and a ruler will work"
 msgstr ""
 "Når du ikke har en stiftemaskin vil en stift og en linjal gjøre nytten"
 
 #. Translators: This is one of the sentences that are used when the user wants to get a hint. Since the 'clock' game is a joke in itself, the sentence it nonsensical and/or a joke. So you can substitute anything you like here; you don't have to translate the original sentence!
-#: ../games/clock.scm:243
+#: ../games/clock.scm:195
 msgid "Never blow in a dog's ear"
 msgstr "Blås aldri en hund i øret"
 
-#: ../games/cruel.scm:155
+#: ../games/cruel.scm:157
 #, scheme-format
 msgid "Cards remaining: ~a"
 msgstr "Kort som gjenstår: ~a"
 
-#: ../games/cruel.scm:198
+#: ../games/cruel.scm:200
 msgid "Redeal."
 msgstr "Del på nytt."
 
@@ -2150,11 +2135,11 @@
 msgid "an empty slot on tableau"
 msgstr "en tom plass på tablået"
 
-#: ../games/eagle_wing.scm:332 ../games/elevator.scm:363
-#: ../games/escalator.scm:222 ../games/royal_east.scm:186
-#: ../games/thirteen.scm:413 ../games/treize.scm:299
-#: ../games/triple_peaks.scm:342 ../games/union_square.scm:461
-#: ../games/westhaven.scm:189 ../games/yield.scm:315
+#: ../games/eagle-wing.scm:332 ../games/elevator.scm:363
+#: ../games/escalator.scm:222 ../games/royal-east.scm:193
+#: ../games/thirteen.scm:419 ../games/treize.scm:305
+#: ../games/triple-peaks.scm:342 ../games/union-square.scm:464
+#: ../games/westhaven.scm:196 ../games/yield.scm:321
 msgid "Deal a card"
 msgstr "Del ut et kort"
 
@@ -2162,108 +2147,109 @@
 msgid "Move a King on to the empty tableau slot"
 msgstr "Flytt en konge til den tomme tablåplassen"
 
-#: ../games/easthaven.scm:234 ../games/klondike.scm:265
+#: ../games/easthaven.scm:239 ../games/klondike.scm:271
+#: ../games/union-square.scm:472
 msgid "No hint available right now"
 msgstr "Ingen hint tilgjengelig akkurat nå"
 
-#: ../games/eight_off.scm:231 ../games/seahaven.scm:298
+#: ../games/seahaven.scm:300
 msgid "an empty tableau"
 msgstr "en tom tablåhaug"
 
-#: ../games/eight_off.scm:247 ../games/seahaven.scm:314
+#: ../games/eight-off.scm:248 ../games/seahaven.scm:315
 msgid "Move something on to an empty reserve"
 msgstr "Plasser noe på den tomme plassen"
 
-#: ../games/eliminator.scm:174
+#: ../games/eliminator.scm:176
 msgid "Six Foundations"
 msgstr "Seks fundamenter"
 
-#: ../games/eliminator.scm:175
+#: ../games/eliminator.scm:177
 msgid "Five Foundations"
 msgstr "Fem fundamenter"
 
-#: ../games/eliminator.scm:176
+#: ../games/eliminator.scm:178
 msgid "Four Foundations"
 msgstr "Fire fundamenter"
 
-#: ../games/eliminator.scm:194
+#: ../games/eliminator.scm:196
 msgid "Play a card to foundation."
 msgstr "Spill et kort til fundamentet."
 
-#: ../games/eliminator.scm:195
+#: ../games/eliminator.scm:197
 msgid "No moves."
 msgstr "Ingen trekk"
 
-#: ../games/first_law.scm:137
+#: ../games/first-law.scm:139
 msgid "Remove the aces"
 msgstr "Fjern essene"
 
-#: ../games/first_law.scm:139
+#: ../games/first-law.scm:141
 msgid "Remove the twos"
 msgstr "Fjern toerene"
 
-#: ../games/first_law.scm:141
+#: ../games/first-law.scm:143
 msgid "Remove the threes"
 msgstr "Fjern treerene"
 
-#: ../games/first_law.scm:143
+#: ../games/first-law.scm:145
 msgid "Remove the fours"
 msgstr "Fjern firerene"
 
-#: ../games/first_law.scm:145
+#: ../games/first-law.scm:147
 msgid "Remove the fives"
 msgstr "Fjern femmerene"
 
-#: ../games/first_law.scm:147
+#: ../games/first-law.scm:149
 msgid "Remove the sixes"
 msgstr "Fjern sekserene"
 
-#: ../games/first_law.scm:149
+#: ../games/first-law.scm:151
 msgid "Remove the sevens"
 msgstr "Fjern syverene"
 
-#: ../games/first_law.scm:151
+#: ../games/first-law.scm:153
 msgid "Remove the eights"
 msgstr "Fjern åtterene"
 
-#: ../games/first_law.scm:153
+#: ../games/first-law.scm:155
 msgid "Remove the nines"
 msgstr "Fjern nierene"
 
-#: ../games/first_law.scm:155
+#: ../games/first-law.scm:157
 msgid "Remove the tens"
 msgstr "Fjern tierene"
 
-#: ../games/first_law.scm:157
+#: ../games/first-law.scm:159
 msgid "Remove the jacks"
 msgstr "Fjern knektene"
 
-#: ../games/first_law.scm:159
+#: ../games/first-law.scm:161
 msgid "Remove the queens"
-msgstr "Fjern dronningene"
+msgstr "Fjern damene"
 
-#: ../games/first_law.scm:161
+#: ../games/first-law.scm:163
 msgid "Remove the kings"
 msgstr "Fjern kongene"
 
-#: ../games/first_law.scm:163
+#: ../games/first-law.scm:165
 msgid "I'm not sure"
 msgstr "Jeg er ikke sikker"
 
-#: ../games/first_law.scm:183
+#: ../games/first-law.scm:184
 msgid "Return cards to stock"
 msgstr "Returner kortene til stokken"
 
-#: ../games/fortunes.scm:133 ../games/fortunes.scm:136
+#: ../games/fortunes.scm:135 ../games/fortunes.scm:138
 #, scheme-format
 msgid "Move ~a off the board"
 msgstr "Flytt ~a av bordet"
 
-#: ../games/fortunes.scm:156 ../games/klondike.scm:256
+#: ../games/fortunes.scm:154 ../games/klondike.scm:262
 msgid "Consider moving something into an empty slot"
 msgstr "Tenk på å flytte noe til en tom rad"
 
-#: ../games/forty_thieves.scm:372
+#: ../games/forty-thieves.scm:357
 msgid "Deal a card from stock"
 msgstr "Del ut et kort fra stokken"
 
@@ -2275,11 +2261,11 @@
 msgid "Bug! make-hint called on false move."
 msgstr "Feil! make-hint ble kalt på et ugyldig trekk."
 
-#: ../games/freecell.scm:623
+#: ../games/freecell.scm:625
 msgid "No moves are possible. Undo or start again."
 msgstr "Ingen mulige trekk. Angre eller start på nytt."
 
-#: ../games/freecell.scm:629
+#: ../games/freecell.scm:631
 msgid "The game has no solution. Undo or start again."
 msgstr "Spillet har ingen løsning. Angre eller start på nytt."
 
@@ -2287,8 +2273,7 @@
 msgid "an empty reserve"
 msgstr "en tom plass"
 
-#: ../games/freecell.scm:632 ../games/napoleons_tomb.scm:336
-#: ../games/terrace.scm:284
+#: ../games/terrace.scm:286
 msgid "the foundation"
 msgstr "fundamenthaugen"
 
@@ -2296,20 +2281,20 @@
 msgid "an open tableau"
 msgstr "en åpen tablåhaug"
 
-#: ../games/gaps.scm:276
+#: ../games/gaps.scm:280
 msgid "Double click any card to redeal."
 msgstr "Dobbeltklikk på et kort for å dele ut på nytt."
 
-#: ../games/gaps.scm:282
+#: ../games/gaps.scm:286
 msgid "No hint available."
 msgstr "Ingen hint tilgjengelig."
 
-#: ../games/gaps.scm:291
+#: ../games/gaps.scm:295
 #, scheme-format
 msgid "Place a two in the leftmost slot of row ~a."
 msgstr "Plasser en toer i plassen lengst til venstre på rad ~a"
 
-#: ../games/gaps.scm:295
+#: ../games/gaps.scm:299
 #, scheme-format
 msgid "Add to the sequence in row ~a."
 msgstr "Legg til på sekvensen på rad ~a"
@@ -2319,49 +2304,49 @@
 msgid "Place the ~a next to ~a."
 msgstr "Plasser ~a ved siden av ~a."
 
-#: ../games/gaps.scm:323
+#: ../games/gaps.scm:383
 msgid "Randomly Placed Gaps on Redeal"
 msgstr "Tilfeldig plasserte hull ved omstokk"
 
-#: ../games/giant.scm:74
+#: ../games/giant.scm:76
 #, scheme-format
 msgid "Deals left: ~a"
 msgstr "Utdelinger som gjenstår: ~a"
 
-#: ../games/giant.scm:250
+#: ../games/giant.scm:252
 msgid "Deal a row"
 msgstr "Del ut en rad"
 
-#: ../games/giant.scm:257
+#: ../games/giant.scm:259
 msgid "an empty foundation place"
 msgstr "en tom fundamentplass"
 
-#: ../games/giant.scm:258
+#: ../games/giant.scm:260
 msgid "an empty tableau place"
 msgstr "en tom tablåplass"
 
-#: ../games/giant.scm:285
+#: ../games/giant.scm:276
 msgid "Try moving a card to the reserve"
 msgstr "Prøv å flytte et kort til reservehaugen"
 
-#: ../games/giant.scm:286
+#: ../games/giant.scm:277
 msgid "Try dealing a row of cards"
 msgstr "Prøv å dele ut en rad med kort"
 
 #. this isn't great, but it will get around the premature end-of-game call
-#: ../games/giant.scm:288 ../games/spider.scm:299
+#: ../games/giant.scm:279 ../games/spider.scm:309
 msgid "Try moving card piles around"
 msgstr "Prøv å flytte korthaugene rundt"
 
-#: ../games/giant.scm:293
+#: ../games/giant.scm:284
 msgid "Same suit"
 msgstr "Samme stokk"
 
-#: ../games/giant.scm:294
+#: ../games/giant.scm:285
 msgid "Alternating colors"
 msgstr "Skiftende farger"
 
-#: ../games/glenwood.scm:256
+#: ../games/glenwood.scm:261
 msgid "Select a card from the reserve for first foundation pile"
 msgstr "Velg et kort fra reserven for den første fundamenthaugen"
 
@@ -2373,22 +2358,22 @@
 msgid "on to the empty tableau slot"
 msgstr "til den tomme tablåplassen"
 
-#: ../games/golf.scm:65 ../games/osmosis.scm:66 ../games/spider.scm:86
+#: ../games/golf.scm:67 ../games/osmosis.scm:68 ../games/spider.scm:88
 #, scheme-format
 msgid "Stock left: ~a"
 msgstr "Igjen i stokken: ~a"
 
-#: ../games/golf.scm:137 ../games/hopscotch.scm:130 ../games/jumbo.scm:319
-#: ../games/kansas.scm:211 ../games/sir_tommy.scm:136
-#: ../games/whitehead.scm:247
+#: ../games/golf.scm:138 ../games/hopscotch.scm:130 ../games/jumbo.scm:298
+#: ../games/kansas.scm:219 ../games/sir-tommy.scm:134
+#: ../games/whitehead.scm:252
 msgid "Deal another card"
 msgstr "Del ut et nytt kort"
 
-#: ../games/gypsy.scm:212
+#: ../games/gypsy.scm:216
 msgid "Move a card or build of cards on to the empty slot"
 msgstr "Flytt et kort eller en serie til den tomme plassen"
 
-#: ../games/gypsy.scm:338
+#: ../games/gypsy.scm:339
 msgid "Deal another hand"
 msgstr "Del ut en ny hånd"
 
@@ -2396,62 +2381,60 @@
 msgid "Move card from waste"
 msgstr "Flytt kort fra kastet"
 
-#: ../games/jumbo.scm:179 ../games/jumbo.scm:272 ../games/kansas.scm:321
-#: ../games/king_albert.scm:191 ../games/lady_jane.scm:395
-#: ../games/lady_jane.scm:407 ../games/straight_up.scm:249
+#: ../games/lady-jane.scm:397 ../games/lady-jane.scm:409
 msgid "an empty tableau slot"
 msgstr "en tom tablåplass"
 
-#: ../games/jumbo.scm:322
+#: ../games/jumbo.scm:301
 msgid "Move waste to stock"
 msgstr "Flytt kast tilbake til stokken"
 
-#: ../games/kings_audience.scm:86
+#: ../games/kings-audience.scm:88
 #, scheme-format
 msgid "Stock remaining: ~a"
 msgstr "Igjen i stokken: ~a"
 
-#: ../games/kings_audience.scm:227
+#: ../games/kings-audience.scm:227
 msgid "Deal a new card"
 msgstr "Del ut et nytt kort"
 
-#: ../games/klondike.scm:264
+#: ../games/klondike.scm:270
 msgid "Try moving cards down from the foundation"
 msgstr "Prøv å flytte kort ned fra fundamentet"
 
-#: ../games/klondike.scm:288 ../games/napoleons_tomb.scm:369
+#: ../games/klondike.scm:294 ../games/napoleons-tomb.scm:355
 msgid "Single card deals"
 msgstr "Del ett kort om gangen"
 
-#: ../games/klondike.scm:289
+#: ../games/klondike.scm:295
 msgid "No redeals"
 msgstr "Ingen ny utdeling"
 
-#: ../games/lady_jane.scm:101 ../games/royal_east.scm:76
+#: ../games/lady-jane.scm:109 ../games/royal-east.scm:83
 msgid "Base Card:"
 msgstr "Basiskort:"
 
-#: ../games/maze.scm:145
+#: ../games/maze.scm:147
 msgid ""
 "Aim to place the suits in the order which fits the current layout most "
 "naturally."
 msgstr ""
 "Prøv å plassere stokkene i rekkefølgen som passer best for denne utformingen."
 
-#: ../games/napoleons_tomb.scm:371
+#: ../games/napoleons-tomb.scm:357
 msgid "Autoplay"
-msgstr ""
+msgstr "Automatisk spill"
 
-#: ../games/osmosis.scm:72
+#: ../games/osmosis.scm:74
 #, scheme-format
 msgid "Redeals left: ~a"
 msgstr "Utdelinger som gjenstår: ~a"
 
-#: ../games/osmosis.scm:213
+#: ../games/osmosis.scm:214
 msgid "Deal new cards from the deck"
 msgstr "Del ut nye kort fra stokken"
 
-#: ../games/pileon.scm:156 ../games/pileon.scm:158 ../games/terrace.scm:284
+#: ../games/pileon.scm:158 ../games/pileon.scm:160 ../games/terrace.scm:286
 msgid "something"
 msgstr "noe"
 
@@ -2465,11 +2448,11 @@
 msgid "Move ~a from the stock to an empty edge or tableau slot"
 msgstr "Flytt ~a fra stokken til en tom kant eller tablåplass"
 
-#: ../games/poker.scm:295
+#: ../games/poker.scm:297
 msgid "Place cards on to the Tableau to form poker hands"
 msgstr "Plasser kortene på tablåplassen for å lage pokerhender"
 
-#: ../games/poker.scm:298
+#: ../games/poker.scm:300
 msgid "Shuffle mode"
 msgstr "Stokkemodus"
 
@@ -2479,7 +2462,7 @@
 msgid "an empty tableau pile"
 msgstr "en tom tablåhaug"
 
-#: ../games/scorpion.scm:142
+#: ../games/scorpion.scm:146
 msgid "Deal the cards"
 msgstr "Del ut kortene"
 
@@ -2491,11 +2474,11 @@
 msgid "empty foundation"
 msgstr "tomt fundament"
 
-#: ../games/sir_tommy.scm:132
+#: ../games/sir-tommy.scm:130
 msgid "Move waste on to a reserve slot"
 msgstr "Flytt kast til en reserveplass"
 
-#: ../games/sol.scm:273
+#: ../games/api.scm:285
 msgid "Unknown color"
 msgstr "Ukjent farge"
 
@@ -2551,7 +2534,7 @@
 msgid "king"
 msgstr "konge"
 
-#: ../games/sol.scm:384
+#: ../games/doublets.scm:170
 msgid "Unknown value"
 msgstr "Ukjent verdi"
 
@@ -2575,298 +2558,298 @@
 msgid "Unknown suit"
 msgstr "Ukjent stokk"
 
-#: ../games/sol.scm:401
+#: ../games/api.scm:410
 msgid "the ace of clubs"
 msgstr "kløver ess"
 
-#: ../games/sol.scm:402
+#: ../games/api.scm:411
 msgid "the two of clubs"
 msgstr "kløver to"
 
-#: ../games/sol.scm:403
+#: ../games/api.scm:412
 msgid "the three of clubs"
 msgstr "kløver tre"
 
-#: ../games/sol.scm:404
+#: ../games/api.scm:413
 msgid "the four of clubs"
 msgstr "kløver fire"
 
-#: ../games/sol.scm:405
+#: ../games/api.scm:414
 msgid "the five of clubs"
 msgstr "kløver fem"
 
-#: ../games/sol.scm:406
+#: ../games/api.scm:415
 msgid "the six of clubs"
 msgstr "kløver seks"
 
-#: ../games/sol.scm:407
+#: ../games/api.scm:416
 msgid "the seven of clubs"
 msgstr "kløver sju"
 
-#: ../games/sol.scm:408
+#: ../games/api.scm:417
 msgid "the eight of clubs"
 msgstr "kløver åtte"
 
-#: ../games/sol.scm:409
+#: ../games/api.scm:418
 msgid "the nine of clubs"
 msgstr "kløver ni"
 
-#: ../games/sol.scm:410
+#: ../games/api.scm:419
 msgid "the ten of clubs"
 msgstr "kløver ti"
 
-#: ../games/sol.scm:411
+#: ../games/api.scm:420
 msgid "the jack of clubs"
 msgstr "kløver knekt"
 
-#: ../games/sol.scm:412
+#: ../games/api.scm:421
 msgid "the queen of clubs"
-msgstr "kløver dronning"
+msgstr "kløver dame"
 
-#: ../games/sol.scm:413
+#: ../games/api.scm:422
 msgid "the king of clubs"
 msgstr "kløver konge"
 
-#: ../games/sol.scm:414 ../games/sol.scm:429 ../games/sol.scm:444
-#: ../games/sol.scm:459 ../games/sol.scm:460
+#: ../games/api.scm:423 ../games/api.scm:438 ../games/api.scm:453
+#: ../games/api.scm:468 ../games/api.scm:469
 msgid "the unknown card"
 msgstr "ukjent kort"
 
-#: ../games/sol.scm:416
+#: ../games/api.scm:425
 msgid "the ace of spades"
 msgstr "spar ess"
 
-#: ../games/sol.scm:417
+#: ../games/api.scm:426
 msgid "the two of spades"
 msgstr "spar to"
 
-#: ../games/sol.scm:418
+#: ../games/api.scm:427
 msgid "the three of spades"
 msgstr "spar tre"
 
-#: ../games/sol.scm:419
+#: ../games/api.scm:428
 msgid "the four of spades"
 msgstr "spar fire"
 
-#: ../games/sol.scm:420
+#: ../games/api.scm:429
 msgid "the five of spades"
 msgstr "spar fem"
 
-#: ../games/sol.scm:421
+#: ../games/api.scm:430
 msgid "the six of spades"
 msgstr "spar seks"
 
-#: ../games/sol.scm:422
+#: ../games/api.scm:431
 msgid "the seven of spades"
 msgstr "spar sju"
 
-#: ../games/sol.scm:423
+#: ../games/api.scm:432
 msgid "the eight of spades"
 msgstr "spar åtte"
 
-#: ../games/sol.scm:424
+#: ../games/api.scm:433
 msgid "the nine of spades"
 msgstr "spar ni"
 
-#: ../games/sol.scm:425
+#: ../games/api.scm:434
 msgid "the ten of spades"
 msgstr "spar ti"
 
-#: ../games/sol.scm:426
+#: ../games/api.scm:435
 msgid "the jack of spades"
 msgstr "spar knekt"
 
-#: ../games/sol.scm:427
+#: ../games/api.scm:436
 msgid "the queen of spades"
-msgstr "spar dronning"
+msgstr "spar dame"
 
-#: ../games/sol.scm:428
+#: ../games/api.scm:437
 msgid "the king of spades"
 msgstr "spar konge"
 
-#: ../games/sol.scm:431
+#: ../games/api.scm:440
 msgid "the ace of hearts"
 msgstr "hjerter ess"
 
-#: ../games/sol.scm:432
+#: ../games/api.scm:441
 msgid "the two of hearts"
 msgstr "hjerter to"
 
-#: ../games/sol.scm:433
+#: ../games/api.scm:442
 msgid "the three of hearts"
 msgstr "hjerter tre"
 
-#: ../games/sol.scm:434
+#: ../games/api.scm:443
 msgid "the four of hearts"
 msgstr "hjerter fire"
 
-#: ../games/sol.scm:435
+#: ../games/api.scm:444
 msgid "the five of hearts"
 msgstr "hjerter fem"
 
-#: ../games/sol.scm:436
+#: ../games/api.scm:445
 msgid "the six of hearts"
 msgstr "hjerter seks"
 
-#: ../games/sol.scm:437
+#: ../games/api.scm:446
 msgid "the seven of hearts"
 msgstr "hjerter sju"
 
-#: ../games/sol.scm:438
+#: ../games/api.scm:447
 msgid "the eight of hearts"
 msgstr "hjerter åtte"
 
-#: ../games/sol.scm:439
+#: ../games/api.scm:448
 msgid "the nine of hearts"
 msgstr "hjerter ni"
 
-#: ../games/sol.scm:440
+#: ../games/api.scm:449
 msgid "the ten of hearts"
 msgstr "hjerter ti"
 
-#: ../games/sol.scm:441
+#: ../games/api.scm:450
 msgid "the jack of hearts"
 msgstr "hjerter knekt"
 
-#: ../games/sol.scm:442
+#: ../games/api.scm:451
 msgid "the queen of hearts"
-msgstr "hjerter dronning"
+msgstr "hjerter dame"
 
-#: ../games/sol.scm:443
+#: ../games/api.scm:452
 msgid "the king of hearts"
 msgstr "hjerter konge"
 
-#: ../games/sol.scm:446
+#: ../games/api.scm:455
 msgid "the ace of diamonds"
 msgstr "ruter ess"
 
-#: ../games/sol.scm:447
+#: ../games/api.scm:456
 msgid "the two of diamonds"
 msgstr "ruter to"
 
-#: ../games/sol.scm:448
+#: ../games/api.scm:457
 msgid "the three of diamonds"
 msgstr "ruter tre"
 
-#: ../games/sol.scm:449
+#: ../games/api.scm:458
 msgid "the four of diamonds"
 msgstr "ruter fire"
 
-#: ../games/sol.scm:450
+#: ../games/api.scm:459
 msgid "the five of diamonds"
 msgstr "ruter fem"
 
-#: ../games/sol.scm:451
+#: ../games/api.scm:460
 msgid "the six of diamonds"
 msgstr "ruter seks"
 
-#: ../games/sol.scm:452
+#: ../games/api.scm:461
 msgid "the seven of diamonds"
 msgstr "ruter sju"
 
-#: ../games/sol.scm:453
+#: ../games/api.scm:462
 msgid "the eight of diamonds"
 msgstr "ruter åtte"
 
-#: ../games/sol.scm:454
+#: ../games/api.scm:463
 msgid "the nine of diamonds"
 msgstr "ruter ni"
 
-#: ../games/sol.scm:455
+#: ../games/api.scm:464
 msgid "the ten of diamonds"
 msgstr "ruter ti"
 
-#: ../games/sol.scm:456
+#: ../games/api.scm:465
 msgid "the jack of diamonds"
 msgstr "ruter knekt"
 
-#: ../games/sol.scm:457
+#: ../games/api.scm:466
 msgid "the queen of diamonds"
-msgstr "ruter dronning"
+msgstr "ruter dame"
 
-#: ../games/sol.scm:458
+#: ../games/api.scm:467
 msgid "the king of diamonds"
 msgstr "ruter konge"
 
-#: ../games/spider.scm:182 ../games/spider.scm:290
+#: ../games/spider.scm:184 ../games/spider.scm:300
 msgid "Undo until there are enough cards to fill all tableau piles"
 msgstr "Angre til det er nok kort til å fylle alle tablåhaugene"
 
-#: ../games/spider.scm:183
+#: ../games/spider.scm:185
 msgid "Please fill in empty pile first."
 msgstr "Vennligst fyll ut den tomme haugen først."
 
-#: ../games/spider.scm:275
+#: ../games/spider.scm:285
 msgid "Place something on empty slot"
 msgstr "Plasser noe på den tomme plassen"
 
-#: ../games/spider.scm:303
+#: ../games/spider.scm:313
 msgid "Four Suits"
 msgstr "Fire sorter"
 
-#: ../games/spider.scm:304
+#: ../games/spider.scm:314
 msgid "Two Suits"
 msgstr "To sorter"
 
-#: ../games/spider.scm:305
+#: ../games/spider.scm:315
 msgid "One Suit"
 msgstr "En sort"
 
-#: ../games/ten_across.scm:249
+#: ../games/ten-across.scm:214
 msgid "Move a card to an empty temporary slot"
 msgstr "Flytt et kort til den tomme midlertidige plassen"
 
-#: ../games/ten_across.scm:250
+#: ../games/ten-across.scm:215
 msgid "No hint available"
 msgstr "Ingen hint tilgjengelig"
 
-#: ../games/ten_across.scm:286
+#: ../games/ten-across.scm:251
 msgid "Allow temporary spots use"
 msgstr "Tillat bruk av midlertidige plasser"
 
 #. Translators: this string is the name of a variant of this game. If there is an established standard name for this game or game variant in your locale, use that; otherwise you can translate this string freely or literally, at your option.
-#: ../games/terrace.scm:39
+#: ../games/terrace.scm:41
 msgid "General's Patience"
 msgstr "Generalens tålmodighet"
 
 #. Translators: this string is the name of a variant of this game. If there is an established standard name for this game or game variant in your locale, use that; otherwise you can translate this string freely or literally, at your option.
-#: ../games/terrace.scm:41
+#: ../games/terrace.scm:43
 msgid "Falling Stars"
 msgstr "Fallende stjerner"
 
 #. Translators: this string is the name of a variant of this game. If there is an established standard name for this game or game variant in your locale, use that; otherwise you can translate this string freely or literally, at your option.
-#: ../games/terrace.scm:43
+#: ../games/terrace.scm:45
 msgid "Signora"
 msgstr "Signora"
 
 #. Translators: this string is the name of a variant of this game. If there is an established standard name for this game or game variant in your locale, use that; otherwise you can translate this string freely or literally, at your option.
-#: ../games/terrace.scm:45
+#: ../games/terrace.scm:47
 msgid "Redheads"
 msgstr "Rødtopper"
 
 #. Translators: this string is the name of a variant of this game. If there is an established standard name for this game or game variant in your locale, use that; otherwise you can translate this string freely or literally, at your option.
-#: ../games/terrace.scm:47
+#: ../games/terrace.scm:49
 msgid "Blondes and Brunettes"
 msgstr "Blondiner og brunetter"
 
 #. Translators: this string is the name of a variant of this game. If there is an established standard name for this game or game variant in your locale, use that; otherwise you can translate this string freely or literally, at your option.
-#: ../games/terrace.scm:49
+#: ../games/terrace.scm:51
 msgid "Wood"
 msgstr "Tre"
 
-#: ../games/thieves.scm:147
+#: ../games/thieves.scm:148
 msgid "Deal a card from the deck"
 msgstr "Del ut et kort fra stokken"
 
-#: ../games/thirteen.scm:379
+#: ../games/thirteen.scm:381
 msgid "Match the top two cards of the waste."
 msgstr "Treff på de to øverste kortene i kastet."
 
-#: ../games/triple_peaks.scm:349
+#: ../games/triple-peaks.scm:349
 msgid "Progressive Rounds"
 msgstr "Progressive runder"
 
-#: ../games/triple_peaks.scm:350
+#: ../games/triple-peaks.scm:350
 msgid "Multiplier Scoring"
 msgstr "Poengfaktor"
 
@@ -2874,7 +2857,7 @@
 msgid "appropriate foundation pile"
 msgstr "riktig fundamenthaug"
 
-#: ../games/whitehead.scm:238
+#: ../games/whitehead.scm:243
 msgid "Move a build of cards on to the empty Tableau slot"
 msgstr "Flytt en rekke med kort til den tomme tablåplassen"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/aptdaemon.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/aptdaemon.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/aptdaemon.po	2013-01-29 09:33:50.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/aptdaemon.po	2014-01-07 06:37:34.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aptdaemon\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-01-12 03:01+0000\n"
+"POT-Creation-Date: 2013-03-27 03:46+0000\n"
 "PO-Revision-Date: 2012-08-06 20:54+0000\n"
 "Last-Translator: Roy S <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:52+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:41+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../data/org.debian.apt.policy.in.h:1
 msgid "List keys of trusted vendors"
@@ -26,7 +26,7 @@
 msgid "To view the list of trusted keys, you need to authenticate."
 msgstr "Du må autentisere deg for å vise godkjente nøkler."
 
-#: ../data/org.debian.apt.policy.in.h:3 ../aptdaemon/console.py:612
+#: ../data/org.debian.apt.policy.in.h:3 ../aptdaemon/console.py:619
 msgid "Remove downloaded package files"
 msgstr "Fjern nedlastede pakkefiler"
 
@@ -132,41 +132,41 @@
 msgstr ""
 "For å bruke en proxytjener til å laste ned programvare må du autentisere deg."
 
-#: ../aptdaemon/console.py:209
+#: ../aptdaemon/console.py:216
 msgid "ERROR"
 msgstr "FEIL"
 
-#: ../aptdaemon/console.py:242 ../aptdaemon/gtkwidgets.py:299
-#: ../aptdaemon/gtk3widgets.py:301
+#: ../aptdaemon/console.py:249 ../aptdaemon/gtkwidgets.py:301
+#: ../aptdaemon/gtk3widgets.py:305
 #, python-format
 msgid "Downloaded %sB of %sB at %sB/s"
 msgstr "Lastet ned %sB av %sB fra %sB/s"
 
-#: ../aptdaemon/console.py:247 ../aptdaemon/gtkwidgets.py:304
-#: ../aptdaemon/gtkwidgets.py:493 ../aptdaemon/gtk3widgets.py:306
-#: ../aptdaemon/gtk3widgets.py:498
+#: ../aptdaemon/console.py:254 ../aptdaemon/gtkwidgets.py:306
+#: ../aptdaemon/gtkwidgets.py:501 ../aptdaemon/gtk3widgets.py:310
+#: ../aptdaemon/gtk3widgets.py:509
 #, python-format
 msgid "Downloaded %sB of %sB"
 msgstr "Lastet ned %sB av %sB"
 
-#: ../aptdaemon/console.py:374 ../aptdaemon/console.py:379
+#: ../aptdaemon/console.py:384 ../aptdaemon/console.py:389
 msgid "ERROR:"
 msgstr "FEIL:"
 
-#: ../aptdaemon/console.py:375
+#: ../aptdaemon/console.py:385
 msgid "You are not allowed to perform this action."
 msgstr "Du har ikke tilgang til å utføre denne handlingen."
 
-#: ../aptdaemon/console.py:398 ../aptdaemon/console.py:526
+#: ../aptdaemon/console.py:408 ../aptdaemon/console.py:537
 msgid "Queuing"
 msgstr "Legger i kø"
 
-#: ../aptdaemon/console.py:405 ../aptdaemon/enums.py:614
+#: ../aptdaemon/console.py:416 ../aptdaemon/enums.py:527
 msgid "Resolving dependencies"
 msgstr "Løser avhengigheter"
 
 #. TRANSLATORS: %s is the number of packages
-#: ../aptdaemon/console.py:447
+#: ../aptdaemon/console.py:458
 #, python-format
 msgid "The following NEW package will be installed (%(count)s):"
 msgid_plural "The following NEW packages will be installed (%(count)s):"
@@ -174,7 +174,7 @@
 msgstr[1] "Følgende NYE pakker vil installeres (%(count)s):"
 
 #. TRANSLATORS: %s is the number of packages
-#: ../aptdaemon/console.py:455
+#: ../aptdaemon/console.py:466
 #, python-format
 msgid "The following package will be upgraded (%(count)s):"
 msgid_plural "The following packages will be upgraded (%(count)s):"
@@ -182,7 +182,7 @@
 msgstr[1] "Følgende pakker vil oppgraderes (%(count)s):"
 
 #. TRANSLATORS: %s is the number of packages
-#: ../aptdaemon/console.py:463
+#: ../aptdaemon/console.py:474
 #, python-format
 msgid "The following package will be REMOVED (%(count)s):"
 msgid_plural "The following packages will be REMOVED (%(count)s):"
@@ -190,7 +190,7 @@
 msgstr[1] "Følgende pakker vil FJERNES (%(count)s):"
 
 #. TRANSLATORS: %s is the number of packages
-#: ../aptdaemon/console.py:472
+#: ../aptdaemon/console.py:483
 #, python-format
 msgid "The following package will be DOWNGRADED (%(count)s):"
 msgid_plural "The following packages will be DOWNGRADED (%(count)s):"
@@ -198,40 +198,40 @@
 msgstr[1] "Følgende pakker vil NEDGRADERES (%(count)s):"
 
 #. TRANSLATORS: %s is the number of packages
-#: ../aptdaemon/console.py:480
+#: ../aptdaemon/console.py:491
 #, python-format
 msgid "The following package will be reinstalled (%(count)s):"
 msgid_plural "The following packages will be reinstalled (%(count)s):"
 msgstr[0] "Følgende pakke vil bli installert på nytt (%(count)s):"
 msgstr[1] "Følgende pakker vil bli installert på nytt (%(count)s):"
 
-#: ../aptdaemon/console.py:487
+#: ../aptdaemon/console.py:498
 #, python-format
 msgid "The following package has been kept back (%(count)s):"
 msgid_plural "The following packages have been kept back (%(count)s):"
 msgstr[0] "Følgende pakke holdes tilbake (%(count)s):"
 msgstr[1] "Følgende pakker holdes tilbake (%(count)s):"
 
-#: ../aptdaemon/console.py:495
+#: ../aptdaemon/console.py:506
 #, python-format
 msgid "Need to get %sB of archives."
 msgstr "Må hente %sB arkiver."
 
-#: ../aptdaemon/console.py:498
+#: ../aptdaemon/console.py:509
 #, python-format
 msgid "After this operation, %sB of additional disk space will be used."
 msgstr "Etter denne operasjonen vil %sB ekstra diskplass brukes."
 
-#: ../aptdaemon/console.py:502
+#: ../aptdaemon/console.py:513
 #, python-format
 msgid "After this operation, %sB of additional disk space will be freed."
 msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli frigjort."
 
-#: ../aptdaemon/console.py:511 ../aptdaemon/console.py:513
+#: ../aptdaemon/console.py:522 ../aptdaemon/console.py:524
 msgid "Do you want to continue [Y/n]?"
 msgstr "Ønsker du å fortsette [J/n]?"
 
-#: ../aptdaemon/console.py:538
+#: ../aptdaemon/console.py:545
 msgid ""
 "To operate on more than one package put the package names in quotation "
 "marks:\n"
@@ -240,11 +240,11 @@
 "Sett pakkenavn i anførselstegn for å betjene mer enn én pakke:\n"
 "aptdcon --install \"foo bar\""
 
-#: ../aptdaemon/console.py:544
+#: ../aptdaemon/console.py:551
 msgid "Refresh the cache"
 msgstr "Oppdater bufferen"
 
-#: ../aptdaemon/console.py:547
+#: ../aptdaemon/console.py:554
 msgid ""
 "Try to resolve broken dependencies. Potentially dangerous operation since it "
 "could try to remove many packages."
@@ -252,76 +252,76 @@
 "Forsøk å løse problemer med ødelagte avhengigheter. Dette er en potensielt "
 "skadelig operasjon da den kan forsøke å fjerne mange pakker."
 
-#: ../aptdaemon/console.py:552
+#: ../aptdaemon/console.py:559
 msgid "Try to finish a previous incompleted installation"
 msgstr "Forsøker å fullføre en tidligere ufullstendig installasjon"
 
-#: ../aptdaemon/console.py:556 ../aptdaemon/console.py:569
+#: ../aptdaemon/console.py:563 ../aptdaemon/console.py:576
 msgid "Install the given packages"
 msgstr "Installer de angitte pakkene"
 
-#: ../aptdaemon/console.py:559
+#: ../aptdaemon/console.py:566
 msgid "Reinstall the given packages"
 msgstr "Installer de angitte pakkene på nytt"
 
-#: ../aptdaemon/console.py:562
+#: ../aptdaemon/console.py:569
 msgid "Remove the given packages"
 msgstr "Fjern angitte pakker"
 
-#: ../aptdaemon/console.py:565
+#: ../aptdaemon/console.py:572
 msgid "Remove the given packages including configuration files"
 msgstr "Fjern angitte pakker og tilhørende oppsettsfiler"
 
-#: ../aptdaemon/console.py:572
+#: ../aptdaemon/console.py:579
 msgid "Downgrade the given packages"
 msgstr "Nedgrader angitte pakker"
 
-#: ../aptdaemon/console.py:575
+#: ../aptdaemon/console.py:582
 msgid "Deprecated: Please use --safe-upgrade"
 msgstr "Utgått: vennlist bruk --safe-upgrade"
 
-#: ../aptdaemon/console.py:579
+#: ../aptdaemon/console.py:586
 msgid "Upgrade the system in a safe way"
 msgstr "Oppgrader systemet på en trygg måte"
 
-#: ../aptdaemon/console.py:582
+#: ../aptdaemon/console.py:589
 msgid "Upgrade the system, possibly installing and removing packages"
 msgstr ""
 "Oppgrader systemet, installasjon og fjerning av pakker vil sannsynligvis "
 "forekomme"
 
-#: ../aptdaemon/console.py:586
+#: ../aptdaemon/console.py:593
 msgid "Add the vendor to the trusted ones"
 msgstr "Legg leverandøren til godkjente"
 
-#: ../aptdaemon/console.py:589
+#: ../aptdaemon/console.py:596
 msgid "Add the vendor keyid (also needs --keyserver)"
 msgstr "Legg til leverandørens nøkkel-id (behøver også --keyserver)"
 
-#: ../aptdaemon/console.py:593
+#: ../aptdaemon/console.py:600
 msgid "Use the given keyserver for looking up keys"
 msgstr "Bruk gitt nøkkeltjener til å lete opp nøkler"
 
-#: ../aptdaemon/console.py:597
+#: ../aptdaemon/console.py:604
 msgid "Add new repository from the given deb-line"
 msgstr "Legg til ny pakkearkiv fra den gitt deb-linjen"
 
-#: ../aptdaemon/console.py:601
+#: ../aptdaemon/console.py:608
 msgid ""
 "Specify an alternative sources.list.d file to which repositories should be "
 "added."
 msgstr ""
 "Angi en alternativ sources.list.d-fil hvor pakkearkeivene skal legges til."
 
-#: ../aptdaemon/console.py:605
+#: ../aptdaemon/console.py:612
 msgid "List trusted vendor keys"
 msgstr "Vise godkjente utgivernøkler"
 
-#: ../aptdaemon/console.py:608
+#: ../aptdaemon/console.py:615
 msgid "Remove the trusted key of the given fingerprint"
 msgstr "Fjern fingeravtrykkets godkjente nøkkel"
 
-#: ../aptdaemon/console.py:615
+#: ../aptdaemon/console.py:622
 msgid ""
 "Reconfigure installed packages. Optionally the minimum priority of questions "
 "can be specified"
@@ -329,206 +329,206 @@
 "Sett opp installerte pakker på nytt. Alternativt kan et minimum av spørsmål "
 "angis"
 
-#: ../aptdaemon/console.py:620
+#: ../aptdaemon/console.py:627
 msgid "The minimum debconf priority of question to be displayed"
-msgstr ""
+msgstr "Nedre prioritetsgrense for debonf-spørsmål som skal vises"
 
-#: ../aptdaemon/console.py:624
+#: ../aptdaemon/console.py:631
 msgid "Do not attach to the apt terminal"
 msgstr "Ikke inkluder apt-terminalen"
 
-#: ../aptdaemon/console.py:628
+#: ../aptdaemon/console.py:635
 msgid "Allow packages from unauthenticated sources"
 msgstr "Tillat pakker fra uautentiserte kilder"
 
-#: ../aptdaemon/console.py:632
+#: ../aptdaemon/console.py:639
 msgid ""
 "Show additional information about the packages. Currently only the version "
 "number"
 msgstr ""
 "Vis detaljert informasjon om pakkene. For øyeblikket kun versjonsnummer"
 
-#: ../aptdaemon/console.py:640 ../aptdaemon/enums.py:619
+#: ../aptdaemon/console.py:647 ../aptdaemon/enums.py:532
 msgid "Waiting for authentication"
 msgstr "Venter på autentisering"
 
-#: ../aptdaemon/core.py:2188
+#: ../aptdaemon/core.py:2207
 msgid "Do not shutdown the daemon because of inactivity"
 msgstr "Ikke avslutt daemon ved inaktivitet"
 
-#: ../aptdaemon/core.py:2193
+#: ../aptdaemon/core.py:2212
 msgid "Do not load any plugins"
 msgstr "Ikke last noen programtillegg"
 
-#: ../aptdaemon/core.py:2197
+#: ../aptdaemon/core.py:2216
 msgid "Show internal processing information"
 msgstr "Vis informasjon om interne prosesser"
 
-#: ../aptdaemon/core.py:2202
+#: ../aptdaemon/core.py:2221
 msgid "Quit and replace an already running daemon"
 msgstr "Avslutt og erstatt en kjørende daemon"
 
-#: ../aptdaemon/core.py:2207
+#: ../aptdaemon/core.py:2226
 msgid "Listen on the DBus session bus (Only required for testing"
-msgstr ""
+msgstr "Lytt til Dbus-øktbussen (Kun påkrevet for testing"
 
-#: ../aptdaemon/core.py:2211
+#: ../aptdaemon/core.py:2230
 msgid "Perform operations in the given chroot"
 msgstr "Utfør operasjoner i angitt chroot"
 
-#: ../aptdaemon/core.py:2216
+#: ../aptdaemon/core.py:2235
 msgid "Store profile stats in the specified file"
 msgstr "Lagre profilstatistikk i angitt fil"
 
-#: ../aptdaemon/core.py:2221
+#: ../aptdaemon/core.py:2240
 msgid "Do not make any changes to the system (Only of use to developers)"
 msgstr "Ikke gjør noen endringer på systemet (til bruk for utviklere)"
 
-#: ../aptdaemon/enums.py:366
+#: ../aptdaemon/enums.py:337
 msgid "Installed file"
 msgstr "Installert fil"
 
-#: ../aptdaemon/enums.py:367
+#: ../aptdaemon/enums.py:338
 msgid "Installed packages"
 msgstr "Installerte pakker"
 
-#: ../aptdaemon/enums.py:368
+#: ../aptdaemon/enums.py:339
 msgid "Added key from file"
 msgstr "La til nøkkel fra fil"
 
-#: ../aptdaemon/enums.py:369
+#: ../aptdaemon/enums.py:340
 msgid "Updated cache"
 msgstr "Mellomlager oppdatert"
 
-#: ../aptdaemon/enums.py:370
+#: ../aptdaemon/enums.py:341
 msgid "Search done"
 msgstr "Søket er utført"
 
-#: ../aptdaemon/enums.py:371
+#: ../aptdaemon/enums.py:342
 msgid "Removed trusted key"
 msgstr "Fjernet sikker nøkkel"
 
-#: ../aptdaemon/enums.py:372
+#: ../aptdaemon/enums.py:343
 msgid "Removed packages"
 msgstr "Fjernede pakker"
 
-#: ../aptdaemon/enums.py:373
+#: ../aptdaemon/enums.py:344
 msgid "Updated packages"
 msgstr "Oppdaterte pakker"
 
-#: ../aptdaemon/enums.py:374
+#: ../aptdaemon/enums.py:345
 msgid "Upgraded system"
 msgstr "Oppgradert system"
 
-#: ../aptdaemon/enums.py:375
+#: ../aptdaemon/enums.py:346
 msgid "Applied changes"
 msgstr "Endringer utført"
 
-#: ../aptdaemon/enums.py:376
+#: ../aptdaemon/enums.py:347
 msgid "Repaired incomplete installation"
 msgstr "Reparer ufullstendige installasjoner"
 
-#: ../aptdaemon/enums.py:377
+#: ../aptdaemon/enums.py:348
 msgid "Repaired broken dependencies"
 msgstr "Reparer ødelagte avhengigheter"
 
-#: ../aptdaemon/enums.py:378
+#: ../aptdaemon/enums.py:349
 msgid "Added software source"
 msgstr "La til programvarekilde"
 
-#: ../aptdaemon/enums.py:379
+#: ../aptdaemon/enums.py:350
 msgid "Enabled component of the distribution"
 msgstr "Aktivert distribusjonskomponent"
 
-#: ../aptdaemon/enums.py:380
+#: ../aptdaemon/enums.py:351
 msgid "Removed downloaded package files"
 msgstr "Fjernet nedlastede pakkefiler"
 
-#: ../aptdaemon/enums.py:381
+#: ../aptdaemon/enums.py:352
 msgid "Reconfigured installed packages"
 msgstr "Satt opp installerte pakker på nytt"
 
-#: ../aptdaemon/enums.py:397
+#: ../aptdaemon/enums.py:356
 msgid "Successful"
 msgstr "Vellykket"
 
-#: ../aptdaemon/enums.py:398
+#: ../aptdaemon/enums.py:357
 msgid "Canceled"
 msgstr "Avbrutt"
 
-#: ../aptdaemon/enums.py:399 ../aptdaemon/enums.py:680
+#: ../aptdaemon/enums.py:358 ../aptdaemon/enums.py:569
 msgid "Failed"
 msgstr "Mislyktes"
 
-#: ../aptdaemon/enums.py:414
+#: ../aptdaemon/enums.py:361
 msgid "Installing file"
 msgstr "Installerer fil"
 
-#: ../aptdaemon/enums.py:415
+#: ../aptdaemon/enums.py:362
 msgid "Installing packages"
 msgstr "Installerer pakker"
 
-#: ../aptdaemon/enums.py:416
+#: ../aptdaemon/enums.py:363
 msgid "Adding key from file"
 msgstr "Legger til nøkkel fra fil"
 
-#: ../aptdaemon/enums.py:417
+#: ../aptdaemon/enums.py:364
 msgid "Updating cache"
 msgstr "Oppdaterer mellomlager"
 
-#: ../aptdaemon/enums.py:418
+#: ../aptdaemon/enums.py:365
 msgid "Removing trusted key"
 msgstr "Fjerner sikker nøkkel"
 
-#: ../aptdaemon/enums.py:419
+#: ../aptdaemon/enums.py:366
 msgid "Removing packages"
 msgstr "Fjerner pakker"
 
-#: ../aptdaemon/enums.py:420
+#: ../aptdaemon/enums.py:367
 msgid "Updating packages"
 msgstr "Oppdaterer pakker"
 
-#: ../aptdaemon/enums.py:421
+#: ../aptdaemon/enums.py:368
 msgid "Upgrading system"
 msgstr "Oppgraderer system"
 
-#: ../aptdaemon/enums.py:422 ../aptdaemon/enums.py:615
+#: ../aptdaemon/enums.py:369 ../aptdaemon/enums.py:528
 msgid "Applying changes"
 msgstr "Utfører endringer"
 
-#: ../aptdaemon/enums.py:423
+#: ../aptdaemon/enums.py:370
 msgid "Repairing incomplete installation"
 msgstr "Reparerer ufullstendig installasjon"
 
-#: ../aptdaemon/enums.py:424
+#: ../aptdaemon/enums.py:371
 msgid "Repairing installed software"
 msgstr "Reparerer installert programvare"
 
-#: ../aptdaemon/enums.py:425
+#: ../aptdaemon/enums.py:372
 msgid "Adding software source"
 msgstr "Legge til programvarekilde"
 
-#: ../aptdaemon/enums.py:426
+#: ../aptdaemon/enums.py:373
 msgid "Enabling component of the distribution"
 msgstr "Aktiverer distribusjonskomponent"
 
-#: ../aptdaemon/enums.py:427
+#: ../aptdaemon/enums.py:374
 msgid "Removing downloaded package files"
 msgstr "Fjerner nedlastede pakkefiler"
 
-#: ../aptdaemon/enums.py:428
+#: ../aptdaemon/enums.py:375
 msgid "Reconfiguring installed packages"
 msgstr "Setter opp installerte pakker på nytt"
 
-#: ../aptdaemon/enums.py:429 ../aptdaemon/enums.py:604
+#: ../aptdaemon/enums.py:376 ../aptdaemon/enums.py:517
 msgid "Searching"
 msgstr "Søker"
 
-#: ../aptdaemon/enums.py:445
+#: ../aptdaemon/enums.py:380
 msgid "Installation of the package file failed"
 msgstr "Installasjon av pakkefil mislyktes"
 
-#: ../aptdaemon/enums.py:446
+#: ../aptdaemon/enums.py:381
 msgid "Installation of software failed"
 msgstr "Installasjon av programvare mislyktes"
 
@@ -537,63 +537,63 @@
 msgstr ""
 "Klarte ikke å legge til nøkkelen i listen over betrodde programvareutgivere"
 
-#: ../aptdaemon/enums.py:449
+#: ../aptdaemon/enums.py:384
 msgid "Refreshing the software list failed"
 msgstr "Mislyktes oppdatering av programvarelisten"
 
-#: ../aptdaemon/enums.py:450
+#: ../aptdaemon/enums.py:385
 msgid "Removing the vendor from the list of trusted ones failed"
 msgstr "Mislyktes fjerning av klarert leverandør fra listen"
 
-#: ../aptdaemon/enums.py:452
+#: ../aptdaemon/enums.py:387
 msgid "Removing software failed"
 msgstr "Fjerning av programvare mislyktes"
 
-#: ../aptdaemon/enums.py:453
+#: ../aptdaemon/enums.py:388
 msgid "Updating software failed"
 msgstr "Oppdatering av programvare mislyktes"
 
-#: ../aptdaemon/enums.py:454
+#: ../aptdaemon/enums.py:389
 msgid "Upgrading the system failed"
 msgstr "Oppgradering av systemet mislyktes"
 
-#: ../aptdaemon/enums.py:455
+#: ../aptdaemon/enums.py:390
 msgid "Applying software changes failed"
 msgstr "Bruk av programvareendringer mislyktes"
 
-#: ../aptdaemon/enums.py:456
+#: ../aptdaemon/enums.py:391
 msgid "Repairing incomplete installation failed"
 msgstr "Mislyktes reparerering av ufullstendig installasjon"
 
-#: ../aptdaemon/enums.py:457
+#: ../aptdaemon/enums.py:393
 msgid "Repairing broken dependencies failed"
 msgstr "Mislyktes reparerering av manglende avhengigheter"
 
-#: ../aptdaemon/enums.py:458
+#: ../aptdaemon/enums.py:394
 msgid "Adding software source failed"
 msgstr "Mislyktes å legge til programvarekilde"
 
-#: ../aptdaemon/enums.py:459
+#: ../aptdaemon/enums.py:395
 msgid "Enabling component of the distribution failed"
 msgstr "Mislyktes å aktivere distribusjonskomponent"
 
-#: ../aptdaemon/enums.py:460 ../aptdaemon/enums.py:461
+#: ../aptdaemon/enums.py:397 ../aptdaemon/enums.py:398
 msgid "Removing downloaded package files failed"
 msgstr "Fjerning av nedlastede pakkefiler mislyktes"
 
-#: ../aptdaemon/enums.py:462
+#: ../aptdaemon/enums.py:399
 msgid "Search failed"
 msgstr "Søk feilet"
 
-#: ../aptdaemon/enums.py:463
+#: ../aptdaemon/enums.py:400
 msgid "Adding license key"
 msgstr "Legger til lisensnøkkel"
 
-#: ../aptdaemon/enums.py:479 ../aptdaemon/enums.py:480
+#: ../aptdaemon/enums.py:404 ../aptdaemon/enums.py:405
 msgid "Check your Internet connection."
 msgstr "Undersøk internettforbindelsen din."
 
-#: ../aptdaemon/enums.py:481
+#: ../aptdaemon/enums.py:406
 msgid ""
 "Check if you are using third party repositories. If so disable them, since "
 "they are a common source of problems.\n"
@@ -603,11 +603,11 @@
 "kilde til problemer - og du må kanskje deaktivere dem.\n"
 "I tillegg bør du kjøre følgende kommando i terminalen: apt-get install -f"
 
-#: ../aptdaemon/enums.py:486
+#: ../aptdaemon/enums.py:411
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Den valgte filen er ikke en GPG-fil, eller er skadet."
 
-#: ../aptdaemon/enums.py:488
+#: ../aptdaemon/enums.py:413
 msgid ""
 "The selected key couldn't be removed. Check that you provided a valid "
 "fingerprint."
@@ -615,7 +615,7 @@
 "Den valgte nøkkelen kan ikke fjernes. Kontroller at du oppgir et gyldig "
 "fingeravtrykk."
 
-#: ../aptdaemon/enums.py:490
+#: ../aptdaemon/enums.py:415
 msgid ""
 "Check if you are currently running another software management tool, e.g. "
 "Synaptic or aptitude. Only one tool is allowed to make changes at a time."
@@ -623,7 +623,7 @@
 "Kontroller om du kjører et annet programvareverktøy, som Synaptic eller "
 "aptitude. Kun ett verktøy kan gjøre endringer om gangen."
 
-#: ../aptdaemon/enums.py:493
+#: ../aptdaemon/enums.py:418
 msgid ""
 "This is a serious problem. Try again later. If this problem appears again, "
 "please report an error to the developers."
@@ -631,7 +631,7 @@
 "Dette er et alvorlig problem. Prøv igjen senere. Om problemet vedvarer, "
 "vennligst send feilmelding til utviklerene."
 
-#: ../aptdaemon/enums.py:496
+#: ../aptdaemon/enums.py:421
 msgid ""
 "Check the spelling of the package name, and that the appropriate repository "
 "is enabled."
@@ -639,46 +639,48 @@
 "Kontroller staving av pakkenavnet og at det riktige programvarearkivet er "
 "aktivert."
 
-#: ../aptdaemon/enums.py:498
+#: ../aptdaemon/enums.py:423
 msgid "There isn't any need for an update."
 msgstr "Det behøves ingen oppdatering."
 
-#: ../aptdaemon/enums.py:499
+#: ../aptdaemon/enums.py:424
 msgid "There isn't any need for an installation"
 msgstr "Det behøves ingen installasjon"
 
-#: ../aptdaemon/enums.py:501
+#: ../aptdaemon/enums.py:426
 msgid "There isn't any need for a removal."
 msgstr "Ingen fjerning behøves."
 
-#: ../aptdaemon/enums.py:502
+#: ../aptdaemon/enums.py:427
 msgid ""
 "You requested to remove a package which is an essential part of your system."
 msgstr "Du har bedt om fjerning av en pakke som er viktig for systemet."
 
-#: ../aptdaemon/enums.py:505
+#: ../aptdaemon/enums.py:430
 msgid ""
 "The connection to the daemon was lost. Most likely the background daemon "
 "crashed."
 msgstr ""
 "Mistet forbindelsen til daemon. Sannsynligvis kræsjet bakgrunns-daemonen."
 
-#: ../aptdaemon/enums.py:507
+#: ../aptdaemon/enums.py:432
 msgid "The installation or removal of a software package failed."
 msgstr "Installasjon/fjerning av programvarepakke mislyktes."
 
-#: ../aptdaemon/enums.py:509
+#: ../aptdaemon/enums.py:434
 msgid "The requested feature is not supported."
 msgstr "Den etterspurte funksjonen er ikke støttet."
 
-#: ../aptdaemon/enums.py:510
+#: ../aptdaemon/enums.py:435
 msgid ""
 "There seems to be a programming error in aptdaemon, the software that allows "
 "you to install/remove software and to perform other package management "
 "related tasks."
 msgstr ""
+"Det ser ut til at aptdaemon - programmet som lar deg installere, fjerne og "
+"vedlikeholde programpakker - har en programfeil."
 
-#: ../aptdaemon/enums.py:514
+#: ../aptdaemon/enums.py:439
 msgid ""
 "This error could be caused by required additional software packages which "
 "are missing or not installable. Furthermore there could be a conflict "
@@ -696,7 +698,7 @@
 msgstr ""
 "Handlingen vil kreve at det installeres pakker fra en ikke-autentisert kilde."
 
-#: ../aptdaemon/enums.py:522
+#: ../aptdaemon/enums.py:447
 msgid ""
 "The installation could have failed because of an error in the corresponding "
 "software package or it was cancelled in an unfriendly way. You have to "
@@ -706,13 +708,13 @@
 "programvarepakken, eller at den ble avbrutt på en brutal måte. Du må fikse "
 "dette før du kan installere eller fjerne flere programmer."
 
-#: ../aptdaemon/enums.py:528
+#: ../aptdaemon/enums.py:453
 msgid ""
 "Please copy the file to your local computer and check the file permissions."
 msgstr ""
 "Vennligst kopier filen til datamaskinen og kontroller filrettighetene."
 
-#: ../aptdaemon/enums.py:531
+#: ../aptdaemon/enums.py:456
 msgid ""
 "The installation of a package which violates the quality standards isn't "
 "allowed. This could cause serious problems on your computer. Please contact "
@@ -724,18 +726,21 @@
 "datamaskinen. Vennligst ta kontakt med de som har gitt ut denne pakkefilen, "
 "og legg ved detaljene under."
 
-#: ../aptdaemon/enums.py:537
+#: ../aptdaemon/enums.py:463
 msgid ""
 "The downloaded license key which is required to run this piece of software "
 "is not valid or could not be installed correctly.\n"
 "See the details for more information."
 msgstr ""
+"Lisensnøkkelen som kreves for å kjøre dette programmet er ikke gyldig. Noe "
+"kan ha gått galt under nedlasting eller installasjon.\n"
+"Se detaljene for mer informasjon."
 
-#: ../aptdaemon/enums.py:543
+#: ../aptdaemon/enums.py:469
 msgid "All available upgrades have already been installed."
 msgstr "Alle tilgjengelige oppgraderinger har allerede blitt installert."
 
-#: ../aptdaemon/enums.py:545
+#: ../aptdaemon/enums.py:471
 msgid ""
 "The license key which allows you to use this piece of software could not be "
 "downloaded. Please check your network connection."
@@ -743,295 +748,295 @@
 "Klarte ikke laste ned lisensnøkkelen som lar deg bruke dette programmet. "
 "Kontroller nettverkstilkoblingen din."
 
-#: ../aptdaemon/enums.py:563
+#: ../aptdaemon/enums.py:485
 msgid "Failed to download package files"
 msgstr "Nedlasting av pakkefiler mislyktes"
 
-#: ../aptdaemon/enums.py:564
+#: ../aptdaemon/enums.py:486
 msgid "Failed to download repository information"
 msgstr "Nedlasting av pakkearkiv-informasjon mislyktes"
 
-#: ../aptdaemon/enums.py:565
+#: ../aptdaemon/enums.py:488
 msgid "Package dependencies cannot be resolved"
 msgstr "Pakkeavhengigheter kunne ikke løses"
 
-#: ../aptdaemon/enums.py:566
+#: ../aptdaemon/enums.py:489
 msgid "The package system is broken"
 msgstr "Pakkesystemet er ødelagt"
 
-#: ../aptdaemon/enums.py:567
+#: ../aptdaemon/enums.py:490
 msgid "Key was not installed"
 msgstr "Nøkkel ble ikke installert"
 
-#: ../aptdaemon/enums.py:568
+#: ../aptdaemon/enums.py:491
 msgid "Key was not removed"
 msgstr "Nøkkel ble ikke fjernet"
 
-#: ../aptdaemon/enums.py:569
+#: ../aptdaemon/enums.py:492
 msgid "Failed to lock the package manager"
 msgstr "Låsing av pakkebehandleren mislyktes"
 
-#: ../aptdaemon/enums.py:570
+#: ../aptdaemon/enums.py:493
 msgid "Failed to load the package list"
 msgstr "Lasting av pakkelisten mislyktes"
 
-#: ../aptdaemon/enums.py:571
+#: ../aptdaemon/enums.py:494
 msgid "Package does not exist"
 msgstr "Pakken eksisterer ikke"
 
-#: ../aptdaemon/enums.py:572
+#: ../aptdaemon/enums.py:495
 msgid "Package is already up to date"
 msgstr "Pakken er allerede oppdatert."
 
-#: ../aptdaemon/enums.py:573
+#: ../aptdaemon/enums.py:496
 msgid "Package is already installed"
 msgstr "Pakken er allerede installert"
 
-#: ../aptdaemon/enums.py:574
+#: ../aptdaemon/enums.py:497
 msgid "Package isn't installed"
 msgstr "Pakken er ikke installert"
 
-#: ../aptdaemon/enums.py:575
+#: ../aptdaemon/enums.py:498
 msgid "Failed to remove essential system package"
 msgstr "Fjerning av betydningsfull systempakke mislyktes"
 
-#: ../aptdaemon/enums.py:577
+#: ../aptdaemon/enums.py:500
 msgid "Task cannot be monitored or controlled"
 msgstr "Oppgaven kan ikke overvåkes eller kontrolleres"
 
-#: ../aptdaemon/enums.py:578
+#: ../aptdaemon/enums.py:501
 msgid "Package operation failed"
 msgstr "Pakkeoperasjon mislyktes"
 
-#: ../aptdaemon/enums.py:579
+#: ../aptdaemon/enums.py:502
 msgid "Requires installation of untrusted packages"
 msgstr "Krever installasjon av usikre pakker"
 
-#: ../aptdaemon/enums.py:581
+#: ../aptdaemon/enums.py:504
 msgid "Previous installation hasn't been completed"
 msgstr "Tidligere installasjon har ikke blitt fullført"
 
-#: ../aptdaemon/enums.py:582
+#: ../aptdaemon/enums.py:505
 msgid "The package is of bad quality"
 msgstr "Pakken er i dårlig forfatning"
 
-#: ../aptdaemon/enums.py:583
+#: ../aptdaemon/enums.py:506
 msgid "Package file could not be opened"
 msgstr "Pakkefilen kunne ikke åpnes"
 
-#: ../aptdaemon/enums.py:584
+#: ../aptdaemon/enums.py:507
 msgid "Not supported feature"
-msgstr ""
+msgstr "Ikke støttet funksjon"
 
-#: ../aptdaemon/enums.py:585
+#: ../aptdaemon/enums.py:508
 msgid "Failed to download the license key"
 msgstr "Klarte ikke laste ned lisensnøkkelen"
 
-#: ../aptdaemon/enums.py:586
+#: ../aptdaemon/enums.py:509
 msgid "Failed to install the license key"
 msgstr "Klarte ikke installere lisensnøkkelen"
 
-#: ../aptdaemon/enums.py:587
+#: ../aptdaemon/enums.py:510
 msgid "The system is already up to date"
 msgstr "Systemet er allerede oppdatert"
 
-#: ../aptdaemon/enums.py:588
+#: ../aptdaemon/enums.py:513
 msgid "An unhandlable error occured"
 msgstr "En uhåndterbar feil oppsto"
 
-#: ../aptdaemon/enums.py:603
+#: ../aptdaemon/enums.py:516
 msgid "Waiting for service to start"
 msgstr "Venter på at tjeneste skal starte"
 
-#: ../aptdaemon/enums.py:605
+#: ../aptdaemon/enums.py:518
 msgid "Waiting"
 msgstr "Venter"
 
-#: ../aptdaemon/enums.py:606
+#: ../aptdaemon/enums.py:519
 msgid "Waiting for required medium"
 msgstr "Venter på påkrevd medie"
 
-#: ../aptdaemon/enums.py:607
+#: ../aptdaemon/enums.py:520
 msgid "Waiting for other software managers to quit"
 msgstr "Venter på at annen programvarebehandler skal avsluttes"
 
-#: ../aptdaemon/enums.py:608
+#: ../aptdaemon/enums.py:521
 msgid "Waiting for configuration file prompt"
 msgstr "Venter på dialog for oppsettsfil"
 
-#: ../aptdaemon/enums.py:610
+#: ../aptdaemon/enums.py:523
 msgid "Running task"
 msgstr "Kjører oppgave"
 
-#: ../aptdaemon/enums.py:611
+#: ../aptdaemon/enums.py:524
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: ../aptdaemon/enums.py:612
+#: ../aptdaemon/enums.py:525
 msgid "Querying software sources"
 msgstr "Spør programvarekilder"
 
-#: ../aptdaemon/enums.py:613
+#: ../aptdaemon/enums.py:526
 msgid "Cleaning up"
 msgstr "Rydder opp"
 
-#: ../aptdaemon/enums.py:616
+#: ../aptdaemon/enums.py:529
 msgid "Finished"
 msgstr "Fullført"
 
-#: ../aptdaemon/enums.py:617
+#: ../aptdaemon/enums.py:530
 msgid "Cancelling"
 msgstr "Avbryter"
 
-#: ../aptdaemon/enums.py:618
+#: ../aptdaemon/enums.py:531
 msgid "Loading software list"
 msgstr "Laster pakkeliste"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:635
+#: ../aptdaemon/enums.py:536
 #, python-format
 msgid "Installing %s"
 msgstr "Installerer %s"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:637
+#: ../aptdaemon/enums.py:538
 #, python-format
 msgid "Configuring %s"
 msgstr "Setter opp %s"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:639
+#: ../aptdaemon/enums.py:540
 #, python-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:641
+#: ../aptdaemon/enums.py:542
 #, python-format
 msgid "Completely removing %s"
 msgstr "Fjerner %s fullstendig"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:643
+#: ../aptdaemon/enums.py:544
 #, python-format
 msgid "Noting disappearance of %s"
 msgstr "Legger merke til at %s forsvinner"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:645
+#: ../aptdaemon/enums.py:546
 #, python-format
 msgid "Running post-installation trigger %s"
 msgstr "Kjører etter-installasjonsutløser %s"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:647
+#: ../aptdaemon/enums.py:548
 #, python-format
 msgid "Upgrading %s"
 msgstr "Oppgraderer %s"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:649
+#: ../aptdaemon/enums.py:550
 #, python-format
 msgid "Unpacking %s"
 msgstr "Pakker ut %s"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:651
+#: ../aptdaemon/enums.py:552
 #, python-format
 msgid "Preparing installation of %s"
 msgstr "Forbereder installasjonen av %s"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:653
+#: ../aptdaemon/enums.py:554
 #, python-format
 msgid "Preparing configuration of %s"
 msgstr "Forbereder konfigureringen av %s"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:655
+#: ../aptdaemon/enums.py:556
 #, python-format
 msgid "Preparing removal of %s"
 msgstr "Forbereder fjerning av %s"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:657
+#: ../aptdaemon/enums.py:558
 #, python-format
 msgid "Preparing complete removal of %s"
-msgstr ""
+msgstr "Forbereder fullstendig fjerning av %s"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:659
+#: ../aptdaemon/enums.py:560
 #, python-format
 msgid "Installed %s"
 msgstr "%s har blitt installert"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:661
+#: ../aptdaemon/enums.py:562
 #, python-format
 msgid "Completely removed %s"
 msgstr "%s er fullstendig fjernet"
 
 #. TRANSLATORS: %s is the name of a package
-#: ../aptdaemon/enums.py:663
+#: ../aptdaemon/enums.py:564
 #, python-format
 msgid "Removed %s"
 msgstr "Fjernet %s"
 
-#: ../aptdaemon/enums.py:675
+#: ../aptdaemon/enums.py:704
 #, python-format
 msgid "Processing %s"
 msgstr "Behandler %s"
 
-#: ../aptdaemon/enums.py:678
+#: ../aptdaemon/enums.py:567
 msgid "Done"
 msgstr "Fullført"
 
-#: ../aptdaemon/enums.py:679
+#: ../aptdaemon/enums.py:568
 msgid "Authentication failed"
 msgstr "Autentisering mislyktes"
 
-#: ../aptdaemon/enums.py:681
+#: ../aptdaemon/enums.py:570
 msgid "Fetching"
 msgstr "Henter"
 
-#: ../aptdaemon/enums.py:682
+#: ../aptdaemon/enums.py:571
 msgid "Idle"
 msgstr "Klar"
 
-#: ../aptdaemon/enums.py:683
+#: ../aptdaemon/enums.py:572
 msgid "Network isn't available"
 msgstr "Nettverk ikke tilgjengelig"
 
-#: ../aptdaemon/gtkwidgets.py:316 ../aptdaemon/gtk3widgets.py:318
+#: ../aptdaemon/gtkwidgets.py:318 ../aptdaemon/gtk3widgets.py:322
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../aptdaemon/gtkwidgets.py:458 ../aptdaemon/gtk3widgets.py:463
+#: ../aptdaemon/gtkwidgets.py:466 ../aptdaemon/gtk3widgets.py:473
 msgid "File"
 msgstr "Fil"
 
 #. TRANSLATORS: header of the progress download column
-#: ../aptdaemon/gtkwidgets.py:463 ../aptdaemon/gtk3widgets.py:468
+#: ../aptdaemon/gtkwidgets.py:471 ../aptdaemon/gtk3widgets.py:478
 msgid "%"
 msgstr "%"
 
-#: ../aptdaemon/gtkwidgets.py:498 ../aptdaemon/gtk3widgets.py:503
+#: ../aptdaemon/gtkwidgets.py:506 ../aptdaemon/gtk3widgets.py:514
 #, python-format
 msgid "Downloaded %sB"
 msgstr "Lastet ned %sB"
 
-#: ../aptdaemon/gtkwidgets.py:500 ../aptdaemon/gtk3widgets.py:505
+#: ../aptdaemon/gtkwidgets.py:508 ../aptdaemon/gtk3widgets.py:516
 msgid "Downloaded"
 msgstr "Lastet ned"
 
 #. TRANSLATORS: %s represents the name of a CD or DVD
-#: ../aptdaemon/gtkwidgets.py:770 ../aptdaemon/gtk3widgets.py:818
+#: ../aptdaemon/gtkwidgets.py:784 ../aptdaemon/gtk3widgets.py:843
 #, python-format
 msgid "CD/DVD '%s' is required"
 msgstr "Behøver CD/DVD '%s'"
 
 #. TRANSLATORS: %s is the name of the CD/DVD drive
-#: ../aptdaemon/gtkwidgets.py:772 ../aptdaemon/gtk3widgets.py:820
+#: ../aptdaemon/gtkwidgets.py:786 ../aptdaemon/gtk3widgets.py:845
 #, python-format
 msgid ""
 "Please insert the above CD/DVD into the drive '%s' to install software "
@@ -1039,36 +1044,36 @@
 msgstr ""
 "Vennligst sett inn angitt CD/DVD i '%s' for å installere programvare fra den."
 
-#: ../aptdaemon/gtkwidgets.py:776 ../aptdaemon/gtkwidgets.py:796
-#: ../aptdaemon/gtk3widgets.py:824 ../aptdaemon/gtk3widgets.py:843
+#: ../aptdaemon/gtkwidgets.py:790 ../aptdaemon/gtkwidgets.py:811
+#: ../aptdaemon/gtk3widgets.py:849 ../aptdaemon/gtk3widgets.py:870
 msgid "C_ontinue"
 msgstr "F_ortsett"
 
-#: ../aptdaemon/gtkwidgets.py:845 ../aptdaemon/gtk3widgets.py:891
+#: ../aptdaemon/gtkwidgets.py:860 ../aptdaemon/gtk3widgets.py:921
 msgid "Install"
 msgstr "Installer"
 
-#: ../aptdaemon/gtkwidgets.py:846 ../aptdaemon/gtk3widgets.py:892
+#: ../aptdaemon/gtkwidgets.py:861 ../aptdaemon/gtk3widgets.py:922
 msgid "Reinstall"
 msgstr "Installer på nytt"
 
-#: ../aptdaemon/gtkwidgets.py:847 ../aptdaemon/gtk3widgets.py:893
+#: ../aptdaemon/gtkwidgets.py:862 ../aptdaemon/gtk3widgets.py:923
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../aptdaemon/gtkwidgets.py:848 ../aptdaemon/gtk3widgets.py:894
+#: ../aptdaemon/gtkwidgets.py:863 ../aptdaemon/gtk3widgets.py:924
 msgid "Purge"
 msgstr "Slett"
 
-#: ../aptdaemon/gtkwidgets.py:849 ../aptdaemon/gtk3widgets.py:895
+#: ../aptdaemon/gtkwidgets.py:864 ../aptdaemon/gtk3widgets.py:925
 msgid "Upgrade"
 msgstr "Oppgrader"
 
-#: ../aptdaemon/gtkwidgets.py:850 ../aptdaemon/gtk3widgets.py:896
+#: ../aptdaemon/gtkwidgets.py:865 ../aptdaemon/gtk3widgets.py:926
 msgid "Downgrade"
 msgstr "Nedgrader"
 
-#: ../aptdaemon/gtkwidgets.py:851 ../aptdaemon/gtk3widgets.py:897
+#: ../aptdaemon/gtkwidgets.py:866 ../aptdaemon/gtk3widgets.py:927
 msgid "Skip upgrade"
 msgstr "Hopp over oppgradering"
 
@@ -1077,66 +1082,66 @@
 #. FIXME: adapt the title and message accordingly
 #. FIXME: Should we have different modes? Only show dependencies, only
 #. initial packages or both?
-#: ../aptdaemon/gtkwidgets.py:862 ../aptdaemon/gtk3widgets.py:908
+#: ../aptdaemon/gtkwidgets.py:877 ../aptdaemon/gtk3widgets.py:938
 msgid "Please take a look at the list of changes below."
 msgstr "Vennligst se over listen over endringer nedenfor."
 
-#: ../aptdaemon/gtkwidgets.py:869 ../aptdaemon/gtk3widgets.py:915
+#: ../aptdaemon/gtkwidgets.py:884 ../aptdaemon/gtk3widgets.py:946
 msgid "Additional software has to be installed"
 msgstr "Andre programvarer må installeres i tillegg"
 
-#: ../aptdaemon/gtkwidgets.py:871 ../aptdaemon/gtk3widgets.py:917
+#: ../aptdaemon/gtkwidgets.py:886 ../aptdaemon/gtk3widgets.py:948
 msgid "Additional software has to be re-installed"
 msgstr "Tilleggsprogramvare må installeres på nytt"
 
-#: ../aptdaemon/gtkwidgets.py:873 ../aptdaemon/gtk3widgets.py:919
+#: ../aptdaemon/gtkwidgets.py:888 ../aptdaemon/gtk3widgets.py:950
 msgid "Additional software has to be removed"
 msgstr "Tilleggsprogramvare må fjernes"
 
-#: ../aptdaemon/gtkwidgets.py:875 ../aptdaemon/gtk3widgets.py:921
+#: ../aptdaemon/gtkwidgets.py:890 ../aptdaemon/gtk3widgets.py:952
 msgid "Additional software has to be purged"
 msgstr "Tilleggsprogramvare må fjernes"
 
-#: ../aptdaemon/gtkwidgets.py:877 ../aptdaemon/gtk3widgets.py:923
+#: ../aptdaemon/gtkwidgets.py:892 ../aptdaemon/gtk3widgets.py:954
 msgid "Additional software has to be upgraded"
 msgstr "Tilleggsprogramvare må oppgraderes"
 
-#: ../aptdaemon/gtkwidgets.py:879 ../aptdaemon/gtk3widgets.py:925
+#: ../aptdaemon/gtkwidgets.py:894 ../aptdaemon/gtk3widgets.py:956
 msgid "Additional software has to be downgraded"
 msgstr "Tilleggsprogramvare må nedgraderes"
 
-#: ../aptdaemon/gtkwidgets.py:881 ../aptdaemon/gtk3widgets.py:927
+#: ../aptdaemon/gtkwidgets.py:896 ../aptdaemon/gtk3widgets.py:958
 msgid "Updates will be skipped"
 msgstr "Hopper over oppdateringer"
 
-#: ../aptdaemon/gtkwidgets.py:888 ../aptdaemon/gtk3widgets.py:934
+#: ../aptdaemon/gtkwidgets.py:904 ../aptdaemon/gtk3widgets.py:966
 msgid "Additional changes are required"
 msgstr "Det må gjøres andre endringer i tillegg"
 
-#: ../aptdaemon/gtkwidgets.py:893 ../aptdaemon/gtk3widgets.py:939
+#: ../aptdaemon/gtkwidgets.py:909 ../aptdaemon/gtk3widgets.py:971
 #, python-format
 msgid "%sB will be downloaded in total."
 msgstr "%sB vil lastes ned totalt."
 
-#: ../aptdaemon/gtkwidgets.py:897 ../aptdaemon/gtk3widgets.py:943
+#: ../aptdaemon/gtkwidgets.py:913 ../aptdaemon/gtk3widgets.py:975
 #, python-format
 msgid "%sB of disk space will be freed."
 msgstr "%sB diskplass vil bli frigjort."
 
-#: ../aptdaemon/gtkwidgets.py:901 ../aptdaemon/gtk3widgets.py:947
+#: ../aptdaemon/gtkwidgets.py:917 ../aptdaemon/gtk3widgets.py:979
 #, python-format
 msgid "%sB more disk space will be used."
 msgstr "%sB mer diskplass vil brukes."
 
 #. TRANSLATORS: %s is a file path
-#: ../aptdaemon/gtkwidgets.py:972 ../aptdaemon/gtk3widgets.py:1020
+#: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1051
 #, python-format
 msgid ""
 "Replace your changes in '%s' with a later version of the configuration file?"
 msgstr ""
 "Erstatt endringene i '%s' med en senere versjon av konfigurasjonsfilen?"
 
-#: ../aptdaemon/gtkwidgets.py:974 ../aptdaemon/gtk3widgets.py:1022
+#: ../aptdaemon/gtkwidgets.py:989 ../aptdaemon/gtk3widgets.py:1053
 msgid ""
 "If you don't know why the file is there already, it is usually safe to "
 "replace it."
@@ -1144,31 +1149,30 @@
 "Det går vanligvis fint å erstatte den hvis du ikke helt vet hvorfor filen i "
 "utgangspunktet er der."
 
-#: ../aptdaemon/gtkwidgets.py:983 ../aptdaemon/gtk3widgets.py:1031
+#: ../aptdaemon/gtkwidgets.py:998 ../aptdaemon/gtk3widgets.py:1062
 msgid "_Changes"
 msgstr "_Endringer"
 
-#: ../aptdaemon/gtkwidgets.py:986 ../aptdaemon/gtk3widgets.py:1034
+#: ../aptdaemon/gtkwidgets.py:1001 ../aptdaemon/gtk3widgets.py:1065
 msgid "_Keep"
 msgstr "_Behold"
 
-#: ../aptdaemon/gtkwidgets.py:987 ../aptdaemon/gtk3widgets.py:1035
+#: ../aptdaemon/gtkwidgets.py:1002 ../aptdaemon/gtk3widgets.py:1066
 msgid "_Replace"
 msgstr "_Erstatt"
 
-#. TRANSLATORS: expander label in the error dialog
-#: ../aptdaemon/gtkwidgets.py:1082 ../aptdaemon/gtk3widgets.py:1132
+#: ../aptdaemon/gtkwidgets.py:1101 ../aptdaemon/gtk3widgets.py:1169
 msgid "_Details"
 msgstr "_Detaljer"
 
 #. TRANSLATORS: %s is the name of a package manager
-#: ../aptdaemon/lock.py:179
+#: ../aptdaemon/lock.py:182
 #, python-format
 msgid "Waiting for %s to exit"
 msgstr "Venter på at %s avslutter"
 
 #. TRANSLATORS: %s is a list of package names
-#: ../aptdaemon/progress.py:168
+#: ../aptdaemon/progress.py:169
 #, python-format
 msgid "Downloading %(files)s"
 msgid_plural "Downloading %(files)s"
@@ -1179,7 +1183,7 @@
 #. get the URI of a local repository
 #: ../aptdaemon/progress.py:281 ../aptdaemon/progress.py:320
 msgid "local repository"
-msgstr ""
+msgstr "lokalt mellomlager"
 
 #. TRANSLATORS: %s is a list of repository names
 #: ../aptdaemon/progress.py:284
@@ -1193,7 +1197,7 @@
 #: ../aptdaemon/progress.py:324
 #, python-format
 msgid "Structure of %s"
-msgstr ""
+msgstr "Struktur av %s"
 
 #. TRANSLATORS: repo is the name of a repository
 #: ../aptdaemon/progress.py:327
@@ -1205,76 +1209,71 @@
 #: ../aptdaemon/progress.py:330
 #, python-format
 msgid "Description signature of %s"
-msgstr ""
+msgstr "Beskrivelse av %s"
 
-#. TRANSLATORS: repo is the name of a repository
-#: ../aptdaemon/progress.py:334
+#: ../aptdaemon/progress.py:335
 #, python-format
 msgid "Available packages from %s"
 msgstr "Tilgjengelige pakker fra %s"
 
-#. TRANSLATORS: repo is the name of a repository
-#: ../aptdaemon/progress.py:337
+#: ../aptdaemon/progress.py:339
 #, python-format
 msgid "Available sources from %s"
 msgstr "Tilgjengelige kilder fra %s"
 
 #. TRANSLATORS: repo is the name of a repository
-#: ../aptdaemon/progress.py:340
+#: ../aptdaemon/progress.py:342
 #, python-format
 msgid "Available translations from %s"
 msgstr "Tilgjengelige oversettelser fra %s"
 
-#. TRANSLATORS: The first %s is the name of a language. The second
-#. one the name of the region/country. The third
-#. %s is the name of the repository
-#: ../aptdaemon/progress.py:356
+#: ../aptdaemon/progress.py:359
 #, python-format
 msgid "Translations for %s (%s) from %s"
 msgstr "Oversettelser på %s (%s) fra %s"
 
 #. TRANSLATORS: %s is the name of a language. The second one is
 #. the name of the repository
-#: ../aptdaemon/progress.py:361
+#: ../aptdaemon/progress.py:363
 #, python-format
 msgid "Translations for %s from %s"
 msgstr "Oversettelser på %s fra %s"
 
 #. TRANSLATORS: %s is the code of a language, e.g. ru_RU.
 #. The second one is the name of the repository
-#: ../aptdaemon/progress.py:366
+#: ../aptdaemon/progress.py:368
 #, python-format
 msgid "Translations (%s) from %s"
 msgstr "Oversettelser (%s) fra %s"
 
-#: ../aptdaemon/worker.py:470 ../aptdaemon/worker.py:770
-#: ../aptdaemon/worker.py:845 ../aptdaemon/worker.py:888
+#: ../aptdaemon/worker.py:466 ../aptdaemon/worker.py:763
+#: ../aptdaemon/worker.py:840 ../aptdaemon/worker.py:883
 #, python-format
 msgid "Package %s isn't available"
 msgstr "Pakke %s er ikke tilgjengelig"
 
-#: ../aptdaemon/worker.py:475 ../aptdaemon/worker.py:774
-#: ../aptdaemon/worker.py:849 ../aptdaemon/worker.py:892
+#: ../aptdaemon/worker.py:471 ../aptdaemon/worker.py:767
+#: ../aptdaemon/worker.py:844 ../aptdaemon/worker.py:887
 #, python-format
 msgid "Package %s isn't installed"
 msgstr "Pakke %s er ikke installert"
 
-#: ../aptdaemon/worker.py:479
+#: ../aptdaemon/worker.py:475
 #, python-format
 msgid "The version %s of %s isn't installed"
 msgstr "Versjon %s av %s er ikke installert"
 
-#: ../aptdaemon/worker.py:493
+#: ../aptdaemon/worker.py:490
 #, python-format
 msgid "Package %s is already installed"
 msgstr "Pakke %s er allerede installert"
 
-#: ../aptdaemon/worker.py:503 ../aptdaemon/worker.py:918
+#: ../aptdaemon/worker.py:499 ../aptdaemon/worker.py:913
 #, python-format
 msgid "The version %s of %s isn't available."
 msgstr "Versjon %s av %s er ikke tilgjengelig."
 
-#: ../aptdaemon/worker.py:684
+#: ../aptdaemon/worker.py:679
 #, python-format
 msgid ""
 "Failed to download and install the key %s from %s:\n"
@@ -1283,126 +1282,130 @@
 "Mislyktes nedlasting og installasjon av nøkkel %s fra %s:\n"
 "%s"
 
-#: ../aptdaemon/worker.py:701
+#: ../aptdaemon/worker.py:696
 #, python-format
 msgid "Key file %s couldn't be installed: %s"
 msgstr "Nøkkelfil %s kunne ikke installeres: %s"
 
-#: ../aptdaemon/worker.py:725
+#: ../aptdaemon/worker.py:720
 #, python-format
 msgid "Key with fingerprint %s couldn't be removed: %s"
 msgstr "Nøkkel med fingeravtrykk %s kunne ikke fjernes: %s"
 
-#: ../aptdaemon/worker.py:778
+#: ../aptdaemon/worker.py:771
 #, python-format
 msgid "Package %s cannot be removed."
 msgstr "Pakken %s kan ikke fjernes."
 
-#: ../aptdaemon/worker.py:782
+#: ../aptdaemon/worker.py:775
 #, python-format
 msgid "The version %s of %s is not installed"
 msgstr "Versjon %s av %s er ikke installert"
 
-#: ../aptdaemon/worker.py:860
+#: ../aptdaemon/worker.py:855
 #, python-format
 msgid "The former version %s of %s is already installed"
 msgstr "Tidligere versjon %s av %s er allerede installert"
 
-#: ../aptdaemon/worker.py:865 ../aptdaemon/worker.py:911
+#: ../aptdaemon/worker.py:860 ../aptdaemon/worker.py:906
 #, python-format
 msgid "The version %s of %s is already installed"
 msgstr "Versjon %s av %s er allerede installert"
 
-#: ../aptdaemon/worker.py:872
+#: ../aptdaemon/worker.py:867
 #, python-format
 msgid "The version %s of %s isn't available"
 msgstr "Versjon %s av %s er ikke tilgjengelig"
 
-#: ../aptdaemon/worker.py:876
+#: ../aptdaemon/worker.py:871
 #, python-format
 msgid "You need to specify a version to downgrade %s to"
 msgstr "Du må angi en versjon som %s skal nedgraderes til"
 
-#: ../aptdaemon/worker.py:904
+#: ../aptdaemon/worker.py:899
 #, python-format
 msgid "The later version %s of %s is already installed"
 msgstr "Den nyere versjonen %s av %s er allerede installert"
 
-#: ../aptdaemon/worker.py:935
+#: ../aptdaemon/worker.py:930
 #, python-format
 msgid "The package %s isn't available in the %s release."
 msgstr "Pakken %s er ikke tilgjengelig i %s-utgivelsen."
 
-#: ../aptdaemon/worker.py:1120
+#: ../aptdaemon/worker.py:1118
 #, python-format
 msgid "Package %s cannot be removed"
 msgstr "Pakke %s kan ikke fjernes"
 
-#: ../aptdaemon/worker.py:1257
+#: ../aptdaemon/worker.py:1255
 msgid ""
 "The package doesn't provide a valid Installed-Size control field. See Debian "
 "Policy 5.6.20."
 msgstr ""
+"Pakken inneholder ikke et gyldig kontrollfelt for Installed-size. Se Debian "
+"Policy-manualens 5.6.20."
 
 #: ../aptdaemon/worker.py:1397
 msgid "The license key is empty"
 msgstr "Lisensnøkkelen er tom"
 
-#: ../aptdaemon/worker.py:1411
+#: ../aptdaemon/worker.py:1413
 msgid "The license key is not allowed to contain executable code."
 msgstr "Lisenskoden kan ikke inneholde kjørbar kode."
 
-#: ../aptdaemon/worker.py:1420
+#: ../aptdaemon/worker.py:1422
 #, python-format
 msgid "The license key path %s is invalid"
 msgstr "Lisensnøkkelens sti %s er ugyldig"
 
-#: ../aptdaemon/worker.py:1424
+#: ../aptdaemon/worker.py:1426
 #, python-format
 msgid "The license key already exists: %s"
 msgstr "Lisensnøkkelen eksisterer allerede: %s"
 
-#: ../aptdaemon/worker.py:1429
+#: ../aptdaemon/worker.py:1431
 #, python-format
 msgid ""
 "The location of the license key is unsecure since it contains symbolic "
 "links. The path %s maps to %s"
 msgstr ""
+"Lisensnøkkelens plassering er usikker, fordi den inneholder symbolske "
+"lenker. Stien %s peker mot %s"
 
-#: ../aptdaemon/worker.py:1437
+#: ../aptdaemon/worker.py:1439
 #, python-format
 msgid "The directory where to install the key to doesn't exist yet: %s"
-msgstr ""
+msgstr "Mappen hvor du installerer nøkkelen eksisterer ikke ennå: %s"
 
-#: ../aptdaemon/worker.py:1448
+#: ../aptdaemon/worker.py:1450
 #, python-format
 msgid "Failed to write key file to: %s"
-msgstr ""
+msgstr "Klarte ikke å skrive nøkkel til %s"
 
-#: ../aptdaemon/worker.py:1483
+#: ../aptdaemon/worker.py:1485
 msgid "The following packages have unmet dependencies:"
 msgstr "Følgende pakker har krav som ikke er oppfylt:"
 
-#: ../aptdaemon/worker.py:1537
+#: ../aptdaemon/worker.py:1538
 msgid "but it is a virtual package"
 msgstr "men er en virtuell pakke"
 
-#: ../aptdaemon/worker.py:1540
+#: ../aptdaemon/worker.py:1541
 msgid "but it is not installed"
 msgstr "men er ikke installert"
 
-#: ../aptdaemon/worker.py:1542
+#: ../aptdaemon/worker.py:1543
 msgid "but it is not going to be installed"
 msgstr "men vil ikke bli installert"
 
 #. TRANSLATORS: %s is a version number
-#: ../aptdaemon/worker.py:1546
+#: ../aptdaemon/worker.py:1547
 #, python-format
 msgid "but %s is installed"
 msgstr "men %s er installert"
 
 #. TRANSLATORS: %s is a version number
-#: ../aptdaemon/worker.py:1550
+#: ../aptdaemon/worker.py:1551
 #, python-format
 msgid "but %s is to be installed"
 msgstr "men %s skal installeres"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/atk10.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/atk10.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/atk10.po	2013-01-29 09:33:48.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/atk10.po	2014-01-07 06:37:05.000000000 +0000
@@ -13,508 +13,508 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:47+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:56+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: no\n"
 
-#: ../atk/atkhyperlink.c:103
+#: ../atk/atkhyperlink.c:127
 msgid "Selected Link"
 msgstr "Valgt lenke"
 
-#: ../atk/atkhyperlink.c:104
+#: ../atk/atkhyperlink.c:128
 msgid "Specifies whether the AtkHyperlink object is selected"
 msgstr "Oppgir om et AtkHyperlink-objekt er valgt"
 
-#: ../atk/atkhyperlink.c:110
+#: ../atk/atkhyperlink.c:134
 msgid "Number of Anchors"
 msgstr "Antall anker"
 
-#: ../atk/atkhyperlink.c:111
+#: ../atk/atkhyperlink.c:135
 msgid "The number of anchors associated with the AtkHyperlink object"
 msgstr "Antall anker assosiert med AtkHyperlink-objektet"
 
-#: ../atk/atkhyperlink.c:119
+#: ../atk/atkhyperlink.c:143
 msgid "End index"
 msgstr "Sluttindeks"
 
-#: ../atk/atkhyperlink.c:120
+#: ../atk/atkhyperlink.c:144
 msgid "The end index of the AtkHyperlink object"
 msgstr "Sluttindeks for AtkHyperlink-objektet"
 
-#: ../atk/atkhyperlink.c:128
+#: ../atk/atkhyperlink.c:152
 msgid "Start index"
 msgstr "Startindeks"
 
-#: ../atk/atkhyperlink.c:129
+#: ../atk/atkhyperlink.c:153
 msgid "The start index of the AtkHyperlink object"
 msgstr "Startindeks for AtkHyperlink-objektet"
 
-#: ../atk/atkobject.c:74
+#: ../atk/atkobject.c:103
 msgid "invalid"
 msgstr "ugyldig"
 
-#: ../atk/atkobject.c:75
+#: ../atk/atkobject.c:104
 msgid "accelerator label"
 msgstr "etikett for snarveitast"
 
-#: ../atk/atkobject.c:76
+#: ../atk/atkobject.c:105
 msgid "alert"
 msgstr "varsel"
 
-#: ../atk/atkobject.c:77
+#: ../atk/atkobject.c:106
 msgid "animation"
 msgstr "animasjon"
 
-#: ../atk/atkobject.c:78
+#: ../atk/atkobject.c:107
 msgid "arrow"
 msgstr "pil"
 
-#: ../atk/atkobject.c:79
+#: ../atk/atkobject.c:108
 msgid "calendar"
 msgstr "kalender"
 
-#: ../atk/atkobject.c:80
+#: ../atk/atkobject.c:109
 msgid "canvas"
 msgstr "kanvas"
 
-#: ../atk/atkobject.c:81
+#: ../atk/atkobject.c:110
 msgid "check box"
 msgstr "avkryssingsboks"
 
-#: ../atk/atkobject.c:82
+#: ../atk/atkobject.c:111
 msgid "check menu item"
 msgstr "menyoppføring med avkryssingsboks"
 
-#: ../atk/atkobject.c:83
+#: ../atk/atkobject.c:112
 msgid "color chooser"
 msgstr "fargevelger"
 
-#: ../atk/atkobject.c:84
+#: ../atk/atkobject.c:113
 msgid "column header"
 msgstr "kolonnetopptekst"
 
-#: ../atk/atkobject.c:85
+#: ../atk/atkobject.c:114
 msgid "combo box"
 msgstr "komboboks"
 
-#: ../atk/atkobject.c:86
+#: ../atk/atkobject.c:115
 msgid "dateeditor"
 msgstr "datoredigering"
 
-#: ../atk/atkobject.c:87
+#: ../atk/atkobject.c:116
 msgid "desktop icon"
 msgstr "skrivebordsikon"
 
-#: ../atk/atkobject.c:88
+#: ../atk/atkobject.c:117
 msgid "desktop frame"
 msgstr "skrivebordsramme"
 
-#: ../atk/atkobject.c:89
+#: ../atk/atkobject.c:118
 msgid "dial"
 msgstr "nummeroppføring"
 
-#: ../atk/atkobject.c:90
+#: ../atk/atkobject.c:119
 msgid "dialog"
 msgstr "dialog"
 
-#: ../atk/atkobject.c:91
+#: ../atk/atkobject.c:120
 msgid "directory pane"
 msgstr "katalogområde"
 
-#: ../atk/atkobject.c:92
+#: ../atk/atkobject.c:121
 msgid "drawing area"
 msgstr "tegneområde"
 
-#: ../atk/atkobject.c:93
+#: ../atk/atkobject.c:122
 msgid "file chooser"
 msgstr "filvelger"
 
-#: ../atk/atkobject.c:94
+#: ../atk/atkobject.c:123
 msgid "filler"
 msgstr "fyll"
 
 #. I know it looks wrong but that is what Java returns
-#: ../atk/atkobject.c:96
+#: ../atk/atkobject.c:125
 msgid "fontchooser"
 msgstr "skriftvelger"
 
-#: ../atk/atkobject.c:97
+#: ../atk/atkobject.c:126
 msgid "frame"
 msgstr "ramme"
 
-#: ../atk/atkobject.c:98
+#: ../atk/atkobject.c:127
 msgid "glass pane"
 msgstr "glass-område"
 
-#: ../atk/atkobject.c:99
+#: ../atk/atkobject.c:128
 msgid "html container"
 msgstr "html-område"
 
-#: ../atk/atkobject.c:100
+#: ../atk/atkobject.c:129
 msgid "icon"
 msgstr "ikon"
 
-#: ../atk/atkobject.c:101
+#: ../atk/atkobject.c:130
 msgid "image"
 msgstr "bilde"
 
-#: ../atk/atkobject.c:102
+#: ../atk/atkobject.c:131
 msgid "internal frame"
 msgstr "intern ramme"
 
-#: ../atk/atkobject.c:103
+#: ../atk/atkobject.c:132
 msgid "label"
 msgstr "etikett"
 
-#: ../atk/atkobject.c:104
+#: ../atk/atkobject.c:133
 msgid "layered pane"
 msgstr "lagdelt område"
 
-#: ../atk/atkobject.c:105
+#: ../atk/atkobject.c:134
 msgid "list"
 msgstr "liste"
 
-#: ../atk/atkobject.c:106
+#: ../atk/atkobject.c:135
 msgid "list item"
 msgstr "listeoppføring"
 
-#: ../atk/atkobject.c:107
+#: ../atk/atkobject.c:136
 msgid "menu"
 msgstr "meny"
 
-#: ../atk/atkobject.c:108
+#: ../atk/atkobject.c:137
 msgid "menu bar"
 msgstr "menylinje"
 
-#: ../atk/atkobject.c:109
+#: ../atk/atkobject.c:138
 msgid "menu item"
 msgstr "menyoppføring"
 
-#: ../atk/atkobject.c:110
+#: ../atk/atkobject.c:139
 msgid "option pane"
 msgstr "alternativ-område"
 
-#: ../atk/atkobject.c:111
+#: ../atk/atkobject.c:140
 msgid "page tab"
 msgstr "sidefane"
 
-#: ../atk/atkobject.c:112
+#: ../atk/atkobject.c:141
 msgid "page tab list"
 msgstr "sidefaneliste"
 
-#: ../atk/atkobject.c:113
+#: ../atk/atkobject.c:142
 msgid "panel"
 msgstr "panel"
 
-#: ../atk/atkobject.c:114
+#: ../atk/atkobject.c:143
 msgid "password text"
 msgstr "passordtekst"
 
-#: ../atk/atkobject.c:115
+#: ../atk/atkobject.c:144
 msgid "popup menu"
 msgstr "oppsprettmeny"
 
-#: ../atk/atkobject.c:116
+#: ../atk/atkobject.c:145
 msgid "progress bar"
 msgstr "fremgangsmåler"
 
-#: ../atk/atkobject.c:117
+#: ../atk/atkobject.c:146
 msgid "push button"
 msgstr "trykknapp"
 
-#: ../atk/atkobject.c:118
+#: ../atk/atkobject.c:147
 msgid "radio button"
 msgstr "radioknapp"
 
-#: ../atk/atkobject.c:119
+#: ../atk/atkobject.c:148
 msgid "radio menu item"
 msgstr "radiomenyoppføring"
 
-#: ../atk/atkobject.c:120
+#: ../atk/atkobject.c:149
 msgid "root pane"
 msgstr "rotområde"
 
-#: ../atk/atkobject.c:121
+#: ../atk/atkobject.c:150
 msgid "row header"
 msgstr "radtoppekst"
 
-#: ../atk/atkobject.c:122
+#: ../atk/atkobject.c:151
 msgid "scroll bar"
 msgstr "rullefelt"
 
-#: ../atk/atkobject.c:123
+#: ../atk/atkobject.c:152
 msgid "scroll pane"
 msgstr "rulleområde"
 
-#: ../atk/atkobject.c:124
+#: ../atk/atkobject.c:153
 msgid "separator"
 msgstr "skillelinje"
 
-#: ../atk/atkobject.c:125
+#: ../atk/atkobject.c:154
 msgid "slider"
 msgstr "ruller"
 
-#: ../atk/atkobject.c:126
+#: ../atk/atkobject.c:155
 msgid "split pane"
 msgstr "delt område"
 
-#: ../atk/atkobject.c:127
+#: ../atk/atkobject.c:156
 msgid "spin button"
 msgstr "spin button"
 
-#: ../atk/atkobject.c:128
+#: ../atk/atkobject.c:157
 msgid "statusbar"
 msgstr "statuslinje"
 
-#: ../atk/atkobject.c:129
+#: ../atk/atkobject.c:158
 msgid "table"
 msgstr "tabell"
 
-#: ../atk/atkobject.c:130
+#: ../atk/atkobject.c:159
 msgid "table cell"
 msgstr "tabellcelle"
 
-#: ../atk/atkobject.c:131
+#: ../atk/atkobject.c:160
 msgid "table column header"
 msgstr "topptekst for kolonne i tabell"
 
-#: ../atk/atkobject.c:132
+#: ../atk/atkobject.c:161
 msgid "table row header"
 msgstr "topptekst for rad i tabell"
 
-#: ../atk/atkobject.c:133
+#: ../atk/atkobject.c:162
 msgid "tear off menu item"
 msgstr "avtagbar menyoppføring"
 
-#: ../atk/atkobject.c:134
+#: ../atk/atkobject.c:163
 msgid "terminal"
 msgstr "terminal"
 
-#: ../atk/atkobject.c:135
+#: ../atk/atkobject.c:164
 msgid "text"
 msgstr "tekst"
 
-#: ../atk/atkobject.c:136
+#: ../atk/atkobject.c:165
 msgid "toggle button"
 msgstr "av/på-knapp"
 
-#: ../atk/atkobject.c:137
+#: ../atk/atkobject.c:166
 msgid "tool bar"
 msgstr "verktøylinje"
 
-#: ../atk/atkobject.c:138
+#: ../atk/atkobject.c:167
 msgid "tool tip"
 msgstr "verktøytips"
 
-#: ../atk/atkobject.c:139
+#: ../atk/atkobject.c:168
 msgid "tree"
 msgstr "tre"
 
-#: ../atk/atkobject.c:140
+#: ../atk/atkobject.c:169
 msgid "tree table"
 msgstr "tretabell"
 
-#: ../atk/atkobject.c:141
+#: ../atk/atkobject.c:170
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../atk/atkobject.c:142
+#: ../atk/atkobject.c:171
 msgid "viewport"
 msgstr "visningsport"
 
-#: ../atk/atkobject.c:143
+#: ../atk/atkobject.c:172
 msgid "window"
 msgstr "vindu"
 
-#: ../atk/atkobject.c:144
+#: ../atk/atkobject.c:173
 msgid "header"
 msgstr "topptekst"
 
-#: ../atk/atkobject.c:145
+#: ../atk/atkobject.c:174
 msgid "footer"
 msgstr "bunntekst"
 
-#: ../atk/atkobject.c:146
+#: ../atk/atkobject.c:175
 msgid "paragraph"
 msgstr "avsnitt"
 
-#: ../atk/atkobject.c:147
+#: ../atk/atkobject.c:176
 msgid "ruler"
 msgstr "linjal"
 
-#: ../atk/atkobject.c:148
+#: ../atk/atkobject.c:177
 msgid "application"
 msgstr "applikasjon"
 
-#: ../atk/atkobject.c:149
+#: ../atk/atkobject.c:178
 msgid "autocomplete"
 msgstr "autofullfør"
 
-#: ../atk/atkobject.c:150
+#: ../atk/atkobject.c:179
 msgid "edit bar"
 msgstr "rediger linje"
 
-#: ../atk/atkobject.c:151
+#: ../atk/atkobject.c:180
 msgid "embedded component"
 msgstr "innebygget komponent"
 
-#: ../atk/atkobject.c:152
+#: ../atk/atkobject.c:181
 msgid "entry"
 msgstr "oppføring"
 
-#: ../atk/atkobject.c:153
+#: ../atk/atkobject.c:182
 msgid "chart"
 msgstr "graf"
 
-#: ../atk/atkobject.c:154
+#: ../atk/atkobject.c:183
 msgid "caption"
 msgstr "bildetekst"
 
-#: ../atk/atkobject.c:155
+#: ../atk/atkobject.c:184
 msgid "document frame"
 msgstr "dokumentramme"
 
-#: ../atk/atkobject.c:156
+#: ../atk/atkobject.c:185
 msgid "heading"
 msgstr "topptekst"
 
-#: ../atk/atkobject.c:157
+#: ../atk/atkobject.c:186
 msgid "page"
 msgstr "side"
 
-#: ../atk/atkobject.c:158
+#: ../atk/atkobject.c:187
 msgid "section"
 msgstr "del"
 
-#: ../atk/atkobject.c:159
+#: ../atk/atkobject.c:188
 msgid "redundant object"
 msgstr "redundant objekt"
 
-#: ../atk/atkobject.c:160
+#: ../atk/atkobject.c:189
 msgid "form"
 msgstr "skjema"
 
-#: ../atk/atkobject.c:161
+#: ../atk/atkobject.c:190
 msgid "link"
 msgstr "lenke"
 
-#: ../atk/atkobject.c:162
+#: ../atk/atkobject.c:191
 msgid "input method window"
 msgstr "vindu for inndatametode"
 
-#: ../atk/atkobject.c:163
+#: ../atk/atkobject.c:192
 msgid "table row"
 msgstr "rad i tabell"
 
-#: ../atk/atkobject.c:164
+#: ../atk/atkobject.c:193
 msgid "tree item"
 msgstr "treoppføring"
 
-#: ../atk/atkobject.c:165
+#: ../atk/atkobject.c:194
 msgid "document spreadsheet"
 msgstr "regnearkdokument"
 
-#: ../atk/atkobject.c:166
+#: ../atk/atkobject.c:195
 msgid "document presentation"
 msgstr "presentasjonsdokument"
 
-#: ../atk/atkobject.c:167
+#: ../atk/atkobject.c:196
 msgid "document text"
 msgstr "tekstdokument"
 
-#: ../atk/atkobject.c:168
+#: ../atk/atkobject.c:197
 msgid "document web"
 msgstr "nettdokument"
 
-#: ../atk/atkobject.c:169
+#: ../atk/atkobject.c:198
 msgid "document email"
 msgstr "e-postdokument"
 
-#: ../atk/atkobject.c:170
+#: ../atk/atkobject.c:199
 msgid "comment"
 msgstr "kommentar"
 
-#: ../atk/atkobject.c:171
+#: ../atk/atkobject.c:200
 msgid "list box"
 msgstr "listeboks"
 
-#: ../atk/atkobject.c:172
+#: ../atk/atkobject.c:201
 msgid "grouping"
 msgstr "gruppering"
 
-#: ../atk/atkobject.c:173
+#: ../atk/atkobject.c:202
 msgid "image map"
 msgstr "bildekart"
 
-#: ../atk/atkobject.c:174
+#: ../atk/atkobject.c:203
 msgid "notification"
 msgstr "varsling"
 
-#: ../atk/atkobject.c:175
+#: ../atk/atkobject.c:204
 msgid "info bar"
 msgstr "informasjonslinje"
 
-#: ../atk/atkobject.c:514
+#: ../atk/atkobject.c:465
 msgid "Accessible Name"
 msgstr "Tilgjengelig navn"
 
-#: ../atk/atkobject.c:515
+#: ../atk/atkobject.c:466
 msgid "Object instance's name formatted for assistive technology access"
 msgstr "Objektinstansens navn formattert for aksess via hjelpefunksjoner"
 
-#: ../atk/atkobject.c:521
+#: ../atk/atkobject.c:472
 msgid "Accessible Description"
 msgstr "Tilgjengelig beskrivelse"
 
-#: ../atk/atkobject.c:522
+#: ../atk/atkobject.c:473
 msgid "Description of an object, formatted for assistive technology access"
 msgstr "Beskrivelse av et objekt formattert for aksess via hjelpefunksjoner"
 
-#: ../atk/atkobject.c:528
+#: ../atk/atkobject.c:479
 msgid "Accessible Parent"
 msgstr "Tilgjengelig opphav"
 
-#: ../atk/atkobject.c:529
+#: ../atk/atkobject.c:480
 msgid "Is used to notify that the parent has changed"
 msgstr "Brukes til å varsle at opphavet er endret"
 
-#: ../atk/atkobject.c:535
+#: ../atk/atkobject.c:486
 msgid "Accessible Value"
 msgstr "Tilgjengelig verdi"
 
-#: ../atk/atkobject.c:536
+#: ../atk/atkobject.c:487
 msgid "Is used to notify that the value has changed"
 msgstr "Brukes til å varsle at verdien er endret"
 
-#: ../atk/atkobject.c:544
+#: ../atk/atkobject.c:495
 msgid "Accessible Role"
 msgstr "Tilgjengelig rolle"
 
-#: ../atk/atkobject.c:545
+#: ../atk/atkobject.c:496
 msgid "The accessible role of this object"
 msgstr "Tilgjengelig rolle for dette objektet"
 
-#: ../atk/atkobject.c:553
+#: ../atk/atkobject.c:504
 msgid "Accessible Layer"
 msgstr "Tilgjengelig lag"
 
-#: ../atk/atkobject.c:554
+#: ../atk/atkobject.c:505
 msgid "The accessible layer of this object"
 msgstr "Tilgjengelig lag for dette objektet"
 
-#: ../atk/atkobject.c:562
+#: ../atk/atkobject.c:513
 msgid "Accessible MDI Value"
 msgstr "Tilgjengelig MDI-verdi"
 
-#: ../atk/atkobject.c:563
+#: ../atk/atkobject.c:514
 msgid "The accessible MDI value of this object"
 msgstr "Tilgjengelig MDI-verdi for dette objektet"
 
-#: ../atk/atkobject.c:571
+#: ../atk/atkobject.c:522
 msgid "Accessible Table Caption"
 msgstr "Tilgjengelig tabelltekst"
 
-#: ../atk/atkobject.c:572
+#: ../atk/atkobject.c:523
 msgid ""
 "Is used to notify that the table caption has changed; this property should "
 "not be used. accessible-table-caption-object should be used instead"
@@ -522,58 +522,58 @@
 "Brukes til å varsle at denne tabellteksten er endret; denne egenskapen bør "
 "ikke brukes. accessible-table-caption-object bør brukes i stedet"
 
-#: ../atk/atkobject.c:578
+#: ../atk/atkobject.c:529
 msgid "Accessible Table Column Header"
 msgstr "Topptekst for kolonne i tilgjengelig tabell"
 
-#: ../atk/atkobject.c:579
+#: ../atk/atkobject.c:530
 msgid "Is used to notify that the table column header has changed"
 msgstr "Brukes til å varsle at kolonnetopptekst for tabellen er endret"
 
-#: ../atk/atkobject.c:585
+#: ../atk/atkobject.c:536
 msgid "Accessible Table Column Description"
 msgstr "Tilgjengelig beskrivelse av kolonne i tabell"
 
-#: ../atk/atkobject.c:586
+#: ../atk/atkobject.c:537
 msgid "Is used to notify that the table column description has changed"
 msgstr "Brukes til å varsle at kolonnebeskrivelse for tabell er endret"
 
-#: ../atk/atkobject.c:592
+#: ../atk/atkobject.c:543
 msgid "Accessible Table Row Header"
 msgstr "Tilgjengelig topptekst for rad i tabell"
 
-#: ../atk/atkobject.c:593
+#: ../atk/atkobject.c:544
 msgid "Is used to notify that the table row header has changed"
 msgstr "Brukes til å varsle at radtopptekst for tabellen er endret"
 
-#: ../atk/atkobject.c:599
+#: ../atk/atkobject.c:550
 msgid "Accessible Table Row Description"
 msgstr "Tilgjengelig beskrivelse av rad i tabell"
 
-#: ../atk/atkobject.c:600
+#: ../atk/atkobject.c:551
 msgid "Is used to notify that the table row description has changed"
 msgstr "Brukes til å varsle at radbeskrivelse i tabell er endret"
 
-#: ../atk/atkobject.c:606
+#: ../atk/atkobject.c:557
 msgid "Accessible Table Summary"
 msgstr "Tilgjengelig tabellsammendrag"
 
-#: ../atk/atkobject.c:607
+#: ../atk/atkobject.c:558
 msgid "Is used to notify that the table summary has changed"
 msgstr "Brukes til å varsle at tabellsammendrag er endret"
 
-#: ../atk/atkobject.c:613
+#: ../atk/atkobject.c:564
 msgid "Accessible Table Caption Object"
 msgstr "Tilgjengelig objekt for tabelltekst"
 
-#: ../atk/atkobject.c:614
+#: ../atk/atkobject.c:565
 msgid "Is used to notify that the table caption has changed"
 msgstr "Brukes til å varsle at tabellteksten er endret"
 
-#: ../atk/atkobject.c:620
+#: ../atk/atkobject.c:571
 msgid "Number of Accessible Hypertext Links"
 msgstr "Antall tilgjengelige hypertekstlenker"
 
-#: ../atk/atkobject.c:621
+#: ../atk/atkobject.c:572
 msgid "The number of links which the current AtkHypertext has"
 msgstr "Antall lenker i aktiv AtkHypertext"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/baobab.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/baobab.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/baobab.po	2013-01-29 09:33:57.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/baobab.po	2014-01-07 06:37:52.000000000 +0000
@@ -16,11 +16,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:44+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 21:17+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
-#: ../data/baobab.desktop.in.in.h:1 ../src/baobab-window.vala:164
+#: ../data/baobab.desktop.in.in.h:1 ../src/baobab-window.vala:167
 msgid "Disk Usage Analyzer"
 msgstr "Analyse av diskplass"
 
@@ -435,23 +435,23 @@
 msgid "_Rescan"
 msgstr "Oppdate_r"
 
-#: ../src/baobab-main-window.ui.h:6
+#: ../src/baobab-main-window.ui.h:5
 msgid "Folder"
 msgstr "Mappe"
 
-#: ../src/baobab-main-window.ui.h:7
+#: ../src/baobab-main-window.ui.h:6
 msgid "Usage"
 msgstr "Bruk"
 
-#: ../src/baobab-main-window.ui.h:8
+#: ../src/baobab-main-window.ui.h:7
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../src/baobab-main-window.ui.h:9
+#: ../src/baobab-main-window.ui.h:8
 msgid "Contents"
 msgstr "Innhold"
 
-#: ../src/baobab-window.vala:206
+#: ../src/baobab-window.vala:213
 msgid "Select Folder"
 msgstr "Velg mappe"
 
@@ -465,20 +465,20 @@
 msgstr "Kan ikke sjekke en utelukket mappe!"
 
 #. || is_virtual_filesystem ()
-#: ../src/baobab-window.vala:576 ../src/baobab-window.vala:582
+#: ../src/baobab-window.vala:585 ../src/baobab-window.vala:591
 #, c-format
 msgid "\"%s\" is not a valid folder"
 msgstr "«%s» er ikke en gyldig mappe"
 
-#: ../src/baobab-window.vala:577 ../src/baobab-window.vala:583
+#: ../src/baobab-window.vala:586 ../src/baobab-window.vala:592
 msgid "Could not analyze disk usage."
 msgstr "Kunne ikke analysere diskbruk"
 
-#: ../src/baobab-main-window.ui.h:12
+#: ../src/baobab-main-window.ui.h:11
 msgid "_Open Folder"
 msgstr "_Åpne mappe"
 
-#: ../src/baobab-main-window.ui.h:14
+#: ../src/baobab-main-window.ui.h:13
 msgid "Mo_ve to Trash"
 msgstr "Fl_ytt til papirkurven"
 
@@ -542,15 +542,15 @@
 "programmet. Hvis dette ikke er tilfelle, kan du skrive til Free Software "
 "Foundation, Inc. 51 Franklin Street, Fifth Florr, Boston, MA 02110-1301, USA"
 
-#: ../src/baobab-window.vala:307
+#: ../src/baobab-window.vala:314
 msgid "Baobab"
 msgstr "Baobab"
 
-#: ../src/baobab-window.vala:310
+#: ../src/baobab-window.vala:317
 msgid "A graphical tool to analyze disk usage."
 msgstr "Et grafisk verktøy for å analysere diskbruk."
 
-#: ../src/baobab-window.vala:315
+#: ../src/baobab-window.vala:322
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/brasero.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/brasero.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/brasero.po	2013-01-29 09:33:50.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/brasero.po	2014-01-07 06:37:27.000000000 +0000
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 14:42+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 15:17+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../data/brasero.desktop.in.in.h:1
@@ -31,7 +31,7 @@
 
 #: ../data/brasero.desktop.in.in.h:3
 msgid "Create and copy CDs and DVDs"
-msgstr "Skriv og kopier CDer eller DVDer"
+msgstr "Skriv og kopier CD-er og DVD-er"
 
 #: ../data/brasero.desktop.in.in.h:5
 msgid "Brasero Disc Burner"
@@ -41,10 +41,9 @@
 msgid "Open a New Window"
 msgstr "Åpne et nytt vindu"
 
-# disk
 #: ../data/brasero.desktop.in.in.h:7
 msgid "Burn an Image File"
-msgstr "Skriv som avtrykk"
+msgstr "Brenn en avtrykksfil"
 
 #: ../data/brasero.desktop.in.in.h:7
 msgid "Copy a Disc"
@@ -64,61 +63,60 @@
 
 #: ../data/mime/brasero.xml.in.h:1
 msgid "Brasero project file"
-msgstr "Brasero prosjektfil"
+msgstr "Brasero-prosjektfil"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:1
+#: ../data/org.gnome.brasero.gschema.xml.h:1
 msgid "Should Nautilus extension output debug statements"
 msgstr "Slå på feilsøkingsinformasjon fra Nautilus-utvidelser"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:2
+#: ../data/org.gnome.brasero.gschema.xml.h:2
 msgid ""
 "Should Nautilus extension output debug statements. The value should be set "
 "to true if it should."
 msgstr ""
-"Skal Nautilusutvidelsen skrive ut feilsøkingsuttrykk. Om den skal det skal "
-"verdien være sann."
+"Sett til «true» hvis nautilustillegget skal skrive ut feilsøkingsinformasjon."
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:3
+#: ../data/org.gnome.brasero.gschema.xml.h:3
 msgid "The type of checksum used for images"
 msgstr "Type sjekksum som brukes for avtrykk"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:4
+#: ../data/org.gnome.brasero.gschema.xml.h:4
 msgid "Set to 0 for MD5, 1 for SHA1 and 2 for SHA256"
 msgstr "Sett  til 0 for MD5, 1 for SHA1 og 2 for SHA256"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:5
+#: ../data/org.gnome.brasero.gschema.xml.h:5
 msgid "The type of checksum used for files"
 msgstr "Type sjekksum som brukes for filer"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:6
+#: ../data/org.gnome.brasero.gschema.xml.h:6
 msgid "Directory to use for temporary files"
-msgstr "Katalog som skal brukes for midlertidige filer"
+msgstr "Mappe som skal brukes for midlertidige filer"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:7
+#: ../data/org.gnome.brasero.gschema.xml.h:7
 msgid ""
 "Contains the path to the directory where brasero should store temporary "
 "files. If that value is empty, the default directory set for glib will be "
 "used."
 msgstr ""
-"Inneholder stien til mappen der Brasero skal lagre midlertidige filer. Om "
-"verdien er tom vil den forvalgte mappen til glib bli brukt."
+"Inneholder stien til mappa der Brasero skal lagre midlertidige filer. Hvis "
+"verdien er tom, brukes standardmappa for glib."
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:8
+#: ../data/org.gnome.brasero.gschema.xml.h:8
 msgid "Favourite burn engine"
-msgstr "Foretrukket motor for skriving"
+msgstr "Foretrukket motor for platebrenning"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:9
+#: ../data/org.gnome.brasero.gschema.xml.h:9
 msgid ""
 "Contains the name of the favourite burn engine suite installed. It will be "
 "used if possible."
 msgstr ""
-"Inneholder navn på preferert skrivemotor. Denne vil brukes hvis mulig."
+"Inneholder navn på foretrukket skrivemotor. Denne brukes hvis det er mulig."
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:10
+#: ../data/org.gnome.brasero.gschema.xml.h:10
 msgid "White list of additional plugins to use"
 msgstr "Hvitliste med ekstra tillegg som skal brukes"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:11
+#: ../data/org.gnome.brasero.gschema.xml.h:11
 msgid ""
 "Contains the list of additional plugins Brasero will use to burn discs. If "
 "set to NULL, Brasero will load them all."
@@ -126,11 +124,11 @@
 "Inneholder liste med ekstra tillegg Brasero skal bruke til å skrive plater. "
 "Hvis den settes til NULL vil Brasero laste alle sammen."
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:12
+#: ../data/org.gnome.brasero.gschema.xml.h:12
 msgid "Enable the \"-immed\" flag with cdrecord"
 msgstr "Bruk flagget «-immed» med cdrecord"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:13
+#: ../data/org.gnome.brasero.gschema.xml.h:13
 msgid ""
 "Whether to use the \"-immed\" flag with cdrecord. Use with caution (set to "
 "true) as it's only a workaround for some drives/setups."
@@ -138,11 +136,11 @@
 "Om «-immed»-flagget med cdrecord. Sett til sann for å bruke det, men bruk "
 "med måte fordi det arbeider rundt problemer for noen enheter og oppsett."
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:14
+#: ../data/org.gnome.brasero.gschema.xml.h:14
 msgid "Whether to use the \"-use-the-force-luke=dao\" flag with growisofs"
-msgstr "Om «-use-the-force-luke=dao\"-flagget med growisofs skal brukes"
+msgstr "Hvorvidt flagget «-use-the-force-luke=dao» med growisofs"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:15
+#: ../data/org.gnome.brasero.gschema.xml.h:15
 msgid ""
 "Whether to use the \"-use-the-force-luke=dao\" flag with growisofs. Set to "
 "false, brasero won't use it; it may be a workaround for some drives/setups."
@@ -150,19 +148,19 @@
 "Sett til falsk om Brasero ikke skal bruke «-use-the-force-luke=dao\"-flagget "
 "med growisofs. Det kan arbeide rundt problemer for noen enheter og oppsett."
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:16
+#: ../data/org.gnome.brasero.gschema.xml.h:16
 msgid "Used in conjunction with the \"-immed\" flag with cdrecord"
 msgstr "Brukes sammen med «-immed» flagget med cdrecord"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:17
+#: ../data/org.gnome.brasero.gschema.xml.h:17
 msgid "Used in conjunction with the \"-immed\" flag with cdrecord."
 msgstr "Brukes sammen med «-immed»-flagget med cdrecord."
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:18
+#: ../data/org.gnome.brasero.gschema.xml.h:18
 msgid "Whether to use the \"--driver generic-mmc-raw\" flag with cdrdao"
 msgstr "Hvorvidt flagget «--driver generic-mmc-raw» skal brukes med cdrdao"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:19
+#: ../data/org.gnome.brasero.gschema.xml.h:19
 msgid ""
 "Whether to use the \"--driver generic-mmc-raw\" flag with cdrdao. Set to "
 "True, brasero will use it; it may be a workaround for some drives/setups."
@@ -170,33 +168,33 @@
 "Sett til sann om Brasero skal bruke «--driver generic-mmc-raw»-flagget med "
 "cdrdao. Det kan arbeide rundt problemer for noen enheter og oppsett."
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:20
+#: ../data/org.gnome.brasero.gschema.xml.h:20
 msgid "The last browsed folder while looking for images to burn"
 msgstr "Sist lest mappe ved søk etter avtrykk som skal skrives"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:21
+#: ../data/org.gnome.brasero.gschema.xml.h:21
 msgid ""
 "Contains the absolute path of the directory that was last browsed for images "
 "to burn"
 msgstr ""
-"Inneholder absolutt sti til katalogen som sist ble brukt til å finne avtrykk "
-"for brenning"
+"Inneholder fullstendig sti til den mappa som senest ble brukt til å finne "
+"avtrykk for brenning"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:22
+#: ../data/org.gnome.brasero.gschema.xml.h:22
 msgid "Enable file preview"
 msgstr "Slå på forhånsvisning av filer"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:23
+#: ../data/org.gnome.brasero.gschema.xml.h:23
 msgid "Whether to display file preview. Set to true to use it."
 msgstr ""
 "Hvorvidt forhåndsvisning av filer skal brukes. Sett til «true» for å bruke "
 "dette."
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:24
+#: ../data/org.gnome.brasero.gschema.xml.h:24
 msgid "Should brasero filter hidden files"
 msgstr "Skal brasero filtrere skjulte filer"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:25
+#: ../data/org.gnome.brasero.gschema.xml.h:25
 msgid ""
 "Should brasero filter hidden files. Set to true, brasero will filter hidden "
 "files."
@@ -204,11 +202,11 @@
 "Hvorvidt brasero filtrerer ut skjulte filer. Sett til «true» for at brasero "
 "skal filtrere ut skjulte filer."
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:26
+#: ../data/org.gnome.brasero.gschema.xml.h:26
 msgid "Replace symbolic links by their targets"
 msgstr "Erstatt symbolske lenker med mål"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:27
+#: ../data/org.gnome.brasero.gschema.xml.h:27
 msgid ""
 "Should brasero replace symbolic links by their target files in the project. "
 "Set to true, brasero will replace symbolic links."
@@ -216,11 +214,11 @@
 "Skal Brasero bytte ut symbolske lenker med deres målfiler i prosjektet. Sett "
 "til sann om Brasero skal bytte de ut."
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:28
+#: ../data/org.gnome.brasero.gschema.xml.h:28
 msgid "Should brasero filter broken symbolic links"
 msgstr "Skal brasero filtrere bort brutte symbolske lenker"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:29
+#: ../data/org.gnome.brasero.gschema.xml.h:29
 msgid ""
 "Should brasero filter broken symbolic links. Set to true, brasero will "
 "filter broken symbolic links."
@@ -228,11 +226,11 @@
 "Skal Brasero filtrere bort symbolske lenker. Sett til sann om Brasero skal "
 "filtrere de ut."
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:30
+#: ../data/org.gnome.brasero.gschema.xml.h:30
 msgid "The priority value for the plugin"
 msgstr "Prioritetsverdi for tillegg"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:31
+#: ../data/org.gnome.brasero.gschema.xml.h:31
 msgid ""
 "When several plugins are available for the same task, this value is used to "
 "determine which plugin should be given priority. 0 means the plugin's native "
@@ -244,11 +242,11 @@
 "innebygde prioritet brukes. En positiv verdi overskriver tilleggets "
 "innebygde prioritet. En negativ verdi deaktiverer tillegget."
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:32
+#: ../data/org.gnome.brasero.gschema.xml.h:32
 msgid "Burning flags to be used"
 msgstr "Flagg som skal brukes ved skriving"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:33
+#: ../data/org.gnome.brasero.gschema.xml.h:33
 msgid ""
 "This value represents the burning flags that were used in such a context the "
 "last time."
@@ -256,11 +254,11 @@
 "Denne verdien representerer skriveflaggene som ble brukt i denne konteksten "
 "sist gang."
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:34
+#: ../data/org.gnome.brasero.gschema.xml.h:34
 msgid "The speed to be used"
 msgstr "Hastighet som skal brukes"
 
-#: ../data/org.gnome.brasero.gschema.xml.in.h:35
+#: ../data/org.gnome.brasero.gschema.xml.h:35
 msgid ""
 "This value represents the speed that was used in such a context the last "
 "time."
@@ -298,7 +296,7 @@
 #: ../libbrasero-burn/brasero-app-indicator.c:273
 #, c-format
 msgid "Brasero Disc Burner: %s"
-msgstr ""
+msgstr "Brasero brenneprogram: %s"
 
 #: ../libbrasero-burn/brasero-blank-dialog.c:222
 msgid "Error while blanking."
@@ -360,7 +358,7 @@
 msgstr "Enheten er opptatt"
 
 #: ../libbrasero-burn/brasero-burn.c:332
-#: ../libbrasero-burn/brasero-burn-dialog.c:649
+#: ../libbrasero-burn/brasero-burn-dialog.c:651
 #: ../libbrasero-burn/brasero-tool-dialog.c:90
 msgid "Make sure another application is not using it"
 msgstr "Sjekk at ingen andre programmer bruker den."
@@ -416,7 +414,7 @@
 msgstr "Fletting av data er umulig med denne platen"
 
 #: ../libbrasero-burn/brasero-burn.c:1624
-#: ../libbrasero-burn/brasero-burn-dialog.c:2184
+#: ../libbrasero-burn/brasero-burn-dialog.c:2186
 #: ../plugins/cdrkit/burn-genisoimage.c:206 ../plugins/cdrkit/burn-wodim.c:114
 #: ../plugins/cdrtools/burn-cdrecord.c:114
 #: ../plugins/cdrtools/burn-mkisofs.c:206
@@ -427,7 +425,7 @@
 
 #. Translators: %s is the name of a missing application
 #: ../libbrasero-burn/brasero-burn.c:1708
-#: ../libbrasero-burn/brasero-burn-options.c:1180
+#: ../libbrasero-burn/brasero-burn-options.c:1187
 #: ../src/brasero-project.c:1385
 #, c-format
 msgid "%s (application)"
@@ -435,7 +433,7 @@
 
 #. Translators: %s is the name of a missing library
 #: ../libbrasero-burn/brasero-burn.c:1714
-#: ../libbrasero-burn/brasero-burn-options.c:1186
+#: ../libbrasero-burn/brasero-burn-options.c:1193
 #: ../src/brasero-project.c:1391
 #, c-format
 msgid "%s (library)"
@@ -443,7 +441,7 @@
 
 #. Translators: %s is the name of a missing GStreamer plugin
 #: ../libbrasero-burn/brasero-burn.c:1719
-#: ../libbrasero-burn/brasero-burn-options.c:1191
+#: ../libbrasero-burn/brasero-burn-options.c:1198
 #: ../src/brasero-project.c:1396
 #, c-format
 msgid "%s (GStreamer plugin)"
@@ -481,12 +479,12 @@
 #: ../nautilus/nautilus-burn-extension.c:218
 #: ../plugins/cdrkit/burn-genisoimage.c:368
 #: ../plugins/cdrkit/burn-readom.c:129 ../plugins/cdrkit/burn-readom.c:370
-#: ../plugins/cdrkit/burn-wodim.c:726 ../plugins/cdrkit/burn-wodim.c:838
-#: ../plugins/cdrkit/burn-wodim.c:853 ../plugins/cdrtools/burn-cdrecord.c:836
-#: ../plugins/cdrtools/burn-cdrecord.c:851
+#: ../plugins/cdrkit/burn-wodim.c:725 ../plugins/cdrkit/burn-wodim.c:837
+#: ../plugins/cdrkit/burn-wodim.c:852 ../plugins/cdrtools/burn-cdrecord.c:835
+#: ../plugins/cdrtools/burn-cdrecord.c:850
 #: ../plugins/cdrtools/burn-mkisofs.c:368
 #: ../plugins/cdrtools/burn-readcd.c:130 ../plugins/cdrtools/burn-readcd.c:380
-#: ../src/brasero-app.c:784
+#: ../src/brasero-app.c:786
 #, c-format
 msgid "An internal error occurred"
 msgstr "En intern feil oppsto"
@@ -496,188 +494,188 @@
 msgstr "Brasero varsling"
 
 #. Translators: This string is used in the title bar %s is the action currently performed
-#: ../libbrasero-burn/brasero-burn-dialog.c:217
+#: ../libbrasero-burn/brasero-burn-dialog.c:219
 #, c-format
 msgid "%s (%i%% Done)"
 msgstr "%s (%i%% ferdig)"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:239
-#: ../libbrasero-burn/brasero-burn-dialog.c:1159
+#: ../libbrasero-burn/brasero-burn-dialog.c:241
+#: ../libbrasero-burn/brasero-burn-dialog.c:1161
 msgid "Creating Image"
 msgstr "Lager avtrykk"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:244
-#: ../libbrasero-burn/brasero-burn-dialog.c:1168
+#: ../libbrasero-burn/brasero-burn-dialog.c:246
+#: ../libbrasero-burn/brasero-burn-dialog.c:1170
 msgid "Burning DVD"
 msgstr "Skriver DVD"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:248
-#: ../libbrasero-burn/brasero-burn-dialog.c:1164
+#: ../libbrasero-burn/brasero-burn-dialog.c:250
+#: ../libbrasero-burn/brasero-burn-dialog.c:1166
 msgid "Copying DVD"
 msgstr "Kopierer DVD"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:254
-#: ../libbrasero-burn/brasero-burn-dialog.c:1178
+#: ../libbrasero-burn/brasero-burn-dialog.c:256
+#: ../libbrasero-burn/brasero-burn-dialog.c:1180
 msgid "Burning CD"
 msgstr "Skriver CD"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:258
-#: ../libbrasero-burn/brasero-burn-dialog.c:379
-#: ../libbrasero-burn/brasero-burn-dialog.c:1174
+#: ../libbrasero-burn/brasero-burn-dialog.c:260
+#: ../libbrasero-burn/brasero-burn-dialog.c:381
+#: ../libbrasero-burn/brasero-burn-dialog.c:1176
 msgid "Copying CD"
 msgstr "Kopierer CD"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:264
-#: ../libbrasero-burn/brasero-burn-dialog.c:1188
+#: ../libbrasero-burn/brasero-burn-dialog.c:266
+#: ../libbrasero-burn/brasero-burn-dialog.c:1190
 msgid "Burning Disc"
 msgstr "Skriver plate"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:268
-#: ../libbrasero-burn/brasero-burn-dialog.c:1184
+#: ../libbrasero-burn/brasero-burn-dialog.c:270
+#: ../libbrasero-burn/brasero-burn-dialog.c:1186
 msgid "Copying Disc"
 msgstr "Kopierer plate"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:298
+#: ../libbrasero-burn/brasero-burn-dialog.c:300
 #: ../libbrasero-burn/burn-basics.c:78
 msgid "Creating image"
 msgstr "Lager avtrykk"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:304
+#: ../libbrasero-burn/brasero-burn-dialog.c:306
 msgid "Simulation of video DVD burning"
 msgstr "Simulerer skriving av filer til platen"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:306
+#: ../libbrasero-burn/brasero-burn-dialog.c:308
 msgid "Burning video DVD"
 msgstr "Skriver video-DVD"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:314
+#: ../libbrasero-burn/brasero-burn-dialog.c:316
 msgid "Simulation of data DVD burning"
 msgstr "Simulering av DVD-skriving"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:316
+#: ../libbrasero-burn/brasero-burn-dialog.c:318
 msgid "Burning data DVD"
 msgstr "Skriver data-DVD"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:324
+#: ../libbrasero-burn/brasero-burn-dialog.c:326
 msgid "Simulation of image to DVD burning"
 msgstr "Simulering av skriving av avtrykk til DVD"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:326
+#: ../libbrasero-burn/brasero-burn-dialog.c:328
 msgid "Burning image to DVD"
 msgstr "Skriver avtrykk til DVD"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:334
+#: ../libbrasero-burn/brasero-burn-dialog.c:336
 msgid "Simulation of data DVD copying"
 msgstr "Simulerer kopiering av DVD"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:336
+#: ../libbrasero-burn/brasero-burn-dialog.c:338
 msgid "Copying data DVD"
 msgstr "Kopierer data-DVD"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:347
+#: ../libbrasero-burn/brasero-burn-dialog.c:349
 msgid "Simulation of (S)VCD burning"
 msgstr "Simulerer skriving av (S)VCD"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:349
+#: ../libbrasero-burn/brasero-burn-dialog.c:351
 msgid "Burning (S)VCD"
 msgstr "Skriver (S)VCD"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:357
-#: ../libbrasero-burn/brasero-burn-dialog.c:410
+#: ../libbrasero-burn/brasero-burn-dialog.c:359
+#: ../libbrasero-burn/brasero-burn-dialog.c:412
 msgid "Simulation of audio CD burning"
 msgstr "Simulerer skriving av lyd-CD"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:359
-#: ../libbrasero-burn/brasero-burn-dialog.c:412
+#: ../libbrasero-burn/brasero-burn-dialog.c:361
+#: ../libbrasero-burn/brasero-burn-dialog.c:414
 msgid "Burning audio CD"
 msgstr "Skriver lyd-CD"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:367
+#: ../libbrasero-burn/brasero-burn-dialog.c:369
 msgid "Simulation of data CD burning"
 msgstr "Simulerer skriving av data-CD"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:369
+#: ../libbrasero-burn/brasero-burn-dialog.c:371
 msgid "Burning data CD"
 msgstr "Skriver data-CD"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:377
+#: ../libbrasero-burn/brasero-burn-dialog.c:379
 msgid "Simulation of CD copying"
 msgstr "Simulerer kopiering av CD"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:387
+#: ../libbrasero-burn/brasero-burn-dialog.c:389
 msgid "Simulation of image to CD burning"
 msgstr "Simulerer skriving av avtrykk til CD"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:389
+#: ../libbrasero-burn/brasero-burn-dialog.c:391
 msgid "Burning image to CD"
 msgstr "Skriver avtrykk til CD"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:400
+#: ../libbrasero-burn/brasero-burn-dialog.c:402
 msgid "Simulation of video disc burning"
 msgstr "Simulerer skriving av video-plate"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:402
+#: ../libbrasero-burn/brasero-burn-dialog.c:404
 msgid "Burning video disc"
 msgstr "Skriver videoplate"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:420
+#: ../libbrasero-burn/brasero-burn-dialog.c:422
 msgid "Simulation of data disc burning"
 msgstr "Simulerer skriving av dataplate"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:422
+#: ../libbrasero-burn/brasero-burn-dialog.c:424
 msgid "Burning data disc"
 msgstr "Skriver dataplate"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:430
+#: ../libbrasero-burn/brasero-burn-dialog.c:432
 msgid "Simulation of disc copying"
 msgstr "Simulerer kopiering av plate"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:432
+#: ../libbrasero-burn/brasero-burn-dialog.c:434
 #: ../libbrasero-burn/burn-basics.c:82
 msgid "Copying disc"
 msgstr "Kopierer plate"
 
 # disk
-#: ../libbrasero-burn/brasero-burn-dialog.c:440
+#: ../libbrasero-burn/brasero-burn-dialog.c:442
 msgid "Simulation of image to disc burning"
 msgstr "Simulerer skriving av avtrykk til plate"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:442
+#: ../libbrasero-burn/brasero-burn-dialog.c:444
 msgid "Burning image to disc"
 msgstr "Skriver avtrykk til plate"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:547
+#: ../libbrasero-burn/brasero-burn-dialog.c:549
 msgid "Please replace the disc with a rewritable disc holding data."
 msgstr "Erstatt platen med en omskrivbar plate som har data."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:549
+#: ../libbrasero-burn/brasero-burn-dialog.c:551
 msgid "Please replace the disc with a disc holding data."
 msgstr "Erstatt platen med en plate som har data."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:553
+#: ../libbrasero-burn/brasero-burn-dialog.c:555
 msgid "Please insert a rewritable disc holding data."
 msgstr "Sett inn en omskrivbar plate som har data."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:555
-#: ../libbrasero-burn/brasero-burn-options.c:494
+#: ../libbrasero-burn/brasero-burn-dialog.c:557
+#: ../libbrasero-burn/brasero-burn-options.c:501
 msgid "Please insert a disc holding data."
 msgstr "Sett inn en plate med data."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:570
+#: ../libbrasero-burn/brasero-burn-dialog.c:572
 #, c-format
 msgid ""
 "Please replace the disc with a writable CD with at least %i MiB of free "
@@ -685,20 +683,20 @@
 msgstr ""
 "Vennligst erstatt platen med en skrivbar CD med minst %i MiB ledig plass."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:573
+#: ../libbrasero-burn/brasero-burn-dialog.c:575
 msgid "Please replace the disc with a writable CD."
 msgstr "Vennligst erstatt platen med en skrivbar CD."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:577
+#: ../libbrasero-burn/brasero-burn-dialog.c:579
 #, c-format
 msgid "Please insert a writable CD with at least %i MiB of free space."
 msgstr "Vennligst sett inn en skrivbar CD med minst %i MiB ledig plass."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:580
+#: ../libbrasero-burn/brasero-burn-dialog.c:582
 msgid "Please insert a writable CD."
 msgstr "Vennligst sett inn en skrivbar CD."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:586
+#: ../libbrasero-burn/brasero-burn-dialog.c:588
 #, c-format
 msgid ""
 "Please replace the disc with a writable DVD with at least %i MiB of free "
@@ -706,20 +704,20 @@
 msgstr ""
 "Vennligst erstatt platen med en skrivbar DVD med minst %i MiB ledig plass."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:589
+#: ../libbrasero-burn/brasero-burn-dialog.c:591
 msgid "Please replace the disc with a writable DVD."
 msgstr "Vennligst erstatt platen med en skrivbar DVD."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:593
+#: ../libbrasero-burn/brasero-burn-dialog.c:595
 #, c-format
 msgid "Please insert a writable DVD with at least %i MiB of free space."
 msgstr "Vennligst sett inn skrivbar DVD med minst %i MiB ledig plass."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:596
+#: ../libbrasero-burn/brasero-burn-dialog.c:598
 msgid "Please insert a writable DVD."
 msgstr "Vennligst sett inn en skrivbar DVD."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:601
+#: ../libbrasero-burn/brasero-burn-dialog.c:603
 #, c-format
 msgid ""
 "Please replace the disc with a writable CD or DVD with at least %i MiB of "
@@ -728,25 +726,25 @@
 "Vennligst erstatt platen med en skrivbar CD eller DVD med minst %i MiB ledig "
 "plass."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:604
+#: ../libbrasero-burn/brasero-burn-dialog.c:606
 msgid "Please replace the disc with a writable CD or DVD."
 msgstr "Vennligst erstatt platen med en skrivbar CD eller DVD."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:608
+#: ../libbrasero-burn/brasero-burn-dialog.c:610
 #, c-format
 msgid ""
 "Please insert a writable CD or DVD with at least %i MiB of free space."
 msgstr ""
 "Vennligst sett inn en skrivbar CD eller DVD med minst %i MiB ledig plass."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:611
-#: ../libbrasero-burn/brasero-burn-dialog.c:2169
-#: ../libbrasero-burn/brasero-burn-dialog.c:2183
-#: ../libbrasero-burn/brasero-burn-options.c:450 ../src/brasero-project.c:995
+#: ../libbrasero-burn/brasero-burn-dialog.c:613
+#: ../libbrasero-burn/brasero-burn-dialog.c:2171
+#: ../libbrasero-burn/brasero-burn-dialog.c:2185
+#: ../libbrasero-burn/brasero-burn-options.c:457 ../src/brasero-project.c:995
 msgid "Please insert a writable CD or DVD."
 msgstr "Vennligst sett inn en skrivbar CD eller DVD."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:638
+#: ../libbrasero-burn/brasero-burn-dialog.c:640
 msgid ""
 "An image of the disc has been created on your hard drive.\n"
 "Burning will begin as soon as a writable disc is inserted."
@@ -754,71 +752,71 @@
 "Et avtrykk av platen er laget på din harddisk.\n"
 "Skriving vil starte så snart en skrivbar plate er satt inn."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:643
+#: ../libbrasero-burn/brasero-burn-dialog.c:645
 msgid "A data integrity test will begin as soon as the disc is inserted."
 msgstr "En test av dataintegriteten vil starte så snart platen settes inn."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:644
+#: ../libbrasero-burn/brasero-burn-dialog.c:646
 msgid "Please re-insert the disc in the CD/DVD burner."
 msgstr "Sett inn platen på nytt i CD/DVD-brenneren."
 
 #. Translators: %s is the name of a drive
-#: ../libbrasero-burn/brasero-burn-dialog.c:648
+#: ../libbrasero-burn/brasero-burn-dialog.c:650
 #, c-format
 msgid "\"%s\" is busy."
 msgstr "«%s» er opptatt."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:652
+#: ../libbrasero-burn/brasero-burn-dialog.c:654
 #, c-format
 msgid "There is no disc in \"%s\"."
 msgstr "Ingen plate i «%s»."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:656
+#: ../libbrasero-burn/brasero-burn-dialog.c:658
 #, c-format
 msgid "The disc in \"%s\" is not supported."
 msgstr "Platen i «%s» er ikke støttet."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:660
+#: ../libbrasero-burn/brasero-burn-dialog.c:662
 #, c-format
 msgid "The disc in \"%s\" is not rewritable."
 msgstr "Platen i «%s» er ikke omskrivbar."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:664
+#: ../libbrasero-burn/brasero-burn-dialog.c:666
 #, c-format
 msgid "The disc in \"%s\" is empty."
 msgstr "Platen i «%s» er tom."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:668
+#: ../libbrasero-burn/brasero-burn-dialog.c:670
 #, c-format
 msgid "The disc in \"%s\" is not writable."
 msgstr "Platen i «%s» er ikke skrivbar."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:672
+#: ../libbrasero-burn/brasero-burn-dialog.c:674
 #, c-format
 msgid "Not enough space available on the disc in \"%s\"."
 msgstr "Ikke nok plass tilgjengelig på platen i «%s»."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:680
+#: ../libbrasero-burn/brasero-burn-dialog.c:682
 #, c-format
 msgid "The disc in \"%s\" needs to be reloaded."
 msgstr "Platen i «%s» må lastes på nytt."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:681
+#: ../libbrasero-burn/brasero-burn-dialog.c:683
 msgid "Please eject the disc and reload it."
 msgstr "Løs ut platen og last den på nytt."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:726
+#: ../libbrasero-burn/brasero-burn-dialog.c:728
 #: ../libbrasero-burn/brasero-sum-dialog.c:333
 msgid ""
 "A file could not be created at the location specified for temporary files"
 msgstr ""
 "En fil kunne ikke opprettes i adressen som er oppgitt for midlertidige filer"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:727
+#: ../libbrasero-burn/brasero-burn-dialog.c:729
 msgid "The image could not be created at the specified location"
 msgstr "Avtrykket kunne ikke lages i oppgitt adresse"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:728
+#: ../libbrasero-burn/brasero-burn-dialog.c:730
 msgid ""
 "Do you want to specify another location for this session or retry with the "
 "current location?"
@@ -826,53 +824,53 @@
 "Vil du oppgi en annen adresse for denne økten eller prøve på nytt med valgt "
 "adresse?"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:740
+#: ../libbrasero-burn/brasero-burn-dialog.c:742
 msgid "You may want to free some space on the disc and retry"
 msgstr "Du må kanskje frigjøre litt plass på platen og prøve igjen"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:747
+#: ../libbrasero-burn/brasero-burn-dialog.c:749
 #: ../libbrasero-burn/brasero-drive-properties.c:244
 #: ../libbrasero-burn/brasero-drive-properties.c:282
 #: ../libbrasero-burn/brasero-drive-properties.c:334
 msgid "_Keep Current Location"
 msgstr "_Behold nåværende lokasjon"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:749
+#: ../libbrasero-burn/brasero-burn-dialog.c:751
 #: ../libbrasero-burn/brasero-drive-properties.c:245
 #: ../libbrasero-burn/brasero-drive-properties.c:283
 #: ../libbrasero-burn/brasero-drive-properties.c:335
 msgid "_Change Location"
 msgstr "_Bytt lokasjon"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:771
+#: ../libbrasero-burn/brasero-burn-dialog.c:773
 #: ../libbrasero-burn/brasero-image-properties.c:459
 msgid "Location for Image File"
 msgstr "Adresse til avtrykksfil"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:779
+#: ../libbrasero-burn/brasero-burn-dialog.c:781
 #: ../libbrasero-burn/brasero-drive-properties.c:366
 msgid "Location for Temporary Files"
 msgstr "Adresse til midlertidige filer"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:887
-#: ../libbrasero-burn/brasero-burn-dialog.c:1133
+#: ../libbrasero-burn/brasero-burn-dialog.c:889
+#: ../libbrasero-burn/brasero-burn-dialog.c:1135
 msgid "_Replace Disc"
 msgstr "E_rstatt plate"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:928
+#: ../libbrasero-burn/brasero-burn-dialog.c:930
 msgid "Do you really want to blank the current disc?"
 msgstr "Vil du virkelig slette denne platen?"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:929
+#: ../libbrasero-burn/brasero-burn-dialog.c:931
 msgid "The disc in the drive holds data."
 msgstr "Platen i enheten inneholder data."
 
 #. Translators: Blank is a verb here
-#: ../libbrasero-burn/brasero-burn-dialog.c:931
+#: ../libbrasero-burn/brasero-burn-dialog.c:933
 msgid "_Blank Disc"
 msgstr "Tø_m plate"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:945
+#: ../libbrasero-burn/brasero-burn-dialog.c:947
 msgid ""
 "If you import them you will be able to see and use them once the current "
 "selection of files is burned."
@@ -880,24 +878,24 @@
 "Hvis du importerer dem vil du kunne se og bruke dem når aktivt utvalg med "
 "filer er skrevet."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:946
+#: ../libbrasero-burn/brasero-burn-dialog.c:948
 msgid "If you don't, they will be invisible (though still readable)."
 msgstr "Hvis ikke vil filene vil bli usynlige (men fremdeles lesbare)."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:949
+#: ../libbrasero-burn/brasero-burn-dialog.c:951
 msgid ""
 "There are files already burned on this disc. Would you like to import them?"
 msgstr "Det er skrevet filer på denne platen allerede. Vil du importere dem?"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:951
+#: ../libbrasero-burn/brasero-burn-dialog.c:953
 msgid "_Import"
 msgstr "_Importer"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:952
+#: ../libbrasero-burn/brasero-burn-dialog.c:954
 msgid "Only _Append"
 msgstr "Kun _legg til"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:965
+#: ../libbrasero-burn/brasero-burn-dialog.c:967
 msgid ""
 "CD-RW audio discs may not play correctly in older CD players and CD-Text "
 "won't be written."
@@ -905,36 +903,36 @@
 "CD-RW lydplater fungerer ikke alltid med eldre CD-spiller og CD-Text vil "
 "ikke bli skrevet."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:966
-#: ../libbrasero-burn/brasero-burn-dialog.c:988
+#: ../libbrasero-burn/brasero-burn-dialog.c:968
+#: ../libbrasero-burn/brasero-burn-dialog.c:990
 msgid "Do you want to continue anyway?"
 msgstr "Vil du fortsette likevel?"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:969
+#: ../libbrasero-burn/brasero-burn-dialog.c:971
 msgid "Appending audio tracks to a CD is not advised."
 msgstr "Det anbefales ikke å legge til lydspor på en CD."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:971
-#: ../libbrasero-burn/brasero-burn-dialog.c:993
+#: ../libbrasero-burn/brasero-burn-dialog.c:973
+#: ../libbrasero-burn/brasero-burn-dialog.c:995
 #: ../libbrasero-burn/brasero-tool-dialog.c:422 ../src/brasero-data-disc.c:572
 msgid "_Continue"
 msgstr "_Fortsett"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:987
+#: ../libbrasero-burn/brasero-burn-dialog.c:989
 msgid "CD-RW audio discs may not play correctly in older CD players."
 msgstr "CD-RW lydplater spilles ikke korrekt i eldre CD-spillere."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:991
+#: ../libbrasero-burn/brasero-burn-dialog.c:993
 msgid "Recording audio tracks on a rewritable disc is not advised."
 msgstr "Skriving av lydspor til en omskrivbar plate er ikke anbefalt."
 
 #. Translators: %s is the name of a drive
-#: ../libbrasero-burn/brasero-burn-dialog.c:1035
+#: ../libbrasero-burn/brasero-burn-dialog.c:1037
 #, c-format
 msgid "Please eject the disc from \"%s\" manually."
 msgstr "Vennligst løs ut platen fra «%s» manuelt."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1044
+#: ../libbrasero-burn/brasero-burn-dialog.c:1046
 msgid ""
 "The disc could not be ejected though it needs to be removed for the current "
 "operation to continue."
@@ -942,19 +940,19 @@
 "Platen kunne ikke løses ut selv om den må fjernes for at aktiv operasjon "
 "skal kunne fortsette."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1131
+#: ../libbrasero-burn/brasero-burn-dialog.c:1133
 msgid "Do you want to replace the disc and continue?"
 msgstr "Vil du erstatte platen og fortsette?"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1132
+#: ../libbrasero-burn/brasero-burn-dialog.c:1134
 msgid "The currently inserted disc could not be blanked."
 msgstr "Platen som er satt inn kan ikke tømmes."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1141
+#: ../libbrasero-burn/brasero-burn-dialog.c:1143
 msgid "Do you want to continue with full Windows compatibility disabled?"
 msgstr "Vil du fortsette med full Windows-kompatibilitet slått av?"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1142
+#: ../libbrasero-burn/brasero-burn-dialog.c:1144
 #: ../libbrasero-burn/brasero-status-dialog.c:340
 #: ../src/brasero-data-disc.c:734
 msgid ""
@@ -962,95 +960,95 @@
 msgstr ""
 "Noen av filene har ikke et passende navn for en Windows-kompatibel CD."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1143
+#: ../libbrasero-burn/brasero-burn-dialog.c:1145
 msgid "C_ontinue"
 msgstr "F_ortsett"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1363
-#: ../libbrasero-burn/brasero-burn-dialog.c:1384
+#: ../libbrasero-burn/brasero-burn-dialog.c:1365
+#: ../libbrasero-burn/brasero-burn-dialog.c:1386
 msgid "The simulation was successful."
 msgstr "Simulering fullført."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1366
+#: ../libbrasero-burn/brasero-burn-dialog.c:1368
 msgid "Real disc burning will take place in 10 seconds."
 msgstr "Skriveoperasjonen vil starte om 10 sekunder."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1369
+#: ../libbrasero-burn/brasero-burn-dialog.c:1371
 msgid "Burn _Now"
 msgstr "Skriv _nå"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1658
+#: ../libbrasero-burn/brasero-burn-dialog.c:1660
 msgid "Save Current Session"
 msgstr "Lagre denne økten"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1733
+#: ../libbrasero-burn/brasero-burn-dialog.c:1735
 msgid "An unknown error occurred."
 msgstr "En ukjent feil oppsto."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1741
-#: ../libbrasero-burn/brasero-burn-dialog.c:1759 ../src/brasero-app.c:618
+#: ../libbrasero-burn/brasero-burn-dialog.c:1743
+#: ../libbrasero-burn/brasero-burn-dialog.c:1761 ../src/brasero-app.c:620
 msgid "Error while burning."
 msgstr "Feil ved skriving."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1749
+#: ../libbrasero-burn/brasero-burn-dialog.c:1751
 msgid "_Save Log"
 msgstr "_Lagre logg"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1784
+#: ../libbrasero-burn/brasero-burn-dialog.c:1786
 msgid "Video DVD successfully burned"
 msgstr "Skriving av video-DVD fullført"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1786
+#: ../libbrasero-burn/brasero-burn-dialog.c:1788
 msgid "(S)VCD successfully burned"
 msgstr "Skriving av (S)VCD fullført"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1789
+#: ../libbrasero-burn/brasero-burn-dialog.c:1791
 msgid "Audio CD successfully burned"
 msgstr "Skriving av lyd-CD fullført"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1791
-#: ../libbrasero-burn/brasero-burn-dialog.c:1822
+#: ../libbrasero-burn/brasero-burn-dialog.c:1793
+#: ../libbrasero-burn/brasero-burn-dialog.c:1824
 msgid "Image successfully created"
 msgstr "Oppretting av avtrykk fullført"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1796
+#: ../libbrasero-burn/brasero-burn-dialog.c:1798
 msgid "DVD successfully copied"
 msgstr "Kopiering av DVD fullført"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1798
+#: ../libbrasero-burn/brasero-burn-dialog.c:1800
 msgid "CD successfully copied"
 msgstr "Kopiering av CD fullført"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1802
+#: ../libbrasero-burn/brasero-burn-dialog.c:1804
 msgid "Image of DVD successfully created"
 msgstr "Oppretting av DVD-avtrykk fullført"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1804
+#: ../libbrasero-burn/brasero-burn-dialog.c:1806
 msgid "Image of CD successfully created"
 msgstr "Oppretting av CD-avtrykk fullført"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1810
+#: ../libbrasero-burn/brasero-burn-dialog.c:1812
 msgid "Image successfully burned to DVD"
 msgstr "Skriving av avtrykk til DVD fullført"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1812
+#: ../libbrasero-burn/brasero-burn-dialog.c:1814
 msgid "Image successfully burned to CD"
 msgstr "Skriving av avtrykk til CD fullført"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1818
+#: ../libbrasero-burn/brasero-burn-dialog.c:1820
 msgid "Data DVD successfully burned"
 msgstr "Skriving av data-DVD fullført"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1820
+#: ../libbrasero-burn/brasero-burn-dialog.c:1822
 msgid "Data CD successfully burned"
 msgstr "Skriving av data-CD fullført"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1879
+#: ../libbrasero-burn/brasero-burn-dialog.c:1881
 #, c-format
 msgid "Copy #%i has been burned successfully."
 msgstr "Skriving av kopi #%i er fullført."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1887
+#: ../libbrasero-burn/brasero-burn-dialog.c:1889
 msgid ""
 "Another copy will start as soon as you insert a new writable disc. If you do "
 "not want to burn another copy, press \"Cancel\"."
@@ -1058,7 +1056,7 @@
 "En ny kopi vil starte så snart du setter inn en ny skrivbar plate. Hvis du "
 "ikke vil skrive en ny kopi kan du trykke «Avbryt»."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:1961
+#: ../libbrasero-burn/brasero-burn-dialog.c:1963
 msgid "Make _More Copies"
 msgstr "L_ag flere kopier"
 
@@ -1066,33 +1064,33 @@
 msgid "_Create Cover"
 msgstr "_Lag omslag"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:2132
+#: ../libbrasero-burn/brasero-burn-dialog.c:2134
 msgid "There are some files left to burn"
 msgstr "Det er noen flere filer igjen å skrive"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:2139
+#: ../libbrasero-burn/brasero-burn-dialog.c:2141
 msgid "There are some more videos left to burn"
 msgstr "Det er noen flere videoer igjen å skrive"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:2143
+#: ../libbrasero-burn/brasero-burn-dialog.c:2145
 msgid "There are some more songs left to burn"
 msgstr "Det er noen flere sanger igjen å skrive"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:2449
+#: ../libbrasero-burn/brasero-burn-dialog.c:2451
 #: ../libbrasero-burn/brasero-tool-dialog.c:411
 msgid "Do you really want to quit?"
 msgstr "Vil du virkelig avslutte?"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:2453
+#: ../libbrasero-burn/brasero-burn-dialog.c:2455
 #: ../libbrasero-burn/brasero-tool-dialog.c:417
 msgid "Interrupting the process may make disc unusable."
 msgstr "Hvis du avbryter prosessen vil platen kunne bli ubrukelig."
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:2456
+#: ../libbrasero-burn/brasero-burn-dialog.c:2458
 msgid "C_ontinue Burning"
 msgstr "F_ortsett skriving"
 
-#: ../libbrasero-burn/brasero-burn-dialog.c:2463
+#: ../libbrasero-burn/brasero-burn-dialog.c:2465
 msgid "_Cancel Burning"
 msgstr "_Avbryt skriving"
 
@@ -1125,45 +1123,45 @@
 msgid "Burn _Several Copies"
 msgstr "Skriv _flere kopier"
 
-#: ../libbrasero-burn/brasero-burn-options.c:426 ../src/brasero-project.c:949
+#: ../libbrasero-burn/brasero-burn-options.c:433 ../src/brasero-project.c:949
 msgid "Would you like to burn the selection of files across several media?"
 msgstr "Vil du skrive filutvalget til over flere medier?"
 
-#: ../libbrasero-burn/brasero-burn-options.c:427
-#: ../libbrasero-burn/brasero-burn-options.c:444
+#: ../libbrasero-burn/brasero-burn-options.c:434
+#: ../libbrasero-burn/brasero-burn-options.c:451
 msgid ""
 "The data size is too large for the disc even with the overburn option."
 msgstr ""
 "Datastørrelsen er for stor for platen selv med alternativ for overbrenning."
 
-#: ../libbrasero-burn/brasero-burn-options.c:432 ../src/brasero-project.c:954
+#: ../libbrasero-burn/brasero-burn-options.c:439 ../src/brasero-project.c:954
 msgid "_Burn Several Discs"
 msgstr "Skriv _flere plater"
 
-#: ../libbrasero-burn/brasero-burn-options.c:434 ../src/brasero-project.c:956
+#: ../libbrasero-burn/brasero-burn-options.c:441 ../src/brasero-project.c:956
 msgid "Burn the selection of files across several media"
 msgstr "Skriv filutvalget over flere medier"
 
-#: ../libbrasero-burn/brasero-burn-options.c:443 ../src/brasero-project.c:965
+#: ../libbrasero-burn/brasero-burn-options.c:450 ../src/brasero-project.c:965
 msgid "Please choose another CD or DVD or insert a new one."
 msgstr "Vennligst velg en annen CD eller DVD eller sett inn en ny."
 
-#: ../libbrasero-burn/brasero-burn-options.c:457 ../src/brasero-project.c:1010
+#: ../libbrasero-burn/brasero-burn-options.c:464 ../src/brasero-project.c:1010
 msgid ""
 "No track information (artist, title, ...) will be written to the disc."
 msgstr ""
 "Ingen informasjon om spor vil bli skrevet til platen (artist, tittel, …)."
 
-#: ../libbrasero-burn/brasero-burn-options.c:458 ../src/brasero-project.c:1011
+#: ../libbrasero-burn/brasero-burn-options.c:465 ../src/brasero-project.c:1011
 msgid "This is not supported by the current active burning backend."
 msgstr "Dette er ikke støttet av aktiv skrivemotor."
 
-#: ../libbrasero-burn/brasero-burn-options.c:470
+#: ../libbrasero-burn/brasero-burn-options.c:477
 #: ../nautilus/nautilus-burn-extension.c:239
 msgid "Please add files."
 msgstr "Legg til filer."
 
-#: ../libbrasero-burn/brasero-burn-options.c:471
+#: ../libbrasero-burn/brasero-burn-options.c:478
 #: ../libbrasero-burn/brasero-track-data.c:672
 #: ../libbrasero-burn/brasero-track-data-cfg.c:2432
 #: ../libbrasero-burn/brasero-track-stream.c:402
@@ -1172,65 +1170,65 @@
 msgid "There are no files to write to disc"
 msgstr "Ingen filer å skrive til platen"
 
-#: ../libbrasero-burn/brasero-burn-options.c:476
+#: ../libbrasero-burn/brasero-burn-options.c:483
 msgid "Please add songs."
 msgstr "Legg til sanger."
 
-#: ../libbrasero-burn/brasero-burn-options.c:477 ../src/brasero-project.c:1268
+#: ../libbrasero-burn/brasero-burn-options.c:484 ../src/brasero-project.c:1268
 msgid "There are no songs to write to disc"
 msgstr "Ingen sanger å skrive til platen"
 
-#: ../libbrasero-burn/brasero-burn-options.c:482
+#: ../libbrasero-burn/brasero-burn-options.c:489
 msgid "Please add videos."
 msgstr "Legg til videoer."
 
-#: ../libbrasero-burn/brasero-burn-options.c:483
+#: ../libbrasero-burn/brasero-burn-options.c:490
 msgid "There are no videos to write to disc"
 msgstr "Ingen videoer å skrive til platen"
 
-#: ../libbrasero-burn/brasero-burn-options.c:495
+#: ../libbrasero-burn/brasero-burn-options.c:502
 msgid "There is no inserted disc to copy."
 msgstr "Det er ikke satt inn en plate som kan kopieres."
 
-#: ../libbrasero-burn/brasero-burn-options.c:504
+#: ../libbrasero-burn/brasero-burn-options.c:511
 msgid "Please select a disc image."
 msgstr "Velg et plateavtrykk."
 
-#: ../libbrasero-burn/brasero-burn-options.c:505
+#: ../libbrasero-burn/brasero-burn-options.c:512
 msgid "There is no selected disc image."
 msgstr "Ingen plateavtrykk valgt."
 
 #. Translators: this is a disc image not a picture
 #. Translators: this is a disc image, not a picture
-#: ../libbrasero-burn/brasero-burn-options.c:515
+#: ../libbrasero-burn/brasero-burn-options.c:522
 #: ../libbrasero-burn/brasero-src-image.c:167
 msgctxt "disc"
 msgid "Please select another image."
 msgstr "Velg et annet avtrykk."
 
-#: ../libbrasero-burn/brasero-burn-options.c:516
+#: ../libbrasero-burn/brasero-burn-options.c:523
 msgid "It doesn't appear to be a valid disc image or a valid cue file."
 msgstr "Ser ikke ut til å være et gyldig avtrykk eller CUE-fil."
 
-#: ../libbrasero-burn/brasero-burn-options.c:525
+#: ../libbrasero-burn/brasero-burn-options.c:532
 msgid "Please insert a disc that is not copy protected."
 msgstr "Sett inn en plate som ikke er kopibeskyttet."
 
-#: ../libbrasero-burn/brasero-burn-options.c:526
-#: ../libbrasero-burn/brasero-burn-options.c:1228
+#: ../libbrasero-burn/brasero-burn-options.c:533
+#: ../libbrasero-burn/brasero-burn-options.c:1235
 #: ../src/brasero-project.c:1445
 msgid "All required applications and libraries are not installed."
 msgstr "Du har ikke alle nødvendige programmer og biblioteker installert."
 
-#: ../libbrasero-burn/brasero-burn-options.c:533 ../src/brasero-project.c:1003
+#: ../libbrasero-burn/brasero-burn-options.c:540 ../src/brasero-project.c:1003
 msgid "Please replace the disc with a supported CD or DVD."
 msgstr "Erstatt platen med en CD eller DVD som er støttet."
 
-#: ../libbrasero-burn/brasero-burn-options.c:542 ../src/brasero-project.c:976
+#: ../libbrasero-burn/brasero-burn-options.c:549 ../src/brasero-project.c:976
 msgid "Would you like to burn beyond the disc's reported capacity?"
 msgstr "Vil du skrive utover platens oppgitte kapasitet?"
 
-#: ../libbrasero-burn/brasero-burn-options.c:543
+#: ../libbrasero-burn/brasero-burn-options.c:550
 msgid ""
 "The data size is too large for the disc and you must remove files from the "
 "selection otherwise.\n"
@@ -1244,41 +1242,41 @@
 "overbrenning.\n"
 "MERK: Dette valget kan forårsake feil."
 
-#: ../libbrasero-burn/brasero-burn-options.c:550 ../src/brasero-project.c:983
+#: ../libbrasero-burn/brasero-burn-options.c:557 ../src/brasero-project.c:983
 msgid "_Overburn"
 msgstr "_Overbrenn"
 
-#: ../libbrasero-burn/brasero-burn-options.c:552 ../src/brasero-project.c:985
+#: ../libbrasero-burn/brasero-burn-options.c:559 ../src/brasero-project.c:985
 msgid "Burn beyond the disc's reported capacity"
 msgstr "Skriv utover oppgitt kapasitet for platen"
 
-#: ../libbrasero-burn/brasero-burn-options.c:562
+#: ../libbrasero-burn/brasero-burn-options.c:569
 msgid ""
 "The drive that holds the source disc will also be the one used to record."
 msgstr "Stasjonen som inneholder kildeplaten vil også brukes til å skrive."
 
-#: ../libbrasero-burn/brasero-burn-options.c:563
+#: ../libbrasero-burn/brasero-burn-options.c:570
 msgid ""
 "A new writable disc will be required once the currently loaded one has been "
 "copied."
 msgstr ""
 "En ny skrivbar plate kreves når den som er lastet nå er ferdig kopiert."
 
-#: ../libbrasero-burn/brasero-burn-options.c:650
+#: ../libbrasero-burn/brasero-burn-options.c:657
 msgid "Select a disc to write to"
 msgstr "Velg en plate å skrive til"
 
-#: ../libbrasero-burn/brasero-burn-options.c:730
-#: ../libbrasero-burn/brasero-burn-options.c:748
-#: ../libbrasero-burn/brasero-burn-options.c:868
+#: ../libbrasero-burn/brasero-burn-options.c:737
+#: ../libbrasero-burn/brasero-burn-options.c:755
+#: ../libbrasero-burn/brasero-burn-options.c:875
 msgid "Disc Burning Setup"
 msgstr "Oppsett av skriving av plate"
 
-#: ../libbrasero-burn/brasero-burn-options.c:757 ../src/brasero-project.c:1544
+#: ../libbrasero-burn/brasero-burn-options.c:764 ../src/brasero-project.c:1544
 msgid "Video Options"
 msgstr "Alternativer for video"
 
-#: ../libbrasero-burn/brasero-burn-options.c:788
+#: ../libbrasero-burn/brasero-burn-options.c:795
 #: ../src/brasero-data-disc.c:613
 msgid ""
 "Do you want to create a disc from the contents of the image or with the "
@@ -1288,7 +1286,7 @@
 "innhold?"
 
 #. Translators: %s is the name of the image
-#: ../libbrasero-burn/brasero-burn-options.c:797
+#: ../libbrasero-burn/brasero-burn-options.c:804
 #, c-format
 msgid ""
 "There is only one selected file (\"%s\"). It is the image of a disc and its "
@@ -1297,32 +1295,32 @@
 "Kun en fil er valgt («%s»). Denne er et platebilde og innholdet kan skrives."
 
 # disk
-#: ../libbrasero-burn/brasero-burn-options.c:802
+#: ../libbrasero-burn/brasero-burn-options.c:809
 msgid "Burn as _File"
 msgstr "Skriv som _fil"
 
-#: ../libbrasero-burn/brasero-burn-options.c:804
+#: ../libbrasero-burn/brasero-burn-options.c:811
 msgid "Burn _Contents…"
 msgstr "Skriv _innhold …"
 
-#: ../libbrasero-burn/brasero-burn-options.c:886
+#: ../libbrasero-burn/brasero-burn-options.c:893
 msgid "Image Burning Setup"
 msgstr "Oppsett av skriving av avtrykk"
 
 #. pack everything
-#: ../libbrasero-burn/brasero-burn-options.c:894
+#: ../libbrasero-burn/brasero-burn-options.c:901
 msgid "Select a disc image to write"
 msgstr "Velg et plateavtrykk som skal skrives"
 
-#: ../libbrasero-burn/brasero-burn-options.c:914
+#: ../libbrasero-burn/brasero-burn-options.c:921
 msgid "Copy CD/DVD"
 msgstr "Kopier CD/DVD"
 
-#: ../libbrasero-burn/brasero-burn-options.c:920
+#: ../libbrasero-burn/brasero-burn-options.c:927
 msgid "Select disc to copy"
 msgstr "Velg plate som skal kopieres"
 
-#: ../libbrasero-burn/brasero-burn-options.c:1222
+#: ../libbrasero-burn/brasero-burn-options.c:1229
 #: ../src/brasero-project.c:1439
 msgid "Please install the following manually and try again:"
 msgstr "Vennligst installer følgende manuelt og prøv igjen:"
@@ -1352,24 +1350,24 @@
 msgid "\"%s\" cannot be read"
 msgstr "«%s» kan ikke leses"
 
-#: ../libbrasero-burn/brasero-dest-selection.c:599
+#: ../libbrasero-burn/brasero-dest-selection.c:605
 #: ../libbrasero-burn/brasero-image-type-chooser.c:133
 msgid "SVCD image"
 msgstr "SVCD-avtrykk"
 
-#: ../libbrasero-burn/brasero-dest-selection.c:601
+#: ../libbrasero-burn/brasero-dest-selection.c:607
 #: ../libbrasero-burn/brasero-image-type-chooser.c:127
 msgid "VCD image"
 msgstr "VCD-avtrykk"
 
-#: ../libbrasero-burn/brasero-dest-selection.c:605
+#: ../libbrasero-burn/brasero-dest-selection.c:611
 #: ../libbrasero-burn/brasero-image-type-chooser.c:106
 msgid "Video DVD image"
 msgstr "Video-DVD avtrykk"
 
 #. NOTE for translators: the first %s is medium_name ("File
 #. * Image") and the second the path for the image file
-#: ../libbrasero-burn/brasero-dest-selection.c:617
+#: ../libbrasero-burn/brasero-dest-selection.c:623
 #, c-format
 msgid "%s: \"%s\""
 msgstr "%s: «%s»"
@@ -1380,20 +1378,20 @@
 #. * destination disc a new one (once the source has been
 #. * copied) which is to be inserted in the drive currently
 #. * holding the source disc
-#: ../libbrasero-burn/brasero-dest-selection.c:649
+#: ../libbrasero-burn/brasero-dest-selection.c:655
 #, c-format
 msgid "New disc in the burner holding the source disc"
 msgstr "Ny plate i enheten inneholder kildeplaten"
 
 #. NOTE for translators, the first %s is the medium name
-#: ../libbrasero-burn/brasero-dest-selection.c:690
+#: ../libbrasero-burn/brasero-dest-selection.c:696
 #, c-format
 msgid "%s: not enough free space"
 msgstr "%s: ikke nok ledig plass"
 
 #. NOTE for translators: the first %s is the medium name, the second %s
 #. * is its available free space. "Free" here is the free space available.
-#: ../libbrasero-burn/brasero-dest-selection.c:721
+#: ../libbrasero-burn/brasero-dest-selection.c:727
 #, c-format
 msgid "%s: %s of free space"
 msgstr "%s: %s ledig plass"
@@ -1508,7 +1506,7 @@
 
 #: ../libbrasero-burn/brasero-drive-properties.c:783
 msgid "Set the directory where to store temporary files"
-msgstr "Oppgi katalog hvor midlertidige filer skal lagres"
+msgstr "Velg mappe hvor midlertidige filer skal lagres"
 
 #: ../libbrasero-burn/brasero-drive-properties.c:788
 msgid "Temporary files"
@@ -1527,7 +1525,7 @@
 msgstr "Brutt symbolsk lenke"
 
 #: ../libbrasero-burn/brasero-filtered-uri.c:60
-#: ../libbrasero-utils/brasero-io.c:1188 ../libbrasero-utils/brasero-io.c:2059
+#: ../libbrasero-utils/brasero-io.c:1190 ../libbrasero-utils/brasero-io.c:2061
 #, c-format
 msgid "Recursive symbolic link"
 msgstr "Rekursiv symbolsk lenke"
@@ -1583,7 +1581,7 @@
 msgid "Change _Extension"
 msgstr "Bytt _filnavn"
 
-#: ../libbrasero-burn/brasero-medium-properties.c:233
+#: ../libbrasero-burn/brasero-medium-properties.c:234
 msgid "Configure recording options"
 msgstr "Konfigurer alternativer for opptak"
 
@@ -1680,10 +1678,10 @@
 "disc may not be readable on all operating systems.\n"
 "Note: Such a file hierarchy is known to work on Linux."
 msgstr ""
-"Barn av denne katalogen vil ha syv opphavskataloger.\n"
-"Brasero kan lage avtrykk av slike filhierarkier og skrive disse, men platen "
-"vil ikke være lesbar på alle operativsystemer.\n"
-"Merk: Slike filhierarkier fungerer på Linux."
+"Undermapper av denne mappa vil ha syv opphavsmapper.\n"
+"Brasero kan lage avtrykk av slike filhierarkier, og brenne dem, men ei slik "
+"plate er ikke lesbar på alle operativsystemer.\n"
+"For øvrig fungerer slike filhierarkier på Linux."
 
 #: ../libbrasero-burn/brasero-status-dialog.c:232
 #: ../libbrasero-burn/brasero-status-dialog.c:294
@@ -1768,7 +1766,7 @@
 msgstr "Sjekk av filintegritet kunne ikke utføres."
 
 #: ../libbrasero-burn/brasero-sum-dialog.c:166 ../src/brasero-data-disc.c:214
-#: ../src/brasero-eject-dialog.c:100 ../src/brasero-playlist.c:393
+#: ../src/brasero-eject-dialog.c:102 ../src/brasero-playlist.c:393
 #: ../src/brasero-project.c:2625
 msgid "An unknown error occurred"
 msgstr "En ukjent feil oppsto"
@@ -1842,12 +1840,12 @@
 msgid "The drive is empty"
 msgstr "Enheten er tom"
 
-#: ../libbrasero-burn/brasero-tool-dialog.c:539
-#: ../src/brasero-eject-dialog.c:164
+#: ../libbrasero-burn/brasero-tool-dialog.c:554
+#: ../src/brasero-eject-dialog.c:167
 msgid "Select a disc"
 msgstr "Velg en plate"
 
-#: ../libbrasero-burn/brasero-tool-dialog.c:572
+#: ../libbrasero-burn/brasero-tool-dialog.c:581
 msgid "Progress"
 msgstr "Framdrift"
 
@@ -1996,7 +1994,7 @@
 #: ../libbrasero-burn/brasero-xfer.c:130 ../libbrasero-burn/brasero-xfer.c:266
 #, c-format
 msgid "Directory could not be created (%s)"
-msgstr "Kunne ikke opprette katalog (%s)"
+msgstr "Klarte ikke å opprette mappe (%s)"
 
 #: ../libbrasero-burn/burn-basics.c:77
 msgid "Getting size"
@@ -2116,7 +2114,7 @@
 
 #. Translators: %s is the error returned by libburn
 #. Translators: the %s is the error message from errno
-#: ../libbrasero-burn/burn-job.c:768 ../plugins/cdrtools/burn-cdrecord.c:710
+#: ../libbrasero-burn/burn-job.c:768 ../plugins/cdrtools/burn-cdrecord.c:709
 #: ../plugins/libburnia/burn-libburn.c:717
 #: ../plugins/transcode/burn-transcode.c:790
 #, c-format
@@ -2135,7 +2133,7 @@
 #: ../libbrasero-burn/burn-mkisofs-base.c:644
 #, c-format
 msgid "VIDEO_TS directory is missing or invalid"
-msgstr "VIDEO_TS-katalogen mangler eller er ugyldig"
+msgstr "VIDEO_TS-mappa mangler, eller er ugyldig"
 
 #: ../libbrasero-burn/burn-plugin.c:647
 #, c-format
@@ -2470,7 +2468,7 @@
 msgid "_Show changes"
 msgstr "Vi_s endringer"
 
-#: ../libbrasero-utils/brasero-io.c:1416
+#: ../libbrasero-utils/brasero-io.c:1418
 #, c-format
 msgid "The file does not appear to be a playlist"
 msgstr "Filen ser ikke ut til å være en spilleliste"
@@ -2533,55 +2531,55 @@
 msgid "Background Properties"
 msgstr "Egenskaper for bakgrunn"
 
-#: ../libbrasero-utils/brasero-jacket-edit.c:589
+#: ../libbrasero-utils/brasero-jacket-edit.c:534
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../libbrasero-utils/brasero-jacket-edit.c:601
+#: ../libbrasero-utils/brasero-jacket-edit.c:546
 msgid "Bac_kground Properties"
 msgstr "Egens_kaper for bakgrunn"
 
-#: ../libbrasero-utils/brasero-jacket-edit.c:604
+#: ../libbrasero-utils/brasero-jacket-edit.c:549
 msgid "Background properties"
 msgstr "Egenskaper for bakgrunn"
 
-#: ../libbrasero-utils/brasero-jacket-edit.c:619
+#: ../libbrasero-utils/brasero-jacket-edit.c:564
 msgid "Align right"
 msgstr "Juster til høyre"
 
-#: ../libbrasero-utils/brasero-jacket-edit.c:629
+#: ../libbrasero-utils/brasero-jacket-edit.c:574
 msgid "Center"
 msgstr "Sentrert"
 
-#: ../libbrasero-utils/brasero-jacket-edit.c:639
+#: ../libbrasero-utils/brasero-jacket-edit.c:584
 msgid "Align left"
 msgstr "Juster til venstre"
 
-#: ../libbrasero-utils/brasero-jacket-edit.c:653
+#: ../libbrasero-utils/brasero-jacket-edit.c:598
 msgid "Underline"
 msgstr "Understreket"
 
-#: ../libbrasero-utils/brasero-jacket-edit.c:663
+#: ../libbrasero-utils/brasero-jacket-edit.c:608
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../libbrasero-utils/brasero-jacket-edit.c:673
+#: ../libbrasero-utils/brasero-jacket-edit.c:618
 msgid "Bold"
 msgstr "Uthevet"
 
-#: ../libbrasero-utils/brasero-jacket-edit.c:699
+#: ../libbrasero-utils/brasero-jacket-edit.c:644
 msgid "Font family and size"
 msgstr "Skriftfamilie og størrelse"
 
-#: ../libbrasero-utils/brasero-jacket-edit.c:706
+#: ../libbrasero-utils/brasero-jacket-edit.c:651
 msgid "_Text Color"
 msgstr "_Tekstfarge"
 
-#: ../libbrasero-utils/brasero-jacket-edit.c:707
+#: ../libbrasero-utils/brasero-jacket-edit.c:652
 msgid "Text color"
 msgstr "Tekstfarge"
 
-#: ../libbrasero-utils/brasero-jacket-edit.c:830
+#: ../libbrasero-utils/brasero-jacket-edit.c:775
 msgid "Cover Editor"
 msgstr "Redigering av omslag"
 
@@ -2607,7 +2605,7 @@
 msgid "The image could not be loaded."
 msgstr "Bildet kunne ikke lastes."
 
-#: ../libbrasero-utils/brasero-metadata.c:1122 ../src/brasero-audio-disc.c:643
+#: ../libbrasero-utils/brasero-metadata.c:1126 ../src/brasero-audio-disc.c:643
 #, c-format
 msgid "\"%s\" could not be handled by GStreamer."
 msgstr "«%s» kunne ikke håndteres av GStreamer."
@@ -2615,13 +2613,13 @@
 #. Translators: %s is the name of the object (as in
 #. * GObject) from the Gstreamer library that could
 #. * not be created
-#: ../libbrasero-utils/brasero-metadata.c:1194
-#: ../libbrasero-utils/brasero-metadata.c:1207
-#: ../libbrasero-utils/brasero-metadata.c:1220
-#: ../libbrasero-utils/brasero-metadata.c:1362
-#: ../libbrasero-utils/brasero-metadata.c:1734
-#: ../libbrasero-utils/brasero-metadata.c:1749
-#: ../libbrasero-utils/brasero-metadata.c:1758
+#: ../libbrasero-utils/brasero-metadata.c:1198
+#: ../libbrasero-utils/brasero-metadata.c:1211
+#: ../libbrasero-utils/brasero-metadata.c:1224
+#: ../libbrasero-utils/brasero-metadata.c:1366
+#: ../libbrasero-utils/brasero-metadata.c:1738
+#: ../libbrasero-utils/brasero-metadata.c:1753
+#: ../libbrasero-utils/brasero-metadata.c:1762
 #: ../plugins/transcode/burn-normalize.c:172
 #: ../plugins/transcode/burn-normalize.c:187
 #: ../plugins/transcode/burn-normalize.c:209
@@ -2897,15 +2895,15 @@
 msgid "The disc needs to be reloaded before being recorded"
 msgstr "Platen må lastes på nytt før den kan tas opp"
 
-#: ../plugins/cdrkit/burn-wodim.c:1270
+#: ../plugins/cdrkit/burn-wodim.c:1269
 msgid "Burns, blanks and formats CDs and DVDs"
 msgstr "Lager, tømmer og kopierer CDer eller DVDer"
 
-#: ../plugins/cdrkit/burn-wodim.c:1414
+#: ../plugins/cdrkit/burn-wodim.c:1413
 msgid "Enable the \"-immed\" flag (see wodim manual)"
 msgstr "Bruk flagget «-immed» (se manualsiden for wodim)"
 
-#: ../plugins/cdrkit/burn-wodim.c:1417
+#: ../plugins/cdrkit/burn-wodim.c:1416
 msgid "Minimum drive buffer fill ratio (in %) (see wodim manual):"
 msgstr "Minste fyllrate for diskbuffer (i %) (se hjelp for wodim):"
 
@@ -2923,16 +2921,16 @@
 msgid "Copy tracks from an audio CD with all associated information"
 msgstr "Kopiér spor fra en lyd-CD med all tilhørende informasjon"
 
-#: ../plugins/cdrtools/burn-cdrecord.c:1204
+#: ../plugins/cdrtools/burn-cdrecord.c:1203
 #: ../plugins/libburnia/burn-libburn.c:975
 msgid "Burns, blanks and formats CDs, DVDs and BDs"
 msgstr "Skriver, tømmer og formaterer CDer, DVDer og BDer"
 
-#: ../plugins/cdrtools/burn-cdrecord.c:1417
+#: ../plugins/cdrtools/burn-cdrecord.c:1416
 msgid "Enable the \"-immed\" flag (see cdrecord manual)"
 msgstr "Slp på «-immed»-flagget (se hjelp for cdrecord)"
 
-#: ../plugins/cdrtools/burn-cdrecord.c:1420
+#: ../plugins/cdrtools/burn-cdrecord.c:1419
 #, c-format
 msgid "Minimum drive buffer fill ratio (in %%) (see cdrecord manual):"
 msgstr "Minste fyllrate for diskbuffer (i %%) (se hjelp for cdrecord):"
@@ -3152,14 +3150,14 @@
 #: ../plugins/libburnia/burn-libisofs.c:811
 #, c-format
 msgid "libisofs reported an error while creating directory \"%s\""
-msgstr "libisofs rapporterte en feil under laging av katalog «%s»"
+msgstr "libisofs rapporterte en feil da mappa «%s» skulle opprettes"
 
 #: ../plugins/libburnia/burn-libisofs.c:759
 #, c-format
 msgid ""
 "libisofs reported an error while adding contents to directory \"%s\" (%x)"
 msgstr ""
-"libisofs rapporterte en feil under tillegg av innhold i katalog «%s» (%x)"
+"libisofs rapporterte en feil da mappa «%s» skulle fylles med innhold (%x)"
 
 #: ../plugins/libburnia/burn-libisofs.c:782
 #: ../plugins/libburnia/burn-libisofs.c:798
@@ -3270,92 +3268,92 @@
 msgid "Creates disc images suitable for SVCDs"
 msgstr "Lager en plate som passer til SVCDer"
 
-#: ../src/brasero-app.c:124
+#: ../src/brasero-app.c:123
 msgid "_Project"
 msgstr "_Prosjekt"
 
-#: ../src/brasero-app.c:125
+#: ../src/brasero-app.c:124
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/brasero-app.c:126
+#: ../src/brasero-app.c:125
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../src/brasero-app.c:127
+#: ../src/brasero-app.c:126
 msgid "_Tools"
 msgstr "Verk_tøy"
 
-#: ../src/brasero-app.c:129
+#: ../src/brasero-app.c:128
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/brasero-app.c:131
+#: ../src/brasero-app.c:130
 msgid "P_lugins"
 msgstr "Ti_llegg"
 
-#: ../src/brasero-app.c:132
+#: ../src/brasero-app.c:131
 msgid "Choose plugins for Brasero"
 msgstr "Velg tillegg for Brasero"
 
-#: ../src/brasero-app.c:134
+#: ../src/brasero-app.c:133
 msgid "E_ject"
 msgstr "_Løs ut"
 
-#: ../src/brasero-app.c:135
+#: ../src/brasero-app.c:134
 msgid "Eject a disc"
 msgstr "Løs ut en plate"
 
-#: ../src/brasero-app.c:137
+#: ../src/brasero-app.c:136
 msgid "_Blank…"
 msgstr "_Tøm …"
 
-#: ../src/brasero-app.c:138
+#: ../src/brasero-app.c:137
 msgid "Blank a disc"
 msgstr "Tøm en plate"
 
-#: ../src/brasero-app.c:140
+#: ../src/brasero-app.c:139
 msgid "_Check Integrity…"
 msgstr "_Sjekk integritet …"
 
-#: ../src/brasero-app.c:141
+#: ../src/brasero-app.c:140
 msgid "Check data integrity of disc"
 msgstr "Sjekk plateinnhold for feil"
 
-#: ../src/brasero-app.c:144
+#: ../src/brasero-app.c:143
 msgid "Quit Brasero"
 msgstr "Avslutt Brasero"
 
-#: ../src/brasero-app.c:146
+#: ../src/brasero-app.c:145
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../src/brasero-app.c:146
+#: ../src/brasero-app.c:145
 msgid "Display help"
 msgstr "Vis hjelp"
 
-#: ../src/brasero-app.c:149
+#: ../src/brasero-app.c:148
 msgid "About"
 msgstr "Om"
 
-#: ../src/brasero-app.c:421 ../src/brasero-app.c:2065
+#: ../src/brasero-app.c:420 ../src/brasero-app.c:2069
 msgid "Disc Burner"
 msgstr "Lag plater"
 
-#: ../src/brasero-app.c:787 ../src/brasero-app.c:820 ../src/brasero-app.c:1449
+#: ../src/brasero-app.c:789 ../src/brasero-app.c:822 ../src/brasero-app.c:1451
 msgid "Error while loading the project"
 msgstr "Feil under lasting av prosjekt"
 
-#: ../src/brasero-app.c:829 ../src/brasero-app.c:858 ../src/brasero-app.c:918
+#: ../src/brasero-app.c:831 ../src/brasero-app.c:860 ../src/brasero-app.c:920
 #: ../src/brasero-project.c:1276
 msgid "Please add files to the project."
 msgstr "Legg til filer i prosjektet."
 
-#: ../src/brasero-app.c:830 ../src/brasero-app.c:859 ../src/brasero-app.c:919
+#: ../src/brasero-app.c:832 ../src/brasero-app.c:861 ../src/brasero-app.c:921
 msgid "The project is empty"
 msgstr "Prosjektet er tomt"
 
-#: ../src/brasero-app.c:1174
+#: ../src/brasero-app.c:1176
 msgid ""
 "Brasero is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -3367,7 +3365,7 @@
 "Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) "
 "enhver senere versjon."
 
-#: ../src/brasero-app.c:1179
+#: ../src/brasero-app.c:1181
 msgid ""
 "Brasero is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -3378,7 +3376,7 @@
 "engang implisitt garanti om at det er SALGBART eller PASSER ET BESTEMT "
 "FORMÅL. Se GNU General Public License for detaljer."
 
-#: ../src/brasero-app.c:1184
+#: ../src/brasero-app.c:1186
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Brasero; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -3388,11 +3386,11 @@
 "programmet. Hvis dette ikke er tilfelle, kan du skrive til Free Software "
 "Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
 
-#: ../src/brasero-app.c:1196
+#: ../src/brasero-app.c:1198
 msgid "A simple to use CD/DVD burning application for GNOME"
 msgstr "Et brukervennlig program for skriving av CDer/DVDer for GNOME"
 
-#: ../src/brasero-app.c:1213
+#: ../src/brasero-app.c:1215
 msgid "Brasero Homepage"
 msgstr "Hjemmeside for Brasero"
 
@@ -3404,7 +3402,7 @@
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #. 
-#: ../src/brasero-app.c:1225
+#: ../src/brasero-app.c:1227
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -3420,20 +3418,21 @@
 "  Kåre Birger Lapstuen https://launchpad.net/~lapstue\n"
 "  Terje Andre Arnøy https://launchpad.net/~terjeaar\n"
 "  Terje Berg-Hansen https://launchpad.net/~terje-axenna\n"
-"  Thor K. H https://launchpad.net/~nitrolinken\n"
+"  Thor K. H. https://launchpad.net/~nitrolinken\n"
 "  Torstein A. W. https://launchpad.net/~kvikende\n"
-"  krage https://launchpad.net/~lindrupsen"
+"  krage https://launchpad.net/~lindrupsen\n"
+"  Åka Sikrom https://launchpad.net/~akrosikam"
 
-#: ../src/brasero-app.c:1447
+#: ../src/brasero-app.c:1449
 #, c-format
 msgid "The project \"%s\" does not exist"
 msgstr "Prosjekt «%s» eksisterer ikke"
 
-#: ../src/brasero-app.c:1731 ../src/brasero-app.c:1737
+#: ../src/brasero-app.c:1733 ../src/brasero-app.c:1739
 msgid "_Recent Projects"
 msgstr "Siste p_rosjekter"
 
-#: ../src/brasero-app.c:1732
+#: ../src/brasero-app.c:1734
 msgid "Display the projects recently opened"
 msgstr "Vis sist åpnede prosjekter"
 
@@ -3492,7 +3491,7 @@
 msgid "Track"
 msgstr "Spor"
 
-#: ../src/brasero-audio-disc.c:458 ../src/brasero-video-disc.c:1206
+#: ../src/brasero-audio-disc.c:458 ../src/brasero-video-disc.c:1209
 msgid "Title"
 msgstr "Tittel"
 
@@ -3501,7 +3500,7 @@
 msgstr "Artist"
 
 #: ../src/brasero-audio-disc.c:488 ../src/brasero-playlist.c:772
-#: ../src/brasero-split-dialog.c:1219
+#: ../src/brasero-split-dialog.c:1225
 msgid "Length"
 msgstr "Lengde"
 
@@ -3539,11 +3538,11 @@
 
 #: ../src/brasero-audio-disc.c:748
 msgid "Do you want to search for audio files inside the directory?"
-msgstr "Vil du søke etter lydfiler i denne katalogen?"
+msgstr "Vil du søke etter lydfiler i denne mappa?"
 
 #: ../src/brasero-audio-disc.c:758
 msgid "Search _Directory"
-msgstr "Søk i _katalog"
+msgstr "Søk i _mappe"
 
 #: ../src/brasero-audio-disc.c:812 ../src/brasero-video-disc.c:395
 #, c-format
@@ -3743,7 +3742,7 @@
 msgid "The contents of the project changed since it was saved."
 msgstr "Innholdet i prosjektet er endret siden det ble lagret."
 
-#: ../src/brasero-data-disc.c:561 ../src/brasero-data-disc.c:569
+#: ../src/brasero-data-disc.c:569
 msgid "Discard the current modified project"
 msgstr "Forkast endret prosjekt"
 
@@ -3900,7 +3899,7 @@
 msgid "Files"
 msgstr "Filer"
 
-#: ../src/brasero-data-disc.c:2350 ../src/brasero-video-disc.c:1224
+#: ../src/brasero-data-disc.c:2350 ../src/brasero-video-disc.c:1227
 msgid "Size"
 msgstr "Størrelse"
 
@@ -3912,16 +3911,16 @@
 msgid "Space"
 msgstr "Plass"
 
-#: ../src/brasero-eject-dialog.c:95
+#: ../src/brasero-eject-dialog.c:97
 #, c-format
 msgid "The disc in \"%s\" cannot be ejected"
 msgstr "Platen i «%s» kan ikke løses ut"
 
-#: ../src/brasero-eject-dialog.c:190
+#: ../src/brasero-eject-dialog.c:193
 msgid "_Eject"
 msgstr "_Løs ut"
 
-#: ../src/brasero-eject-dialog.c:205
+#: ../src/brasero-eject-dialog.c:208
 msgid "Eject Disc"
 msgstr "Løs ut plate"
 
@@ -4322,7 +4321,7 @@
 msgid "_Add"
 msgstr "Le_gg til"
 
-#: ../src/brasero-project.c:2384 ../src/brasero-split-dialog.c:1249
+#: ../src/brasero-project.c:2384 ../src/brasero-split-dialog.c:1255
 msgid "_Remove"
 msgstr "_Fjern"
 
@@ -4575,15 +4574,15 @@
 msgid "Error while loading the project."
 msgstr "Feil under lasting av prosjekt."
 
-#: ../src/brasero-project-parse.c:454
+#: ../src/brasero-project-parse.c:458
 msgid "The project could not be opened"
 msgstr "Kunne ikke åpne prosjektet"
 
-#: ../src/brasero-project-parse.c:463
+#: ../src/brasero-project-parse.c:467
 msgid "The file is empty"
 msgstr "Filen er tom"
 
-#: ../src/brasero-project-parse.c:542 ../src/brasero-project-parse.c:607
+#: ../src/brasero-project-parse.c:546 ../src/brasero-project-parse.c:611
 msgid "It does not seem to be a valid Brasero project"
 msgstr "Ser ikke ut til å være et gyldig Brasero-prosjekt"
 
@@ -4640,7 +4639,7 @@
 msgid "Create a new project:"
 msgstr "Lag et nytt prosjekt:"
 
-#: ../src/brasero-project-type-chooser.c:509
+#: ../src/brasero-project-type-chooser.c:510
 msgid "Recent projects:"
 msgstr "Siste prosjekter:"
 
@@ -4735,16 +4734,16 @@
 msgid "Track length:"
 msgstr "Lengde på spor:"
 
-#: ../src/brasero-song-properties.c:372
+#: ../src/brasero-song-properties.c:365
 #, c-format
 msgid "Song information for track %02i"
 msgstr "Sanginformasjon for spor %02i"
 
-#: ../src/brasero-split-dialog.c:166
+#: ../src/brasero-split-dialog.c:172
 msgid "Do you really want to split the track?"
 msgstr "Vil du virkelig dele sporet?"
 
-#: ../src/brasero-split-dialog.c:169
+#: ../src/brasero-split-dialog.c:175
 msgid ""
 "If you split the track, the size of the new track will be shorter than 6 "
 "seconds and will be padded."
@@ -4752,131 +4751,131 @@
 "Hvis du deler sporet vil størrelsen på det nye sporet bli kortere enn 6 "
 "sekunder og det vil bli fylt ut."
 
-#: ../src/brasero-split-dialog.c:175 ../src/brasero-split-dialog.c:746
+#: ../src/brasero-split-dialog.c:181 ../src/brasero-split-dialog.c:752
 msgid "_Split"
 msgstr "_Del"
 
-#: ../src/brasero-split-dialog.c:603
+#: ../src/brasero-split-dialog.c:609
 msgid "The track wasn't split."
 msgstr "Sporet ble ikke delt."
 
-#: ../src/brasero-split-dialog.c:604
+#: ../src/brasero-split-dialog.c:610
 msgid "No silence could be detected"
 msgstr "Ingen stillhet ble funnet"
 
-#: ../src/brasero-split-dialog.c:627
+#: ../src/brasero-split-dialog.c:633
 msgid "An error occurred while detecting silences."
 msgstr "En feil oppsto under gjenkjenning av stillhet."
 
-#: ../src/brasero-split-dialog.c:706
+#: ../src/brasero-split-dialog.c:712
 msgid "This will remove all previous results."
 msgstr "Dette vil fjerne alle tidligere resultater."
 
-#: ../src/brasero-split-dialog.c:744
+#: ../src/brasero-split-dialog.c:750
 msgid "Do you really want to carry on with automatic splitting?"
 msgstr "Vil du virkelig fortsette med automatisk splitting?"
 
-#: ../src/brasero-split-dialog.c:745
+#: ../src/brasero-split-dialog.c:751
 msgid "_Don't split"
 msgstr "Ikke _del"
 
-#: ../src/brasero-split-dialog.c:962
+#: ../src/brasero-split-dialog.c:968
 msgid "Do you really want to empty the slices preview?"
 msgstr "Vil du virkelig tømme forhåndsvisning av stykker?"
 
-#: ../src/brasero-split-dialog.c:964 ../src/brasero-split-dialog.c:1263
+#: ../src/brasero-split-dialog.c:970 ../src/brasero-split-dialog.c:1269
 msgid "Re_move All"
 msgstr "Fjern _alle"
 
-#: ../src/brasero-split-dialog.c:1049
+#: ../src/brasero-split-dialog.c:1055
 msgid "Split Track"
 msgstr "Del spor"
 
-#: ../src/brasero-split-dialog.c:1066
+#: ../src/brasero-split-dialog.c:1072
 msgid "M_ethod:"
 msgstr "M_etode:"
 
-#: ../src/brasero-split-dialog.c:1072
+#: ../src/brasero-split-dialog.c:1078
 msgid "Method to be used to split the track"
 msgstr "Metode som skal brukes til å dele opp spor"
 
-#: ../src/brasero-split-dialog.c:1075
+#: ../src/brasero-split-dialog.c:1081
 msgid "Split track manually"
 msgstr "Del spor manuelt"
 
-#: ../src/brasero-split-dialog.c:1076
+#: ../src/brasero-split-dialog.c:1082
 msgid "Split track in parts with a fixed length"
 msgstr "Del spor i deler med fast lengde"
 
-#: ../src/brasero-split-dialog.c:1077
+#: ../src/brasero-split-dialog.c:1083
 msgid "Split track in a fixed number of parts"
 msgstr "Del spor i et fast antall deler"
 
-#: ../src/brasero-split-dialog.c:1078
+#: ../src/brasero-split-dialog.c:1084
 msgid "Split track for each silence"
 msgstr "Del spor for hver stillhet"
 
-#: ../src/brasero-split-dialog.c:1084
+#: ../src/brasero-split-dialog.c:1090
 msgid "_Slice"
 msgstr "_Del"
 
-#: ../src/brasero-split-dialog.c:1095
+#: ../src/brasero-split-dialog.c:1101
 msgid "Add a splitting point"
 msgstr "Legg til delingspunkt"
 
 #. Translators: this goes with the next (= "seconds")
-#: ../src/brasero-split-dialog.c:1112
+#: ../src/brasero-split-dialog.c:1118
 msgid "Split this track every"
 msgstr "Del opp dette sporet hver"
 
 #. Translators: this goes with the previous (= "Split track every")
-#: ../src/brasero-split-dialog.c:1121
+#: ../src/brasero-split-dialog.c:1127
 msgid "seconds"
 msgstr "sekunder"
 
 #. Translators: this goes with the next (= "parts")
-#: ../src/brasero-split-dialog.c:1130
+#: ../src/brasero-split-dialog.c:1136
 msgid "Split this track in"
 msgstr "Del dette sporet i"
 
 #. Translators: this goes with the previous (= "Split this track in")
-#: ../src/brasero-split-dialog.c:1139
+#: ../src/brasero-split-dialog.c:1145
 msgid "parts"
 msgstr "deler"
 
-#: ../src/brasero-split-dialog.c:1147
+#: ../src/brasero-split-dialog.c:1153
 msgid "Slicing Method"
 msgstr "Oppdelingsmetode"
 
-#: ../src/brasero-split-dialog.c:1205
+#: ../src/brasero-split-dialog.c:1211
 msgid "Start"
 msgstr "Start"
 
-#: ../src/brasero-split-dialog.c:1212
+#: ../src/brasero-split-dialog.c:1218
 msgid "End"
 msgstr "Slutt"
 
-#: ../src/brasero-split-dialog.c:1235
+#: ../src/brasero-split-dialog.c:1241
 msgid "Mer_ge"
 msgstr "_Flett"
 
-#: ../src/brasero-split-dialog.c:1246
+#: ../src/brasero-split-dialog.c:1252
 msgid "Merge a selected slice with the next selected one"
 msgstr "Flett et valgt stykke med neste som er valgt"
 
-#: ../src/brasero-split-dialog.c:1260
+#: ../src/brasero-split-dialog.c:1266
 msgid "Remove the selected slices"
 msgstr "Fjern valgte deler"
 
-#: ../src/brasero-split-dialog.c:1274
+#: ../src/brasero-split-dialog.c:1280
 msgid "Clear the slices preview"
 msgstr "Tøm forhåndsvisning av stykker"
 
-#: ../src/brasero-split-dialog.c:1284
+#: ../src/brasero-split-dialog.c:1290
 msgid "_List of slices that are to be created:"
 msgstr "_Liste med stykker som skal lages:"
 
-#: ../src/brasero-split-dialog.c:1292
+#: ../src/brasero-split-dialog.c:1298
 msgid "Slices Preview"
 msgstr "Forhåndsvisning av stykker"
 
@@ -4918,11 +4917,11 @@
 
 #: ../src/brasero-video-disc.c:359
 msgid "Do you want to search for video files inside the directory?"
-msgstr "Vil du søke etter videofiler i katalogen?"
+msgstr "Vil du søke etter videofiler i mappa?"
 
 #: ../src/brasero-video-disc.c:369
 msgid "_Search Directory"
-msgstr "_Søk i katalog"
+msgstr "_Søk i mappe"
 
 #: ../src/brasero-video-disc.c:412
 #, c-format
@@ -4997,11 +4996,11 @@
 msgid "Show session management options"
 msgstr "Vis alternativer for økthåndtering"
 
-#: ../src/main.c:85
+#: ../src/main.c:84
 msgid "[URI] [URI] …"
 msgstr "[URI] [URI] …"
 
-#: ../src/main.c:97
+#: ../src/main.c:96
 #, c-format
 msgid "Please type \"%s --help\" to see all available options\n"
 msgstr "Vennligst skriv «%s --help» for å se alle tilgjengelige flagg\n"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/clutter-1.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/clutter-1.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/clutter-1.0.po	2013-01-29 09:33:53.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/clutter-1.0.po	2014-01-07 06:37:36.000000000 +0000
@@ -15,532 +15,532 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:12+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:03+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
-#: clutter/clutter-actor.c:6125
+#: clutter/clutter-actor.c:6165
 msgid "X coordinate"
 msgstr "X-koordinat"
 
-#: clutter/clutter-actor.c:6126
+#: clutter/clutter-actor.c:6166
 msgid "X coordinate of the actor"
 msgstr "X-koordinat for aktøren"
 
-#: clutter/clutter-actor.c:6144
+#: clutter/clutter-actor.c:6184
 msgid "Y coordinate"
 msgstr "Y-koordinat"
 
-#: clutter/clutter-actor.c:6145
+#: clutter/clutter-actor.c:6185
 msgid "Y coordinate of the actor"
 msgstr "Y-koordinat for aktøren"
 
-#: clutter/clutter-actor.c:6185 clutter/clutter-canvas.c:215
+#: clutter/clutter-actor.c:6225 clutter/clutter-canvas.c:215
 #: clutter/clutter-grid-layout.c:1238
 #: clutter/deprecated/clutter-behaviour-ellipse.c:481
 msgid "Width"
 msgstr "Bredde"
 
-#: clutter/clutter-actor.c:6186
+#: clutter/clutter-actor.c:6226
 msgid "Width of the actor"
 msgstr "Bredde på aktøren"
 
-#: clutter/clutter-actor.c:6204 clutter/clutter-canvas.c:231
+#: clutter/clutter-actor.c:6244 clutter/clutter-canvas.c:231
 #: clutter/clutter-grid-layout.c:1245
 #: clutter/deprecated/clutter-behaviour-ellipse.c:497
 msgid "Height"
 msgstr "Høyde"
 
-#: clutter/clutter-actor.c:6205
+#: clutter/clutter-actor.c:6245
 msgid "Height of the actor"
 msgstr "Høyde på aktøren"
 
-#: clutter/clutter-actor.c:6245
+#: clutter/clutter-actor.c:6285
 msgid "Fixed X"
 msgstr "Fast X"
 
-#: clutter/clutter-actor.c:6246
+#: clutter/clutter-actor.c:6286
 msgid "Forced X position of the actor"
 msgstr "Tvunget X-posisjon for aktøren"
 
-#: clutter/clutter-actor.c:6263
+#: clutter/clutter-actor.c:6303
 msgid "Fixed Y"
 msgstr "Fast Y"
 
-#: clutter/clutter-actor.c:6264
+#: clutter/clutter-actor.c:6304
 msgid "Forced Y position of the actor"
 msgstr "Tvunget Y-posisjon for aktøren"
 
-#: clutter/clutter-actor.c:6279
+#: clutter/clutter-actor.c:6319
 msgid "Fixed position set"
 msgstr "Fast posisjon satt"
 
-#: clutter/clutter-actor.c:6280
+#: clutter/clutter-actor.c:6320
 msgid "Whether to use fixed positioning for the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:6298
+#: clutter/clutter-actor.c:6338
 msgid "Min Width"
 msgstr "Minste bredde"
 
-#: clutter/clutter-actor.c:6299
+#: clutter/clutter-actor.c:6339
 msgid "Forced minimum width request for the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:6317
+#: clutter/clutter-actor.c:6357
 msgid "Min Height"
 msgstr "Minste høyde"
 
-#: clutter/clutter-actor.c:6318
+#: clutter/clutter-actor.c:6358
 msgid "Forced minimum height request for the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:6336
+#: clutter/clutter-actor.c:6376
 msgid "Natural Width"
 msgstr "Naturlig bredde"
 
-#: clutter/clutter-actor.c:6337
+#: clutter/clutter-actor.c:6377
 msgid "Forced natural width request for the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:6355
+#: clutter/clutter-actor.c:6395
 msgid "Natural Height"
 msgstr "Naturlig høyde"
 
-#: clutter/clutter-actor.c:6356
+#: clutter/clutter-actor.c:6396
 msgid "Forced natural height request for the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:6371
+#: clutter/clutter-actor.c:6411
 msgid "Minimum width set"
 msgstr "Minimum bredde satt"
 
-#: clutter/clutter-actor.c:6372
+#: clutter/clutter-actor.c:6412
 msgid "Whether to use the min-width property"
 msgstr ""
 
-#: clutter/clutter-actor.c:6386
+#: clutter/clutter-actor.c:6426
 msgid "Minimum height set"
 msgstr "Minimum høyde satt"
 
-#: clutter/clutter-actor.c:6387
+#: clutter/clutter-actor.c:6427
 msgid "Whether to use the min-height property"
 msgstr ""
 
-#: clutter/clutter-actor.c:6401
+#: clutter/clutter-actor.c:6441
 msgid "Natural width set"
 msgstr "Naturlig bredde satt"
 
-#: clutter/clutter-actor.c:6402
+#: clutter/clutter-actor.c:6442
 msgid "Whether to use the natural-width property"
 msgstr ""
 
-#: clutter/clutter-actor.c:6416
+#: clutter/clutter-actor.c:6456
 msgid "Natural height set"
 msgstr "Naturlig høyde satt"
 
-#: clutter/clutter-actor.c:6417
+#: clutter/clutter-actor.c:6457
 msgid "Whether to use the natural-height property"
 msgstr ""
 
-#: clutter/clutter-actor.c:6433
+#: clutter/clutter-actor.c:6473
 msgid "Allocation"
 msgstr "Allokering"
 
-#: clutter/clutter-actor.c:6434
+#: clutter/clutter-actor.c:6474
 msgid "The actor's allocation"
 msgstr ""
 
-#: clutter/clutter-actor.c:6491
+#: clutter/clutter-actor.c:6531
 msgid "Request Mode"
 msgstr ""
 
-#: clutter/clutter-actor.c:6492
+#: clutter/clutter-actor.c:6532
 msgid "The actor's request mode"
 msgstr ""
 
-#: clutter/clutter-actor.c:6516
+#: clutter/clutter-actor.c:6556
 msgid "Depth"
 msgstr "Dybde"
 
-#: clutter/clutter-actor.c:6517
+#: clutter/clutter-actor.c:6557
 msgid "Position on the Z axis"
 msgstr "Posisjonn på Z-aksen"
 
-#: clutter/clutter-actor.c:6562
+#: clutter/clutter-actor.c:6602
 msgid "Opacity"
 msgstr "Ugjennomsiktighet"
 
-#: clutter/clutter-actor.c:6563
+#: clutter/clutter-actor.c:6603
 msgid "Opacity of an actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:6583
+#: clutter/clutter-actor.c:6623
 msgid "Offscreen redirect"
 msgstr ""
 
-#: clutter/clutter-actor.c:6584
+#: clutter/clutter-actor.c:6624
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr ""
 
-#: clutter/clutter-actor.c:6598
+#: clutter/clutter-actor.c:6638
 msgid "Visible"
 msgstr "Synlig"
 
-#: clutter/clutter-actor.c:6599
+#: clutter/clutter-actor.c:6639
 msgid "Whether the actor is visible or not"
 msgstr ""
 
-#: clutter/clutter-actor.c:6613
+#: clutter/clutter-actor.c:6653
 msgid "Mapped"
 msgstr ""
 
-#: clutter/clutter-actor.c:6614
+#: clutter/clutter-actor.c:6654
 msgid "Whether the actor will be painted"
 msgstr ""
 
-#: clutter/clutter-actor.c:6627
+#: clutter/clutter-actor.c:6667
 msgid "Realized"
 msgstr "Realisert"
 
-#: clutter/clutter-actor.c:6628
+#: clutter/clutter-actor.c:6668
 msgid "Whether the actor has been realized"
 msgstr ""
 
-#: clutter/clutter-actor.c:6643
+#: clutter/clutter-actor.c:6683
 msgid "Reactive"
 msgstr "Reaktiv"
 
-#: clutter/clutter-actor.c:6644
+#: clutter/clutter-actor.c:6684
 msgid "Whether the actor is reactive to events"
 msgstr ""
 
-#: clutter/clutter-actor.c:6655
+#: clutter/clutter-actor.c:6695
 msgid "Has Clip"
 msgstr ""
 
-#: clutter/clutter-actor.c:6656
+#: clutter/clutter-actor.c:6696
 msgid "Whether the actor has a clip set"
 msgstr ""
 
-#: clutter/clutter-actor.c:6669
+#: clutter/clutter-actor.c:6709
 msgid "Clip"
 msgstr ""
 
-#: clutter/clutter-actor.c:6670
+#: clutter/clutter-actor.c:6710
 msgid "The clip region for the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:6704 clutter/clutter-actor-meta.c:207
+#: clutter/clutter-actor.c:6744 clutter/clutter-actor-meta.c:207
 #: clutter/clutter-binding-pool.c:319 clutter/clutter-input-device.c:258
 msgid "Name"
 msgstr "Navn"
 
-#: clutter/clutter-actor.c:6705
+#: clutter/clutter-actor.c:6745
 msgid "Name of the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:6764
+#: clutter/clutter-actor.c:6804
 msgid "Scale X"
 msgstr ""
 
-#: clutter/clutter-actor.c:6765
+#: clutter/clutter-actor.c:6805
 msgid "Scale factor on the X axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:6783
+#: clutter/clutter-actor.c:6823
 msgid "Scale Y"
 msgstr ""
 
-#: clutter/clutter-actor.c:6784
+#: clutter/clutter-actor.c:6824
 msgid "Scale factor on the Y axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:6821
+#: clutter/clutter-actor.c:6861
 msgid "Scale Center X"
 msgstr ""
 
-#: clutter/clutter-actor.c:6822
+#: clutter/clutter-actor.c:6862
 msgid "Horizontal scale center"
 msgstr ""
 
-#: clutter/clutter-actor.c:6840
+#: clutter/clutter-actor.c:6880
 msgid "Scale Center Y"
 msgstr ""
 
-#: clutter/clutter-actor.c:6841
+#: clutter/clutter-actor.c:6881
 msgid "Vertical scale center"
 msgstr ""
 
-#: clutter/clutter-actor.c:6859
+#: clutter/clutter-actor.c:6899
 msgid "Scale Gravity"
 msgstr ""
 
-#: clutter/clutter-actor.c:6860
+#: clutter/clutter-actor.c:6900
 msgid "The center of scaling"
 msgstr ""
 
-#: clutter/clutter-actor.c:6878
+#: clutter/clutter-actor.c:6918
 msgid "Rotation Angle X"
 msgstr ""
 
-#: clutter/clutter-actor.c:6879
+#: clutter/clutter-actor.c:6919
 msgid "The rotation angle on the X axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:6897
+#: clutter/clutter-actor.c:6937
 msgid "Rotation Angle Y"
 msgstr ""
 
-#: clutter/clutter-actor.c:6898
+#: clutter/clutter-actor.c:6938
 msgid "The rotation angle on the Y axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:6916
+#: clutter/clutter-actor.c:6956
 msgid "Rotation Angle Z"
 msgstr ""
 
-#: clutter/clutter-actor.c:6917
+#: clutter/clutter-actor.c:6957
 msgid "The rotation angle on the Z axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:6935
+#: clutter/clutter-actor.c:6975
 msgid "Rotation Center X"
 msgstr ""
 
-#: clutter/clutter-actor.c:6936
+#: clutter/clutter-actor.c:6976
 msgid "The rotation center on the X axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:6953
+#: clutter/clutter-actor.c:6993
 msgid "Rotation Center Y"
 msgstr ""
 
-#: clutter/clutter-actor.c:6954
+#: clutter/clutter-actor.c:6994
 msgid "The rotation center on the Y axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:6971
+#: clutter/clutter-actor.c:7011
 msgid "Rotation Center Z"
 msgstr ""
 
-#: clutter/clutter-actor.c:6972
+#: clutter/clutter-actor.c:7012
 msgid "The rotation center on the Z axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:6989
+#: clutter/clutter-actor.c:7029
 msgid "Rotation Center Z Gravity"
 msgstr ""
 
-#: clutter/clutter-actor.c:6990
+#: clutter/clutter-actor.c:7030
 msgid "Center point for rotation around the Z axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:7018
+#: clutter/clutter-actor.c:7058
 msgid "Anchor X"
 msgstr "Anker X"
 
-#: clutter/clutter-actor.c:7019
+#: clutter/clutter-actor.c:7059
 msgid "X coordinate of the anchor point"
 msgstr "X-koordinat for ankerpunkt"
 
-#: clutter/clutter-actor.c:7047
+#: clutter/clutter-actor.c:7087
 msgid "Anchor Y"
 msgstr "Anker Y"
 
-#: clutter/clutter-actor.c:7048
+#: clutter/clutter-actor.c:7088
 msgid "Y coordinate of the anchor point"
 msgstr "Y-koordinat for ankerpunkt"
 
-#: clutter/clutter-actor.c:7075
+#: clutter/clutter-actor.c:7115
 msgid "Anchor Gravity"
 msgstr ""
 
-#: clutter/clutter-actor.c:7076
+#: clutter/clutter-actor.c:7116
 msgid "The anchor point as a ClutterGravity"
 msgstr ""
 
-#: clutter/clutter-actor.c:7238
+#: clutter/clutter-actor.c:7278
 msgid "Show on set parent"
 msgstr ""
 
-#: clutter/clutter-actor.c:7239
+#: clutter/clutter-actor.c:7279
 msgid "Whether the actor is shown when parented"
 msgstr ""
 
-#: clutter/clutter-actor.c:7256
+#: clutter/clutter-actor.c:7296
 msgid "Clip to Allocation"
 msgstr ""
 
-#: clutter/clutter-actor.c:7257
+#: clutter/clutter-actor.c:7297
 msgid "Sets the clip region to track the actor's allocation"
 msgstr ""
 
-#: clutter/clutter-actor.c:7270
+#: clutter/clutter-actor.c:7310
 msgid "Text Direction"
 msgstr "Tekstretning"
 
-#: clutter/clutter-actor.c:7271
+#: clutter/clutter-actor.c:7311
 msgid "Direction of the text"
 msgstr "Retning for teksten"
 
-#: clutter/clutter-actor.c:7286
+#: clutter/clutter-actor.c:7326
 msgid "Has Pointer"
 msgstr "Har peker"
 
-#: clutter/clutter-actor.c:7287
+#: clutter/clutter-actor.c:7327
 msgid "Whether the actor contains the pointer of an input device"
 msgstr ""
 
-#: clutter/clutter-actor.c:7300
+#: clutter/clutter-actor.c:7340
 msgid "Actions"
 msgstr "Hendlinger"
 
-#: clutter/clutter-actor.c:7301
+#: clutter/clutter-actor.c:7341
 msgid "Adds an action to the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:7314
+#: clutter/clutter-actor.c:7354
 msgid "Constraints"
 msgstr "Begrensninger"
 
-#: clutter/clutter-actor.c:7315
+#: clutter/clutter-actor.c:7355
 msgid "Adds a constraint to the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:7328
+#: clutter/clutter-actor.c:7368
 msgid "Effect"
 msgstr "Effekt"
 
-#: clutter/clutter-actor.c:7329
+#: clutter/clutter-actor.c:7369
 msgid "Add an effect to be applied on the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:7343
+#: clutter/clutter-actor.c:7383
 msgid "Layout Manager"
 msgstr "Utformingshåndterer"
 
-#: clutter/clutter-actor.c:7344
+#: clutter/clutter-actor.c:7384
 msgid "The object controlling the layout of an actor's children"
 msgstr ""
 
-#: clutter/clutter-actor.c:7391
+#: clutter/clutter-actor.c:7431
 msgid "X Alignment"
 msgstr "X-justering"
 
-#: clutter/clutter-actor.c:7392
+#: clutter/clutter-actor.c:7432
 msgid "The alignment of the actor on the X axis within its allocation"
 msgstr ""
 
-#: clutter/clutter-actor.c:7407
+#: clutter/clutter-actor.c:7447
 msgid "Y Alignment"
 msgstr "Y-justering"
 
-#: clutter/clutter-actor.c:7408
+#: clutter/clutter-actor.c:7448
 msgid "The alignment of the actor on the Y axis within its allocation"
 msgstr ""
 
-#: clutter/clutter-actor.c:7427
+#: clutter/clutter-actor.c:7467
 msgid "Margin Top"
 msgstr "Toppmarg"
 
-#: clutter/clutter-actor.c:7428
+#: clutter/clutter-actor.c:7468
 msgid "Extra space at the top"
 msgstr "Ekstra plass på toppen"
 
-#: clutter/clutter-actor.c:7449
+#: clutter/clutter-actor.c:7489
 msgid "Margin Bottom"
 msgstr "Bunnmarg"
 
-#: clutter/clutter-actor.c:7450
+#: clutter/clutter-actor.c:7490
 msgid "Extra space at the bottom"
 msgstr "Ekstra plass nederst"
 
-#: clutter/clutter-actor.c:7471
+#: clutter/clutter-actor.c:7511
 msgid "Margin Left"
 msgstr "Venstre marg"
 
-#: clutter/clutter-actor.c:7472
+#: clutter/clutter-actor.c:7512
 msgid "Extra space at the left"
 msgstr "Ekstra plass til venstre"
 
-#: clutter/clutter-actor.c:7493
+#: clutter/clutter-actor.c:7533
 msgid "Margin Right"
 msgstr "Høyre marg"
 
-#: clutter/clutter-actor.c:7494
+#: clutter/clutter-actor.c:7534
 msgid "Extra space at the right"
 msgstr "Ekstra plass til høyre"
 
-#: clutter/clutter-actor.c:7510
+#: clutter/clutter-actor.c:7550
 msgid "Background Color Set"
 msgstr "Bakgrunnsfarge satt"
 
-#: clutter/clutter-actor.c:7511 clutter/deprecated/clutter-box.c:275
+#: clutter/clutter-actor.c:7551 clutter/deprecated/clutter-box.c:275
 msgid "Whether the background color is set"
 msgstr "Om bakgrunnsfarge er satt"
 
-#: clutter/clutter-actor.c:7527
+#: clutter/clutter-actor.c:7567
 msgid "Background color"
 msgstr "Bakgrunnsfarge"
 
-#: clutter/clutter-actor.c:7528
+#: clutter/clutter-actor.c:7568
 msgid "The actor's background color"
 msgstr "Bakgrunnsfarge for aktøren"
 
-#: clutter/clutter-actor.c:7543
+#: clutter/clutter-actor.c:7583
 msgid "First Child"
 msgstr "Første barn"
 
-#: clutter/clutter-actor.c:7544
+#: clutter/clutter-actor.c:7584
 msgid "The actor's first child"
 msgstr "Aktørens første barn"
 
-#: clutter/clutter-actor.c:7557
+#: clutter/clutter-actor.c:7597
 msgid "Last Child"
 msgstr "Siste barn"
 
-#: clutter/clutter-actor.c:7558
+#: clutter/clutter-actor.c:7598
 msgid "The actor's last child"
 msgstr "Aktørens siste barn"
 
-#: clutter/clutter-actor.c:7572
+#: clutter/clutter-actor.c:7612
 msgid "Content"
 msgstr "Innhold"
 
-#: clutter/clutter-actor.c:7573
+#: clutter/clutter-actor.c:7613
 msgid "Delegate object for painting the actor's content"
 msgstr ""
 
-#: clutter/clutter-actor.c:7598
+#: clutter/clutter-actor.c:7638
 msgid "Content Gravity"
 msgstr "Gravitet for innholdet"
 
-#: clutter/clutter-actor.c:7599
+#: clutter/clutter-actor.c:7639
 msgid "Alignment of the actor's content"
 msgstr ""
 
-#: clutter/clutter-actor.c:7619
+#: clutter/clutter-actor.c:7659
 msgid "Content Box"
 msgstr "Innholdsboks"
 
-#: clutter/clutter-actor.c:7620
+#: clutter/clutter-actor.c:7660
 msgid "The bounding box of the actor's content"
 msgstr ""
 
-#: clutter/clutter-actor.c:7628
+#: clutter/clutter-actor.c:7668
 msgid "Minification Filter"
 msgstr ""
 
-#: clutter/clutter-actor.c:7629
+#: clutter/clutter-actor.c:7669
 msgid "The filter used when reducing the size of the content"
 msgstr ""
 
-#: clutter/clutter-actor.c:7636
+#: clutter/clutter-actor.c:7676
 msgid "Magnification Filter"
 msgstr ""
 
-#: clutter/clutter-actor.c:7637
+#: clutter/clutter-actor.c:7677
 msgid "The filter used when increasing the size of the content"
 msgstr ""
 
@@ -594,7 +594,7 @@
 
 #: clutter/deprecated/clutter-alpha.c:355
 #: clutter/deprecated/clutter-animation.c:575
-#: clutter/deprecated/clutter-animator.c:1820
+#: clutter/deprecated/clutter-animator.c:1821
 msgid "Timeline"
 msgstr "Tidslinje"
 
@@ -631,10 +631,10 @@
 msgid "The mode of the animation"
 msgstr "Modus for animasjonen"
 
-#: clutter/clutter-timeline.c:592 clutter/deprecated/clutter-animation.c:544
-#: clutter/deprecated/clutter-animator.c:1803
+#: clutter/clutter-timeline.c:625 clutter/deprecated/clutter-animation.c:544
+#: clutter/deprecated/clutter-animator.c:1804
 #: clutter/deprecated/clutter-media.c:224
-#: clutter/deprecated/clutter-state.c:1522
+#: clutter/deprecated/clutter-state.c:1523
 msgid "Duration"
 msgstr "Varighet"
 
@@ -642,7 +642,7 @@
 msgid "Duration of the animation, in milliseconds"
 msgstr "Varighet for animasjonen, i millisekunder"
 
-#: clutter/clutter-timeline.c:561 clutter/deprecated/clutter-animation.c:560
+#: clutter/clutter-timeline.c:594 clutter/deprecated/clutter-animation.c:560
 msgid "Loop"
 msgstr "Løkke"
 
@@ -663,11 +663,11 @@
 msgid "The alpha used by the animation"
 msgstr ""
 
-#: clutter/deprecated/clutter-animator.c:1804
+#: clutter/deprecated/clutter-animator.c:1805
 msgid "The duration of the animation"
 msgstr "Varighet for animasjonen"
 
-#: clutter/deprecated/clutter-animator.c:1821
+#: clutter/deprecated/clutter-animator.c:1822
 msgid "The timeline of the animation"
 msgstr "Tidslinje for animasjonen"
 
@@ -900,7 +900,7 @@
 msgid "Whether the clickable has a grab"
 msgstr ""
 
-#: clutter/clutter-click-action.c:591 clutter/clutter-settings.c:599
+#: clutter/clutter-click-action.c:591 clutter/clutter-settings.c:607
 msgid "Long Press Duration"
 msgstr ""
 
@@ -957,7 +957,7 @@
 msgstr ""
 
 #: clutter/clutter-device-manager.c:131 clutter/clutter-input-device.c:366
-#: clutter/x11/clutter-keymap-x11.c:316
+#: clutter/x11/clutter-keymap-x11.c:321
 msgid "Backend"
 msgstr ""
 
@@ -998,12 +998,12 @@
 msgstr ""
 
 #: clutter/clutter-box-layout.c:1383 clutter/clutter-flow-layout.c:890
-#: clutter/clutter-grid-layout.c:1547
+#: clutter/clutter-grid-layout.c:1550
 msgid "Orientation"
 msgstr "Orientering"
 
 #: clutter/clutter-box-layout.c:1384 clutter/clutter-flow-layout.c:891
-#: clutter/clutter-grid-layout.c:1548
+#: clutter/clutter-grid-layout.c:1551
 msgid "The orientation of the layout"
 msgstr "Orientering for utformingen"
 
@@ -1140,59 +1140,59 @@
 msgid "The manager that created this data"
 msgstr ""
 
-#: clutter/clutter-main.c:772
+#: clutter/clutter-main.c:795
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: clutter/clutter-main.c:1646
+#: clutter/clutter-main.c:1669
 msgid "Show frames per second"
 msgstr "Vis rammer per sekund"
 
-#: clutter/clutter-main.c:1648
+#: clutter/clutter-main.c:1671
 msgid "Default frame rate"
 msgstr "Forvalgt bilderate"
 
-#: clutter/clutter-main.c:1650
+#: clutter/clutter-main.c:1673
 msgid "Make all warnings fatal"
 msgstr "La alle advarsler være fatale"
 
-#: clutter/clutter-main.c:1653
+#: clutter/clutter-main.c:1676
 msgid "Direction for the text"
 msgstr "Retning for teksten"
 
-#: clutter/clutter-main.c:1656
+#: clutter/clutter-main.c:1679
 msgid "Disable mipmapping on text"
 msgstr ""
 
-#: clutter/clutter-main.c:1659
+#: clutter/clutter-main.c:1682
 msgid "Use 'fuzzy' picking"
 msgstr ""
 
-#: clutter/clutter-main.c:1662
+#: clutter/clutter-main.c:1685
 msgid "Clutter debugging flags to set"
 msgstr ""
 
-#: clutter/clutter-main.c:1664
+#: clutter/clutter-main.c:1687
 msgid "Clutter debugging flags to unset"
 msgstr ""
 
-#: clutter/clutter-main.c:1668
+#: clutter/clutter-main.c:1691
 msgid "Clutter profiling flags to set"
 msgstr ""
 
-#: clutter/clutter-main.c:1670
+#: clutter/clutter-main.c:1693
 msgid "Clutter profiling flags to unset"
 msgstr ""
 
-#: clutter/clutter-main.c:1673
+#: clutter/clutter-main.c:1696
 msgid "Enable accessibility"
 msgstr "Slå på tilgjengelighet"
 
-#: clutter/clutter-main.c:1865
+#: clutter/clutter-main.c:1888
 msgid "Clutter Options"
 msgstr "Alternativer for Clutter"
 
-#: clutter/clutter-main.c:1866
+#: clutter/clutter-main.c:1889
 msgid "Show Clutter Options"
 msgstr "Vis alternativer for Clutter"
 
@@ -1309,100 +1309,100 @@
 msgid "The translation domain used to localize string"
 msgstr ""
 
-#: clutter/clutter-settings.c:440
+#: clutter/clutter-settings.c:448
 msgid "Double Click Time"
 msgstr "Tid for dobbeltklikk"
 
-#: clutter/clutter-settings.c:441
+#: clutter/clutter-settings.c:449
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr ""
 
-#: clutter/clutter-settings.c:456
+#: clutter/clutter-settings.c:464
 msgid "Double Click Distance"
 msgstr "Avstand ved dobbeltklikk"
 
-#: clutter/clutter-settings.c:457
+#: clutter/clutter-settings.c:465
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr ""
 
-#: clutter/clutter-settings.c:472
+#: clutter/clutter-settings.c:480
 msgid "Drag Threshold"
 msgstr ""
 
-#: clutter/clutter-settings.c:473
+#: clutter/clutter-settings.c:481
 msgid "The distance the cursor should travel before starting to drag"
 msgstr ""
 
-#: clutter/clutter-settings.c:488 clutter/clutter-text.c:3368
+#: clutter/clutter-settings.c:496 clutter/clutter-text.c:3367
 msgid "Font Name"
 msgstr "Skriftnavn"
 
-#: clutter/clutter-settings.c:489
+#: clutter/clutter-settings.c:497
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 
-#: clutter/clutter-settings.c:504
+#: clutter/clutter-settings.c:512
 msgid "Font Antialias"
 msgstr ""
 
-#: clutter/clutter-settings.c:505
+#: clutter/clutter-settings.c:513
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
 msgstr ""
 
-#: clutter/clutter-settings.c:521
+#: clutter/clutter-settings.c:529
 msgid "Font DPI"
 msgstr "DPI for skrift"
 
-#: clutter/clutter-settings.c:522
+#: clutter/clutter-settings.c:530
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 
-#: clutter/clutter-settings.c:538
+#: clutter/clutter-settings.c:546
 msgid "Font Hinting"
 msgstr ""
 
-#: clutter/clutter-settings.c:539
+#: clutter/clutter-settings.c:547
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 
-#: clutter/clutter-settings.c:560
+#: clutter/clutter-settings.c:568
 msgid "Font Hint Style"
 msgstr ""
 
-#: clutter/clutter-settings.c:561
+#: clutter/clutter-settings.c:569
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr ""
 
-#: clutter/clutter-settings.c:582
+#: clutter/clutter-settings.c:590
 msgid "Font Subpixel Order"
 msgstr ""
 
-#: clutter/clutter-settings.c:583
+#: clutter/clutter-settings.c:591
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr ""
 
-#: clutter/clutter-settings.c:600
+#: clutter/clutter-settings.c:608
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr ""
 
-#: clutter/clutter-settings.c:607
+#: clutter/clutter-settings.c:615
 msgid "Fontconfig configuration timestamp"
 msgstr ""
 
-#: clutter/clutter-settings.c:608
+#: clutter/clutter-settings.c:616
 msgid "Timestamp of the current fontconfig configuration"
 msgstr ""
 
-#: clutter/clutter-settings.c:625
+#: clutter/clutter-settings.c:633
 msgid "Password Hint Time"
 msgstr "Tid for passordhint"
 
-#: clutter/clutter-settings.c:626
+#: clutter/clutter-settings.c:634
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 
@@ -1438,120 +1438,120 @@
 msgid "The offset in pixels to apply to the constraint"
 msgstr ""
 
-#: clutter/clutter-stage.c:1895
+#: clutter/clutter-stage.c:1938
 msgid "Fullscreen Set"
 msgstr "Fullskjerm satt"
 
-#: clutter/clutter-stage.c:1896
+#: clutter/clutter-stage.c:1939
 msgid "Whether the main stage is fullscreen"
 msgstr ""
 
-#: clutter/clutter-stage.c:1910
+#: clutter/clutter-stage.c:1953
 msgid "Offscreen"
 msgstr "Utenfor skjermen"
 
-#: clutter/clutter-stage.c:1911
+#: clutter/clutter-stage.c:1954
 msgid "Whether the main stage should be rendered offscreen"
 msgstr ""
 
-#: clutter/clutter-stage.c:1923 clutter/clutter-text.c:3482
+#: clutter/clutter-stage.c:1966 clutter/clutter-text.c:3481
 msgid "Cursor Visible"
 msgstr "Markør synlig"
 
-#: clutter/clutter-stage.c:1924
+#: clutter/clutter-stage.c:1967
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr ""
 
-#: clutter/clutter-stage.c:1938
+#: clutter/clutter-stage.c:1981
 msgid "User Resizable"
 msgstr ""
 
-#: clutter/clutter-stage.c:1939
+#: clutter/clutter-stage.c:1982
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr ""
 
-#: clutter/clutter-stage.c:1954 clutter/deprecated/clutter-box.c:260
+#: clutter/clutter-stage.c:1997 clutter/deprecated/clutter-box.c:260
 #: clutter/deprecated/clutter-rectangle.c:273
 msgid "Color"
 msgstr "Farge"
 
-#: clutter/clutter-stage.c:1955
+#: clutter/clutter-stage.c:1998
 msgid "The color of the stage"
 msgstr ""
 
-#: clutter/clutter-stage.c:1970
+#: clutter/clutter-stage.c:2013
 msgid "Perspective"
 msgstr "Prespektiv"
 
-#: clutter/clutter-stage.c:1971
+#: clutter/clutter-stage.c:2014
 msgid "Perspective projection parameters"
 msgstr ""
 
-#: clutter/clutter-stage.c:1986
+#: clutter/clutter-stage.c:2029
 msgid "Title"
 msgstr "Tittel"
 
-#: clutter/clutter-stage.c:1987
+#: clutter/clutter-stage.c:2030
 msgid "Stage Title"
 msgstr "Tittel for scene"
 
-#: clutter/clutter-stage.c:2004
+#: clutter/clutter-stage.c:2047
 msgid "Use Fog"
 msgstr "Bruk tåke"
 
-#: clutter/clutter-stage.c:2005
+#: clutter/clutter-stage.c:2048
 msgid "Whether to enable depth cueing"
 msgstr ""
 
-#: clutter/clutter-stage.c:2021
+#: clutter/clutter-stage.c:2064
 msgid "Fog"
 msgstr "Tåke"
 
-#: clutter/clutter-stage.c:2022
+#: clutter/clutter-stage.c:2065
 msgid "Settings for the depth cueing"
 msgstr ""
 
-#: clutter/clutter-stage.c:2038
+#: clutter/clutter-stage.c:2081
 msgid "Use Alpha"
 msgstr ""
 
-#: clutter/clutter-stage.c:2039
+#: clutter/clutter-stage.c:2082
 msgid "Whether to honour the alpha component of the stage color"
 msgstr ""
 
-#: clutter/clutter-stage.c:2055
+#: clutter/clutter-stage.c:2098
 msgid "Key Focus"
 msgstr ""
 
-#: clutter/clutter-stage.c:2056
+#: clutter/clutter-stage.c:2099
 msgid "The currently key focused actor"
 msgstr ""
 
-#: clutter/clutter-stage.c:2072
+#: clutter/clutter-stage.c:2115
 msgid "No Clear Hint"
 msgstr ""
 
-#: clutter/clutter-stage.c:2073
+#: clutter/clutter-stage.c:2116
 msgid "Whether the stage should clear its contents"
 msgstr ""
 
-#: clutter/clutter-stage.c:2086
+#: clutter/clutter-stage.c:2129
 msgid "Accept Focus"
 msgstr ""
 
-#: clutter/clutter-stage.c:2087
+#: clutter/clutter-stage.c:2130
 msgid "Whether the stage should accept focus on show"
 msgstr ""
 
-#: clutter/deprecated/clutter-state.c:1504
+#: clutter/deprecated/clutter-state.c:1505
 msgid "State"
 msgstr "Tilstand"
 
-#: clutter/deprecated/clutter-state.c:1505
+#: clutter/deprecated/clutter-state.c:1506
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 
-#: clutter/deprecated/clutter-state.c:1523
+#: clutter/deprecated/clutter-state.c:1524
 msgid "Default transition duration"
 msgstr ""
 
@@ -1611,7 +1611,7 @@
 msgid "Spacing between rows"
 msgstr ""
 
-#: clutter/clutter-text-buffer.c:351 clutter/clutter-text.c:3403
+#: clutter/clutter-text-buffer.c:351 clutter/clutter-text.c:3402
 msgid "Text"
 msgstr "Tekst"
 
@@ -1635,203 +1635,203 @@
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr ""
 
-#: clutter/clutter-text.c:3350
+#: clutter/clutter-text.c:3349
 msgid "Buffer"
 msgstr ""
 
-#: clutter/clutter-text.c:3351
+#: clutter/clutter-text.c:3350
 msgid "The buffer for the text"
 msgstr ""
 
-#: clutter/clutter-text.c:3369
+#: clutter/clutter-text.c:3368
 msgid "The font to be used by the text"
 msgstr "Skrift som skal brukes av teksten"
 
-#: clutter/clutter-text.c:3386
+#: clutter/clutter-text.c:3385
 msgid "Font Description"
 msgstr "Skriftbeskrivelse"
 
-#: clutter/clutter-text.c:3387
+#: clutter/clutter-text.c:3386
 msgid "The font description to be used"
 msgstr "Skriftbeskrivelse som skal brukes"
 
-#: clutter/clutter-text.c:3404
+#: clutter/clutter-text.c:3403
 msgid "The text to render"
 msgstr "Tekst som skal vises"
 
-#: clutter/clutter-text.c:3418
+#: clutter/clutter-text.c:3417
 msgid "Font Color"
 msgstr "Skriftfarge"
 
-#: clutter/clutter-text.c:3419
+#: clutter/clutter-text.c:3418
 msgid "Color of the font used by the text"
 msgstr "Farge på skriften som brukes av teksten"
 
-#: clutter/clutter-text.c:3434
+#: clutter/clutter-text.c:3433
 msgid "Editable"
 msgstr "Redigerbar"
 
-#: clutter/clutter-text.c:3435
+#: clutter/clutter-text.c:3434
 msgid "Whether the text is editable"
 msgstr "Om teksten er redigerbar"
 
-#: clutter/clutter-text.c:3450
+#: clutter/clutter-text.c:3449
 msgid "Selectable"
 msgstr "Markerbar"
 
-#: clutter/clutter-text.c:3451
+#: clutter/clutter-text.c:3450
 msgid "Whether the text is selectable"
 msgstr "Om teksten kan markeres"
 
-#: clutter/clutter-text.c:3465
+#: clutter/clutter-text.c:3464
 msgid "Activatable"
 msgstr "Kan aktiveres"
 
-#: clutter/clutter-text.c:3466
+#: clutter/clutter-text.c:3465
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr ""
 
-#: clutter/clutter-text.c:3483
+#: clutter/clutter-text.c:3482
 msgid "Whether the input cursor is visible"
 msgstr ""
 
-#: clutter/clutter-text.c:3497 clutter/clutter-text.c:3498
+#: clutter/clutter-text.c:3496 clutter/clutter-text.c:3497
 msgid "Cursor Color"
 msgstr "Markørfarge"
 
-#: clutter/clutter-text.c:3513
+#: clutter/clutter-text.c:3512
 msgid "Cursor Color Set"
 msgstr "Markørfarge satt"
 
-#: clutter/clutter-text.c:3514
+#: clutter/clutter-text.c:3513
 msgid "Whether the cursor color has been set"
 msgstr ""
 
-#: clutter/clutter-text.c:3529
+#: clutter/clutter-text.c:3528
 msgid "Cursor Size"
 msgstr "Markørstørrelse"
 
-#: clutter/clutter-text.c:3530
+#: clutter/clutter-text.c:3529
 msgid "The width of the cursor, in pixels"
 msgstr ""
 
-#: clutter/clutter-text.c:3546 clutter/clutter-text.c:3564
+#: clutter/clutter-text.c:3545 clutter/clutter-text.c:3563
 msgid "Cursor Position"
 msgstr "Markørposisjon"
 
-#: clutter/clutter-text.c:3547 clutter/clutter-text.c:3565
+#: clutter/clutter-text.c:3546 clutter/clutter-text.c:3564
 msgid "The cursor position"
 msgstr "Posisjon for markøren"
 
-#: clutter/clutter-text.c:3580
+#: clutter/clutter-text.c:3579
 msgid "Selection-bound"
 msgstr ""
 
-#: clutter/clutter-text.c:3581
+#: clutter/clutter-text.c:3580
 msgid "The cursor position of the other end of the selection"
 msgstr ""
 
-#: clutter/clutter-text.c:3596 clutter/clutter-text.c:3597
+#: clutter/clutter-text.c:3595 clutter/clutter-text.c:3596
 msgid "Selection Color"
 msgstr "Utvalgsfarge"
 
-#: clutter/clutter-text.c:3612
+#: clutter/clutter-text.c:3611
 msgid "Selection Color Set"
 msgstr ""
 
-#: clutter/clutter-text.c:3613
+#: clutter/clutter-text.c:3612
 msgid "Whether the selection color has been set"
 msgstr ""
 
-#: clutter/clutter-text.c:3628
+#: clutter/clutter-text.c:3627
 msgid "Attributes"
 msgstr "Attributter"
 
-#: clutter/clutter-text.c:3629
+#: clutter/clutter-text.c:3628
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr ""
 
-#: clutter/clutter-text.c:3651
+#: clutter/clutter-text.c:3650
 msgid "Use markup"
 msgstr ""
 
-#: clutter/clutter-text.c:3652
+#: clutter/clutter-text.c:3651
 msgid "Whether or not the text includes Pango markup"
 msgstr ""
 
-#: clutter/clutter-text.c:3668
+#: clutter/clutter-text.c:3667
 msgid "Line wrap"
 msgstr "Linjebryting"
 
-#: clutter/clutter-text.c:3669
+#: clutter/clutter-text.c:3668
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr ""
 
-#: clutter/clutter-text.c:3684
+#: clutter/clutter-text.c:3683
 msgid "Line wrap mode"
 msgstr ""
 
-#: clutter/clutter-text.c:3685
+#: clutter/clutter-text.c:3684
 msgid "Control how line-wrapping is done"
 msgstr ""
 
-#: clutter/clutter-text.c:3700
+#: clutter/clutter-text.c:3699
 msgid "Ellipsize"
 msgstr ""
 
-#: clutter/clutter-text.c:3701
+#: clutter/clutter-text.c:3700
 msgid "The preferred place to ellipsize the string"
 msgstr ""
 
-#: clutter/clutter-text.c:3717
+#: clutter/clutter-text.c:3716
 msgid "Line Alignment"
 msgstr "Linjejustering"
 
-#: clutter/clutter-text.c:3718
+#: clutter/clutter-text.c:3717
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr ""
 
-#: clutter/clutter-text.c:3734
+#: clutter/clutter-text.c:3733
 msgid "Justify"
 msgstr ""
 
-#: clutter/clutter-text.c:3735
+#: clutter/clutter-text.c:3734
 msgid "Whether the text should be justified"
 msgstr ""
 
-#: clutter/clutter-text.c:3750
+#: clutter/clutter-text.c:3749
 msgid "Password Character"
 msgstr "Passordtegn"
 
-#: clutter/clutter-text.c:3751
+#: clutter/clutter-text.c:3750
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 
-#: clutter/clutter-text.c:3765
+#: clutter/clutter-text.c:3764
 msgid "Max Length"
 msgstr "Maks lengde"
 
-#: clutter/clutter-text.c:3766
+#: clutter/clutter-text.c:3765
 msgid "Maximum length of the text inside the actor"
 msgstr ""
 
-#: clutter/clutter-text.c:3789
+#: clutter/clutter-text.c:3788
 msgid "Single Line Mode"
 msgstr ""
 
-#: clutter/clutter-text.c:3790
+#: clutter/clutter-text.c:3789
 msgid "Whether the text should be a single line"
 msgstr ""
 
-#: clutter/clutter-text.c:3804 clutter/clutter-text.c:3805
+#: clutter/clutter-text.c:3803 clutter/clutter-text.c:3804
 msgid "Selected Text Color"
 msgstr "Valgt tekstfarge"
 
-#: clutter/clutter-text.c:3820
+#: clutter/clutter-text.c:3819
 msgid "Selected Text Color Set"
 msgstr ""
 
-#: clutter/clutter-text.c:3821
+#: clutter/clutter-text.c:3820
 msgid "Whether the selected text color has been set"
 msgstr ""
 
@@ -1967,53 +1967,53 @@
 msgid "YUV2 textues are not supported"
 msgstr ""
 
-#: clutter/clutter-timeline.c:562
+#: clutter/clutter-timeline.c:595
 msgid "Should the timeline automatically restart"
 msgstr ""
 
-#: clutter/clutter-timeline.c:576
+#: clutter/clutter-timeline.c:609
 msgid "Delay"
 msgstr "Pause"
 
-#: clutter/clutter-timeline.c:577
+#: clutter/clutter-timeline.c:610
 msgid "Delay before start"
 msgstr "Pause før start"
 
-#: clutter/clutter-timeline.c:593
+#: clutter/clutter-timeline.c:626
 msgid "Duration of the timeline in milliseconds"
 msgstr "Varighet for tidslinjen i millisekunder"
 
-#: clutter/clutter-timeline.c:608
+#: clutter/clutter-timeline.c:641
 #: clutter/deprecated/clutter-behaviour-ellipse.c:528
 #: clutter/deprecated/clutter-behaviour-rotate.c:337
 msgid "Direction"
 msgstr "Retning"
 
-#: clutter/clutter-timeline.c:609
+#: clutter/clutter-timeline.c:642
 msgid "Direction of the timeline"
 msgstr "Retning for tidslinjen"
 
-#: clutter/clutter-timeline.c:624
+#: clutter/clutter-timeline.c:657
 msgid "Auto Reverse"
 msgstr ""
 
-#: clutter/clutter-timeline.c:625
+#: clutter/clutter-timeline.c:658
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr ""
 
-#: clutter/clutter-timeline.c:643
+#: clutter/clutter-timeline.c:676
 msgid "Repeat Count"
 msgstr ""
 
-#: clutter/clutter-timeline.c:644
+#: clutter/clutter-timeline.c:677
 msgid "How many times the timeline should repeat"
 msgstr ""
 
-#: clutter/clutter-timeline.c:658
+#: clutter/clutter-timeline.c:691
 msgid "Progress Mode"
 msgstr ""
 
-#: clutter/clutter-timeline.c:659
+#: clutter/clutter-timeline.c:692
 msgid "How the timeline should compute the progress"
 msgstr ""
 
@@ -2309,7 +2309,7 @@
 msgid "Path of the device node"
 msgstr ""
 
-#: clutter/gdk/clutter-backend-gdk.c:296
+#: clutter/gdk/clutter-backend-gdk.c:287
 #, c-format
 msgid "Could not find a suitable CoglWinsys for a GdkDisplay of type %s"
 msgstr ""
@@ -2338,15 +2338,15 @@
 msgid "The height of the underlying wayland surface"
 msgstr "Høyde på underliggende wayland-overflate"
 
-#: clutter/x11/clutter-backend-x11.c:516
+#: clutter/x11/clutter-backend-x11.c:507
 msgid "X display to use"
 msgstr "X-skjerm som skal brukes"
 
-#: clutter/x11/clutter-backend-x11.c:522
+#: clutter/x11/clutter-backend-x11.c:513
 msgid "X screen to use"
 msgstr "X-skjerm som skal brukes"
 
-#: clutter/x11/clutter-backend-x11.c:527
+#: clutter/x11/clutter-backend-x11.c:518
 msgid "Make X calls synchronous"
 msgstr ""
 
@@ -2354,7 +2354,7 @@
 msgid "Enable XInput support"
 msgstr ""
 
-#: clutter/x11/clutter-keymap-x11.c:317
+#: clutter/x11/clutter-keymap-x11.c:322
 msgid "The Clutter backend"
 msgstr ""
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/cogl.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/cogl.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/cogl.po	2013-01-29 09:34:03.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/cogl.po	2014-01-07 06:37:51.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:29+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 20:57+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: cogl/cogl-debug.c:174
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/computerjanitor.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/computerjanitor.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/computerjanitor.po	2013-01-29 09:34:06.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/computerjanitor.po	2014-01-07 06:37:34.000000000 +0000
@@ -9,13 +9,13 @@
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-01-03 11:02+0000\n"
 "PO-Revision-Date: 2011-05-06 21:59+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
+"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:53+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:42+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../computerjanitorapp/gtk/dialogs.py:58
 #, python-format
@@ -47,7 +47,7 @@
 
 #: ../computerjanitorapp/gtk/dialogs.py:77
 msgid "There is nothing to clean up"
-msgstr "Det er ingenting å rydde opp"
+msgstr "Det er ingenting å rydde opp i"
 
 #: ../computerjanitorapp/gtk/dialogs.py:80
 msgid "Ok"
@@ -58,15 +58,16 @@
 #. and probably to the cruft plugin architecture underneath that.
 #: ../computerjanitorapp/gtk/dialogs.py:88
 msgid "Are you sure you want to clean your system?"
-msgstr "Ønsker du å rydde opp systemet?"
+msgstr "Er du sikker på at du vil rydde opp i systemet?"
 
 #: ../computerjanitorapp/gtk/dialogs.py:114
 msgid ""
 "System clean up could not complete. Be sure no other package manager such as "
 "Synaptic or Update Manager is running."
 msgstr ""
-"Systemopprydding kunne ikke fullføre. Sørg for at ingen andre "
-"pakkebehandlere som Synaptic eller Oppdateringsverktøy kjører samtidig."
+"Systemopprydding klarte ikke å fullføre. Sørg for at ingen andre "
+"pakkebehandlere - som Synaptic eller Oppdateringsverktøy - kjører samtidig "
+"som oppryddingen."
 
 #: ../computerjanitorapp/gtk/dialogs.py:122
 msgid "System clean up failure"
@@ -74,15 +75,15 @@
 
 #: ../computerjanitorapp/gtk/ui.py:53
 msgid "Package will be <b>removed</b>."
-msgstr "Pakke vil bli <b>fjernet</b>."
+msgstr "Pakka blir <b>fjernet</b>."
 
 #: ../computerjanitorapp/gtk/ui.py:54
 msgid "Package will be <b>installed</b>."
-msgstr "Pakke vil bli <b>installert</b>."
+msgstr "Pakka blir <b>installert</b>."
 
 #: ../computerjanitorapp/gtk/ui.py:55
 msgid "File will be <b>removed</b>."
-msgstr "Fil vil bli <b>fjernet</b>."
+msgstr "Fila blir <b>fjernet</b>."
 
 #. XXX barry 2010-08-23: LP: #622720
 #: ../computerjanitorapp/gtk/ui.py:270
@@ -99,7 +100,7 @@
 #: ../computerjanitorapp/gtk/ui.py:478 ../data/ComputerJanitor.ui.h:8
 #: ../data/computer-janitor-gtk.desktop.in.h:1
 msgid "Computer Janitor"
-msgstr "Datamaskinvedlikeholder"
+msgstr "Systemopprydding"
 
 #: ../computerjanitorapp/cli/main.py:52
 msgid ""
@@ -110,67 +111,79 @@
 "on\n"
 "            your system but aren't."
 msgstr ""
+"            Finn og fjern gammelt rot fra systemet.\n"
+"\n"
+"            Rot (eng.: «cruft») er ting og tang som ikke hører hjemme på "
+"systemet ditt, \n"
+"            og som er der likevel.\n"
+"            Definisjonen gjelder også motsatt vei, altså for ting som skal "
+"være på\n"
+"            systemet, og som ikke er der."
 
 #. XXX barry 2010-08-23: LP: #622720
 #: ../computerjanitorapp/cli/main.py:61
 #, python-format
 msgid "Computer Janitor %(version)s"
-msgstr "Datamaskinvedlikeholder %(version)s"
+msgstr "Systemopprydding %(version)s"
 
 #: ../computerjanitorapp/cli/main.py:66
 msgid "Find and display all cruft found on your system."
-msgstr ""
+msgstr "Finn og vis alt det gamle rotet som finnes på systemet."
 
 #: ../computerjanitorapp/cli/main.py:69
 msgid ""
 "            Display a detailed explanation for each piece of cruft found."
 msgstr ""
+"            Vis en detaljert forklaring på hvert stykke med rot som oppdages."
 
 #: ../computerjanitorapp/cli/main.py:73
 msgid "Find and display only the ignored cruft."
-msgstr ""
+msgstr "Bare søk og vis rotet som ignoreres."
 
 #: ../computerjanitorapp/cli/main.py:76
 msgid "Find and display only the removable cruft."
-msgstr ""
+msgstr "Bare søk og vis rotet som kan fjernes."
 
 #: ../computerjanitorapp/cli/main.py:79
 msgid "Display only the package names.  Do not use with -v."
-msgstr "Vis kun pakkenavn. Ikke bruk i kombinasjon med -v."
+msgstr "Bare vis pakkenavn. Ikke bruk dette sammen med «-v»."
 
 #: ../computerjanitorapp/cli/main.py:83
 msgid "            Ignore a piece of cruft so that it is not cleaned up."
-msgstr ""
+msgstr "            Ignorer et stykke rot, og ikke rydd det bort."
 
 #: ../computerjanitorapp/cli/main.py:87
 msgid "The name of the cruft to ignore."
-msgstr ""
+msgstr "Navnet på stykket med rot som skal ignoreres."
 
 #: ../computerjanitorapp/cli/main.py:91
 msgid "            Unignore a piece of cruft so that it will be cleaned up."
 msgstr ""
+"            Fjern ignorering av et stykke rot, slik at det kan ryddes bort."
 
 #: ../computerjanitorapp/cli/main.py:95
 msgid "The name of the cruft to unignore."
-msgstr ""
+msgstr "Navnet på rotet som ikke skal ignoreres lenger."
 
 #: ../computerjanitorapp/cli/main.py:100
 msgid "Remove the selected cruft from the system."
-msgstr ""
+msgstr "Fjern det valgt rotet fra systemet."
 
 #: ../computerjanitorapp/cli/main.py:103
 msgid "Clean up all unignored cruft."
-msgstr ""
+msgstr "Fjern alt rot som ikke er merket som ignorert."
 
 #: ../computerjanitorapp/cli/main.py:106
 msgid "Provide more details on what's being cleaned."
-msgstr "Gi mer informasjon om hva som blir rensket."
+msgstr "Gi detaljert informasjon om hva som blir ryddet bort."
 
 #: ../computerjanitorapp/cli/main.py:109
 msgid ""
 "            The name of the cruft to clean up.  Do not use if specifying\n"
 "            --all."
 msgstr ""
+"            Navnet på rotet som skal ryddes bort. Ikke bruk dette valget\n"
+"            sammen med «--all»."
 
 #. The prefix will either be 'ignored' or 'removable' however this
 #. string will be translated, so calculate the prefix size in the
@@ -195,16 +208,16 @@
 "This application helps you find and remove software packages you might not "
 "need anymore. It also suggests configuration changes that might benefit you."
 msgstr ""
-"Denne applikasjonen hjelper deg finne og fjerne programmer du kanskje ikke "
-"lenger behøver. Den foreslår også nyttige konfigurasjonsendringer."
+"Dette programmet hjelper deg finne og fjerne programmer som du kanskje ikke "
+"har bruk for lenger. Det foreslår også nyttige endringer i oppsettet ditt."
 
 #: ../data/ComputerJanitor.ui.h:4
 msgid "Launchpad page"
-msgstr "Launchpad-side"
+msgstr "Launchpad-nettside"
 
 #: ../data/ComputerJanitor.ui.h:5
 msgid "Did not find anything to clean up."
-msgstr "Fant ingenting å rydde opp."
+msgstr "Fant ingenting å rydde opp i."
 
 #: ../data/ComputerJanitor.ui.h:6
 msgid "You can close the program now."
@@ -212,7 +225,7 @@
 
 #: ../data/ComputerJanitor.ui.h:7
 msgid "Cleaning up..."
-msgstr "Rydder opp..."
+msgstr "Rydder opp …"
 
 #: ../data/ComputerJanitor.ui.h:9
 msgid "_File"
@@ -236,15 +249,15 @@
 
 #: ../data/ComputerJanitor.ui.h:14
 msgid "Deselect all"
-msgstr "Fjern merking"
+msgstr "Fjern all markering"
 
 #: ../data/ComputerJanitor.ui.h:15
 msgid "Deselect all packages"
-msgstr ""
+msgstr "Fjern pakkemarkeringer"
 
 #: ../data/ComputerJanitor.ui.h:16
 msgid "Deselect all other"
-msgstr ""
+msgstr "Fjern all annen markering"
 
 #: ../data/ComputerJanitor.ui.h:17
 msgid "_View"
@@ -276,27 +289,27 @@
 
 #: ../data/ComputerJanitor.ui.h:24
 msgid "_Do selected tasks"
-msgstr "_Gjør valgte oppgaver"
+msgstr "_Utfør valgte handlinger"
 
 #: ../data/computer-janitor-gtk.desktop.in.h:2
 msgid "Clean up a system so it's more like a freshly installed one"
-msgstr "Rydd opp et system slik at det blir som et nyinstallert"
+msgstr "Rydd opp i et system, slik at det blir som nyinstallert"
 
 #: ../plugins/add_nfs_common_plugin.py:34
 msgid "NFS is being used, so the nfs-common package needs to be installed."
-msgstr "NFS blir brukt, så nfs-common pakken installeres."
+msgstr "NFS blir brukt, så pakka «nfs-common» må installeres."
 
 #: ../plugins/autoremoval_plugin.py:34
 msgid ""
 "Package was installed because another package required it, but now nothing "
 "requires it anymore."
 msgstr ""
-"Pakken ble installert fordi en annen pakke behøvde den, men nå er det ingen "
-"som gjør det lenger."
+"Pakka ble installert fordi en annen pakke var avhengig av den, men det er "
+"ingenting som krever at du beholder den nå lenger."
 
 #: ../plugins/check_admin_group_plugin.py:39
 msgid "User is missing from admin group."
-msgstr "Brukeren mangler i administratorgruppen."
+msgstr "Brukeren finnes ikke i administratorgruppen."
 
 #: ../plugins/check_admin_group_plugin.py:45
 #: ../plugins/check_admin_group_plugin.py:72
@@ -311,23 +324,24 @@
 "compare it with the actual configuration file (the one without the .dpkg-old "
 "or .dpkg-new suffix). If unsure, don't remove the file."
 msgstr ""
-"Filen ble etterlatt på disken av dpkg som en del av dets konfgurasjonsfil-"
-"håndtering. Hvis datamaskinen fungerer ok kan du fjerne den. Du vi kanskje "
-"sammenligne den med den faktiske konfigurasjonsfilen (den uten .dpkg-old "
-"eller .dpkg-new suffiks). Hvis du er usikker så ikke fjern filen."
+"Fila ble etterlatt på disken av dpkg som en del av dets håndtering av "
+"oppsettsfila. Du kan fjerne den hvis datamaskinen fungerer godt. Du bør "
+"uansett vurdere å sammenligne fila med den faktiske konfigurasjonsfilen "
+"(altså den uten suffikset «.dpkg-old» eller «.dpkg-new»). Ikke fjern filen "
+"hvis du er usikker på om du kan ha bruk for den."
 
 #: ../plugins/fstab_plugin.py:47
 #, python-format
 msgid "The 'relatime' mount option is missing for filesystem mounted at %s"
-msgstr "Alternativet 'relatime' mangler for filsystemet på %s"
+msgstr "Valget «relatime» mangler for filsystemet med monteringspunkt %s"
 
 #: ../plugins/fstab_plugin.py:73
 msgid "The '/dev/scd0' device should be '/dev/cdrom' in fstab."
-msgstr "'/dev/scd0'-enheten bør være '/dev/cdrom' i fstab"
+msgstr "Enheten «/dev/scd0» bør være «/dev/cdrom» i fstab"
 
 #: ../plugins/landscape_stub_plugin.py:44
 msgid "Remove landscape-client stub"
-msgstr "Fjern landscape-client stubb"
+msgstr "Fjern «landscape-client»-stubb"
 
 #: ../plugins/unsupported_plugin.py:38
 msgid ""
@@ -335,6 +349,6 @@
 "may also have been installed from an unofficial archive that is no longer "
 "available. In that case you may want to keep it.)"
 msgstr ""
-"Pakken støttes ikke lenger. Den er ikke i pakkearkivet. (Den kan også ha "
-"blitt installert fra et uoffisielt arkiv som ikke er tilgjengelig lenger. I "
-"så tilfelle vil du kanskje beholde den.)"
+"Pakka støttes ikke lenger. Den er ikke i pakkearkivet. Den kan også ha blitt "
+"installert fra et uoffisielt arkiv som ikke er tilgjengelig lenger. I "
+"sistnevnte tilfelle er det mulig at du bør beholde den."
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/deja-dup.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/deja-dup.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/deja-dup.po	2013-01-29 09:34:08.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/deja-dup.po	2014-01-07 06:37:33.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: deja-dup\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-19 03:35+0000\n"
+"POT-Creation-Date: 2013-04-02 19:33+0000\n"
 "PO-Revision-Date: 2012-08-07 00:04+0000\n"
 "Last-Translator: Roy S <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
@@ -15,12 +15,13 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:49+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:37+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. Translators: "Backup" is a noun
-#: ../data/deja-dup.desktop.in.h:1 ../data/deja-dup-ccpanel.desktop.in.h:1
-#: ../data/deja-dup-preferences.desktop.in.in.h:1 ../deja-dup/Prompt.vala:93
+#: ../data/deja-dup.desktop.in.h:1
+#: ../data/deja-dup-preferences.desktop.in.in.h:1
+#: ../data/gnome-deja-dup-panel.desktop.in.h:1 ../deja-dup/Prompt.vala:93
 #: ../deja-dup/Prompt.vala:128 ../deja-dup/StatusIcon.vala:133
 #: ../deja-dup/StatusIcon.vala:232 ../monitor/monitor.vala:115
 #: ../preferences/preferences-main.vala:52
@@ -33,36 +34,36 @@
 #. context is itself a reference to both the underlying command line tool
 #. "duplicity" and the act of duplicating data for backup.  As a whole, the
 #. phrase "Déjà Dup" may not be very translatable.
-#: ../data/deja-dup.desktop.in.h:2 ../common/CommonUtils.vala:90
-#: ../deja-dup/main.vala:78 ../preferences/Preferences.vala:88
-#, c-format
+#: ../deja-dup/deja-dup.appdata.xml.in.h:1 ../deja-dup/deja-dup.desktop.in.h:2
+#: ../deja-dup/main.vala:78 ../libdeja/CommonUtils.vala:133
 msgid "Déjà Dup Backup Tool"
 msgstr "Déjà Dup verktøy for sikkerhetskopiering"
 
-#: ../data/deja-dup-ccpanel.desktop.in.h:2
-#: ../data/deja-dup-preferences.desktop.in.in.h:2
+#: ../deja-dup/preferences/deja-dup-preferences.desktop.in.h:2
+#: ../deja-dup/preferences/gnome-deja-dup-panel.desktop.in.h:2
 msgid "Change your backup settings"
 msgstr "Endre innstillinger for sikkerhetskopiering"
 
 #. These keywords are used when searching for applications in dashes, etc.
-#: ../data/deja-dup-ccpanel.desktop.in.h:4
-#: ../data/deja-dup-preferences.desktop.in.in.h:4
+#: ../deja-dup/preferences/deja-dup-preferences.desktop.in.h:4
+#: ../deja-dup/preferences/gnome-deja-dup-panel.desktop.in.h:4
 msgid "déjà;deja;dup;"
-msgstr ""
+msgstr "déjà;deja;dup;"
 
-#: ../data/deja-dup-ccpanel.desktop.in.h:5
 #: ../data/deja-dup-preferences.desktop.in.in.h:5
+#: ../data/gnome-deja-dup-panel.desktop.in.h:5
 msgid "Back Up Now"
 msgstr "Sikkerhetskopier nå"
 
 #. Translators: Monitor in this sense means something akin to 'watcher', not
 #. a computer screen.  This program acts like a daemon that kicks off
 #. backups at scheduled times.
-#: ../data/deja-dup-monitor.desktop.in.in.h:1 ../monitor/monitor.vala:328
+#: ../deja-dup/monitor/deja-dup-monitor.desktop.in.h:1
+#: ../deja-dup/monitor/monitor.vala:328
 msgid "Backup Monitor"
 msgstr "Planlegging av sikkerhetskopiering"
 
-#: ../data/deja-dup-monitor.desktop.in.in.h:2
+#: ../deja-dup/monitor/deja-dup-monitor.desktop.in.h:2
 msgid "Schedules backups at regular intervals"
 msgstr "Tar en sikkerhetskopi med jevne mellomrom"
 
@@ -84,7 +85,7 @@
 "disse mappene. Filbaner er relative i forhold til brukerens hjemmemappe."
 
 #: ../data/org.gnome.DejaDup.gschema.xml.in.h:3
-#: ../preferences/Preferences.vala:168
+#: ../deja-dup/preferences/Preferences.vala:202
 msgid "Folders to ignore"
 msgstr "Mapper som skal hoppes over"
 
@@ -103,13 +104,13 @@
 
 #: ../data/org.gnome.DejaDup.gschema.xml.in.h:5
 msgid "Whether the welcome screen has been dismissed"
-msgstr ""
+msgstr "Om velkomstbildet har blitt avvist"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:6
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:5
 msgid "Whether to request the root password"
 msgstr "Om det skal spørres etter root (administrator)-passordet"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:7
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:6
 msgid ""
 "Whether to request the root password when backing up from or restoring to "
 "system folders."
@@ -117,11 +118,11 @@
 "Om det skal spørres om root (administrator)-passordet ved "
 "sikkerhetskopiering fra eller gjenoppretting til systemmapper."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:8
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:7
 msgid "The last time Déjà Dup was run"
 msgstr "Sist gang Déjà Dup ble brukt"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:9
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:8
 msgid ""
 "The last time Déjà Dup was successfully run. This time should be in ISO 8601 "
 "format."
@@ -129,11 +130,11 @@
 "Sist gang Déjà Dup ble kjørt. (Dette tidspunktet skal være angitt i formatet "
 "ISO 8601.)"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:10
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:9
 msgid "The last time Déjà Dup backed up"
 msgstr "Sist Déjà Dup tok en sikkerhetskopi"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:11
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:10
 msgid ""
 "The last time Déjà Dup successfully completed a backup. This time should be "
 "in ISO 8601 format."
@@ -141,11 +142,11 @@
 "Sist gang Déjà Dup gjennomførte en vellykket sikkerhetskopiering. (Dette "
 "tidspunktet skal være angitt i formatet ISO 8601.)"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:12
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:11
 msgid "The last time Déjà Dup restored"
 msgstr "Sist Déjà Dup gjennoprettet en sikkerhetskopi"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:13
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:12
 msgid ""
 "The last time Déjà Dup successfully completed a restore. This time should be "
 "in ISO 8601 format."
@@ -153,19 +154,19 @@
 "Sist gang Déjà Dup gjennomførte en vellykket sikkerhetskopiering. (Dette "
 "tidspunktet skal være angitt i formatet ISO 8601.)"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:14
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:13
 msgid "Whether to periodically back up"
 msgstr "Om det skal tas jevnlige sikkerhetskopier"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:15
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:14
 msgid "Whether to automatically back up on a regular schedule."
 msgstr "Om det skal tas sikkerhetskopier automatisk etter en tidsplan."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:16
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:15
 msgid "How often to periodically back up"
 msgstr "Hvor ofte sikkerhetskopiene skal tas"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:17
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:16
 msgid "The number of days between backups."
 msgstr "Antall dager mellom sikkerthetskopieringer."
 
@@ -174,19 +175,24 @@
 "The first time Déjà Dup checked whether it should prompt about backing up"
 msgstr ""
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:19
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:18
 msgid ""
 "When a user logs in, the Déjà Dup monitor checks whether it should prompt "
 "about backing up. This is used to increase discoverability for users that "
 "don’t know about backups. This time should be either ‘disabled’ to turn off "
 "this check or in ISO 8601 format."
 msgstr ""
+"Når en bruker logger inn, sjekker Déjà Dup-monitoren om den skal spørre ham "
+"eller henne om å ta sikkerhetskopi. Dette er aktivert som standard for å "
+"gjøre det enkelt for nye brukere å lage en plan for sikkerhetskopiering. "
+"Sett tiden til «deaktivert» for å ikke foreta denne sjekken. Ellers skal "
+"tiden være oppgitt i formatet ISO 8601."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:22
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:21
 msgid "How long to keep backup files"
 msgstr "Hvor lenge sikkerhetskopiene skal beholdes"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:23
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:22
 msgid ""
 "The number of days to keep backup files on the backup location. A value of 0 "
 "means forever. This is a minimum number of days; the files may be kept "
@@ -196,11 +202,11 @@
 "de aldri slettes. Dette er det minste antallet dager de forblir lagret, de "
 "kan bli liggende lenger."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:26
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:25
 msgid "Type of location to store backup"
 msgstr "Type plassering for å lagre sikkerhetskopiene"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:27
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:26
 msgid ""
 "The type of backup location. If ‘auto’, a default will be chosen based on "
 "what is available."
@@ -208,19 +214,20 @@
 "Typen plassering for sikkerhetskopiene. Hvis 'auto' er valgt, velges en "
 "standard etter hva som er tilgjengelig."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:28
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:27
 msgid "Amazon S3 Access Key ID"
 msgstr "Amazon S3 Tillgangsnøkkel ID"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:29
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:28
 msgid "Your Amazon S3 Access Key Identifier. This acts as your S3 username."
 msgstr ""
+"Din Amazon S3 Access Key Identifier. Denne fungerer som ditt S3 brukernavn."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:30
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:29
 msgid "The Amazon S3 bucket name to use"
 msgstr "Navn på Amazon S3 bucket"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:31
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:30
 msgid ""
 "Which Amazon S3 bucket to store files in. This does not need to exist "
 "already. Only legal hostname strings are valid."
@@ -228,42 +235,44 @@
 "Hvilken Amazon S3 \"bucket\" sikkerhetskopiene skal oppbevares i. Denne "
 "behøver ikke å eksistere fra før av. Amazon tillater bare gyldige vertsnavn."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:32
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:31
 msgid "The Amazon S3 folder"
 msgstr "Amazon S3 katalog"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:33
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:32
 msgid ""
 "An optional folder name to store files in. This folder will be created in "
 "the chosen bucket."
 msgstr ""
+"Valgfritt mappenavn for lagring av sikkerhetskopierte filer. Mappa blir "
+"opprettet i den valgte bøtta («bucket»)."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:34
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:33
 msgid "The Rackspace Cloud Files container"
-msgstr ""
+msgstr "Rackspace Cloud Files-beholderen"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:35
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:34
 msgid ""
 "Which Rackspace Cloud Files container to store files in. This does not need "
 "to exist already. Only legal hostname strings are valid."
 msgstr ""
-"Hvilken Rackspace Cloud Files \"container\" sikkerhetskopiene skal "
-"oppbevares i. Denne behøver ikke å eksistere fra før av. Rackspace tillater "
-"bare gyldige vertsnavn."
+"Hvilken «container» sikkerhetskopiene skal oppbevares i hos Rackspace. Denne "
+"behøver ikke å eksistere fra før av. Rackspace tillater bare gyldige "
+"vertsnavn."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:36
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:35
 msgid "Your Rackspace username"
-msgstr "Ditt Rackspace-brukernavn."
+msgstr "Brukernavnet ditt hos Rackspace"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:37
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:36
 msgid "This is your username for the Rackspace Cloud Files service."
-msgstr "Dette er ditt brukernavn for tjenesten Rackspace Cloud Files."
+msgstr "Dette er brukernavnet ditt for tjenesten Rackspace skyfiler."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:38
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:37
 msgid "The Ubuntu One folder"
 msgstr "Ubuntu One-mappen"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:39
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:38
 msgid ""
 "The folder name to store files in. If ‘$HOSTNAME’, it will default to a "
 "folder based on the name of the computer."
@@ -271,31 +280,31 @@
 "Mappenavnet filene blir lagret i. Bruk ‘$HOSTNAME’, for å automatisk lage et "
 "mappenavn basert på navnet på datamaskinen."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:40
-#: ../deja-dup/AssistantRestore.vala:221 ../preferences/Preferences.vala:151
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:39
+#: ../deja-dup/AssistantRestore.vala:221
 msgid "Backup location"
 msgstr "Plassering av sikkerhetskopi"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:41
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:40
 msgid "Location in which to hold the backup files."
 msgstr "Plasseringen hvor sikkerhetskopiene skal lagres."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:42
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:41
 msgid "Folder type"
 msgstr "Mappetype"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:43
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:42
 msgid ""
 "Whether the backup location is a mounted external volume or a normal folder."
 msgstr ""
 "Om sikkerhetskopien ligger på et montert eksternt volum eller en normal "
 "mappe."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:44
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:43
 msgid "Relative path under the external volume"
 msgstr "Relativ bane i det eksterne volumet"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:45
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:44
 msgid ""
 "If the backup location is on an external volume, this is the path of the "
 "folder on that volume."
@@ -303,11 +312,11 @@
 "Hvis plasseringen til sikkerhetskopien er på et eksternt volum, er dette "
 "banen til mappen på det volumet."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:46
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:45
 msgid "Unique ID of the external volume"
 msgstr "Det eksterne volumets unike ID"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:47
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:46
 msgid ""
 "If the backup location is on an external volume, this is its unique "
 "filesystem identifier."
@@ -315,11 +324,11 @@
 "Hvis sikkerhetskopien skal plasseres på et eksternt volum, er dette volumets "
 "unike identitet."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:48
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:47
 msgid "Full name of the external volume"
 msgstr "Det eksterne volumets fulle navn"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:49
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:48
 msgid ""
 "If the backup location is on an external volume, this is the volume’s longer "
 "descriptive name."
@@ -327,11 +336,11 @@
 "Hvis plasseringen til sikkerhetskopien er på et eksternt volum, er dette "
 "volumets lange, beskrivende navn."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:50
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:49
 msgid "Short name of the external volume"
 msgstr "Kortnavn for det eksterne volumet"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:51
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:50
 msgid ""
 "If the backup location is on an external volume, this is the volume’s "
 "shorter name."
@@ -339,44 +348,45 @@
 "Hvis plasseringen til sikkerhetskopien er på et eksternt volum, er dette "
 "volumets kortere navn."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:52
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:51
 msgid "Icon of the external volume"
 msgstr "Det eksterne volumets ikon"
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:53
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:52
 msgid ""
 "If the backup location is on an external volume, this is the volume’s icon."
 msgstr ""
 "Hvis plasseringen til sikkerhetskopien er på et eksternt volum, er dette "
 "ikonet til volumet."
 
-#: ../data/org.gnome.DejaDup.gschema.xml.in.h:55
+#: ../data/org.gnome.DejaDup.gschema.xml.in.h:51
 msgid "Obsolete"
 msgstr "Overflødig"
 
-#: ../data/ui/restore-missing.ui.h:1
+#: ../deja-dup/ui/restore-missing.ui.h:1
 msgid "Folder"
 msgstr "Mappe"
 
-#: ../data/ui/restore-missing.ui.h:2 ../deja-dup/AssistantOperation.vala:178
+#: ../deja-dup/ui/restore-missing.ui.h:2
+#: ../deja-dup/AssistantOperation.vala:177
 msgid "Scanning…"
 msgstr "Leser …"
 
-#: ../nautilus/NautilusExtension.c:174
+#: ../deja-dup/nautilus/NautilusExtension.c:173
 msgid "Restore Missing Files…"
 msgstr "Gjenopprett manglende filer…"
 
-#: ../nautilus/NautilusExtension.c:175
+#: ../deja-dup/nautilus/NautilusExtension.c:174
 msgid "Restore deleted files from backup"
 msgstr "Gjenopprett slettede filer fra en sikkerhetskopi"
 
-#: ../nautilus/NautilusExtension.c:217
+#: ../deja-dup/nautilus/NautilusExtension.c:216
 msgid "Revert to Previous Version…"
 msgid_plural "Revert to Previous Versions…"
 msgstr[0] "Tilbakestill til en tidligere versjon…"
 msgstr[1] "Tilbakestill til tidligere versjoner…"
 
-#: ../nautilus/NautilusExtension.c:221
+#: ../deja-dup/nautilus/NautilusExtension.c:220
 msgid "Restore file from backup"
 msgid_plural "Restore files from backup"
 msgstr[0] "Gjenopprett fil fra sikkerhetskopi"
@@ -384,139 +394,141 @@
 
 #. Translators: %2$s is the name of a removable drive, %1$s is a folder
 #. on that removable drive.
-#: ../common/BackendFile.vala:135 ../common/CommonUtils.vala:421
+#: ../libdeja/BackendFile.vala:135 ../libdeja/CommonUtils.vala:513
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 
-#: ../common/BackendFile.vala:168
+#: ../libdeja/BackendFile.vala:168
 #, c-format
 msgid "Backup will begin when %s becomes connected."
 msgstr "Sikkerhetskopieringen vil starte når %s kobles til."
 
-#: ../common/BackendFile.vala:175 ../common/BackendRackspace.vala:49
-#: ../common/BackendS3.vala:59 ../common/BackendU1.vala:150
+#: ../libdeja/BackendFile.vala:175 ../libdeja/BackendRackspace.vala:49
+#: ../libdeja/BackendS3.vala:59 ../libdeja/BackendU1.vala:150
 msgid "Backup will begin when a network connection becomes available."
 msgstr ""
 "Sikkerhetskopieringen vil starte når systemet blir koblet til Internett."
 
-#: ../common/BackendFile.vala:384 ../common/BackendFile.vala:448
+#: ../libdeja/BackendFile.vala:384 ../libdeja/BackendFile.vala:448
 msgid "Backup location not available"
 msgstr "Plasseringen for sikkerhetskopien er ikke tilgjengelig"
 
-#: ../common/BackendFile.vala:385
+#: ../libdeja/BackendFile.vala:385
 msgid "Waiting for a network connection…"
 msgstr "Venter på en nettverkstilkobling …"
 
-#: ../common/BackendFile.vala:448
+#: ../libdeja/BackendFile.vala:448
 #, c-format
 msgid "Waiting for ‘%s’ to become connected…"
 msgstr "Venter på at ‘%s’ blir koblet til…"
 
-#: ../common/BackendRackspace.vala:69 ../widgets/ConfigLocation.vala:194
+#: ../deja-dup/widgets/ConfigLocation.vala:194
+#: ../libdeja/BackendRackspace.vala:69
 msgid "Rackspace Cloud Files"
-msgstr ""
+msgstr "Rackspace skyfiler"
 
 #. Translators: %s is a folder.
-#: ../common/BackendRackspace.vala:72
+#: ../libdeja/BackendRackspace.vala:72
 #, c-format
 msgid "%s on Rackspace Cloud Files"
-msgstr ""
+msgstr "%s i Rackspace skyfiler"
 
-#: ../common/BackendRackspace.vala:115 ../common/BackendS3.vala:168
+#: ../libdeja/BackendRackspace.vala:115 ../libdeja/BackendS3.vala:168
 msgid "Permission denied"
 msgstr "Ikke tilgang"
 
-#: ../common/BackendRackspace.vala:146
+#: ../libdeja/BackendRackspace.vala:146
 #, c-format
 msgid ""
 "You can sign up for a Rackspace Cloud Files account <a "
 "href=\"%s\">online</a>."
 msgstr ""
+"Du kan registrere en Rackspace skyfil-konto <a href=\"%s\">på nett</a>."
 
-#: ../common/BackendRackspace.vala:147
+#: ../libdeja/BackendRackspace.vala:147
 msgid "Connect to Rackspace Cloud Files"
-msgstr ""
+msgstr "Koble til Rackspace skyfiler"
 
-#: ../common/BackendRackspace.vala:148
+#: ../libdeja/BackendRackspace.vala:148
 msgid "_API access key"
-msgstr ""
+msgstr "_API-tilgangsnøkkel"
 
-#: ../common/BackendRackspace.vala:149
+#: ../libdeja/BackendRackspace.vala:149
 msgid "S_how API access key"
-msgstr ""
+msgstr "V_is API-tilgangsnøkkel"
 
-#: ../common/BackendRackspace.vala:150
+#: ../libdeja/BackendRackspace.vala:150
 msgid "_Remember API access key"
-msgstr ""
+msgstr "_Husk API-tilgangsnøkkel"
 
-#: ../common/BackendS3.vala:122 ../widgets/ConfigLocation.vala:176
+#: ../deja-dup/widgets/ConfigLocation.vala:176 ../libdeja/BackendS3.vala:122
 msgid "Amazon S3"
 msgstr "Amazon S3"
 
 #. Translators: %s is a folder.
-#: ../common/BackendS3.vala:125
+#: ../libdeja/BackendS3.vala:125
 #, c-format
 msgid "%s on Amazon S3"
 msgstr "%s på Amazon S3"
 
-#: ../common/BackendS3.vala:199
+#: ../libdeja/BackendS3.vala:199
 #, c-format
 msgid "You can sign up for an Amazon S3 account <a href=\"%s\">online</a>."
 msgstr ""
 "Du kan registrere en Amazon S3-konto <a href=\"%s\">på Internett</a>."
 
-#: ../common/BackendS3.vala:200
+#: ../libdeja/BackendS3.vala:200
 msgid "Connect to Amazon S3"
 msgstr "Koble til Amazon S3"
 
-#: ../common/BackendS3.vala:201
+#: ../libdeja/BackendS3.vala:201
 msgid "_Access key ID"
-msgstr ""
+msgstr "_ID for tilgangsnøkkel"
 
-#: ../common/BackendS3.vala:202
+#: ../libdeja/BackendS3.vala:202
 msgid "_Secret access key"
-msgstr ""
+msgstr "_Hemmelig tilgangsnøkkel"
 
-#: ../common/BackendS3.vala:203
+#: ../libdeja/BackendS3.vala:203
 msgid "S_how secret access key"
-msgstr ""
+msgstr "V_is hemmelig tilgangsnøkkel"
 
-#: ../common/BackendS3.vala:204
+#: ../libdeja/BackendS3.vala:204
 msgid "_Remember secret access key"
-msgstr ""
+msgstr "_Husk hemmelig tilgangsnøkkel"
 
-#: ../common/BackendU1.vala:170 ../widgets/ConfigLocation.vala:186
+#: ../deja-dup/widgets/ConfigLocation.vala:186 ../libdeja/BackendU1.vala:170
 msgid "Ubuntu One"
 msgstr "Ubuntu One"
 
 #. Translators: %s is a folder.
-#: ../common/BackendU1.vala:173
+#: ../libdeja/BackendU1.vala:173
 #, c-format
 msgid "%s on Ubuntu One"
 msgstr "%s på Ubuntu One"
 
-#: ../common/BackendU1.vala:259
+#: ../libdeja/BackendU1.vala:259
 msgid "Connect to Ubuntu One"
 msgstr "Koble til Ubuntu One"
 
-#: ../common/BackendU1.vala:260
+#: ../libdeja/BackendU1.vala:260
 msgid "Sign into Ubuntu One…"
 msgstr "Logg inn på Ubuntu One…"
 
 #. Translators: this is the home folder and %s is the user's username
-#: ../common/CommonUtils.vala:472
+#: ../libdeja/CommonUtils.vala:564
 #, c-format
 msgid "Home (%s)"
 msgstr "Hjemmemappe (%s)"
 
 #. Translators: this is the home folder
-#: ../common/CommonUtils.vala:477
+#: ../libdeja/CommonUtils.vala:569
 msgid "Home"
 msgstr "Hjemmemappe"
 
 #. Translators: this is the trash folder
-#: ../common/CommonUtils.vala:482
+#: ../libdeja/CommonUtils.vala:574
 msgid "Trash"
 msgstr "Søppel"
 
@@ -552,7 +564,7 @@
 msgid "Duplicity’s version is too old"
 msgstr "Den installerte versjonen av Duplicity er for gammel"
 
-#: ../tools/duplicity/DuplicityPlugin.vala:64
+#: ../libdeja/tools/duplicity/DuplicityPlugin.vala:50
 #, c-format
 msgid ""
 "Déjà Dup Backup Tool requires at least version %d.%d.%.2d of duplicity, but "
@@ -561,21 +573,21 @@
 "Déjà Dup Verktøy for sikkerhetskopiering trenger versjon %d.%d.%.2d eller "
 "nyere av duplicity, men fant bare versjon %d.%d.%.2d"
 
-#: ../tools/duplicity/DuplicityJob.vala:90
-#: ../tools/duplicity/DuplicityJob.vala:187
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:89
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:172
 msgid "Paused (no network)"
 msgstr "Pauset (ingen nettverkstilkobling)"
 
-#: ../common/Operation.vala:69 ../common/Operation.vala:103
-#: ../tools/duplicity/DuplicityJob.vala:400
-#: ../tools/duplicity/DuplicityJob.vala:407
-#: ../tools/duplicity/DuplicityJob.vala:426
-#: ../tools/duplicity/DuplicityJob.vala:431
+#: ../libdeja/Operation.vala:69 ../libdeja/Operation.vala:103
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:385
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:392
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:411
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:416
 msgid "Preparing…"
 msgstr "Forbereder…"
 
 #. Was not even a file path (maybe something goofy like computer://)
-#: ../tools/duplicity/DuplicityJob.vala:458
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:443
 #, c-format
 msgid "Could not restore ‘%s’: Not a valid file location"
 msgstr ""
@@ -583,25 +595,25 @@
 "filplassering"
 
 #. Tiny backup location.  Suggest they get a larger one.
-#: ../tools/duplicity/DuplicityJob.vala:525
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:510
 msgid "Backup location is too small.  Try using one with more space."
 msgstr ""
 "Plasseringen for sikkerhetskopien er for liten. Prøv å bruke en med mer "
 "lagringsplass."
 
-#: ../tools/duplicity/DuplicityJob.vala:548
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:533
 msgid "Backup location does not have enough free space."
 msgstr "Plasseringen for sikkerhetskopien har ikke nok ledig lagringsplass."
 
-#: ../tools/duplicity/DuplicityJob.vala:568
-#: ../tools/duplicity/DuplicityJob.vala:582
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:553
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:567
 msgid "Cleaning up…"
 msgstr "Rydder opp …"
 
 #. OK, we succeeded yay!  But some files didn't make it into the backup
 #. because we couldn't read them.  So tell the user so they don't think
 #. everything is hunky dory.
-#: ../tools/duplicity/DuplicityJob.vala:678
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:663
 msgid ""
 "Could not back up the following files.  Please make sure you are able to "
 "open them."
@@ -612,7 +624,7 @@
 #. OK, we succeeded yay!  But some files didn't actually restore
 #. because we couldn't write to them.  So tell the user so they
 #. don't think everything is hunky dory.
-#: ../tools/duplicity/DuplicityJob.vala:694
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:679
 msgid ""
 "Could not restore the following files.  Please make sure you are able to "
 "write to them."
@@ -620,13 +632,22 @@
 "Klarte ikke gjenopprette de følgende filene. Sørg for at du kan skrive til "
 "dem."
 
-#: ../deja-dup/AssistantOperation.vala:601
-#: ../tools/duplicity/DuplicityJob.vala:711
-#: ../tools/duplicity/DuplicityJob.vala:1093
+#. For most, don't do anything special.  Show generic 'unknown error'
+#. message, but provide the exception text for better bug reports.
+#. Plus, sometimes it may clue the user in to what's wrong.
+#. But first, try to restart without a cache, since that seems to quite
+#. frequently fix odd metadata errors with duplicity.  If we hit an error
+#. a second time, we'll show the unknown error message.
+#: ../deja-dup/AssistantOperation.vala:594
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:696
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1075
 msgid "Failed with an unknown error."
 msgstr "Feilet av ukjent årsak."
 
-#: ../tools/duplicity/DuplicityJob.vala:941
+#. make text a little nicer than duplicity gives
+#. duplicity gives something like "home/blah/blah not found in archive,
+#. no files restored".
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:923
 #, c-format
 msgid "Could not restore ‘%s’: File not found in backup"
 msgstr "Kunne ikke gjenopprette ‘%s’: Filen finnes ikke i sikkerhetskopien"
@@ -634,17 +655,17 @@
 #. notify upper layers, if they want to do anything
 #. Duplicity tried to ask the user what the encryption password is.
 #. notify upper layers, if they want to do anything
-#: ../tools/duplicity/DuplicityJob.vala:947
-#: ../tools/duplicity/DuplicityJob.vala:1045
-#: ../tools/duplicity/DuplicityJob.vala:1049
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:929
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1027
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1031
 msgid "Bad encryption password."
 msgstr "Feil passord for kryptering."
 
-#: ../tools/duplicity/DuplicityJob.vala:952
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:934
 msgid "Computer name changed"
 msgstr "Navnet på datamaskinen er forandret"
 
-#: ../tools/duplicity/DuplicityJob.vala:952
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:934
 #, c-format
 msgid ""
 "The existing backup is of a computer named %s, but the current computer’s "
@@ -655,93 +676,95 @@
 "navnet til denne datamaskinen er %s.  Hvis dette er uventet, bør du gå "
 "tilbake og velge en annen plassering."
 
-#: ../tools/duplicity/DuplicityJob.vala:987
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:969
 #, c-format
 msgid "Permission denied when trying to create ‘%s’."
 msgstr "Forsøkte å lage ‘%s’, men ble nektet tilgang."
 
 #. assume error is on backend side
-#: ../tools/duplicity/DuplicityJob.vala:991
-#: ../tools/duplicity/DuplicityJob.vala:995
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:973
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:977
 #, c-format
 msgid "Permission denied when trying to read ‘%s’."
 msgstr "Forsøkte å lese ‘%s’, men ble nektet tilgang."
 
-#: ../tools/duplicity/DuplicityJob.vala:999
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:981
 #, c-format
 msgid "Permission denied when trying to delete ‘%s’."
 msgstr "Forsøkte å slette ‘%s’, men ble nektet tilgang."
 
-#: ../tools/duplicity/DuplicityJob.vala:1006
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:988
 #, c-format
 msgid "Backup location ‘%s’ does not exist."
 msgstr "Plasseringen ‘%s’ finnes ikke."
 
-#: ../tools/duplicity/DuplicityJob.vala:1012
-#: ../tools/duplicity/DuplicityJob.vala:1064
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:994
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1046
 msgid "No space left."
 msgstr "Tom for lagringsplass."
 
-#: ../tools/duplicity/DuplicityJob.vala:1026
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1008
 msgid "Invalid ID."
 msgstr "Feil ID."
 
-#: ../tools/duplicity/DuplicityJob.vala:1028
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1010
 msgid "Invalid secret key."
 msgstr "Feil hemmelig nøkkel."
 
-#: ../tools/duplicity/DuplicityJob.vala:1030
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1012
 msgid "Your Amazon Web Services account is not signed up for the S3 service."
 msgstr ""
+"Kontoen din hos Amazon Web Services er ikke registrert for bruk av S3-"
+"tjenesten."
 
-#: ../tools/duplicity/DuplicityJob.vala:1039
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1021
 msgid "S3 bucket name is not available."
 msgstr "S3 bucket-navn er ikke tilgjengelig"
 
-#: ../tools/duplicity/DuplicityJob.vala:1053
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1035
 #, c-format
 msgid "Error reading file ‘%s’."
 msgstr "Klarte ikke å lese filen ‘%s’."
 
-#: ../tools/duplicity/DuplicityJob.vala:1055
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1037
 #, c-format
 msgid "Error writing file ‘%s’."
 msgstr "Klarte ikke å skrive filen ‘%s’."
 
-#: ../tools/duplicity/DuplicityJob.vala:1066
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1048
 #, c-format
 msgid "No space left in ‘%s’."
 msgstr "‘%s’ er tom for lagringsplass."
 
-#: ../tools/duplicity/DuplicityJob.vala:1074
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1056
 msgid "No backup files found"
 msgstr "Ingen sikkerhetskopier ble funnet"
 
-#: ../tools/duplicity/DuplicityJob.vala:1124
+#: ../libdeja/tools/duplicity/DuplicityJob.vala:1106
 msgid "Uploading…"
 msgstr "Laster opp…"
 
-#: ../common/OperationRestore.vala:51
+#: ../libdeja/OperationRestore.vala:51
 msgid "Restoring files…"
 msgstr "Gjenoppretter filer…"
 
-#: ../common/Operation.vala:61
+#: ../libdeja/Operation.vala:61
 msgid "Backing up…"
 msgstr "Sikkerhetskopierer …"
 
-#: ../common/Operation.vala:63 ../deja-dup/AssistantRestore.vala:484
+#: ../deja-dup/AssistantRestore.vala:484 ../libdeja/Operation.vala:63
 msgid "Restoring…"
 msgstr "Gjenoppretter…"
 
-#: ../common/Operation.vala:65
+#: ../libdeja/Operation.vala:65
 msgid "Checking for backups…"
 msgstr "Ser etter sikkerhetskopier…"
 
-#: ../common/Operation.vala:67
+#: ../libdeja/Operation.vala:67
 msgid "Listing files…"
 msgstr "Lister filer…"
 
-#: ../common/Operation.vala:295
+#: ../libdeja/Operation.vala:296
 msgid "Another backup operation is already running"
 msgstr "En annen sikkerhetskopiering pågår"
 
@@ -764,8 +787,8 @@
 "Creating a fresh backup to protect against backup corruption.  This will "
 "take longer than normal."
 msgstr ""
-"Lager en fullstendig sikkerhetskopi for å unngå problemer med en korrupt "
-"kopi. Dette vil ta lenger tid enn normalt."
+"Lager en ny fullstendig sikkerhetskopi for å unngå problemer med korrupte "
+"data. Dette vil ta lengre tid enn normalt."
 
 #. Translators:  This is the phrase 'Backing up' in the larger phrase
 #. "Backing up '%s'".  %s is a filename.
@@ -785,24 +808,23 @@
 msgid "Backing Up…"
 msgstr "Sikkerhetskopierer …"
 
-#: ../deja-dup/AssistantOperation.vala:177
+#: ../deja-dup/AssistantOperation.vala:176
 msgid "Scanning:"
 msgstr "Leser:"
 
-#: ../deja-dup/AssistantOperation.vala:259
+#: ../deja-dup/AssistantOperation.vala:258
 msgid "_Details"
 msgstr "_Detaljer"
 
-#: ../deja-dup/AssistantOperation.vala:307
+#: ../deja-dup/AssistantOperation.vala:306
 msgid "_Allow restoring without a password"
 msgstr "_Tillat gjenoppretting uten passord"
 
-#: ../deja-dup/AssistantOperation.vala:313
+#: ../deja-dup/AssistantOperation.vala:312
 msgid "_Password-protect your backup"
 msgstr "Passordbeskytt sikkerhetskopien"
 
-#: ../deja-dup/AssistantOperation.vala:327
-#, c-format
+#: ../deja-dup/AssistantOperation.vala:324
 msgid ""
 "You will need your password to restore your files. You might want to write "
 "it down."
@@ -810,38 +832,38 @@
 "Du kommer til å trenge passordet for å gjenopprette filene. Det er lurt å "
 "skrive det ned."
 
-#: ../deja-dup/AssistantOperation.vala:342
-#: ../deja-dup/AssistantOperation.vala:413
+#: ../deja-dup/AssistantOperation.vala:339
+#: ../deja-dup/AssistantOperation.vala:408
 msgid "E_ncryption password"
 msgstr "Kr_ypteringspassord"
 
-#: ../deja-dup/AssistantOperation.vala:359
+#: ../deja-dup/AssistantOperation.vala:356
 msgid "Confir_m password"
 msgstr "_Bekreft passord"
 
-#: ../deja-dup/AssistantOperation.vala:372
-#: ../deja-dup/AssistantOperation.vala:422
+#: ../deja-dup/AssistantOperation.vala:369
+#: ../deja-dup/AssistantOperation.vala:417
 msgid "_Show password"
 msgstr "Vi_s passord"
 
-#: ../deja-dup/AssistantOperation.vala:381
+#: ../deja-dup/AssistantOperation.vala:376
 #: ../deja-dup/MountOperationAssistant.vala:40
 msgid "_Remember password"
 msgstr "Husk passo_rd"
 
-#: ../deja-dup/AssistantOperation.vala:503
+#: ../deja-dup/AssistantOperation.vala:496
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: ../deja-dup/AssistantOperation.vala:798
+#: ../deja-dup/AssistantOperation.vala:791
 msgid "Require Password?"
 msgstr "Krev passord?"
 
-#: ../deja-dup/AssistantOperation.vala:800
+#: ../deja-dup/AssistantOperation.vala:793
 msgid "Encryption Password Needed"
 msgstr "Trenger et krypteringspassord"
 
-#: ../deja-dup/AssistantOperation.vala:872
+#: ../deja-dup/AssistantOperation.vala:865
 msgid "Backup encryption password"
 msgstr "Krypteringspassord for sikkerhetskopieringen"
 
@@ -853,7 +875,7 @@
 msgid "_Restore"
 msgstr "_Gjenopprett"
 
-#: ../deja-dup/AssistantRestore.vala:91 ../preferences/Preferences.vala:262
+#: ../deja-dup/AssistantRestore.vala:91
 msgid "_Backup location"
 msgstr "_Plassering av sikkerhetskopi"
 
@@ -916,6 +938,7 @@
 msgid "%x %X"
 msgstr "%x %X"
 
+#. If we didn't see any dates...  Must not be any backups on the backend
 #: ../deja-dup/AssistantRestore.vala:361
 msgid "No backups to restore"
 msgstr "Ingen sikkerhetskopier å gjenopprette"
@@ -938,6 +961,7 @@
 msgid "Restore Finished"
 msgstr "Gjenoppretting er ferdig"
 
+#. if it *is* visible, a header will be set already
 #: ../deja-dup/AssistantRestore.vala:474
 msgid "Your files were successfully restored."
 msgstr "Filene dine er gjenopprettet."
@@ -960,46 +984,47 @@
 msgid "Restore which Files?"
 msgstr "Hvilke filer skal gjenopprettes?"
 
+#. Hours
 #: ../deja-dup/AssistantRestoreMissing.vala:346
 msgid "Scanning for files from up to a day ago…"
-msgstr ""
+msgstr "Søker etter filer som er opp til en dag gamle…"
 
 #: ../deja-dup/AssistantRestoreMissing.vala:349
 msgid "Scanning for files from up to a week ago…"
-msgstr ""
+msgstr "Søker etter filer som er opp til ei uke gamle…"
 
 #: ../deja-dup/AssistantRestoreMissing.vala:352
 msgid "Scanning for files from up to a month ago…"
-msgstr ""
+msgstr "Søker etter filer som er opptil én måned gamle…"
 
 #: ../deja-dup/AssistantRestoreMissing.vala:357
 #, c-format
 msgid "Scanning for files from about a month ago…"
 msgid_plural "Scanning for files from about %d months ago…"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Søker etter filer som er opp til én måned gamle…"
+msgstr[1] "Søker etter filer som er opp til %d måneder gamle…"
 
 #: ../deja-dup/AssistantRestoreMissing.vala:364
 #, c-format
 msgid "Scanning for files from about a year ago…"
 msgid_plural "Scanning for files from about %d years ago…"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Søker etter filer som er omtrent ett år gamle…"
+msgstr[1] "Søker etter filer som er omtrent %d år gamle…"
 
 #: ../deja-dup/AssistantRestoreMissing.vala:454
 msgid "Scanning finished"
 msgstr "Søket er ferdig"
 
-#: ../deja-dup/Assistant.vala:316
+#: ../deja-dup/Assistant.vala:317
 msgid "Co_ntinue"
 msgstr "Fo_rtsett"
 
-#: ../deja-dup/Assistant.vala:359 ../deja-dup/StatusIcon.vala:93
+#: ../deja-dup/Assistant.vala:360 ../deja-dup/StatusIcon.vala:93
 msgid "_Resume Later"
 msgstr "Fortsett _senere"
 
-#: ../deja-dup/main.vala:34 ../monitor/monitor.vala:36
-#: ../preferences/preferences-main.vala:26
+#: ../deja-dup/main.vala:34 ../deja-dup/monitor/monitor.vala:36
+#: ../deja-dup/preferences/preferences-main.vala:87
 msgid "Show version"
 msgstr "Vis versjon"
 
@@ -1059,9 +1084,11 @@
 msgstr "Koble til tjener"
 
 #: ../deja-dup/MountOperationAssistant.vala:37
-#: ../widgets/ConfigLocationDAV.vala:49 ../widgets/ConfigLocationFTP.vala:45
-#: ../widgets/ConfigLocationRackspace.vala:31
-#: ../widgets/ConfigLocationSMB.vala:37 ../widgets/ConfigLocationSSH.vala:40
+#: ../deja-dup/widgets/ConfigLocationDAV.vala:49
+#: ../deja-dup/widgets/ConfigLocationFTP.vala:45
+#: ../deja-dup/widgets/ConfigLocationRackspace.vala:31
+#: ../deja-dup/widgets/ConfigLocationSMB.vala:37
+#: ../deja-dup/widgets/ConfigLocationSSH.vala:40
 msgid "_Username"
 msgstr "Br_ukernavn"
 
@@ -1156,7 +1183,7 @@
 msgid "Show _Progress"
 msgstr "Vis _fremgang"
 
-#: ../monitor/monitor.vala:159
+#: ../deja-dup/monitor/monitor.vala:159
 msgid "Scheduled backup delayed"
 msgstr "Planlagt sikkerhetskopiering utsatt"
 
@@ -1182,7 +1209,7 @@
 msgid "Next automatic backup"
 msgstr "Neste automatiske sikkerhetskopiering"
 
-#: ../preferences/Preferences.vala:224
+#: ../deja-dup/preferences/Preferences.vala:129
 msgid "_Restore…"
 msgstr "_Gjenopprett …"
 
@@ -1190,7 +1217,7 @@
 msgid "Back Up _Now"
 msgstr "Ta sikkerhetskopi _nå"
 
-#: ../preferences/Preferences.vala:252
+#: ../deja-dup/preferences/Preferences.vala:180
 msgid "Overview"
 msgstr "Oversikt"
 
@@ -1224,7 +1251,7 @@
 msgid "Schedule"
 msgstr "Tidsplan"
 
-#: ../preferences/Preferences.vala:365
+#: ../deja-dup/preferences/Preferences.vala:77
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -1240,19 +1267,19 @@
 msgid "At least three months"
 msgstr "Minst tre måneder"
 
-#: ../widgets/ConfigDelete.vala:40
+#: ../deja-dup/widgets/ConfigDelete.vala:40
 msgid "At least six months"
 msgstr "Minst seks måneder"
 
-#: ../widgets/ConfigDelete.vala:41
+#: ../deja-dup/widgets/ConfigDelete.vala:41
 msgid "At least a year"
 msgstr "Minst ett år"
 
-#: ../widgets/ConfigDelete.vala:42
+#: ../deja-dup/widgets/ConfigDelete.vala:42
 msgid "Forever"
 msgstr "For alltid"
 
-#: ../widgets/ConfigDelete.vala:89
+#: ../deja-dup/widgets/ConfigDelete.vala:89
 #, c-format
 msgid "At least %d day"
 msgid_plural "At least %d days"
@@ -1360,93 +1387,102 @@
 "Gamle sikkerhetskopier vil bli behold minst %d dager, eller til det er lite "
 "tilgjengelig lagringsplass."
 
-#: ../widgets/ConfigList.vala:179
+#: ../deja-dup/widgets/ConfigList.vala:178
+#: ../deja-dup/widgets/ConfigList.vala:256
 msgid "_Add"
 msgstr "_Legg til"
 
-#: ../widgets/ConfigList.vala:180
+#: ../deja-dup/widgets/ConfigList.vala:179
 msgid "Add"
 msgstr "Legg til"
 
-#: ../widgets/ConfigList.vala:188
+#: ../deja-dup/widgets/ConfigList.vala:187
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../widgets/ConfigList.vala:189
+#: ../deja-dup/widgets/ConfigList.vala:188
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../widgets/ConfigList.vala:275
+#: ../deja-dup/widgets/ConfigList.vala:252
 msgid "Choose folders"
 msgstr "Velg mapper"
 
-#: ../widgets/ConfigLocation.vala:118
+#. Now insert remote servers
+#: ../deja-dup/widgets/ConfigLocation.vala:118
 msgid "SSH"
 msgstr "SSH"
 
-#: ../widgets/ConfigLocation.vala:120
+#: ../deja-dup/widgets/ConfigLocation.vala:120
 msgid "Windows Share"
 msgstr "Delt mappe i Windows"
 
-#: ../widgets/ConfigLocation.vala:122
+#: ../deja-dup/widgets/ConfigLocation.vala:122
 msgid "FTP"
 msgstr "FTP"
 
-#: ../widgets/ConfigLocation.vala:124
+#: ../deja-dup/widgets/ConfigLocation.vala:124
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../widgets/ConfigLocation.vala:127
+#: ../deja-dup/widgets/ConfigLocation.vala:127
 msgid "Custom Location"
 msgstr "Egendefinert plassering"
 
 #. And a local folder option
-#: ../widgets/ConfigLocation.vala:133
+#: ../deja-dup/widgets/ConfigLocation.vala:133
 msgid "Local Folder"
 msgstr "Lokal mappe"
 
-#: ../widgets/ConfigLocationCustom.vala:33
+#: ../deja-dup/widgets/ConfigLocationCustom.vala:34
 msgid "_URI"
 msgstr "_URI"
 
-#: ../widgets/ConfigLocationDAV.vala:31 ../widgets/ConfigLocationFTP.vala:32
-#: ../widgets/ConfigLocationSMB.vala:31 ../widgets/ConfigLocationSSH.vala:31
+#: ../deja-dup/widgets/ConfigLocationDAV.vala:31
+#: ../deja-dup/widgets/ConfigLocationFTP.vala:32
+#: ../deja-dup/widgets/ConfigLocationSMB.vala:31
+#: ../deja-dup/widgets/ConfigLocationSSH.vala:31
 msgid "_Server"
 msgstr "_Server"
 
-#: ../widgets/ConfigLocationDAV.vala:38
+#: ../deja-dup/widgets/ConfigLocationDAV.vala:38
 msgid "Use secure connection (_HTTPS)"
 msgstr "Bruke sikker tilkobling (_HTTPS)"
 
-#: ../widgets/ConfigLocationDAV.vala:43 ../widgets/ConfigLocationFTP.vala:35
-#: ../widgets/ConfigLocationSSH.vala:34
+#: ../deja-dup/widgets/ConfigLocationDAV.vala:43
+#: ../deja-dup/widgets/ConfigLocationFTP.vala:35
+#: ../deja-dup/widgets/ConfigLocationSSH.vala:34
 msgid "_Port"
 msgstr "_Port"
 
-#: ../widgets/ConfigLocationDAV.vala:46 ../widgets/ConfigLocationFTP.vala:38
-#: ../widgets/ConfigLocationFile.vala:45 ../widgets/ConfigLocationS3.vala:33
-#: ../widgets/ConfigLocationSMB.vala:34 ../widgets/ConfigLocationSSH.vala:37
-#: ../widgets/ConfigLocationU1.vala:33 ../widgets/ConfigLocationVolume.vala:33
+#: ../deja-dup/widgets/ConfigLocationDAV.vala:46
+#: ../deja-dup/widgets/ConfigLocationFTP.vala:38
+#: ../deja-dup/widgets/ConfigLocationFile.vala:45
+#: ../deja-dup/widgets/ConfigLocationS3.vala:33
+#: ../deja-dup/widgets/ConfigLocationSMB.vala:34
+#: ../deja-dup/widgets/ConfigLocationSSH.vala:37
+#: ../deja-dup/widgets/ConfigLocationU1.vala:33
+#: ../deja-dup/widgets/ConfigLocationVolume.vala:33
 msgid "_Folder"
 msgstr "_Mappe"
 
-#: ../widgets/ConfigLocationFile.vala:39
+#: ../deja-dup/widgets/ConfigLocationFile.vala:39
 msgid "_Choose Folder…"
 msgstr "_Velg mappe …"
 
-#: ../widgets/ConfigLocationFile.vala:50
+#: ../deja-dup/widgets/ConfigLocationFile.vala:50
 msgid "Choose Folder"
 msgstr "Velg mappe"
 
-#: ../widgets/ConfigLocationRackspace.vala:33
+#: ../deja-dup/widgets/ConfigLocationRackspace.vala:33
 msgid "_Container"
-msgstr ""
+msgstr "_Beholder"
 
-#: ../widgets/ConfigLocationS3.vala:31
+#: ../deja-dup/widgets/ConfigLocationS3.vala:31
 msgid "S3 Access Key I_D"
-msgstr ""
+msgstr "S3 tilgangsnøkkel-ID"
 
-#: ../widgets/ConfigLocationSMB.vala:40
+#: ../deja-dup/widgets/ConfigLocationSMB.vala:40
 msgid "_Domain Name"
 msgstr "_Domenenavn"
 
@@ -1473,7 +1509,7 @@
 msgstr[0] "Hver %d. dag"
 msgstr[1] "Hver %d. dag"
 
-#: ../widgets/WidgetUtils.vala:30
+#: ../deja-dup/widgets/WidgetUtils.vala:29
 #, c-format
 msgid "Could not display %s"
 msgstr "Kunne ikke vise %s"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/devhelp.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/devhelp.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/devhelp.po	2013-01-29 09:34:05.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/devhelp.po	2014-01-07 06:37:00.000000000 +0000
@@ -14,14 +14,14 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 10:49+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 10:49+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #. i18n: Please don't translate "Devhelp" (it's marked as translatable
 #. * for transliteration only)
-#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:167 ../src/dh-app.c:350
-#: ../src/dh-window.c:958 ../src/dh-window.c:1857
+#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:347
+#: ../src/dh-window.c:655
 msgid "Devhelp"
 msgstr "Devhelp"
 
@@ -33,167 +33,167 @@
 msgid "Documentation Browser"
 msgstr "Dokumentasjonsvisning"
 
-#: ../data/devhelp.schemas.in.h:1
+#: ../data/org.gnome.devhelp.gschema.xml.h:1
 msgid "Main window maximized state"
 msgstr "Maksimert tilstand for hovedvinduet"
 
-#: ../data/devhelp.schemas.in.h:2
+#: ../data/org.gnome.devhelp.gschema.xml.h:2
 msgid "Whether the main window should start maximized."
 msgstr "Om hovedvinduet skal startes maksimert."
 
-#: ../data/devhelp.schemas.in.h:3
+#: ../data/org.gnome.devhelp.gschema.xml.h:3
 msgid "Width of the main window"
 msgstr "Bredde på hovedvinduet"
 
-#: ../data/devhelp.schemas.in.h:4
+#: ../data/org.gnome.devhelp.gschema.xml.h:4
 msgid "The width of the main window."
 msgstr "Bredde på hovedvinduet."
 
-#: ../data/devhelp.schemas.in.h:5
+#: ../data/org.gnome.devhelp.gschema.xml.h:5
 msgid "Height of main window"
 msgstr "Høyde for hovedvinduet"
 
-#: ../data/devhelp.schemas.in.h:6
+#: ../data/org.gnome.devhelp.gschema.xml.h:6
 msgid "The height of the main window."
 msgstr "Høyde på hovedvinduet."
 
-#: ../data/devhelp.schemas.in.h:7
+#: ../data/org.gnome.devhelp.gschema.xml.h:7
 msgid "X position of main window"
 msgstr "Horisontal posisjon for hovedvinduet"
 
-#: ../data/devhelp.schemas.in.h:8
+#: ../data/org.gnome.devhelp.gschema.xml.h:8
 msgid "The X position of the main window."
 msgstr "Horisontal posisjon for hovedvinduet."
 
-#: ../data/devhelp.schemas.in.h:9
+#: ../data/org.gnome.devhelp.gschema.xml.h:9
 msgid "Y position of main window"
 msgstr "Vertikal posisjon for hovedvinduet"
 
-#: ../data/devhelp.schemas.in.h:10
+#: ../data/org.gnome.devhelp.gschema.xml.h:10
 msgid "The Y position of the main window."
 msgstr "Vertikal posisjon for hovedvinduet."
 
-#: ../data/devhelp.schemas.in.h:11
+#: ../data/org.gnome.devhelp.gschema.xml.h:19
 msgid "Width of the assistant window"
 msgstr "Bredde på assistentvinduet"
 
-#: ../data/devhelp.schemas.in.h:12
+#: ../data/org.gnome.devhelp.gschema.xml.h:20
 msgid "The width of the assistant window."
 msgstr "Bredde på assistentvinduet."
 
-#: ../data/devhelp.schemas.in.h:13
+#: ../data/org.gnome.devhelp.gschema.xml.h:21
 msgid "Height of assistant window"
 msgstr "Høyde på veiviservinduet"
 
-#: ../data/devhelp.schemas.in.h:14
+#: ../data/org.gnome.devhelp.gschema.xml.h:22
 msgid "The height of the assistant window."
 msgstr "Høyde på assistentvinduet."
 
-#: ../data/devhelp.schemas.in.h:15
+#: ../data/org.gnome.devhelp.gschema.xml.h:23
 msgid "X position of assistant window"
 msgstr "X-posisjon for assistentvinduet"
 
-#: ../data/devhelp.schemas.in.h:16
+#: ../data/org.gnome.devhelp.gschema.xml.h:24
 msgid "The X position of the assistant window."
 msgstr "X-posisjon for veiviservinduet."
 
-#: ../data/devhelp.schemas.in.h:17
+#: ../data/org.gnome.devhelp.gschema.xml.h:25
 msgid "Y position of assistant window"
 msgstr "Vertikal posisjon for hovedvinduet"
 
-#: ../data/devhelp.schemas.in.h:18
+#: ../data/org.gnome.devhelp.gschema.xml.h:26
 msgid "The Y position of the assistant window."
 msgstr "Y-posisjon for veiviservinduet."
 
-#: ../data/devhelp.schemas.in.h:19
+#: ../data/org.gnome.devhelp.gschema.xml.h:11
 msgid "Width of the index and search pane"
 msgstr "Bredde på indeks og hovedvinduet"
 
-#: ../data/devhelp.schemas.in.h:20
+#: ../data/org.gnome.devhelp.gschema.xml.h:12
 msgid "The width of the index and search pane."
 msgstr "Bredde på indeks og søkevinduet."
 
-#: ../data/devhelp.schemas.in.h:21
+#: ../data/org.gnome.devhelp.gschema.xml.h:13
 msgid "Selected tab: \"content\" or \"search\""
 msgstr "Valgt fane: «content» eller «search»"
 
-#: ../data/devhelp.schemas.in.h:22
+#: ../data/org.gnome.devhelp.gschema.xml.h:14
 msgid "Which of the tabs is selected: \"content\" or \"search\"."
 msgstr "Hvilken fane er valgt: «content» eller «search»."
 
-#: ../data/devhelp.schemas.in.h:23
+#: ../data/org.gnome.devhelp.gschema.xml.h:15
 msgid "Books disabled"
 msgstr "Deaktiverte bøker"
 
-#: ../data/devhelp.schemas.in.h:24
+#: ../data/org.gnome.devhelp.gschema.xml.h:16
 msgid "List of books disabled by the user."
 msgstr "Liste med bøker som er deaktivert av bruker."
 
-#: ../data/devhelp.schemas.in.h:25
+#: ../data/org.gnome.devhelp.gschema.xml.h:17
 msgid "Group by language"
 msgstr "Grupper etter språk"
 
-#: ../data/devhelp.schemas.in.h:26
+#: ../data/org.gnome.devhelp.gschema.xml.h:18
 msgid "Whether books should be grouped by language in the UI"
 msgstr "Om bøkene skal grupperes etter språk i brukergrensesnittet"
 
-#: ../data/devhelp.schemas.in.h:27
+#: ../data/org.gnome.devhelp.gschema.xml.h:27
 msgid "Use system fonts"
 msgstr "Bruk systemets skrifter"
 
-#: ../data/devhelp.schemas.in.h:28
+#: ../data/org.gnome.devhelp.gschema.xml.h:28
 msgid "Use the system default fonts."
 msgstr "Bruk systemets forvalgte skrifter."
 
-#: ../data/devhelp.schemas.in.h:29
+#: ../data/org.gnome.devhelp.gschema.xml.h:29
 msgid "Font for text"
 msgstr "Skrift for tekst"
 
-#: ../data/devhelp.schemas.in.h:30
+#: ../data/org.gnome.devhelp.gschema.xml.h:30
 msgid "Font for text with variable width."
 msgstr "Skrift for tekst med variabel bredde."
 
-#: ../data/devhelp.schemas.in.h:31
+#: ../data/org.gnome.devhelp.gschema.xml.h:31
 msgid "Font for fixed width text"
 msgstr "Skrift for tekst med fast størrelse"
 
-#: ../data/devhelp.schemas.in.h:32
+#: ../data/org.gnome.devhelp.gschema.xml.h:32
 msgid "Font for text with fixed width, such as code examples."
 msgstr "Skrift for tekst med fast bredde som f.eks kodeeksempler."
 
-#: ../data/ui/devhelp.builder.h:2
+#: ../src/devhelp.ui.h:2
 msgid "Preferences"
 msgstr "Brukervalg"
 
-#: ../data/ui/devhelp.builder.h:28
+#: ../src/devhelp.ui.h:11
 msgid "_Group by language"
 msgstr "_Grupper etter språk"
 
-#: ../data/ui/devhelp.builder.h:29
+#: ../src/devhelp.ui.h:12
 msgid "Enabled"
 msgstr "Slått på"
 
-#: ../data/ui/devhelp.builder.h:30
+#: ../src/devhelp.ui.h:13
 msgid "Title"
 msgstr "Tittel"
 
-#: ../data/ui/devhelp.builder.h:31
+#: ../src/devhelp.ui.h:14
 msgid "Book Shelf"
 msgstr "Bokhylle"
 
-#: ../data/ui/devhelp.builder.h:32
+#: ../src/devhelp.ui.h:15
 msgid "_Use system fonts"
 msgstr "Br_uk systemets skrifter"
 
-#: ../data/ui/devhelp.builder.h:33
+#: ../src/devhelp.ui.h:16
 msgid "_Variable width: "
 msgstr "_Variabel bredde: "
 
-#: ../data/ui/devhelp.builder.h:34
+#: ../src/devhelp.ui.h:17
 msgid "_Fixed width:"
 msgstr "_Fast bredde:"
 
-#: ../data/ui/devhelp.builder.h:35
+#: ../src/devhelp.ui.h:18
 msgid "Fonts"
 msgstr "Skrifter"
 
@@ -214,20 +214,20 @@
 msgstr "Vis API-dokumentasjon for ordet ved markøren"
 
 #. i18n: Please don't translate "Devhelp".
-#: ../src/dh-assistant.c:76
+#: ../src/dh-assistant.c:121
 msgid "Devhelp — Assistant"
 msgstr "Devhelp - Assistent"
 
-#: ../src/dh-assistant-view.c:395
+#: ../src/dh-assistant-view.c:403
 msgid "Book:"
 msgstr "Bok:"
 
-#: ../src/dh-book.c:252
+#: ../src/dh-book.c:255
 #, c-format
 msgid "Language: %s"
 msgstr "Språk: %s"
 
-#: ../src/dh-book.c:253
+#: ../src/dh-book.c:256
 msgid "Language: Undefined"
 msgstr "Språk: Udefinert"
 
@@ -282,15 +282,15 @@
 msgid "Type"
 msgstr "Type"
 
-#: ../src/dh-main.c:58
+#: ../src/dh-main.c:48
 msgid "Search for a keyword"
 msgstr "Søk etter en nøkkelord"
 
-#: ../src/dh-main.c:73
+#: ../src/dh-main.c:63
 msgid "Quit any running Devhelp"
 msgstr "Avslutt Devhelp"
 
-#: ../src/dh-main.c:68
+#: ../src/dh-main.c:58
 msgid "Display the version and exit"
 msgstr "Vis versjon og avslutt"
 
@@ -298,7 +298,7 @@
 msgid "Focus the Devhelp window with the search field active"
 msgstr "Fokuser Devhelp-vinduet med søkefeltet aktivt"
 
-#: ../src/dh-main.c:63
+#: ../src/dh-main.c:53
 msgid "Search and display any hit in the assistant window"
 msgstr "Søk etter og vis alle treff i assistentvinduet"
 
@@ -353,43 +353,43 @@
 msgid "Search in:"
 msgstr "Søk i:"
 
-#: ../src/dh-window.c:100
+#: ../src/dh-window.c:86
 msgid "50%"
 msgstr "50%"
 
-#: ../src/dh-window.c:101
+#: ../src/dh-window.c:87
 msgid "75%"
 msgstr "75%"
 
-#: ../src/dh-window.c:102
+#: ../src/dh-window.c:88
 msgid "100%"
 msgstr "100%"
 
-#: ../src/dh-window.c:103
+#: ../src/dh-window.c:89
 msgid "125%"
 msgstr "125%"
 
-#: ../src/dh-window.c:104
+#: ../src/dh-window.c:90
 msgid "150%"
 msgstr "150%"
 
-#: ../src/dh-window.c:105
+#: ../src/dh-window.c:91
 msgid "175%"
 msgstr "175%"
 
-#: ../src/dh-window.c:106
+#: ../src/dh-window.c:92
 msgid "200%"
 msgstr "200%"
 
-#: ../src/dh-window.c:107
+#: ../src/dh-window.c:93
 msgid "300%"
 msgstr "300%"
 
-#: ../src/dh-window.c:108
+#: ../src/dh-window.c:94
 msgid "400%"
 msgstr "400%"
 
-#: ../src/dh-app.c:162
+#: ../src/dh-app.c:157
 msgid "translator_credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -399,11 +399,11 @@
 "  Kjartan Maraas https://launchpad.net/~kmaraas\n"
 "  Torstein A. W. https://launchpad.net/~kvikende"
 
-#: ../src/dh-app.c:169
+#: ../src/dh-app.c:164
 msgid "A developers' help browser for GNOME"
 msgstr "GNOME's hjelpleser for utviklere"
 
-#: ../src/dh-app.c:177
+#: ../src/dh-app.c:172
 msgid "DevHelp Website"
 msgstr "Nettsted for Devhelp"
 
@@ -432,7 +432,7 @@
 msgid "_New Window"
 msgstr "_Nytt vindu"
 
-#: ../data/ui/devhelp.builder.h:6
+#: ../src/devhelp.ui.h:5
 msgid "New _Tab"
 msgstr "Ny _fane"
 
@@ -515,11 +515,11 @@
 msgid "Search"
 msgstr "Søk"
 
-#: ../src/dh-window.c:1266
+#: ../src/dh-window.c:967
 msgid "Error opening the requested link."
 msgstr "Feil ved åpning av forespurt lenke."
 
-#: ../src/dh-window.c:1638 ../src/dh-window.c:1885
+#: ../src/dh-window.c:1317 ../src/dh-window.c:1503
 msgid "Empty Page"
 msgstr "Tom side"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/dia.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/dia.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/dia.po	2013-01-29 09:34:08.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/dia.po	2014-01-07 06:37:00.000000000 +0000
@@ -14,8 +14,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 10:52+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 10:53+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: no\n"
 
 #. This is not an errror
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/empathy.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/empathy.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/empathy.po	2013-01-29 09:33:58.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/empathy.po	2014-01-07 06:37:29.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: empathy 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 06:32+0000\n"
+"POT-Creation-Date: 2013-10-31 19:28+0000\n"
 "PO-Revision-Date: 2012-08-07 00:04+0000\n"
 "Last-Translator: Roy S <Unknown>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:12+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 15:52+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: no\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -35,20 +35,20 @@
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr "Prat på Google Talk, Facebook, MSN og mange andre pratetjenester"
 
-#: ../data/empathy.desktop.in.in.h:5
+#: ../data/empathy.desktop.in.in.h:6
 msgid "Open Hidden in Background"
-msgstr ""
+msgstr "Vis skjulte i bakgrunnen"
 
-#: ../data/empathy.desktop.in.in.h:6
+#: ../data/empathy.desktop.in.in.h:7
 msgid "Open Preferences"
-msgstr ""
+msgstr "Åpne innstillinger"
 
-#: ../data/empathy.desktop.in.in.h:7
+#: ../data/empathy.desktop.in.in.h:8
 msgid "Open Accounts"
 msgstr "Åpne kontoer"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2420
 msgid "Messaging and VoIP Accounts"
 msgstr "Meldings- og VoIP-kontoer"
 
@@ -536,199 +536,199 @@
 msgstr ""
 "Om Empathy skal redusere nøyaktighet for plassering av personvernhensyn."
 
-#: ../libempathy/empathy-ft-handler.c:733
+#: ../libempathy/empathy-ft-handler.c:732
 msgid "No reason was specified"
 msgstr "Ingen årsak oppgitt"
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:735
 msgid "The change in state was requested"
 msgstr "Tilstandsendring ble etterspurt"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "You canceled the file transfer"
 msgstr "Du avbrøt filoverføringen"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The other participant canceled the file transfer"
 msgstr "Avsender avbrøt filoverføringen"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "Error while trying to transfer the file"
 msgstr "Feil under overføring av filen"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:747
 msgid "The other participant is unable to transfer the file"
 msgstr "Avsender kan ikke overføre filen"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:750 ../libempathy/empathy-utils.c:297
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
-#: ../libempathy/empathy-ft-handler.c:914
+#: ../libempathy/empathy-ft-handler.c:913
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Filoverføring fullført, men filen ble korrupt"
 
-#: ../libempathy/empathy-ft-handler.c:1200
+#: ../libempathy/empathy-ft-handler.c:1199
 msgid "File transfer not supported by remote contact"
 msgstr "Filoverføring støttes ikke av ekstern kontakt"
 
-#: ../libempathy/empathy-ft-handler.c:1256
+#: ../libempathy/empathy-ft-handler.c:1255
 msgid "The selected file is not a regular file"
 msgstr "Valgt fil er ikke en vanlig fil"
 
-#: ../libempathy/empathy-ft-handler.c:1265
+#: ../libempathy/empathy-ft-handler.c:1264
 msgid "The selected file is empty"
 msgstr "Valgt fil er tom"
 
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:108
 #, c-format
 msgid "Missed call from %s"
 msgstr "Tapt anrop fra %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Samtale med %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Samtale fra %s"
 
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:217
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:219
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:222
 msgid "Away"
 msgstr "Borte"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:224
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:226
 msgid "Offline"
 msgstr "Frakoblet"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:229
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:269
 msgid "No reason specified"
 msgstr "Ingen årsak oppgitt"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:271 ../libempathy/empathy-utils.c:327
 msgid "Status is set to offline"
 msgstr "Status er satt til frakoblet"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307
+#: ../libempathy-gtk/empathy-call-utils.c:45
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "Network error"
 msgstr "Nettverksfeil"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309
 msgid "Authentication failed"
 msgstr "Autentiseringen feilet"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:277 ../libempathy/empathy-utils.c:311
 msgid "Encryption error"
 msgstr "Krypteringsfeil"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:279
 msgid "Name in use"
 msgstr "Navn i bruk"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313
 msgid "Certificate not provided"
 msgstr "Sertifikat ikke oppgitt"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315
 msgid "Certificate untrusted"
 msgstr "Stoler ikke på sertifikat"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:317
 msgid "Certificate expired"
 msgstr "Sertifikat utgått"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:319
 msgid "Certificate not activated"
 msgstr "Sertifikat ikke aktivert"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:321
 msgid "Certificate hostname mismatch"
 msgstr "Feil vertsnavn i forhold til sertifikat"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:323
 msgid "Certificate fingerprint mismatch"
 msgstr "Fingeravtrykk stemmer ikke for sertifikat"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:325
 msgid "Certificate self-signed"
 msgstr "Selvsignert sertifikat"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:295
 msgid "Certificate error"
 msgstr "Sertifikatsfeil"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:329
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:331
 msgid "Certificate is invalid"
 msgstr "Sertifikatet ikke ugyldig"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:333
 msgid "Connection has been refused"
 msgstr "Tilkobling nektes"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:335
 msgid "Connection can't be established"
 msgstr "Tilkobling kan ikke etableres"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:337
 msgid "Connection has been lost"
 msgstr "Tilkobling mistet"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:339
 msgid "This account is already connected to the server"
 msgstr "Denne kontoen er allerede koblet til tjeneren"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:341
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Tilkoblingen er erstattet med en ny tilkobling som bruker samme ressurs"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:344
 msgid "The account already exists on the server"
 msgstr "Kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:346
 msgid "Server is currently too busy to handle the connection"
 msgstr "Tjeneren er for opptatt til å håndtere tilkoblingen"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:348
 msgid "Certificate has been revoked"
 msgstr "Sertifikatet er trukket tilbake"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:350
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikatet bruker en usikker cipher-algoritme eller er kryptografisk svakt"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:353
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -736,140 +736,140 @@
 "Lengden på tjenersertifikatet eller dybden på sertifikatkjeden på tjeneren "
 "oversteg grensen som settes av kryptografibiblioteket"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:357
 msgid "Your software is too old"
 msgstr "Programvaren din er for gammel"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:359
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: ../libempathy/empathy-utils.c:497
+#: ../libempathy/empathy-utils.c:488
 #: ../libempathy-gtk/empathy-roster-model.h:30
 msgid "People Nearby"
 msgstr "Personer i nærheten"
 
-#: ../libempathy/empathy-utils.c:502
+#: ../libempathy/empathy-utils.c:493
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:531 ../src/empathy-roster-window.c:620
+#: ../libempathy/empathy-utils.c:529 ../src/empathy-roster-window.c:660
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:530
 msgid "Facebook Chat"
 msgstr "Facebook-prat"
 
-#: ../libempathy/empathy-time.c:90
+#: ../libempathy/empathy-time.c:87
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: ../libempathy/empathy-time.c:96
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minutt siden"
 msgstr[1] "%d minutter siden"
 
-#: ../libempathy/empathy-time.c:102
+#: ../libempathy/empathy-time.c:99
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d time siden"
 msgstr[1] "%d timer siden"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:105
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag siden"
 msgstr[1] "%d dager siden"
 
-#: ../libempathy/empathy-time.c:114
+#: ../libempathy/empathy-time.c:111
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d uke siden"
 msgstr[1] "%d uker siden"
 
-#: ../libempathy/empathy-time.c:120
+#: ../libempathy/empathy-time.c:117
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:139
 msgid "in the future"
 msgstr "i fremtiden"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
+#: ../libempathy/empathy-keyring.c:83 ../libempathy/empathy-keyring.c:192
 msgid "Password not found"
 msgstr "Passordet ble ikke funnet"
 
-#: ../libempathy/empathy-keyring.c:594
+#: ../libempathy/empathy-keyring.c:592
 #, c-format
 msgid "IM account password for %s (%s)"
 msgstr "Passord for lynmeldingskonto for %s (%s)"
 
-#: ../libempathy/empathy-keyring.c:631
+#: ../libempathy/empathy-keyring.c:629
 #, c-format
 msgid "Password for chatroom '%s' on account %s (%s)"
 msgstr "Passord for praterom «%s» på konto %s (%s)"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:684
 msgid "All accounts"
 msgstr "Alle kontoer"
 
-#: ../libempathy-gtk/empathy-account-widget.c:675
+#: ../libempathy-gtk/empathy-account-widget.c:668
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
+#: ../src/empathy-import-widget.c:318
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:676
+#: ../libempathy-gtk/empathy-account-widget.c:669
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "Password"
 msgstr "Passord"
 
-#: ../libempathy-gtk/empathy-account-widget.c:677
+#: ../libempathy-gtk/empathy-account-widget.c:670
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:505
 msgid "Server"
 msgstr "Tjener"
 
-#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-account-widget.c:671
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:526
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:817
+#: ../libempathy-gtk/empathy-account-widget.c:810
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1429
+#: ../libempathy-gtk/empathy-account-widget.c:1422
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1746
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "A_pply"
 msgstr "_Bruk"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1775
+#: ../libempathy-gtk/empathy-account-widget.c:1768
 msgid "L_og in"
 msgstr "L_ogg inn"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1845
+#: ../libempathy-gtk/empathy-account-widget.c:1838
 msgid "This account already exists on the server"
 msgstr "Denne kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1842
 msgid "Create a new account on the server"
 msgstr "Lag en ny konto på tjeneren"
 
@@ -878,19 +878,19 @@
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
+#: ../libempathy-gtk/empathy-account-widget.c:2263
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s av %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2296
+#: ../libempathy-gtk/empathy-account-widget.c:2289
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2300
+#: ../libempathy-gtk/empathy-account-widget.c:2293
 msgid "New account"
 msgstr "Ny konto"
 
@@ -995,32 +995,32 @@
 msgid "What is your ICQ password?"
 msgstr "Hva er ditt passord for ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+#: ../libempathy-gtk/empathy-account-widget-sip.c:198
+#: ../libempathy-gtk/empathy-account-widget-sip.c:231
 msgid "Auto"
 msgstr "Auto"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+#: ../libempathy-gtk/empathy-account-widget-sip.c:201
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+#: ../libempathy-gtk/empathy-account-widget-sip.c:204
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
 msgid "TLS"
 msgstr "TLS"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+#: ../libempathy-gtk/empathy-account-widget-sip.c:236
 msgid "Register"
 msgstr "Register"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+#: ../libempathy-gtk/empathy-account-widget-sip.c:241
 msgid "Options"
 msgstr "Alternativer"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "None"
 msgstr "Ingen"
 
@@ -1244,7 +1244,7 @@
 msgid "Discover Binding"
 msgstr "Oppdag binding"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:109
 msgid "Server:"
 msgstr "Tjener:"
 
@@ -1308,77 +1308,77 @@
 msgid "What is your Yahoo! password?"
 msgstr "Hva er ditt passord for Yahoo!?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
+#: ../libempathy-gtk/empathy-avatar-chooser.c:540
+#: ../libempathy-gtk/empathy-avatar-chooser.c:625
 msgid "Couldn't convert image"
 msgstr "Kunne ikke konvertere bilde"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
+#: ../libempathy-gtk/empathy-avatar-chooser.c:541
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Ingen av de godkjente bildeformatene støttes av ditt system"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
+#: ../libempathy-gtk/empathy-avatar-chooser.c:901
 msgid "Couldn't save picture to file"
 msgstr "Kunne ikke lagre bilde til fil"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
 msgid "Select Your Avatar Image"
 msgstr "Velg personbilde"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1033
 msgid "Take a picture..."
 msgstr "Ta et bilde …"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1046
 msgid "No Image"
 msgstr "Ingen bilde"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1103
 msgid "Images"
 msgstr "Bilder"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1107
 msgid "All Files"
 msgstr "Alle filer"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:319
 msgid "Click to enlarge"
 msgstr "Klikk for å forstørre"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:40
+#: ../libempathy-gtk/empathy-call-utils.c:58
 msgid "There was an error starting the call"
 msgstr "Det oppsto en feil ved start av samtalen"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact doesn't support calls"
 msgstr "Valgt kontakt støtter ikke oppringing"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact is offline"
 msgstr "Valgt kontakt er koblet fra"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is not valid"
 msgstr "Valgt kontakt er ugyldig"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Nødsamtaler er ikke støttet på denne protokollen"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "You don't have enough credit in order to place this call"
 msgstr "Du har ikke nok kreditt til å starte denne samtalen"
 
-#: ../libempathy-gtk/empathy-chat.c:727
+#: ../libempathy-gtk/empathy-chat.c:731
 msgid "Failed to open private chat"
 msgstr "Klarte ikke å åpne privat prat"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:789
 msgid "Topic not supported on this conversation"
 msgstr "Emne er ikke støttet for denne samtalen"
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:795
 msgid "You are not allowed to change the topic"
 msgstr "Du har ikke lov til å bytte emne"
 
@@ -1387,23 +1387,23 @@
 msgid "“%s” is not a valid contact ID"
 msgstr "«%s» er ikke en gyldig kontakt-ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: tøm alle meldinger fra aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <emne>: sett emne for aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID for praterom>: bli med i et nytt praterom"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <prateroms-ID>: bli med i et nytt praterom"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1411,23 +1411,23 @@
 "/part [<praterom-ID>] [<årsak>]: forlat praterommet, forvalg er det aktive "
 "rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontakt-ID> [<melding>]: åpne en privat samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakt-ID> <melding>: åpne en privat samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <kallenavn>: bytt kallenavn på denne tjeneren"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <melding>: send en HANDLINGS-melding til aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1437,11 +1437,11 @@
 "sende en melding som starter med tegnet «/». For eksempel: «/say /join "
 "brukes til å bli med i et nytt praterom»"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakt-ID>: vis informasjon om en kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1449,126 +1449,126 @@
 "/help [<kommando>]: vis alle støttede kommandoer. Vis hjelp for <kommando> "
 "hvis den er definert."
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Bruk: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Ukjent kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer"
 
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1542
 msgid "insufficient balance to send message"
 msgstr "ikke nok kreditt til å sende melding"
 
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1560
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Feil ved sending av melding «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1627
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Feil ved sending av melding: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1550
+#: ../libempathy-gtk/empathy-chat.c:1554
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "ikke nok kreditt til å sende melding. <a href='%s'>Fyll på</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1590
+#: ../libempathy-gtk/empathy-chat.c:1594
 msgid "not capable"
 msgstr "ikke kapabel"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "permission denied"
 msgstr "tilgang nektet"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "too long message"
 msgstr "meldingen er for lang"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "not implemented"
 msgstr "ikke implementert"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:1001
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1699
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Emne satt til: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr "Emne satt av %s til: %s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1702
+#: ../libempathy-gtk/empathy-chat.c:1706
 msgid "No topic defined"
 msgstr "Emne ikke definert"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2222
 msgid "(No Suggestions)"
 msgstr "(Ingen forslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2290
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Legg til «%s» i ordboken"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2323
+#: ../libempathy-gtk/empathy-chat.c:2327
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Legg til «%s» i ordbok for %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2397
 msgid "Insert Smiley"
 msgstr "Sett inn smilefjes"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1183
+#: ../libempathy-gtk/empathy-chat.c:2415
+#: ../libempathy-gtk/empathy-ui-utils.c:1176
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2472
 msgid "_Spelling Suggestions"
 msgstr "_Staveforslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Klarte ikke å hente siste logger"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2826
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har koblet fra"
@@ -1576,12 +1576,12 @@
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #. 
-#: ../libempathy-gtk/empathy-chat.c:2725
+#: ../libempathy-gtk/empathy-chat.c:2833
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ble sparket av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2836
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ble sparket"
@@ -1589,17 +1589,17 @@
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #. 
-#: ../libempathy-gtk/empathy-chat.c:2736
+#: ../libempathy-gtk/empathy-chat.c:2844
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ble bannlyst av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2847
 #, c-format
 msgid "%s was banned"
 msgstr "%s ble bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2851
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forlatt rommet"
@@ -1609,17 +1609,17 @@
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #. 
-#: ../libempathy-gtk/empathy-chat.c:2752
+#: ../libempathy-gtk/empathy-chat.c:2860
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2885
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s har blitt med i rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2910
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
@@ -1627,55 +1627,55 @@
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2580
-#: ../src/empathy-call-window.c:2886 ../src/empathy-event-manager.c:1247
+#: ../libempathy-gtk/empathy-chat.c:3097 ../src/empathy-call-window.c:1519
+#: ../src/empathy-call-window.c:1569 ../src/empathy-call-window.c:2644
+#: ../src/empathy-call-window.c:2951 ../src/empathy-event-manager.c:1241
 msgid "Disconnected"
 msgstr "Koblet fra"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3784
 msgid "Would you like to store this password?"
 msgstr "Vil du lagre dette passordet?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3790
 msgid "Remember"
 msgstr "Husk"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3800
 msgid "Not now"
 msgstr "Ikke nå"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:141
+#: ../libempathy-gtk/empathy-chat.c:3844
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3848
 msgid "Wrong password; please try again:"
 msgstr "Feil passord; vennligst prøv igjen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3978
 msgid "This room is protected by a password:"
 msgstr "Dette rommet er beskyttet med et passord:"
 
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4005
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Bli med"
 
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1268
+#: ../libempathy-gtk/empathy-chat.c:4197 ../src/empathy-event-manager.c:1262
 msgid "Connected"
 msgstr "Koblet til"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4252
 msgid "Conversation"
 msgstr "Samtale"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4257
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1706,8 +1706,8 @@
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:527
+#: ../libempathy-gtk/empathy-individual-widget.c:1473
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1718,12 +1718,12 @@
 msgstr "Blokkerte kontakter"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Copy Link Address"
 msgstr "_Kopier lenkens adresse"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
 msgid "_Open Link"
 msgstr "_Åpne lenke"
 
@@ -1733,29 +1733,29 @@
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:109
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
+#: ../libempathy-gtk/empathy-individual-dialogs.c:184
 #: ../libempathy-gtk/empathy-subscription-dialog.c:121
 #, c-format
 msgid "Block %s?"
 msgstr "Blokker %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
+#: ../libempathy-gtk/empathy-individual-dialogs.c:239
 #: ../libempathy-gtk/empathy-subscription-dialog.c:125
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Er du sikker på at du vil blokkere «%s» fra å kontakte deg igjen?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-individual-dialogs.c:261
 #: ../libempathy-gtk/empathy-subscription-dialog.c:130
 #: ../libempathy-gtk/empathy-subscription-dialog.c:275
 msgid "_Block"
 msgstr "_Blokker"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
+#: ../libempathy-gtk/empathy-individual-dialogs.c:270
 #: ../libempathy-gtk/empathy-subscription-dialog.c:150
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1775,153 +1775,153 @@
 msgstr "A_vgjør senere"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
 msgid "Search contacts"
 msgstr "Søk i kontakter"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:550
 msgid "Search: "
 msgstr "Søk: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:608
 msgid "_Add Contact"
 msgstr "_Legg til kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:626
 msgid "No contacts found"
 msgstr "Ingen kontakter funnet"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:642
 msgid "Your message introducing yourself:"
 msgstr "Melding der du introduserer deg selv:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:650
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Vennligst la meg så når du er tilkoblet. Takk!"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:294
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:445
 msgid "Country ISO Code:"
 msgstr "ISO-kode for land:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:447
 msgid "Country:"
 msgstr "Land:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:449
 msgid "State:"
 msgstr "Tilstand:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "City:"
 msgstr "By:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Area:"
 msgstr "Område:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Postal Code:"
 msgstr "Postkode:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Street:"
 msgstr "Gate:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "Building:"
 msgstr "Bygning:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Floor:"
 msgstr "Etasje:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Accuracy Level:"
 msgstr "Nøyaktighetsnivå:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Error:"
 msgstr "Feil:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Vertical Error (meters):"
 msgstr "Vertikal feil (meter):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Horizontal Error (meters):"
 msgstr "Horisontal feil (meter):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Bearing:"
 msgstr "Retning:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Climb Speed:"
 msgstr "Klatrehastighet:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Last Updated on:"
 msgstr "Sist oppdatert:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Longitude:"
 msgstr "Lengdegrad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Latitude:"
 msgstr "Breddegrad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Altitude:"
 msgstr "Høyde:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:583
+#: ../libempathy-gtk/empathy-individual-widget.c:598
 #: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "Sted"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:600
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:649
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y, %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-contact-widget.c:157
+#: ../libempathy-gtk/empathy-individual-widget.c:888
 msgid "Save Avatar"
 msgstr "Lagre personbilder"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-contact-widget.c:213
+#: ../libempathy-gtk/empathy-individual-widget.c:946
 msgid "Unable to save avatar"
 msgstr "Kan ikke lagre personbilde"
 
@@ -1934,78 +1934,78 @@
 msgid "Contact Details"
 msgstr "Kontaktdetaljer"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:99
 msgid "Full name"
 msgstr "Fullt navn"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:100
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:101
 msgid "E-mail address"
 msgstr "E-postadresse"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
 msgid "Website"
 msgstr "Nettsted"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
 msgid "Birthday"
 msgstr "Fødselsdag"
 
 #. Note to translators: this is the caption for a string of the form "5
 #. * minutes ago", and refers to the time since the contact last interacted
 #. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Last seen:"
 msgstr "Sist sett:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:110
 msgid "Connected from:"
 msgstr "Tilkoblet fra:"
 
 #. FIXME: once Idle implements SimplePresence using this information, we can
 #. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Away message:"
 msgstr "Bortemelding:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:127
 msgid "work"
 msgstr "arbeid"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:128
 msgid "home"
 msgstr "hjemme"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:129
 msgid "mobile"
 msgstr "mobil"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
 msgid "voice"
 msgstr "tale"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
 msgid "preferred"
 msgstr "foretrukket"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "postal"
 msgstr "post"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
 msgid "parcel"
 msgstr "pakke"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1501
 msgid "Identifier:"
 msgstr "Identifikator:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2034,11 +2034,11 @@
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2046,169 +2046,169 @@
 "Velg gruppene du ønsker at denne kontakten skal vises i. Du kan velge flere "
 "eller ingen."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "_Legg til gruppe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Velg"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:244
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Følgende identitet vil bli blokkert:"
 msgstr[1] "Følgende identiteter vil bli blokkert:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:251
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Følgende identitet kan ikke blokkeres:"
 msgstr[1] "Følgende identiteter kan ikke blokkeres:"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:238
 msgid "Edit Contact Information"
 msgstr "Endre kontaktinformasjon"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:284
 msgid "Linked Contacts"
 msgstr "Lenkede kontakter"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:177
+#: ../libempathy-gtk/empathy-individual-menu.c:168
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Velg en konto til bruk for samtalen"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Ring"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Hjemme"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:660
 msgid "_Block Contact"
 msgstr "_Blokker kontakt"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1225
+#: ../libempathy-gtk/empathy-new-message-dialog.c:310
 msgid "_Chat"
 msgstr "_Prat"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1260
+#: ../libempathy-gtk/empathy-new-message-dialog.c:304
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1293
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Lydsamtale"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1326
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videosamtale"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1367
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "_Tidligere samtaler"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1396
 msgid "Send File"
 msgstr "Send fil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 msgid "Share My Desktop"
 msgstr "Del mitt skrivebord"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-menu.c:1452
+#: ../libempathy-gtk/empathy-individual-widget.c:1356
 msgid "Favorite"
 msgstr "Favoritt"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:323
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts er ikke installert"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:326
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "Vennligst installer gnome-contacts for tilgang til kontaktdetaljer."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1481
 msgid "Infor_mation"
 msgstr "Infor_masjon"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1530
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_ediger"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1276
+#: ../libempathy-gtk/empathy-individual-menu.c:1646
+#: ../src/empathy-chat-window.c:1267
 msgid "Inviting you to this room"
 msgstr "Inviterer deg til dette rommet"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1692
 msgid "_Invite to Chat Room"
 msgstr "_Inviter til praterom"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:1888
 msgid "_Add Contact…"
 msgstr "_Legg til kontakt …"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:716
 msgid "Delete and _Block"
 msgstr "Slett og _blokker"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2360
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Vil du virkelig fjerne gruppen «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2363
 msgid "Removing group"
 msgstr "Fjerner gruppe"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:862
+#: ../libempathy-gtk/empathy-individual-view.c:2440
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:778
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Vil du virkelig fjerne kontakten «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:787
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2217,11 +2217,11 @@
 "Vil du virkelig fjerne lenket kontakt «%s»? Merk at dette vil fjerne alle "
 "kontaktene den lenkede kontakten består av."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:798
 msgid "Removing contact"
 msgstr "Fjerner kontakt"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1640
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2236,160 +2236,160 @@
 msgid "Online from a phone or mobile device"
 msgstr "Tilkoblet fra en telefon eller mobil enhet"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329
 msgid "New Network"
 msgstr "Nytt nettverk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532
 msgid "Choose an IRC network"
 msgstr "Velg et IRC-nettverk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615
 msgid "Reset _Networks List"
 msgstr "Nullstill _nettverksliste"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Velg"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:274
 msgid "new server"
 msgstr "ny tjener"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:631
 msgid "History"
 msgstr "Historikk"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:686
 msgid "Show"
 msgstr "Vis"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:708
 msgid "Search"
 msgstr "Søk"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "Prat i %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "Prat med %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1355
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1292
+#: ../libempathy-gtk/empathy-log-window.c:1298
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1298
+#: ../libempathy-gtk/empathy-log-window.c:1304
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1379
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s sekund"
 msgstr[1] "%s sekunder"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minutt"
 msgstr[1] "%s minutter"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1394
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Samtalen tok %s, avsluttet %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1725
 msgid "Today"
 msgstr "I dag"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Yesterday"
 msgstr "I går"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1740
+#: ../libempathy-gtk/empathy-log-window.c:1744
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1848
+#: ../libempathy-gtk/empathy-log-window.c:3471
 msgid "Anytime"
 msgstr "Når som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1947
+#: ../libempathy-gtk/empathy-log-window.c:2406
 msgid "Anyone"
 msgstr "Hvem som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2719
 msgid "Who"
 msgstr "Hvem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2928
 msgid "When"
 msgstr "Når"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3046
 msgid "Anything"
 msgstr "Hva som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Text chats"
 msgstr "Tekstsamtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3049
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Incoming calls"
 msgstr "Innkommende samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Outgoing calls"
 msgstr "Utgående samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3055
 msgid "Missed calls"
 msgstr "Tapte samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3075
 msgid "What"
 msgstr "Hva"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3764
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Er du sikker på at du vil slette alle logger av tidligere samtaler?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3764
+#: ../libempathy-gtk/empathy-log-window.c:3768
 msgid "Clear All"
 msgstr "Tøm alle"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3775
 msgid "Delete from:"
 msgstr "Slett fra:"
 
@@ -2411,12 +2411,12 @@
 msgstr "Profil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1460 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Prat"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
 msgid "Video"
 msgstr "Video"
 
@@ -2428,72 +2428,72 @@
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Laster …</span>"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The contact is offline"
 msgstr "Kontakten er koblet fra"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The specified contact is either invalid or unknown"
 msgstr "Valgt kontakt er ugyldig eller ukjent"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The contact does not support this kind of conversation"
 msgstr "Kontakten støtter ikke denne type samtale"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:80
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Forespurt funksjonalitet er ikke implementert for denne protokollen"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "Could not start a conversation with the given contact"
 msgstr "Kunne ikke starte en samtale med oppgitt kontakt"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "You are banned from this channel"
 msgstr "Du er bannlyst fra denne kanalen"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "This channel is full"
 msgstr "Kanalen er full"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "You must be invited to join this channel"
 msgstr "Du må bli invitert til å bli med i denne kanalen"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Can't proceed while disconnected"
 msgstr "Kan ikke fortsette da du er koblet fra"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
 msgid "There was an error starting the conversation"
 msgstr "Det oppsto en feil ved start av samtalen"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:191
+#: ../libempathy-gtk/empathy-new-message-dialog.c:281
 msgid "Enter a contact identifier or phone number:"
 msgstr "Oppgi en kontaktidentifikator eller telefonnummer:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:324
 msgid "New Conversation"
 msgstr "Ny samtale"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:214
 msgid "_Video Call"
 msgstr "_Videosamtale"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:224
 msgid "_Audio Call"
 msgstr "_Lydsamtale"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:234
 msgid "New Call"
 msgstr "Ny samtale"
 
@@ -2503,7 +2503,7 @@
 msgstr "Autentiseringen feilet for konto <b>%s</b>"
 
 #: ../libempathy-gtk/empathy-base-password-dialog.c:224
-#: ../libempathy-gtk/empathy-password-dialog.c:134
+#: ../libempathy-gtk/empathy-password-dialog.c:133
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2518,30 +2518,30 @@
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:156
+#: ../libempathy-gtk/empathy-presence-chooser.c:192
 msgid "Custom Message…"
 msgstr "Egendefinert melding …"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:209
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
 msgid "Edit Custom Messages…"
 msgstr "Rediger egendefinerte meldinger …"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:333
 msgid "Click to remove this status as a favorite"
 msgstr "Klikk for å fjerne denne statusen som favoritt"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:342
 msgid "Click to make this status a favorite"
 msgstr "Klikk for å gjøre denne statusen til en favoritt"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:385
 msgid "Set status"
 msgstr "Sett status"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1093
 msgid "Custom messages…"
 msgstr "Egendefinerte meldinger …"
 
@@ -2549,7 +2549,7 @@
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #. 
-#: ../libempathy-gtk/empathy-protocol-chooser.c:609
+#: ../libempathy-gtk/empathy-protocol-chooser.c:605
 #, c-format
 msgid "New %s account"
 msgstr "Ny %s-konto"
@@ -2574,56 +2574,56 @@
 msgid "Phrase not found"
 msgstr "Teksten ble ikke funnet"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:49
 msgid "Received an instant message"
 msgstr "Mottok en lynmelding"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Sent an instant message"
 msgstr "Send en lynmelding"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Incoming chat request"
 msgstr "Innkommende samtaleforespørsel"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Contact connected"
 msgstr "Kontakt koblet til"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact disconnected"
 msgstr "Kontakt koblet fra"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Connected to server"
 msgstr "Koblet til tjener"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Disconnected from server"
 msgstr "Koblet fra tjener"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Incoming voice call"
 msgstr "Innkommende samtale"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Outgoing voice call"
 msgstr "Utgående samtale"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Voice call ended"
 msgstr "Samtale avsluttet"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Rediger egendefinerte meldinger"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1212
 #, c-format
 msgid "Message edited at %s"
 msgstr "Melding redigert %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1914
 msgid "Normal"
 msgstr "Normal"
 
@@ -2643,97 +2643,97 @@
 msgid "Blue"
 msgstr "Blå"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "Identiteten som ble oppgitt av pratetjeneren kan ikke verifiseres."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Sertifikatet er ikke signert av en sertifikatmyndighet."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Sertifikatet er utløpt."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Sertifikatet er ikke aktivert ennå."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Sertifikatet har ikke forventet fingeravtrykk."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid ""
 "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
 "Vertsnavn verifisert av sertifikatet er ikke det samme som navn på tjener."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "Sertifikatet er selvsignert."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr ""
 "Sertifikatet har blitt trukket tilbake av utstedende sertifikatmyndighet."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Sertifikatet er kryptografisk svakt."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "Sertifikatets lengde overstiger verifiserbare grenser."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "Sertifikatet ikke feilutformet."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Forventet vertsnavn: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Vertsnavn i sertifikat: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "F_ortsett"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "Tilkobling uten tillit"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Denne tilkoblingen er ikke tiltrodd. Vil du fortsette likevel?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Husk dette valget for fremtidige tilkoblinger"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Sertifikatdetaljer"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1053
+#: ../libempathy-gtk/empathy-ui-utils.c:1046
 msgid "Unable to open URI"
 msgstr "Kan ikke åpne URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1177
+#: ../libempathy-gtk/empathy-ui-utils.c:1170
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1251
+#: ../libempathy-gtk/empathy-ui-utils.c:1244
 msgid "Insufficient free space to save file"
 msgstr "Ikke nok ledig plass til å lagre filen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1259
+#: ../libempathy-gtk/empathy-ui-utils.c:1252
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2742,183 +2742,183 @@
 "%s ledig plass kreves for å lagre denne filen, men kun %s er tilgjengelig. "
 "Vennligst velg en annen lokasjon."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1305
+#: ../libempathy-gtk/empathy-ui-utils.c:1298
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Innkommende fil fra %s"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+#: ../libempathy-gtk/totem-subtitle-encoding.c:157
 msgid "Current Locale"
 msgstr "Aktivt locale"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:161
-#: ../libempathy-gtk/totem-subtitle-encoding.c:163
-#: ../libempathy-gtk/totem-subtitle-encoding.c:165
-#: ../libempathy-gtk/totem-subtitle-encoding.c:167
+#: ../libempathy-gtk/totem-subtitle-encoding.c:160
+#: ../libempathy-gtk/totem-subtitle-encoding.c:162
+#: ../libempathy-gtk/totem-subtitle-encoding.c:164
+#: ../libempathy-gtk/totem-subtitle-encoding.c:166
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+#: ../libempathy-gtk/totem-subtitle-encoding.c:169
 msgid "Armenian"
 msgstr "Armensk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+#: ../libempathy-gtk/totem-subtitle-encoding.c:172
+#: ../libempathy-gtk/totem-subtitle-encoding.c:174
+#: ../libempathy-gtk/totem-subtitle-encoding.c:176
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+#: ../libempathy-gtk/totem-subtitle-encoding.c:179
 msgid "Celtic"
 msgstr "Keltisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:183
-#: ../libempathy-gtk/totem-subtitle-encoding.c:185
-#: ../libempathy-gtk/totem-subtitle-encoding.c:187
-#: ../libempathy-gtk/totem-subtitle-encoding.c:189
+#: ../libempathy-gtk/totem-subtitle-encoding.c:182
+#: ../libempathy-gtk/totem-subtitle-encoding.c:184
+#: ../libempathy-gtk/totem-subtitle-encoding.c:186
+#: ../libempathy-gtk/totem-subtitle-encoding.c:188
 msgid "Central European"
 msgstr "Sentraleuropeisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:192
-#: ../libempathy-gtk/totem-subtitle-encoding.c:194
-#: ../libempathy-gtk/totem-subtitle-encoding.c:196
-#: ../libempathy-gtk/totem-subtitle-encoding.c:198
+#: ../libempathy-gtk/totem-subtitle-encoding.c:191
+#: ../libempathy-gtk/totem-subtitle-encoding.c:193
+#: ../libempathy-gtk/totem-subtitle-encoding.c:195
+#: ../libempathy-gtk/totem-subtitle-encoding.c:197
 msgid "Chinese Simplified"
 msgstr "Forenklet kinesisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:201
-#: ../libempathy-gtk/totem-subtitle-encoding.c:203
-#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+#: ../libempathy-gtk/totem-subtitle-encoding.c:200
+#: ../libempathy-gtk/totem-subtitle-encoding.c:202
+#: ../libempathy-gtk/totem-subtitle-encoding.c:204
 msgid "Chinese Traditional"
 msgstr "Tradisjonell kinesisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+#: ../libempathy-gtk/totem-subtitle-encoding.c:207
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:211
-#: ../libempathy-gtk/totem-subtitle-encoding.c:213
-#: ../libempathy-gtk/totem-subtitle-encoding.c:215
-#: ../libempathy-gtk/totem-subtitle-encoding.c:217
-#: ../libempathy-gtk/totem-subtitle-encoding.c:219
-#: ../libempathy-gtk/totem-subtitle-encoding.c:221
+#: ../libempathy-gtk/totem-subtitle-encoding.c:210
+#: ../libempathy-gtk/totem-subtitle-encoding.c:212
+#: ../libempathy-gtk/totem-subtitle-encoding.c:214
+#: ../libempathy-gtk/totem-subtitle-encoding.c:216
+#: ../libempathy-gtk/totem-subtitle-encoding.c:218
+#: ../libempathy-gtk/totem-subtitle-encoding.c:220
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+#: ../libempathy-gtk/totem-subtitle-encoding.c:223
 msgid "Cyrillic/Russian"
 msgstr "Kyrillisk/Russisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+#: ../libempathy-gtk/totem-subtitle-encoding.c:226
+#: ../libempathy-gtk/totem-subtitle-encoding.c:228
 msgid "Cyrillic/Ukrainian"
 msgstr "Kyrillisk/Ukrainsk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+#: ../libempathy-gtk/totem-subtitle-encoding.c:231
 msgid "Georgian"
 msgstr "Georgisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+#: ../libempathy-gtk/totem-subtitle-encoding.c:234
+#: ../libempathy-gtk/totem-subtitle-encoding.c:236
+#: ../libempathy-gtk/totem-subtitle-encoding.c:238
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+#: ../libempathy-gtk/totem-subtitle-encoding.c:241
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+#: ../libempathy-gtk/totem-subtitle-encoding.c:244
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:248
-#: ../libempathy-gtk/totem-subtitle-encoding.c:250
-#: ../libempathy-gtk/totem-subtitle-encoding.c:252
-#: ../libempathy-gtk/totem-subtitle-encoding.c:254
+#: ../libempathy-gtk/totem-subtitle-encoding.c:247
+#: ../libempathy-gtk/totem-subtitle-encoding.c:249
+#: ../libempathy-gtk/totem-subtitle-encoding.c:251
+#: ../libempathy-gtk/totem-subtitle-encoding.c:253
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+#: ../libempathy-gtk/totem-subtitle-encoding.c:256
 msgid "Hebrew Visual"
 msgstr "Visuell hebraisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+#: ../libempathy-gtk/totem-subtitle-encoding.c:259
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+#: ../libempathy-gtk/totem-subtitle-encoding.c:262
 msgid "Icelandic"
 msgstr "Islandsk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+#: ../libempathy-gtk/totem-subtitle-encoding.c:265
+#: ../libempathy-gtk/totem-subtitle-encoding.c:267
+#: ../libempathy-gtk/totem-subtitle-encoding.c:269
 msgid "Japanese"
 msgstr "Japansk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:273
-#: ../libempathy-gtk/totem-subtitle-encoding.c:275
-#: ../libempathy-gtk/totem-subtitle-encoding.c:277
-#: ../libempathy-gtk/totem-subtitle-encoding.c:279
+#: ../libempathy-gtk/totem-subtitle-encoding.c:272
+#: ../libempathy-gtk/totem-subtitle-encoding.c:274
+#: ../libempathy-gtk/totem-subtitle-encoding.c:276
+#: ../libempathy-gtk/totem-subtitle-encoding.c:278
 msgid "Korean"
 msgstr "Koreansk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+#: ../libempathy-gtk/totem-subtitle-encoding.c:281
 msgid "Nordic"
 msgstr "Nordisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+#: ../libempathy-gtk/totem-subtitle-encoding.c:284
 msgid "Persian"
 msgstr "Persisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+#: ../libempathy-gtk/totem-subtitle-encoding.c:287
+#: ../libempathy-gtk/totem-subtitle-encoding.c:289
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+#: ../libempathy-gtk/totem-subtitle-encoding.c:292
 msgid "South European"
 msgstr "Sør-Europeisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+#: ../libempathy-gtk/totem-subtitle-encoding.c:295
 msgid "Thai"
 msgstr "Thai"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:299
-#: ../libempathy-gtk/totem-subtitle-encoding.c:301
-#: ../libempathy-gtk/totem-subtitle-encoding.c:303
-#: ../libempathy-gtk/totem-subtitle-encoding.c:305
+#: ../libempathy-gtk/totem-subtitle-encoding.c:298
+#: ../libempathy-gtk/totem-subtitle-encoding.c:300
+#: ../libempathy-gtk/totem-subtitle-encoding.c:302
+#: ../libempathy-gtk/totem-subtitle-encoding.c:304
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:308
-#: ../libempathy-gtk/totem-subtitle-encoding.c:310
-#: ../libempathy-gtk/totem-subtitle-encoding.c:312
-#: ../libempathy-gtk/totem-subtitle-encoding.c:314
-#: ../libempathy-gtk/totem-subtitle-encoding.c:316
+#: ../libempathy-gtk/totem-subtitle-encoding.c:307
+#: ../libempathy-gtk/totem-subtitle-encoding.c:309
+#: ../libempathy-gtk/totem-subtitle-encoding.c:311
+#: ../libempathy-gtk/totem-subtitle-encoding.c:313
+#: ../libempathy-gtk/totem-subtitle-encoding.c:315
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:319
-#: ../libempathy-gtk/totem-subtitle-encoding.c:321
-#: ../libempathy-gtk/totem-subtitle-encoding.c:323
-#: ../libempathy-gtk/totem-subtitle-encoding.c:325
-#: ../libempathy-gtk/totem-subtitle-encoding.c:327
+#: ../libempathy-gtk/totem-subtitle-encoding.c:318
+#: ../libempathy-gtk/totem-subtitle-encoding.c:320
+#: ../libempathy-gtk/totem-subtitle-encoding.c:322
+#: ../libempathy-gtk/totem-subtitle-encoding.c:324
+#: ../libempathy-gtk/totem-subtitle-encoding.c:326
 msgid "Western"
 msgstr "Vestlig"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+#: ../libempathy-gtk/totem-subtitle-encoding.c:329
+#: ../libempathy-gtk/totem-subtitle-encoding.c:331
+#: ../libempathy-gtk/totem-subtitle-encoding.c:333
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
+#: ../libempathy-gtk/empathy-calendar-button.c:64
 msgid "Select..."
 msgstr "Velg …"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:154
+#: ../libempathy-gtk/empathy-calendar-button.c:152
 msgid "_Select"
 msgstr "_Velg"
 
@@ -2930,23 +2930,23 @@
 msgid "Instant Message (Empathy)"
 msgstr "Lynmelding (Empathy)"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:412
 msgid "Don't connect on startup"
 msgstr "Ikke koble til ved oppstart"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:416
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ikke vis kontaktlisten eller andre dialoger ved oppstart"
 
-#: ../src/empathy.c:447
+#: ../src/empathy.c:445
 msgid "- Empathy IM Client"
 msgstr "- Empathy lynmeldingsprogram"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:631
 msgid "Error contacting the Account Manager"
 msgstr "Feil ved forsøk på å kontakte kontohåndtering"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:633
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2959,7 +2959,7 @@
 "\n"
 "%s"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:78
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -2971,7 +2971,7 @@
 "Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) "
 "enhver senere versjon."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:82
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -2982,7 +2982,7 @@
 "GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER ET "
 "BESTEMT FORMÅL. Se GNU General Public License for detaljer."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:86
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -2992,11 +2992,11 @@
 "Hvis ikke så skriv til Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-1301159, USA."
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:106
 msgid "An Instant Messaging client for GNOME"
 msgstr "En meldingsklient for GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:112
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas\n"
@@ -3015,47 +3015,48 @@
 "  Kjartan Maraas https://launchpad.net/~kmaraas\n"
 "  Kjetil Birkeland Moe https://launchpad.net/~kjetilbmoe\n"
 "  Mathias Bynke https://launchpad.net/~mabynke\n"
-"  Roy S https://launchpad.net/~clean-carrier\n"
+"  Roy S https://launchpad.net/~clean-carrier-deactivatedaccount\n"
 "  famthegeek https://launchpad.net/~famthegeek\n"
 "  messo https://launchpad.net/~rsolvang\n"
-"  tarkume https://launchpad.net/~taraldmjelde"
+"  tarkume https://launchpad.net/~taraldmjelde\n"
+"  Åka Sikrom https://launchpad.net/~akrosikam"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:54
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Det finnes ikke-lagrede endringer for din %s-konto."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:58
 msgid "Your new account has not been saved yet."
 msgstr "Din nye konto er ikke lagret ennå."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:390 ../src/empathy-call-window.c:1261
 msgid "Connecting…"
 msgstr "Kobler til …"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:431
 #, c-format
 msgid "Offline — %s"
 msgstr "Frakoblet - %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:443
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Koblet fra - %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:454
 msgid "Offline — No Network Connection"
 msgstr "Frakoblet - Ingen nettverkstilkobling"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:461
 msgid "Unknown Status"
 msgstr "Ukjent status"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:478
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3065,11 +3066,11 @@
 "som ikke støttes. Vennligst installer telepathy-haze og start økten på nytt "
 "for å migrere kontoen."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:488
 msgid "Offline — Account Disabled"
 msgstr "Frakoblet - Konto deaktivert"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:594
 msgid "Edit Connection Parameters"
 msgstr "Rediger parametere for tilkobling"
 
@@ -3077,24 +3078,24 @@
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Klarte ikke å hente din personlige informasjon fra tjeneren."
 
-#: ../libempathy-gtk/empathy-user-info.c:384
+#: ../libempathy-gtk/empathy-user-info.c:395
 msgid "Go online to edit your personal information."
 msgstr "Rediger din personlige informasjon på nettet."
 
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:721
 msgid "_Edit Connection Parameters..."
 msgstr "R_ediger parametere for tilkoblingen …"
 
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1254
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Vil du fjerne %s fra din datamaskin?"
 
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1258
 msgid "This will not remove your account on the server."
 msgstr "Dette vil ikke fjerne din konto på tjeneren."
 
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1463
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3111,15 +3112,15 @@
 msgid "_Disable"
 msgstr "Slå _av"
 
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2093
 msgid "_Skip"
 msgstr "_Hopp over"
 
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2097
 msgid "_Connect"
 msgstr "_Koble til"
 
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2276
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3147,19 +3148,19 @@
 msgid "No protocol backends installed"
 msgstr "Ingen protokollmotor installert"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:287
 msgid " - Empathy authentication client"
 msgstr " - Empathy autentiseringsklient"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:303
 msgid "Empathy authentication client"
 msgstr "Empathy autentiseringsklient"
 
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:217
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy lyd-/bildeklient"
 
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:241
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy lyd-/bildeklient"
 
@@ -3201,28 +3202,28 @@
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1916
 #, c-format
 msgid "Call with %s"
 msgstr "Samtale med %s"
 
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2168
 msgid "The IP address as seen by the machine"
 msgstr "IP-adresse som sett av maskinen"
 
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2170
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adresse som sett av en tjener på internett"
 
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2172
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-adresse for peer som sett av andre siden"
 
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address of a relay server"
 msgstr "IP-adresse for en relay-tjener"
 
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address of the multicast group"
 msgstr "IP-adresse for multicast-gruppe"
 
@@ -3240,11 +3241,11 @@
 msgid "Connected — %d:%02dm"
 msgstr "Koblet til - %d:%02dm"
 
-#: ../src/empathy-call-window.c:2989
+#: ../src/empathy-call-window.c:3054
 msgid "Technical Details"
 msgstr "Tekniske detaljer"
 
-#: ../src/empathy-call-window.c:3028
+#: ../src/empathy-call-window.c:3093
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3253,7 +3254,7 @@
 "Programvaren til %s forstår ikke noen av lydformatene som støttes av din "
 "datamaskin"
 
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-call-window.c:3098
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3262,7 +3263,7 @@
 "Programvaren til %s forstår ikke noen av videoformatene som støttes av din "
 "datamaskin"
 
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3104
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3271,25 +3272,25 @@
 "Kan ikke etablere tilkobling til %s. En av dere kan være på et nettverk som "
 "ikke tillater direkte tilkoblinger."
 
-#: ../src/empathy-call-window.c:3045
+#: ../src/empathy-call-window.c:3110
 msgid "There was a failure on the network"
 msgstr "Det oppsto en feil på nettverket"
 
-#: ../src/empathy-call-window.c:3049
+#: ../src/empathy-call-window.c:3114
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Lydformatene som kreves for denne samtalen er ikke installert på din "
 "datamaskin"
 
-#: ../src/empathy-call-window.c:3052
+#: ../src/empathy-call-window.c:3117
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Videoformatene som kreves for denne samtalen er ikke installert på din "
 "datamaskin"
 
-#: ../src/empathy-call-window.c:3064
+#: ../src/empathy-call-window.c:3129
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a "
@@ -3300,19 +3301,19 @@
 "href=\"%s\">rapporter denne feilen</a> og legg ved loggene som samles inn i "
 "«Feilsøking»-vinduet i Hjelp-menyen."
 
-#: ../src/empathy-call-window.c:3073
+#: ../src/empathy-call-window.c:3138
 msgid "There was a failure in the call engine"
 msgstr "Det oppsto en feil i samtalemotoren"
 
-#: ../src/empathy-call-window.c:3076
+#: ../src/empathy-call-window.c:3141
 msgid "The end of the stream was reached"
 msgstr "Slutt på strømmen ble nådd"
 
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3181
 msgid "Can't establish audio stream"
 msgstr "Kan ikke etablere lydstrøm"
 
-#: ../src/empathy-call-window.c:3126
+#: ../src/empathy-call-window.c:3191
 msgid "Can't establish video stream"
 msgstr "Kan ikke etablere videostrøm"
 
@@ -3348,47 +3349,47 @@
 msgid "_Debug"
 msgstr "_Feilsøk"
 
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:12
 msgid "Swap camera"
 msgstr "Bytt kamera"
 
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
 msgid "Minimise me"
 msgstr "Minimer meg"
 
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
 msgid "Maximise me"
 msgstr "Maksimer meg"
 
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
 msgid "Disable camera"
 msgstr "Slå av kamera"
 
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
 msgid "Hang up"
 msgstr "Legg på"
 
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
 msgid "Hang up current call"
 msgstr "Legg på denne samtalen"
 
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
 msgid "Video call"
 msgstr "Videosamtale"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start a video call"
 msgstr "Start en videosamtale"
 
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
 msgid "Start an audio call"
 msgstr "Start en lydsamtale"
 
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
 msgid "Show dialpad"
 msgstr "Vis ringetastatur"
 
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
 msgid "Display the dialpad"
 msgstr "Vis ringetastatur"
 
@@ -3396,7 +3397,7 @@
 msgid "Send Video"
 msgstr "Send video"
 
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
 msgid "Toggle video transmission"
 msgstr "Slå av/på overføring av video"
 
@@ -3405,41 +3406,41 @@
 msgid "Send Audio"
 msgstr "Send lyd"
 
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
 msgid "Toggle audio transmission"
 msgstr "Slå av/på overføring av lyd"
 
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
 msgid "Encoding Codec:"
 msgstr "Kodek for koding:"
 
-#: ../src/empathy-call-window.c:2525 ../src/empathy-call-window.c:2526
-#: ../src/empathy-call-window.c:2527 ../src/empathy-call-window.c:2528
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
+#: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
 msgid "Decoding Codec:"
 msgstr "Kodek for dekoding:"
 
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
 msgid "Remote Candidate:"
 msgstr "Ekstern kandidat:"
 
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
 msgid "Local Candidate:"
 msgstr "Lokal kandidat:"
 
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
 msgid "Audio"
 msgstr "Lyd"
 
-#: ../src/empathy-chat-window.c:318
+#: ../src/empathy-chat-window.c:309
 msgid "Close this window?"
 msgstr "Lukk dette vinduet?"
 
-#: ../src/empathy-chat-window.c:324
+#: ../src/empathy-chat-window.c:315
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3448,7 +3449,7 @@
 "Hvis du lukker dette vinduet vil du forlate %s. Du vil ikke motta videre "
 "meldinger før du blir med igjen."
 
-#: ../src/empathy-chat-window.c:337
+#: ../src/empathy-chat-window.c:328
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3463,12 +3464,12 @@
 "Hvis du lukker dette vinduet vil du forlate %u praterom. Du vil ikke motta "
 "videre meldinger før du blir med igjen."
 
-#: ../src/empathy-chat-window.c:348
+#: ../src/empathy-chat-window.c:339
 #, c-format
 msgid "Leave %s?"
 msgstr "Forlat %s?"
 
-#: ../src/empathy-chat-window.c:350
+#: ../src/empathy-chat-window.c:341
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
@@ -3476,54 +3477,54 @@
 "Du vil ikke motta videre meldinger fra dette praterommet før du blir med "
 "igjen."
 
-#: ../src/empathy-chat-window.c:369
+#: ../src/empathy-chat-window.c:360
 msgid "Close window"
 msgstr "Lukk vindu"
 
-#: ../src/empathy-chat-window.c:369
+#: ../src/empathy-chat-window.c:360
 msgid "Leave room"
 msgstr "Forlat rom"
 
-#: ../src/empathy-chat-window.c:708 ../src/empathy-chat-window.c:731
+#: ../src/empathy-chat-window.c:699 ../src/empathy-chat-window.c:722
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d ulest)"
 msgstr[1] "%s (%d uleste)"
 
-#: ../src/empathy-chat-window.c:723
+#: ../src/empathy-chat-window.c:714
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (og %u annen)"
 msgstr[1] "%s (og %u andre)"
 
-#: ../src/empathy-chat-window.c:739
+#: ../src/empathy-chat-window.c:730
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d ulest fra andre)"
 msgstr[1] "%s (%d uleste fra andre)"
 
-#: ../src/empathy-chat-window.c:748
+#: ../src/empathy-chat-window.c:739
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d ulest fra alle)"
 msgstr[1] "%s (%d uleste fra alle)"
 
-#: ../src/empathy-chat-window.c:985
+#: ../src/empathy-chat-window.c:976
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:993
+#: ../src/empathy-chat-window.c:984
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sender %d melding"
 msgstr[1] "Sender %d meldinger"
 
-#: ../src/empathy-chat-window.c:1013
+#: ../src/empathy-chat-window.c:1004
 msgid "Typing a message."
 msgstr "Skriver en melding"
 
@@ -3587,15 +3588,15 @@
 msgid "_Detach Tab"
 msgstr "Riv _løs fane"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:245
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:263
 msgid "Room"
 msgstr "Rom"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:271
 msgid "Auto-Connect"
 msgstr "Koble til automatisk"
 
@@ -3603,99 +3604,99 @@
 msgid "Manage Favorite Rooms"
 msgstr "Håndter favorittrom"
 
-#: ../src/empathy-event-manager.c:516 ../src/empathy-event-manager.c:1026
+#: ../src/empathy-event-manager.c:510 ../src/empathy-event-manager.c:1020
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Innkommende filoverføring fra %s"
 
-#: ../src/empathy-event-manager.c:518
+#: ../src/empathy-event-manager.c:512
 #, c-format
 msgid "%s is sending you a file. Do you want to accept it?"
 msgstr "%s vil sende deg en fil. Ønsker du å ta den imot?"
 
-#: ../src/empathy-event-manager.c:538 ../src/empathy-event-manager.c:622
+#: ../src/empathy-event-manager.c:532 ../src/empathy-event-manager.c:616
 msgid "_Reject"
 msgstr "Av_vis"
 
 #: ../libempathy-gtk/empathy-subscription-dialog.c:282
-#: ../src/empathy-event-manager.c:544
+#: ../src/empathy-event-manager.c:538
 msgid "_Accept"
 msgstr "Godt_a"
 
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:591
-#: ../src/empathy-event-manager.c:994
+#: ../src/empathy-call-window.c:1542 ../src/empathy-event-manager.c:585
+#: ../src/empathy-event-manager.c:988
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Innkommende videosamtale fra %s"
 
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:591
-#: ../src/empathy-event-manager.c:994
+#: ../src/empathy-call-window.c:1542 ../src/empathy-event-manager.c:585
+#: ../src/empathy-event-manager.c:988
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Innkommende samtale fra %s"
 
-#: ../src/empathy-event-manager.c:593
+#: ../src/empathy-event-manager.c:587
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ringer deg med video. Vil du svare?"
 
-#: ../src/empathy-event-manager.c:594
+#: ../src/empathy-event-manager.c:588
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ringer deg. Vil du svare?"
 
-#: ../src/empathy-event-manager.c:630 ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:624 ../src/empathy-event-manager.c:632
 msgid "_Answer"
 msgstr "Sv_ar"
 
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:632
 msgid "_Answer with video"
 msgstr "Sv_ar med video"
 
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:787
 msgid "Room invitation"
 msgstr "Invitasjon til rom"
 
-#: ../src/empathy-event-manager.c:795
+#: ../src/empathy-event-manager.c:789
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitasjon til å bli med i %s"
 
-#: ../src/empathy-event-manager.c:802
+#: ../src/empathy-event-manager.c:796
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s inviterer deg til å bli med i %s"
 
 #: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:810
+#: ../src/empathy-event-manager.c:804
 msgid "_Decline"
 msgstr "_Avslå"
 
-#: ../src/empathy-event-manager.c:815
+#: ../src/empathy-event-manager.c:809
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../src/empathy-event-manager.c:841
+#: ../src/empathy-event-manager.c:835
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s inviterte deg til å bli med i %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:841
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Du har blitt invitert til å bli med i %s"
 
-#: ../src/empathy-event-manager.c:1054 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:1048 ../src/empathy-roster-window.c:215
 msgid "Password required"
 msgstr "Passord kreves"
 
 #: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1185
+#: ../src/empathy-event-manager.c:1179
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ønsker rettigheter til å se når du er tilkoblet"
 
-#: ../src/empathy-event-manager.c:1191
+#: ../src/empathy-event-manager.c:1185
 #, c-format
 msgid ""
 "\n"
@@ -3705,105 +3706,105 @@
 "Melding: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:149
+#: ../src/empathy-ft-manager.c:144
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:152
+#: ../src/empathy-ft-manager.c:147
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:228
+#: ../src/empathy-ft-manager.c:223
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/empathy-ft-manager.c:323
+#: ../src/empathy-ft-manager.c:318
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s av %s med %s/s"
 
-#: ../src/empathy-ft-manager.c:324
+#: ../src/empathy-ft-manager.c:319
 #, c-format
 msgid "%s of %s"
 msgstr "%s av %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:355
+#: ../src/empathy-ft-manager.c:350
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Mottar «%s» fra %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:358
+#: ../src/empathy-ft-manager.c:353
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Sender «%s» til %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:388
+#: ../src/empathy-ft-manager.c:383
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Feil ved mottak av «%s» fra %s"
 
-#: ../src/empathy-ft-manager.c:391
+#: ../src/empathy-ft-manager.c:386
 msgid "Error receiving a file"
 msgstr "Feil ved mottak av en fil"
 
-#: ../src/empathy-ft-manager.c:396
+#: ../src/empathy-ft-manager.c:391
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Feil ved sending av «%s» til %s"
 
-#: ../src/empathy-ft-manager.c:399
+#: ../src/empathy-ft-manager.c:394
 msgid "Error sending a file"
 msgstr "Feil ved sending av en fil"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:545
+#: ../src/empathy-ft-manager.c:540
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "«%s» mottatt fra %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:550
+#: ../src/empathy-ft-manager.c:545
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "«%s» sendt til %s"
 
-#: ../src/empathy-ft-manager.c:553
+#: ../src/empathy-ft-manager.c:548
 msgid "File transfer completed"
 msgstr "Filoverføring fullført"
 
-#: ../src/empathy-ft-manager.c:678 ../src/empathy-ft-manager.c:842
+#: ../src/empathy-ft-manager.c:673 ../src/empathy-ft-manager.c:837
 msgid "Waiting for the other participant's response"
 msgstr "Venter på svar fra motparten"
 
-#: ../src/empathy-ft-manager.c:704 ../src/empathy-ft-manager.c:742
+#: ../src/empathy-ft-manager.c:699 ../src/empathy-ft-manager.c:737
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Sjekker integriteten for «%s»"
 
-#: ../src/empathy-ft-manager.c:707 ../src/empathy-ft-manager.c:745
+#: ../src/empathy-ft-manager.c:702 ../src/empathy-ft-manager.c:740
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Hasher «%s»"
 
-#: ../src/empathy-ft-manager.c:1088
+#: ../src/empathy-ft-manager.c:1083
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1100
+#: ../src/empathy-ft-manager.c:1095
 msgid "File"
 msgstr "Fil"
 
-#: ../src/empathy-ft-manager.c:1122
+#: ../src/empathy-ft-manager.c:1117
 msgid "Remaining"
 msgstr "Gjenstår"
 
@@ -3815,69 +3816,69 @@
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Fjerning fullført. Filoverføringer fra listen er avbrutt og feilet"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Importer"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
 "Fant ingen kontoer å importere. Empathy støtter kun import fra Pidgin."
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Importer kontoer"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Importer"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Kilde"
 
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:232
 msgid "Provide Password"
 msgstr "Oppgi passord"
 
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:238
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../src/empathy-roster-window.c:441
+#: ../src/empathy-roster-window.c:481
 msgid "You need to setup an account to see contacts here."
 msgstr "Du må sette opp en konto for å se kontakter her."
 
-#: ../src/empathy-roster-window.c:1624
+#: ../src/empathy-roster-window.c:1709
 msgid "No match found"
 msgstr "Ingen treff funnet"
 
-#: ../src/empathy-roster-window.c:517
+#: ../src/empathy-roster-window.c:557
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "Beklager %s-kontoer kan ikke brukes før %s-programvaren er oppdatert."
 
-#: ../src/empathy-roster-window.c:695
+#: ../src/empathy-roster-window.c:735
 msgid "Update software..."
 msgstr "Oppdater programvare …"
 
-#: ../src/empathy-roster-window.c:710
+#: ../src/empathy-roster-window.c:750
 msgid "Close"
 msgstr "Lukk"
 
-#: ../src/empathy-roster-window.c:701
+#: ../src/empathy-roster-window.c:741
 msgid "Reconnect"
 msgstr "Koble til på nytt"
 
-#: ../src/empathy-roster-window.c:705
+#: ../src/empathy-roster-window.c:745
 msgid "Edit Account"
 msgstr "Rediger konto"
 
@@ -3901,17 +3902,17 @@
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-roster-window.c:1529
+#: ../src/empathy-roster-window.c:1614
 msgid "You need to enable one of your accounts to see contacts here."
 msgstr "Du må slå på en av kontoene for å se kontakter her."
 
 #. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1537
+#: ../src/empathy-roster-window.c:1622
 #, c-format
 msgid "You need to enable %s to see contacts here."
 msgstr "Du må slå på %s for å se kontakter her."
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2167
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2266
 msgid "Contact List"
 msgstr "Kontaktliste"
 
@@ -4003,15 +4004,15 @@
 msgid "Manage Favorites"
 msgstr "Håndter favoritter"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Samtalerom"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Medlemmer"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4024,13 +4025,13 @@
 "Passord kreves: %s\n"
 "Medlemmer: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "Nei"
 
@@ -4042,7 +4043,7 @@
 msgid "Could not stop room listing"
 msgstr "Kune ikke stoppe romliste"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Bli med i rom"
 
@@ -4073,79 +4074,79 @@
 msgid "Room List"
 msgstr "Romliste"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:136
 msgid "Message received"
 msgstr "Melding mottatt"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:137
 msgid "Message sent"
 msgstr "Melding sendt"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:138
 msgid "New conversation"
 msgstr "Ny samtale"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:139
 msgid "Contact comes online"
 msgstr "Kontakt kobler til"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:140
 msgid "Contact goes offline"
 msgstr "Kontakt kobler fra"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:141
 msgid "Account connected"
 msgstr "Konto koblet til"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:142
 msgid "Account disconnected"
 msgstr "Konto koblet fra"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:379
 msgid "Language"
 msgstr "Språk"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:630
 msgid "Juliet"
 msgstr "Juliet"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:637
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:643
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:647
 msgid "Deny thy father and refuse thy name;"
 msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:650
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:660
+#: ../src/empathy-preferences.c:653
 msgid "And I'll no longer be a Capulet."
 msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:656
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:666
+#: ../src/empathy-preferences.c:659
 msgid "Juliet has disconnected"
 msgstr "Juliet har koblet fra"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1025
 msgid "Preferences"
 msgstr "Brukervalg"
 
@@ -4375,138 +4376,138 @@
 msgid "Contact Map View"
 msgstr "Kartvisning for kontakter"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Lagre"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Lenke til Pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Svar fra Pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr ""
 "Data for stor for en enkel klipp-og-lim operasjon. Vennligst lagre loggene "
 "til en fil."
 
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Feilsøkingsvindu"
 
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Send til Pastebin"
 
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Nivå "
 
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Feilsøk"
 
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2073
 msgid "Message"
 msgstr "Melding"
 
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Domene"
 
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Nivå"
 
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2096
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Valgt tilkoblingshåndterer støtter ikke utvidelse for ekstern feilsøking."
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:198
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite Participant"
 msgstr "Inviter deltaker"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:199
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Velg en kontakt å invitere til samtalen:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:222
 msgid "Invite"
 msgstr "Inviter"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:173
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Ikke vis noen dialoger. Utfør arbeid (f.eks import) og avslutt"
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:177
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Ikke vis noen dialoger med mindre det kun finnes «Personer i nærheten»-"
 "kontoer"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:181
 msgid ""
 "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Velg en gitt konto ved oppstart (f.eks. gabble/jabber/foo_40eksempel_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:183
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:188
 msgid "- Empathy Accounts"
 msgstr "- Empathy-kontoer"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy-kontoer"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:67
 msgid "Show a particular service"
 msgstr "Vis en spesiell tjeneste"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:72
 msgid "- Empathy Debugger"
 msgstr "- Empathy feilsøking"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:111
 msgid "Empathy Debugger"
 msgstr "Empathy feilsøking"
 
@@ -4514,89 +4515,89 @@
 msgid "- Empathy Chat Client"
 msgstr "- Empathy lynmeldingsprogram"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:184
 msgid "Respond"
 msgstr "Svar"
 
-#: ../src/empathy-call-window.c:1494
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1546
+#: ../src/empathy-notifications-approver.c:193
 msgid "Reject"
 msgstr "Avvis"
 
-#: ../src/empathy-call-window.c:1495
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1547
+#: ../src/empathy-notifications-approver.c:198
+#: ../src/empathy-notifications-approver.c:203
 msgid "Answer"
 msgstr "Svar"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:203
 msgid "Answer with video"
 msgstr "Svar med video"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:221
 msgid "Decline"
 msgstr "Avslå"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:215
+#: ../src/empathy-notifications-approver.c:226
 msgid "Accept"
 msgstr "Godta"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:236
 msgid "Provide"
 msgstr "Oppgi"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:111
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s prøvde å ringe deg, men du var i en annen samtale."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+#: ../src/empathy-call-window.c:1122 ../src/empathy-call-window.c:1138
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:1484
+#: ../src/empathy-call-window.c:1536
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-call-window.c:2949
 msgid "On hold"
 msgstr "På vent"
 
-#: ../src/empathy-call-window.c:2888
+#: ../src/empathy-call-window.c:2953
 msgid "Mute"
 msgstr "Demp"
 
-#: ../src/empathy-call-window.c:2890
+#: ../src/empathy-call-window.c:2955
 msgid "Duration"
 msgstr "Varighet"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2893
+#: ../src/empathy-call-window.c:2958
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s – %d:%02dm"
 
-#: ../src/empathy-call-window.c:3163
+#: ../src/empathy-call-window.c:3228
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Din saldo er %s."
 
-#: ../src/empathy-call-window.c:3167
+#: ../src/empathy-call-window.c:3232
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Du har ikke nok kreditt til å starte denne samtalen."
 
-#: ../src/empathy-call-window.c:3169
+#: ../src/empathy-call-window.c:3234
 msgid "Top Up"
 msgstr "Fyll opp"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:238
 msgid "_Match case"
 msgstr "Skill _mellom små/store bokstaver"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/eog.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/eog.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/eog.po	2013-01-29 09:34:07.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/eog.po	2014-01-07 06:37:00.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 10:57+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 10:57+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #. Translaters: This string is for a toggle to display a toolbar.
@@ -60,7 +60,8 @@
 msgid "Separator"
 msgstr "Skillelinje"
 
-#: ../data/eog.desktop.in.in.h:1 ../src/eog-window.c:5742 ../src/main.c:173
+#: ../data/eog.desktop.in.in.h:1 ../src/eog-application.c:269
+#: ../src/eog-window.c:6144
 msgid "Image Viewer"
 msgstr "Bildevisning"
 
@@ -73,7 +74,7 @@
 msgid "Picture;Slideshow;Graphics;"
 msgstr "Bilde;Lysbilder;Grafikk;"
 
-#: ../data/eog-image-properties-dialog.ui.h:1 ../src/eog-window.c:4626
+#: ../data/eog-image-properties-dialog.ui.h:1 ../src/eog-window.c:5020
 msgid "Image Properties"
 msgstr "Egenskaper for bilde"
 
@@ -86,22 +87,22 @@
 msgstr "_Neste"
 
 #: ../data/eog-image-properties-dialog.ui.h:4
-#: ../src/eog-metadata-sidebar.c:498
+#: ../src/eog-metadata-sidebar.c:495
 msgid "Name:"
 msgstr "Navn:"
 
 #: ../data/eog-image-properties-dialog.ui.h:5
-#: ../src/eog-metadata-sidebar.c:500
+#: ../src/eog-metadata-sidebar.c:497
 msgid "Width:"
 msgstr "Bredde:"
 
 #: ../data/eog-image-properties-dialog.ui.h:6
-#: ../src/eog-metadata-sidebar.c:502
+#: ../src/eog-metadata-sidebar.c:499
 msgid "Height:"
 msgstr "Høyde:"
 
 #: ../data/eog-image-properties-dialog.ui.h:7
-#: ../src/eog-metadata-sidebar.c:504
+#: ../src/eog-metadata-sidebar.c:501
 msgid "Type:"
 msgstr "Type:"
 
@@ -110,87 +111,87 @@
 msgstr "Bytes:"
 
 #: ../data/eog-image-properties-dialog.ui.h:9
-#: ../src/eog-metadata-sidebar.c:508
+#: ../src/eog-metadata-sidebar.c:505
 msgid "Folder:"
 msgstr "Mappe:"
 
 #: ../data/eog-image-properties-dialog.ui.h:10
-#: ../src/eog-metadata-sidebar.c:496
+#: ../src/eog-metadata-sidebar.c:493
 msgid "General"
 msgstr "Generelt"
 
 #: ../data/eog-image-properties-dialog.ui.h:11
-#: ../src/eog-metadata-sidebar.c:528
+#: ../src/eog-metadata-sidebar.c:530
 msgid "Aperture Value:"
 msgstr "Blenderåpning:"
 
 #: ../data/eog-image-properties-dialog.ui.h:12
-#: ../src/eog-metadata-sidebar.c:531
+#: ../src/eog-metadata-sidebar.c:533
 msgid "Exposure Time:"
 msgstr "Eksponeringstid:"
 
 #: ../data/eog-image-properties-dialog.ui.h:13
-#: ../src/eog-metadata-sidebar.c:534
+#: ../src/eog-metadata-sidebar.c:536
 msgid "Focal Length:"
 msgstr "Brennvidde:"
 
 #: ../data/eog-image-properties-dialog.ui.h:14
-#: ../src/eog-metadata-sidebar.c:536
+#: ../src/eog-metadata-sidebar.c:538
 msgid "Flash:"
 msgstr "Blitz:"
 
 #: ../data/eog-image-properties-dialog.ui.h:15
-#: ../src/eog-metadata-sidebar.c:540
+#: ../src/eog-metadata-sidebar.c:542
 msgid "ISO Speed Rating:"
 msgstr "ISO-verdi:"
 
 #: ../data/eog-image-properties-dialog.ui.h:16
-#: ../src/eog-metadata-sidebar.c:543
+#: ../src/eog-metadata-sidebar.c:545
 msgid "Metering Mode:"
 msgstr "Lysmålingsmodus:"
 
 #: ../data/eog-image-properties-dialog.ui.h:17
-#: ../src/eog-metadata-sidebar.c:546
+#: ../src/eog-metadata-sidebar.c:548
 msgid "Camera Model:"
 msgstr "Kameramodell:"
 
 #: ../data/eog-image-properties-dialog.ui.h:18
-#: ../src/eog-metadata-sidebar.c:548
+#: ../src/eog-metadata-sidebar.c:550
 msgid "Date/Time:"
 msgstr "Dato/klokkeslett:"
 
 #: ../data/eog-image-properties-dialog.ui.h:19
-#: ../src/eog-metadata-sidebar.c:553
+#: ../src/eog-metadata-sidebar.c:555
 msgid "Description:"
 msgstr "Beskrivelse:"
 
 #: ../data/eog-image-properties-dialog.ui.h:20
-#: ../src/eog-metadata-sidebar.c:556
+#: ../src/eog-metadata-sidebar.c:558
 msgid "Location:"
 msgstr "Plassering:"
 
 #: ../data/eog-image-properties-dialog.ui.h:21
-#: ../src/eog-metadata-sidebar.c:559
+#: ../src/eog-metadata-sidebar.c:561
 msgid "Keywords:"
 msgstr "Nøkkelord:"
 
 #: ../data/eog-image-properties-dialog.ui.h:22
-#: ../src/eog-metadata-sidebar.c:561
+#: ../src/eog-metadata-sidebar.c:563
 msgid "Author:"
 msgstr "Forfatter:"
 
 #: ../data/eog-image-properties-dialog.ui.h:23
-#: ../src/eog-metadata-sidebar.c:564
+#: ../src/eog-metadata-sidebar.c:566
 msgid "Copyright:"
 msgstr "Opphavsrett:"
 
 #: ../data/eog-image-properties-dialog.ui.h:24
-#: ../src/eog-metadata-sidebar.c:567
+#: ../src/eog-metadata-sidebar.c:569
 msgid "Details"
 msgstr "Detaljer"
 
 #: ../data/eog-image-properties-dialog.ui.h:25
-#: ../src/eog-metadata-sidebar.c:524
+#: ../src/eog-metadata-sidebar.c:526
 msgid "Metadata"
 msgstr "Metadata"
 
@@ -212,7 +213,7 @@
 msgid "Filename format:"
 msgstr "Format for filnavn:"
 
-#: ../data/eog-multiple-save-as-dialog.ui.h:7
+#: ../data/eog-multiple-save-as-dialog.ui.h:8
 msgid "Choose a folder"
 msgstr "Velg en mappe"
 
@@ -277,7 +278,7 @@
 msgstr "Som egendefinert farge:"
 
 #: ../data/eog-preferences-dialog.ui.h:8
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:3
+#: ../data/org.gnome.eog.gschema.xml.in.h:3
 msgid "Background Color"
 msgstr "Bakgrunnsfarge"
 
@@ -341,16 +342,16 @@
 msgid "Plugins"
 msgstr "Tillegg"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:1
+#: ../data/org.gnome.eog.gschema.xml.in.h:1
 msgid "Automatic orientation"
 msgstr "Automatisk orientering"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:2
+#: ../data/org.gnome.eog.gschema.xml.in.h:2
 msgid ""
 "Whether the image should be rotated automatically based on EXIF orientation."
 msgstr "Om bildet skal roteres automatisk basert på EXIF-orientering."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:4
+#: ../data/org.gnome.eog.gschema.xml.in.h:4
 msgid ""
 "The color that is used to fill the area behind the image. If the use-"
 "background-color key is not set, the color is determined by the active GTK+ "
@@ -360,11 +361,11 @@
 "background-color» ikke er satt blir fargen bestemt av det aktive GTK+-temaet "
 "i stedet."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:5
+#: ../data/org.gnome.eog.gschema.xml.in.h:5
 msgid "Interpolate Image"
 msgstr "Interpoler bilde"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:6
+#: ../data/org.gnome.eog.gschema.xml.in.h:6
 msgid ""
 "Whether the image should be interpolated on zoom-out. This leads to better "
 "quality but is somewhat slower than non-interpolated images."
@@ -372,11 +373,11 @@
 "Om bildet skal interpoleres ved zoom ut. Dette gir bedre kvalitet, men er "
 "noe tregere enn ikke-interpolerte bilder."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:7
+#: ../data/org.gnome.eog.gschema.xml.in.h:7
 msgid "Extrapolate Image"
 msgstr "Ekstrapoler bilde"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:8
+#: ../data/org.gnome.eog.gschema.xml.in.h:8
 msgid ""
 "Whether the image should be extrapolated on zoom-in. This leads to blurry "
 "quality and is somewhat slower than non-extrapolated images."
@@ -384,11 +385,11 @@
 "Om bildet skal ekstrapoleres ved zoom inn. Dette gir en uskarp effekt og er "
 "noe tregere enn ikke-ekstrapolerte bilder."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:9
+#: ../data/org.gnome.eog.gschema.xml.in.h:9
 msgid "Transparency indicator"
 msgstr "Indikator for gjennomsiktighet"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:10
+#: ../data/org.gnome.eog.gschema.xml.in.h:10
 msgid ""
 "Determines how transparency should be indicated. Valid values are "
 "CHECK_PATTERN, COLOR and NONE. If COLOR is chosen, then the trans-color key "
@@ -398,19 +399,19 @@
 "CHECK_PATTERN, COLOR og NONE. Hvis COLOR velges bestemmes valgt fargeverdi "
 "av nøkkelen trans-color."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:11
+#: ../data/org.gnome.eog.gschema.xml.in.h:11
 msgid "Scroll wheel zoom"
 msgstr "Zoom med mushjul"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:12
+#: ../data/org.gnome.eog.gschema.xml.in.h:12
 msgid "Whether the scroll wheel should be used for zooming."
 msgstr "Om hjulet på musen skal brukes til å zoome eller ikke."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:13
+#: ../data/org.gnome.eog.gschema.xml.in.h:13
 msgid "Zoom multiplier"
 msgstr "Zoom-faktor"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:15
+#: ../data/org.gnome.eog.gschema.xml.in.h:15
 #, no-c-format
 msgid ""
 "The multiplier to be applied when using the mouse scroll wheel for zooming. "
@@ -422,11 +423,11 @@
 "definerer zoom-steg som brukes for hver rullehendelse. 0.05 gir f.eks 5% "
 "zoom for hver zoom-hendelse og 1.00 gir 100% per steg."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:16
+#: ../data/org.gnome.eog.gschema.xml.in.h:16
 msgid "Transparency color"
 msgstr "Farge for gjennomsiktighet"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:17
+#: ../data/org.gnome.eog.gschema.xml.in.h:17
 msgid ""
 "If the transparency key has the value COLOR, then this key determines the "
 "color which is used for indicating transparency."
@@ -434,11 +435,11 @@
 "Hvis nøkkel for gjennomsiktighet har verdien COLOR bestemmer denne nøkkelen "
 "farge som brukes for å indikere gjennomsiktighet."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:18
+#: ../data/org.gnome.eog.gschema.xml.in.h:18
 msgid "Use a custom background color"
 msgstr "Bruk en egendefinert bakgrunnsfarge"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:19
+#: ../data/org.gnome.eog.gschema.xml.in.h:19
 msgid ""
 "If this is active, the color set by the background-color key will be used to "
 "fill the area behind the image. If it is not set, the current GTK+ theme "
@@ -448,20 +449,20 @@
 "brukes til å fylle området bak bildet. Hvis den ikke settes vil aktivt GTK+-"
 "tema bestemme farge for fyllet."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:20
+#: ../data/org.gnome.eog.gschema.xml.in.h:20
 msgid "Loop through the image sequence"
 msgstr "Kontinuerlig visning av bildesekvensen"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:21
+#: ../data/org.gnome.eog.gschema.xml.in.h:21
 msgid "Whether the sequence of images should be shown in an endless loop."
 msgstr "Om bildesekvensen skal vises i en uendelig løkke."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:23
+#: ../data/org.gnome.eog.gschema.xml.in.h:23
 #, no-c-format
 msgid "Allow zoom greater than 100% initially"
 msgstr "Tillat zoom større enn 100% ved start"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:24
+#: ../data/org.gnome.eog.gschema.xml.in.h:24
 msgid ""
 "If this is set to FALSE small images will not be stretched to fit into the "
 "screen initially."
@@ -469,11 +470,11 @@
 "Hvis dette settes til FALSE vil ikke små bilder strekkes for å passe til "
 "skjermen."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:25
+#: ../data/org.gnome.eog.gschema.xml.in.h:25
 msgid "Delay in seconds until showing the next image"
 msgstr "Pause i sekunder før visning av neste bilde"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:26
+#: ../data/org.gnome.eog.gschema.xml.in.h:26
 msgid ""
 "A value greater than 0 determines the seconds an image stays on screen until "
 "the next one is shown automatically. Zero disables the automatic browsing."
@@ -481,19 +482,19 @@
 "En verdi større enn 0 bestemmer antall sekunder før neste bilde vises "
 "automatisk. Null deaktiverer automatisk fremvisning."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:27
+#: ../data/org.gnome.eog.gschema.xml.in.h:27
 msgid "Show/Hide the window toolbar."
 msgstr "Vis/skjul vinduets verktøylinje."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:28
+#: ../data/org.gnome.eog.gschema.xml.in.h:28
 msgid "Show/Hide the window statusbar."
 msgstr "Vis/skjul vinduets statuslinje."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:29
+#: ../data/org.gnome.eog.gschema.xml.in.h:29
 msgid "Show/Hide the image gallery pane."
 msgstr "Vis/skjul bildesamlingsområdet."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:30
+#: ../data/org.gnome.eog.gschema.xml.in.h:30
 msgid ""
 "Image gallery pane position. Set to 0 for bottom; 1 for left; 2 for top; 3 "
 "for right."
@@ -501,27 +502,27 @@
 "Posisjon for bildesamlingsområde. Sett til 0 for bunn; 1 for venstre; 2 for "
 "topp; 3 for høyre."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:31
+#: ../data/org.gnome.eog.gschema.xml.in.h:31
 msgid "Whether the image gallery pane should be resizable."
 msgstr "Om bildesamlingsområdet skal kunne endre størrelse eller ikke."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:32
+#: ../data/org.gnome.eog.gschema.xml.in.h:32
 msgid "Show/Hide the window side pane."
 msgstr "Vis/skjul vinduets sidelinje."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:33
+#: ../data/org.gnome.eog.gschema.xml.in.h:33
 msgid "Show/Hide the image gallery pane scroll buttons."
 msgstr "Vis/skjul rulleknapper for bildesamlingsområdet."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:34
+#: ../data/org.gnome.eog.gschema.xml.in.h:34
 msgid "Close main window without asking to save changes."
 msgstr "Lukk hovedvinduet uten å spørre om endringer skal lagres."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:35
+#: ../data/org.gnome.eog.gschema.xml.in.h:35
 msgid "Trash images without asking"
 msgstr "Slett bilder uten å spørre"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:36
+#: ../data/org.gnome.eog.gschema.xml.in.h:36
 msgid ""
 "If activated, Eye of GNOME won't ask for confirmation when moving images to "
 "the trash. It will still ask if any of the files cannot be moved to the "
@@ -531,14 +532,14 @@
 "flyttes til papirkurven. Programmet vil fremdeles spørre hvis noen av filene "
 "ikke kan flyttes til papirkurven og dermed må slettes i stedet."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:37
+#: ../data/org.gnome.eog.gschema.xml.in.h:37
 msgid ""
 "Whether the file chooser should show the user's pictures folder if no images "
 "are loaded."
 msgstr ""
 "Om filvelger skal vise brukers bildemappe hvis ingen bilder er lastet."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:38
+#: ../data/org.gnome.eog.gschema.xml.in.h:38
 msgid ""
 "If activated and no image is loaded in the active window, the file chooser "
 "will display the user's pictures folder using the XDG special user "
@@ -550,12 +551,12 @@
 "den deaktiveres eller bildemappen ikke er satt opp vil den vise nåværende "
 "arbeidskatalog."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:39
+#: ../data/org.gnome.eog.gschema.xml.in.h:39
 msgid ""
 "Whether the metadata list in the properties dialog should have its own page."
 msgstr "Om metadatalisten i egenskaper-dialogen skal ha sin egen side."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:40
+#: ../data/org.gnome.eog.gschema.xml.in.h:40
 msgid ""
 "If activated, the detailed metadata list in the properties dialog will be "
 "moved to its own page in the dialog. This should make the dialog more usable "
@@ -567,11 +568,11 @@
 "brukervennlig på mindre skjermer, f.eks nettbrett. Hvis den deaktiveres vil "
 "komponenten vises på «Metadata»-siden."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:41
+#: ../data/org.gnome.eog.gschema.xml.in.h:41
 msgid "External program to use for editing images"
 msgstr "Eksternt program som skal brukes til å redigere bilder"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:42
+#: ../data/org.gnome.eog.gschema.xml.in.h:42
 msgid ""
 "The desktop file name (including the \".desktop\") of the application to use "
 "for editing images (when the \"Edit Image\" toolbar button is clicked). Set "
@@ -581,11 +582,11 @@
 "til å redigere bilder (via «Rediger bilde»-knappen på verktøylinjen). Sett "
 "til tom streng for å slå av denne funksjonen."
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:43
+#: ../data/org.gnome.eog.gschema.xml.in.h:43
 msgid "Active plugins"
 msgstr "Aktive tillegg"
 
-#: ../data/org.gnome.eog.gschema.xml.in.in.h:44
+#: ../data/org.gnome.eog.gschema.xml.in.h:44
 msgid ""
 "List of active plugins. It doesn't contain the \"Location\" of the active "
 "plugins. See the .eog-plugin file for obtaining the \"Location\" of a given "
@@ -620,24 +621,24 @@
 msgid "Shows the image date in the window statusbar"
 msgstr "Viser dato for bildet i statuslinjen"
 
-#: ../src/eog-close-confirmation-dialog.c:171
+#: ../src/eog-close-confirmation-dialog.c:167
 msgid "Close _without Saving"
 msgstr "Lukk _uten å lagre"
 
-#: ../src/eog-close-confirmation-dialog.c:217
+#: ../src/eog-close-confirmation-dialog.c:213
 msgid "Question"
 msgstr "Spørsmål"
 
-#: ../src/eog-close-confirmation-dialog.c:398
+#: ../src/eog-close-confirmation-dialog.c:392
 msgid "If you don't save, your changes will be lost."
 msgstr "Hvis du ikke lagrer vil endringene gå tapt."
 
-#: ../src/eog-close-confirmation-dialog.c:435
+#: ../src/eog-close-confirmation-dialog.c:429
 #, c-format
 msgid "Save changes to image \"%s\" before closing?"
 msgstr "Lagre endringer i bilde «%s» før du lukker?"
 
-#: ../src/eog-close-confirmation-dialog.c:642
+#: ../src/eog-close-confirmation-dialog.c:636
 #, c-format
 msgid "There is %d image with unsaved changes. Save changes before closing?"
 msgid_plural ""
@@ -649,24 +650,27 @@
 "Det finnes %d bilder med endringer som ikke er lagret. Lagre endringer før "
 "programmet lukkes?"
 
-#: ../src/eog-close-confirmation-dialog.c:659
+#: ../src/eog-close-confirmation-dialog.c:653
 msgid "S_elect the images you want to save:"
 msgstr "V_elg bildene du vil lagre:"
 
 #. Secondary label
-#: ../src/eog-close-confirmation-dialog.c:678
+#: ../src/eog-close-confirmation-dialog.c:672
 msgid "If you don't save, all your changes will be lost."
 msgstr "Hvis du ikke lagrer vil alle endringene dine gå tapt."
 
-#: ../src/eog-error-message-area.c:119
+#: ../src/eog-close-confirmation-dialog.c:173
+#: ../src/eog-error-message-area.c:119 ../src/eog-file-chooser.c:457
+#: ../src/eog-file-chooser.c:465 ../src/eog-file-chooser.c:473
+#: ../src/eog-window.c:3356 ../src/eog-window.c:3359 ../src/eog-window.c:3610
 msgid "_Cancel"
 msgstr "A_vbryt"
 
-#: ../src/eog-error-message-area.c:124 ../src/eog-window.c:839
+#: ../src/eog-error-message-area.c:124 ../src/eog-window.c:847
 msgid "_Reload"
 msgstr "_Last på nytt"
 
-#: ../src/eog-error-message-area.c:129 ../src/eog-window.c:3830
+#: ../src/eog-error-message-area.c:129 ../src/eog-window.c:4074
 msgid "Save _As…"
 msgstr "L_agre som…"
 
@@ -689,67 +693,67 @@
 msgid "The given locations contain no images."
 msgstr "Oppgitte plasseringer inneholder ingen bilder."
 
-#: ../src/eog-exif-details.c:69
+#: ../src/eog-metadata-details.c:64
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../src/eog-exif-details.c:70
+#: ../src/eog-metadata-details.c:65
 msgid "Image Data"
 msgstr "Bildedata"
 
-#: ../src/eog-exif-details.c:71
+#: ../src/eog-metadata-details.c:66
 msgid "Image Taking Conditions"
 msgstr "Tilstand når bildet ble tatt"
 
-#: ../src/eog-exif-details.c:72
+#: ../src/eog-metadata-details.c:67
 msgid "GPS Data"
 msgstr "GPS-data"
 
-#: ../src/eog-exif-details.c:73
+#: ../src/eog-metadata-details.c:68
 msgid "Maker Note"
 msgstr "Utvidet metadata for kameramodell"
 
-#: ../src/eog-exif-details.c:74
+#: ../src/eog-metadata-details.c:69
 msgid "Other"
 msgstr "Annet"
 
-#: ../src/eog-exif-details.c:76
+#: ../src/eog-metadata-details.c:71
 msgid "XMP Exif"
 msgstr "XMP Exif"
 
-#: ../src/eog-exif-details.c:77
+#: ../src/eog-metadata-details.c:72
 msgid "XMP IPTC"
 msgstr "XMP IPTC"
 
-#: ../src/eog-exif-details.c:78
+#: ../src/eog-metadata-details.c:73
 msgid "XMP Rights Management"
 msgstr "XMP rettighetshåndtering"
 
-#: ../src/eog-exif-details.c:79
+#: ../src/eog-metadata-details.c:74
 msgid "XMP Other"
 msgstr "XMP annet"
 
-#: ../src/eog-exif-details.c:253
+#: ../src/eog-metadata-details.c:250
 msgid "Tag"
 msgstr "Merking"
 
-#: ../src/eog-exif-details.c:260
+#: ../src/eog-metadata-details.c:257
 msgid "Value"
 msgstr "Verdi"
 
-#: ../src/eog-exif-details.c:422
+#: ../src/eog-metadata-details.c:417
 msgid "North"
 msgstr "Nord"
 
-#: ../src/eog-exif-details.c:425
+#: ../src/eog-metadata-details.c:420
 msgid "East"
 msgstr "Øst"
 
-#: ../src/eog-exif-details.c:428
+#: ../src/eog-metadata-details.c:423
 msgid "West"
 msgstr "Vest"
 
-#: ../src/eog-exif-details.c:431
+#: ../src/eog-metadata-details.c:426
 msgid "South"
 msgstr "Sør"
 
@@ -778,11 +782,11 @@
 msgid "%.1f (35mm film)"
 msgstr "%.1f (35mm film)"
 
-#: ../src/eog-file-chooser.c:126
+#: ../src/eog-file-chooser.c:120
 msgid "File format is unknown or unsupported"
 msgstr "Filformatet er ukjent eller ikke støttet"
 
-#: ../src/eog-file-chooser.c:131
+#: ../src/eog-file-chooser.c:125
 msgid ""
 "Image Viewer could not determine a supported writable file format based on "
 "the filename."
@@ -790,76 +794,76 @@
 "Bildevisning kunne ikke bestemme et støttet skrivbart filformat basert på "
 "filnavnet."
 
-#: ../src/eog-file-chooser.c:132
+#: ../src/eog-file-chooser.c:126
 msgid "Please try a different file extension like .png or .jpg."
 msgstr "Vennligst prøv en annen filtype som .png eller .jpg."
 
 #. Filter name: First description then file extension, eg. "The PNG-Format (*.png)".
-#: ../src/eog-file-chooser.c:167
+#: ../src/eog-file-chooser.c:161
 #, c-format
 msgid "%s (*.%s)"
 msgstr "%s (*.%s)"
 
-#: ../src/eog-file-chooser.c:219
+#: ../src/eog-file-chooser.c:213
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/eog-file-chooser.c:224
+#: ../src/eog-file-chooser.c:218
 msgid "Supported image files"
 msgstr "Støttede bildefiler"
 
 #. Pixel size of image: width x height in pixel
-#: ../src/eog-file-chooser.c:296 ../src/eog-metadata-sidebar.c:235
-#: ../src/eog-metadata-sidebar.c:239 ../src/eog-properties-dialog.c:138
-#: ../src/eog-properties-dialog.c:140 ../src/eog-thumb-view.c:519
+#: ../src/eog-file-chooser.c:290 ../src/eog-metadata-sidebar.c:232
+#: ../src/eog-metadata-sidebar.c:236 ../src/eog-properties-dialog.c:135
+#: ../src/eog-properties-dialog.c:137 ../src/eog-thumb-view.c:515
 msgid "pixel"
 msgid_plural "pixels"
 msgstr[0] "piksel"
 msgstr[1] "piksler"
 
-#: ../src/eog-file-chooser.c:466
+#: ../src/eog-file-chooser.c:460
 msgid "Open Image"
 msgstr "Åpne bilde"
 
-#: ../src/eog-file-chooser.c:474
+#: ../src/eog-file-chooser.c:468
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#: ../src/eog-file-chooser.c:482
+#: ../src/eog-file-chooser.c:476
 msgid "Open Folder"
 msgstr "Åpne mappe"
 
-#: ../src/eog-image.c:615
+#: ../src/eog-image.c:613
 #, c-format
 msgid "Transformation on unloaded image."
 msgstr "Transformasjon på bilde som ikke er lastet."
 
-#: ../src/eog-image.c:643
+#: ../src/eog-image.c:641
 #, c-format
 msgid "Transformation failed."
 msgstr "Transformasjon feilet."
 
-#: ../src/eog-image.c:1104
+#: ../src/eog-image.c:1110
 #, c-format
 msgid "EXIF not supported for this file format."
 msgstr "EXIF er ikke støttet for dette filformatet."
 
-#: ../src/eog-image.c:1253
+#: ../src/eog-image.c:1259
 #, c-format
 msgid "Image loading failed."
 msgstr "Lasting av bilde feilet."
 
-#: ../src/eog-image.c:1834 ../src/eog-image.c:1954
+#: ../src/eog-image.c:1840 ../src/eog-image.c:1960
 #, c-format
 msgid "No image loaded."
 msgstr "Ingen bilder lastet."
 
-#: ../src/eog-image.c:1842 ../src/eog-image.c:1963
+#: ../src/eog-image.c:1848 ../src/eog-image.c:1969
 #, c-format
 msgid "You do not have the permissions necessary to save the file."
 msgstr "Du har ikke tilstrekkelige rettigheter til å lagre filen."
 
-#: ../src/eog-image.c:1852 ../src/eog-image.c:1974
+#: ../src/eog-image.c:1858 ../src/eog-image.c:1980
 #, c-format
 msgid "Temporary file creation failed."
 msgstr "Oppretting av midlertidig fil feilet."
@@ -874,16 +878,16 @@
 msgid "Couldn't allocate memory for loading JPEG file"
 msgstr "Kunne ikke reservere minne for lasting av JPEG-fil"
 
-#: ../src/eog-metadata-sidebar.c:248 ../src/eog-properties-dialog.c:155
+#: ../src/eog-metadata-sidebar.c:245 ../src/eog-properties-dialog.c:152
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/eog-metadata-sidebar.c:506
+#: ../src/eog-metadata-sidebar.c:503
 msgid "File size:"
 msgstr "Filstørrelse:"
 
-#: ../src/eog-metadata-sidebar.c:517 ../src/eog-properties-dialog.c:674
-#: ../src/eog-window.c:3834
+#: ../src/eog-metadata-sidebar.c:519 ../src/eog-properties-dialog.c:669
+#: ../src/eog-window.c:4078
 msgid "Show the folder which contains this file in the file manager"
 msgstr "Vis mappen som inneholder denne filen i filhåndterer"
 
@@ -891,95 +895,95 @@
 msgid "Image Settings"
 msgstr "Egenskaper for bilde"
 
-#: ../src/eog-print-image-setup.c:906
+#: ../src/eog-print-image-setup.c:902
 msgid "Image"
 msgstr "Bilde"
 
-#: ../src/eog-print-image-setup.c:907
+#: ../src/eog-print-image-setup.c:903
 msgid "The image whose printing properties will be set up"
 msgstr "Bilde som skal brukes til egenskaper for utskrift"
 
-#: ../src/eog-print-image-setup.c:913
+#: ../src/eog-print-image-setup.c:909
 msgid "Page Setup"
 msgstr "Sideoppsett"
 
-#: ../src/eog-print-image-setup.c:914
+#: ../src/eog-print-image-setup.c:910
 msgid "The information for the page where the image will be printed"
 msgstr "Informasjon for siden hvor bildet skal skrives ut"
 
-#: ../src/eog-print-image-setup.c:942
+#: ../src/eog-print-image-setup.c:936
 msgid "Position"
 msgstr "Posisjon"
 
-#: ../src/eog-print-image-setup.c:946
+#: ../src/eog-print-image-setup.c:940
 msgid "_Left:"
 msgstr "_Venstre:"
 
-#: ../src/eog-print-image-setup.c:948
+#: ../src/eog-print-image-setup.c:942
 msgid "_Right:"
 msgstr "Høy_re:"
 
-#: ../src/eog-print-image-setup.c:949
+#: ../src/eog-print-image-setup.c:943
 msgid "_Top:"
 msgstr "_Topp:"
 
-#: ../src/eog-print-image-setup.c:950
+#: ../src/eog-print-image-setup.c:944
 msgid "_Bottom:"
 msgstr "_Bunn:"
 
-#: ../src/eog-print-image-setup.c:953
+#: ../src/eog-print-image-setup.c:947
 msgid "C_enter:"
 msgstr "S_entrert:"
 
-#: ../src/eog-print-image-setup.c:958
+#: ../src/eog-print-image-setup.c:952
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/eog-print-image-setup.c:960
+#: ../src/eog-print-image-setup.c:954
 msgid "Horizontal"
 msgstr "Horisontal"
 
-#: ../src/eog-print-image-setup.c:962
+#: ../src/eog-print-image-setup.c:956
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: ../src/eog-print-image-setup.c:964
+#: ../src/eog-print-image-setup.c:958
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/eog-print-image-setup.c:980
+#: ../src/eog-print-image-setup.c:974
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../src/eog-print-image-setup.c:983
+#: ../src/eog-print-image-setup.c:977
 msgid "_Width:"
 msgstr "_Bredde:"
 
-#: ../src/eog-print-image-setup.c:985
+#: ../src/eog-print-image-setup.c:979
 msgid "_Height:"
 msgstr "_Høyde:"
 
-#: ../src/eog-print-image-setup.c:988
+#: ../src/eog-print-image-setup.c:982
 msgid "_Scaling:"
 msgstr "_Skalering:"
 
-#: ../src/eog-print-image-setup.c:999
+#: ../src/eog-print-image-setup.c:993
 msgid "_Unit:"
 msgstr "En_het:"
 
-#: ../src/eog-print-image-setup.c:1004
+#: ../src/eog-print-image-setup.c:998
 msgid "Millimeters"
 msgstr "Millimetere"
 
-#: ../src/eog-print-image-setup.c:1006
+#: ../src/eog-print-image-setup.c:1000
 msgid "Inches"
 msgstr "Tommer"
 
-#: ../src/eog-print-image-setup.c:1035
+#: ../src/eog-print-image-setup.c:1029
 msgid "Preview"
 msgstr "Forhåndsvis"
 
-#: ../src/eog-save-as-dialog-helper.c:161
+#: ../src/eog-save-as-dialog-helper.c:162
 msgid "as is"
 msgstr "som det er"
 
@@ -993,16 +997,16 @@
 #. * Note that translating this doesn't guarantee that you get localized
 #. * digits. That needs support from your system and locale definition
 #. * too.
-#: ../src/eog-statusbar.c:131
+#: ../src/eog-statusbar.c:126
 #, c-format
 msgid "%d / %d"
 msgstr "%d / %d"
 
-#: ../src/eog-thumb-view.c:547
+#: ../src/eog-thumb-view.c:543
 msgid "Taken on"
 msgstr "Tatt"
 
-#: ../src/eog-uri-converter.c:984
+#: ../src/eog-uri-converter.c:980
 #, c-format
 msgid "At least two file names are equal."
 msgstr "Minst to filnavn er like."
@@ -1021,21 +1025,21 @@
 #. * - image height
 #. * - image size in bytes
 #. * - zoom in percent
-#: ../src/eog-window.c:533
+#: ../src/eog-window.c:541
 #, c-format
 msgid "%i × %i pixel  %s    %i%%"
 msgid_plural "%i × %i pixels  %s    %i%%"
 msgstr[0] "%i x %i piksel  %s   %i%%"
 msgstr[1] "%i x %i piksler  %s   %i%%"
 
-#: ../src/eog-window.c:841 ../src/eog-window.c:2778
+#: ../src/eog-window.c:849 ../src/eog-window.c:2775
 msgctxt "MessageArea"
 msgid "Hi_de"
 msgstr "Skj_ul"
 
 #. The newline character is currently necessary due to a problem
 #. * with the automatic line break.
-#: ../src/eog-window.c:851
+#: ../src/eog-window.c:859
 #, c-format
 msgid ""
 "The image \"%s\" has been modified by an external application.\n"
@@ -1044,7 +1048,7 @@
 "Bilde «%s» er endret av et eksternt program.\n"
 "Vil du laste bildet på nytt?"
 
-#: ../src/eog-window.c:1015
+#: ../src/eog-window.c:1023
 #, c-format
 msgid "Use \"%s\" to open the selected image"
 msgstr "Bruk «%s» til å åpne valgt bilde"
@@ -1054,17 +1058,17 @@
 #. * - the original filename
 #. * - the current image's position in the queue
 #. * - the total number of images queued for saving
-#: ../src/eog-window.c:1171
+#: ../src/eog-window.c:1179
 #, c-format
 msgid "Saving image \"%s\" (%u/%u)"
 msgstr "Lagrer bilde «%s» (%u/%u)"
 
-#: ../src/eog-window.c:1553
+#: ../src/eog-window.c:1574
 #, c-format
 msgid "Opening image \"%s\""
 msgstr "Åpner bilde «%s»"
 
-#: ../src/eog-window.c:2262
+#: ../src/eog-window.c:2259
 #, c-format
 msgid ""
 "Error printing file:\n"
@@ -1073,15 +1077,15 @@
 "Feil under utskrift av fil:\n"
 "%s"
 
-#: ../src/eog-window.c:2561
+#: ../src/eog-window.c:2558
 msgid "Toolbar Editor"
 msgstr "Rediger verktøylinje"
 
-#: ../src/eog-window.c:2564
+#: ../src/eog-window.c:2561
 msgid "_Reset to Default"
 msgstr "_Sett til forvalg"
 
-#: ../src/eog-window.c:5748
+#: ../src/eog-window.c:6150
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -1095,23 +1099,23 @@
 "  TH https://launchpad.net/~thaugseth\n"
 "  Terance Edward Sola https://launchpad.net/~tedsola"
 
-#: ../src/eog-window.c:5745
+#: ../src/eog-window.c:6147
 msgid "The GNOME image viewer."
 msgstr "Bildevisning for GNOME."
 
-#: ../src/eog-window.c:2725 ../src/eog-window.c:2740
+#: ../src/eog-window.c:2722 ../src/eog-window.c:2737
 msgid "Error launching System Settings: "
 msgstr "Feil under oppstart av systeminnstillinger: "
 
 #. I18N: When setting mnemonics for these strings, watch out to not
 #. clash with mnemonics from eog's menubar
-#: ../src/eog-window.c:2776
+#: ../src/eog-window.c:2773
 msgid "_Open Background Preferences"
 msgstr "_Åpne brukervalg for bakgrunn"
 
 #. The newline character is currently necessary due to a problem
 #. * with the automatic line break.
-#: ../src/eog-window.c:2792
+#: ../src/eog-window.c:2789
 #, c-format
 msgid ""
 "The image \"%s\" has been set as Desktop Background.\n"
@@ -1120,11 +1124,11 @@
 "Bilde «%s» er satt som skrivebordsbakgrunn.\n"
 "Vil du forandre utseende på bildet?"
 
-#: ../src/eog-window.c:3259
+#: ../src/eog-window.c:3254
 msgid "Saving image locally…"
 msgstr "Lagrer bildet lokalt…"
 
-#: ../src/eog-window.c:3339
+#: ../src/eog-window.c:3583
 #, c-format
 msgid ""
 "Are you sure you want to move\n"
@@ -1133,7 +1137,7 @@
 "Er du sikker på at du vil\n"
 "flytte «%s» til papirkurven?"
 
-#: ../src/eog-window.c:3342
+#: ../src/eog-window.c:3586
 #, c-format
 msgid ""
 "A trash for \"%s\" couldn't be found. Do you want to remove this image "
@@ -1142,7 +1146,7 @@
 "Fant ikke papirkurv for «%s». Er du sikker på at du vil fjerne dette bildet "
 "permanent?"
 
-#: ../src/eog-window.c:3347
+#: ../src/eog-window.c:3591
 #, c-format
 msgid ""
 "Are you sure you want to move\n"
@@ -1157,7 +1161,7 @@
 "Er du sikker på at du vil\n"
 "flytte %d valgte bilder til papirkurven?"
 
-#: ../src/eog-window.c:3352
+#: ../src/eog-window.c:3596
 msgid ""
 "Some of the selected images can't be moved to the trash and will be removed "
 "permanently. Are you sure you want to proceed?"
@@ -1165,420 +1169,423 @@
 "Noen av de valgte bildene kan ikke flyttes til papirkurven og vil bli "
 "fjernet permanent. Er du sikker på at du vil fortsette?"
 
-#: ../src/eog-window.c:3369 ../src/eog-window.c:3860 ../src/eog-window.c:3884
+#: ../src/eog-window.c:3613 ../src/eog-window.c:4104 ../src/eog-window.c:4131
 msgid "Move to _Trash"
 msgstr "Flytt til _papirkurv"
 
-#: ../src/eog-window.c:3371
+#: ../src/eog-window.c:3378
 msgid "_Do not ask again during this session"
 msgstr "Ikke spør i_gjen under denne økten"
 
-#: ../src/eog-window.c:3416 ../src/eog-window.c:3430
+#: ../src/eog-window.c:3660 ../src/eog-window.c:3674
 #, c-format
 msgid "Couldn't access trash."
 msgstr "Kunne ikke aksessere papirkurv."
 
-#: ../src/eog-window.c:3438
+#: ../src/eog-window.c:3440 ../src/eog-window.c:3682
 #, c-format
 msgid "Couldn't delete file"
 msgstr "Kunne ikke slette fil"
 
-#: ../src/eog-window.c:3534
+#. set dialog error message
+#: ../src/eog-window.c:3490 ../src/eog-window.c:3778
 #, c-format
 msgid "Error on deleting image %s"
 msgstr "Feil under sletting av bilde %s"
 
-#: ../src/eog-window.c:3781
+#: ../src/eog-window.c:4025
 msgid "_Image"
 msgstr "_Bilde"
 
-#: ../src/eog-window.c:3782
+#: ../src/eog-window.c:4026
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../data/eog-app-menu.xml.h:1 ../src/eog-window.c:3783
+#: ../data/eog-app-menu.xml.h:1 ../src/eog-window.c:4027
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/eog-window.c:3784
+#: ../src/eog-window.c:4028
 msgid "_Go"
 msgstr "_Gå til"
 
-#: ../src/eog-window.c:3785
+#: ../src/eog-window.c:4029
 msgid "_Tools"
 msgstr "Verk_tøy"
 
-#: ../data/eog-app-menu.xml.h:7 ../src/eog-window.c:3786
+#: ../data/eog-app-menu.xml.h:7 ../src/eog-window.c:2565
+#: ../src/eog-window.c:4030
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/eog-window.c:3788
+#: ../src/eog-window.c:4032
 msgid "_Open…"
 msgstr "_Åpne…"
 
-#: ../src/eog-window.c:3789
+#: ../src/eog-window.c:4033
 msgid "Open a file"
 msgstr "Åpne en fil"
 
-#: ../src/eog-window.c:3791
+#: ../src/eog-window.c:2563 ../src/eog-window.c:4035
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ../src/eog-window.c:3792
+#: ../src/eog-window.c:4036
 msgid "Close window"
 msgstr "Lukk vindu"
 
-#: ../src/eog-window.c:3794
+#: ../src/eog-window.c:4038
 msgid "T_oolbar"
 msgstr "V_erktøylinje"
 
-#: ../src/eog-window.c:3795
+#: ../src/eog-window.c:4039
 msgid "Edit the application toolbar"
 msgstr "Rediger programmets verktøylinje"
 
-#: ../data/eog-app-menu.xml.h:6 ../src/eog-window.c:3797
+#: ../data/eog-app-menu.xml.h:6 ../src/eog-window.c:4041
 msgid "Prefere_nces"
 msgstr "_Brukervalg"
 
-#: ../src/eog-window.c:3798
+#: ../src/eog-window.c:4042
 msgid "Preferences for Image Viewer"
 msgstr "Brukervalg for bildevisning"
 
-#: ../src/eog-window.c:3800
+#: ../src/eog-window.c:4044
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../src/eog-window.c:3801
+#: ../src/eog-window.c:4045
 msgid "Help on this application"
 msgstr "Hjelp om dette programmet"
 
-#: ../src/eog-window.c:3803
+#: ../data/eog-app-menu.xml.h:8 ../src/eog-window.c:4047
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/eog-window.c:3804
+#: ../src/eog-window.c:4048
 msgid "About this application"
 msgstr "Om dette programmet"
 
-#: ../data/eog-app-menu.xml.h:2 ../src/eog-window.c:3809
+#: ../data/eog-app-menu.xml.h:2 ../src/eog-window.c:4053
 msgid "_Toolbar"
 msgstr "Verk_tøylinje"
 
-#: ../src/eog-window.c:3810
+#: ../src/eog-window.c:4054
 msgid "Changes the visibility of the toolbar in the current window"
 msgstr "Endrer synlighet for verktøylinjen i aktivt vindu"
 
-#: ../data/eog-app-menu.xml.h:3 ../src/eog-window.c:3812
+#: ../data/eog-app-menu.xml.h:3 ../src/eog-window.c:4056
 msgid "_Statusbar"
 msgstr "_Statuslinje"
 
-#: ../src/eog-window.c:3813
+#: ../src/eog-window.c:4057
 msgid "Changes the visibility of the statusbar in the current window"
 msgstr "Endrer synlighet for statuslinjen i aktivt vindu"
 
-#: ../data/eog-app-menu.xml.h:4 ../src/eog-window.c:3815
+#: ../data/eog-app-menu.xml.h:4 ../src/eog-window.c:4059
 msgid "_Image Gallery"
 msgstr "B_ildesamling"
 
-#: ../src/eog-window.c:3816
+#: ../src/eog-window.c:4060
 msgid ""
 "Changes the visibility of the image gallery pane in the current window"
 msgstr "Endre synlighet for bildesamlingsområdet i aktivt vindu"
 
-#: ../data/eog-app-menu.xml.h:5 ../src/eog-window.c:3818
+#: ../data/eog-app-menu.xml.h:5 ../src/eog-window.c:4062
 msgid "Side _Pane"
 msgstr "Side_linje"
 
-#: ../src/eog-window.c:3819
+#: ../src/eog-window.c:4063
 msgid "Changes the visibility of the side pane in the current window"
 msgstr "Endrer synlighet for sidelinjen i aktivt vindu"
 
-#: ../src/eog-window.c:3824
+#: ../src/eog-close-confirmation-dialog.c:179 ../src/eog-file-chooser.c:466
+#: ../src/eog-window.c:4068
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../src/eog-window.c:3825
+#: ../src/eog-window.c:4069
 msgid "Save changes in currently selected images"
 msgstr "Lagre endringene i de aktive valgte bildene"
 
-#: ../src/eog-window.c:3827
+#: ../src/eog-window.c:4071
 msgid "Open _with"
 msgstr "Åpne _med"
 
-#: ../src/eog-window.c:3828
+#: ../src/eog-window.c:4072
 msgid "Open the selected image with a different application"
 msgstr "Åpne det valgte bildet med et annet program"
 
-#: ../src/eog-window.c:3831
+#: ../src/eog-window.c:4075
 msgid "Save the selected images with a different name"
 msgstr "Lagre de valgte bildene med et annet navn"
 
-#: ../src/eog-window.c:3833
+#: ../src/eog-window.c:4077
 msgid "Show Containing _Folder"
 msgstr "Vis opphavs_mappe"
 
-#: ../src/eog-window.c:3836
+#: ../src/eog-window.c:4080
 msgid "_Print…"
 msgstr "S_kriv ut…"
 
-#: ../src/eog-window.c:3837
+#: ../src/eog-window.c:4081
 msgid "Print the selected image"
 msgstr "Skriv ut valgt bilde"
 
-#: ../src/eog-window.c:3839
+#: ../src/eog-window.c:4083
 msgid "Prope_rties"
 msgstr "Egenskape_r"
 
-#: ../src/eog-window.c:3840
+#: ../src/eog-window.c:4084
 msgid "Show the properties and metadata of the selected image"
 msgstr "Vis egenskaper og metadata for det valgte bildet"
 
-#: ../src/eog-window.c:3842
+#: ../src/eog-window.c:4086
 msgid "_Undo"
 msgstr "_Angre"
 
-#: ../src/eog-window.c:3843
+#: ../src/eog-window.c:4087
 msgid "Undo the last change in the image"
 msgstr "Angre siste endring i bildet"
 
-#: ../src/eog-window.c:3845
+#: ../src/eog-window.c:4089
 msgid "Flip _Horizontal"
 msgstr "Vend _horisontalt"
 
-#: ../src/eog-window.c:3846
+#: ../src/eog-window.c:4090
 msgid "Mirror the image horizontally"
 msgstr "Speil bildet horisontalt"
 
-#: ../src/eog-window.c:3848
+#: ../src/eog-window.c:4092
 msgid "Flip _Vertical"
 msgstr "Vend _vertikalt"
 
-#: ../src/eog-window.c:3849
+#: ../src/eog-window.c:4093
 msgid "Mirror the image vertically"
 msgstr "Speil bildet vertikalt"
 
-#: ../src/eog-window.c:3851
+#: ../src/eog-window.c:4095
 msgid "_Rotate Clockwise"
 msgstr "_Roter med klokken"
 
-#: ../src/eog-window.c:3852
+#: ../src/eog-window.c:4096
 msgid "Rotate the image 90 degrees to the right"
 msgstr "Roter bildet 90 grader til høyre"
 
-#: ../src/eog-window.c:3854
+#: ../src/eog-window.c:4098
 msgid "Rotate Counterc_lockwise"
 msgstr "Roter mot k_lokken"
 
-#: ../src/eog-window.c:3855
+#: ../src/eog-window.c:4099
 msgid "Rotate the image 90 degrees to the left"
 msgstr "Roter bildet 90 grader til venstre"
 
-#: ../src/eog-window.c:3816
+#: ../src/eog-window.c:3814
 msgid "Set as _Desktop Background"
 msgstr "Som bakgrunn for skrivebor_det"
 
-#: ../src/eog-window.c:3817
+#: ../src/eog-window.c:3815
 msgid "Set the selected image as the desktop background"
 msgstr "Sett valgt bilde som skrivebordsbakgrunn"
 
-#: ../src/eog-window.c:3861
+#: ../src/eog-window.c:4105
 msgid "Move the selected image to the trash folder"
 msgstr "Flytt valgt bilde til papirkurven"
 
-#: ../src/eog-window.c:3863
+#: ../src/eog-window.c:4110
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../src/eog-window.c:3864
+#: ../src/eog-window.c:4111
 msgid "Copy the selected image to the clipboard"
 msgstr "Kopier valgt bilde til utklippstavlen"
 
-#: ../src/eog-window.c:3866 ../src/eog-window.c:3875 ../src/eog-window.c:3878
+#: ../src/eog-window.c:4113 ../src/eog-window.c:4122 ../src/eog-window.c:4125
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
-#: ../src/eog-window.c:3867 ../src/eog-window.c:3876
+#: ../src/eog-window.c:4114 ../src/eog-window.c:4123
 msgid "Enlarge the image"
 msgstr "Forstørr bildet"
 
-#: ../src/eog-window.c:3869 ../src/eog-window.c:3881
+#: ../src/eog-window.c:4116 ../src/eog-window.c:4128
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../src/eog-window.c:3870 ../src/eog-window.c:3879 ../src/eog-window.c:3882
+#: ../src/eog-window.c:4117 ../src/eog-window.c:4126 ../src/eog-window.c:4129
 msgid "Shrink the image"
 msgstr "Krymp bildet"
 
-#: ../src/eog-window.c:3872
+#: ../src/eog-window.c:4119
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: ../src/eog-window.c:3873
+#: ../src/eog-window.c:4120
 msgid "Show the image at its normal size"
 msgstr "Vis bildet i normal størrelse"
 
-#: ../src/eog-window.c:3890
+#: ../src/eog-window.c:4137
 msgid "_Fullscreen"
 msgstr "_Full skjerm"
 
-#: ../src/eog-window.c:3891
+#: ../src/eog-window.c:4138
 msgid "Show the current image in fullscreen mode"
 msgstr "Vis det aktive bildet i fullskjerm-modus"
 
-#: ../src/eog-window.c:3893
+#: ../src/eog-window.c:4140
 msgid "Pause Slideshow"
 msgstr "Sett lysbildevisning på pause"
 
-#: ../src/eog-window.c:3894
+#: ../src/eog-window.c:4141
 msgid "Pause or resume the slideshow"
 msgstr "Sett lysbildevisning på pause eller gjenoppta den"
 
-#: ../src/eog-window.c:3896
+#: ../src/eog-window.c:4143
 msgid "_Best Fit"
 msgstr "_Beste tilpasning"
 
-#: ../src/eog-window.c:3897
+#: ../src/eog-window.c:4144
 msgid "Fit the image to the window"
 msgstr "Tilpass bildet til vinduet"
 
-#: ../src/eog-window.c:3902 ../src/eog-window.c:3917
+#: ../src/eog-window.c:4149 ../src/eog-window.c:4164
 msgid "_Previous Image"
 msgstr "F_orrige bilde"
 
-#: ../src/eog-window.c:3903
+#: ../src/eog-window.c:4150
 msgid "Go to the previous image of the gallery"
 msgstr "Gå til forrige bilde i samlingen"
 
-#: ../src/eog-window.c:3905
+#: ../src/eog-window.c:4152
 msgid "_Next Image"
 msgstr "_Neste bilde"
 
-#: ../src/eog-window.c:3906
+#: ../src/eog-window.c:4153
 msgid "Go to the next image of the gallery"
 msgstr "Gå til neste bilde i samlingen"
 
-#: ../src/eog-window.c:3908 ../src/eog-window.c:3920
+#: ../src/eog-window.c:4155 ../src/eog-window.c:4167
 msgid "_First Image"
 msgstr "_Første bilde"
 
-#: ../src/eog-window.c:3909
+#: ../src/eog-window.c:4156
 msgid "Go to the first image of the gallery"
 msgstr "Gå til første bilde i samlingen"
 
-#: ../src/eog-window.c:3911 ../src/eog-window.c:3923
+#: ../src/eog-window.c:4158 ../src/eog-window.c:4170
 msgid "_Last Image"
 msgstr "_Siste bilde"
 
-#: ../src/eog-window.c:3912
+#: ../src/eog-window.c:4159
 msgid "Go to the last image of the gallery"
 msgstr "Gå til siste bilde i samlingen"
 
-#: ../src/eog-window.c:3914
+#: ../src/eog-window.c:4161
 msgid "_Random Image"
 msgstr "Tilfel_dig bilde"
 
-#: ../src/eog-window.c:3915
+#: ../src/eog-window.c:4162
 msgid "Go to a random image of the gallery"
 msgstr "Gå til et tilfeldig bilde i samlingen"
 
-#: ../src/eog-window.c:3929
+#: ../src/eog-window.c:4320
 msgid "S_lideshow"
 msgstr "Lysbi_ldevisning"
 
-#: ../src/eog-window.c:3930
+#: ../src/eog-window.c:4321
 msgid "Start a slideshow view of the images"
 msgstr "Start lysbildevisning av bildene"
 
-#: ../src/eog-window.c:3998
+#: ../src/eog-window.c:4389
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../src/eog-window.c:4002
+#: ../src/eog-window.c:4393
 msgid "Next"
 msgstr "Neste"
 
-#: ../src/eog-window.c:4006
+#: ../src/eog-window.c:4397
 msgid "Right"
 msgstr "Høyre"
 
-#: ../src/eog-window.c:4009
+#: ../src/eog-window.c:4400
 msgid "Left"
 msgstr "Venstre"
 
-#: ../src/eog-window.c:4012
+#: ../src/eog-window.c:4403
 msgid "Show Folder"
 msgstr "Vis mappe"
 
-#: ../src/eog-window.c:4015
+#: ../src/eog-window.c:4406
 msgid "In"
 msgstr "Inn"
 
-#: ../src/eog-window.c:4018
+#: ../src/eog-window.c:4409
 msgid "Out"
 msgstr "Ut"
 
-#: ../src/eog-window.c:4021
+#: ../src/eog-window.c:4412
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/eog-window.c:4024
+#: ../src/eog-window.c:4415
 msgid "Fit"
 msgstr "Tilpass"
 
-#: ../src/eog-window.c:4027
+#: ../src/eog-window.c:4418
 msgid "Gallery"
 msgstr "Samling"
 
-#: ../src/eog-window.c:4044
+#: ../src/eog-window.c:4435
 msgctxt "action (to trash)"
 msgid "Trash"
 msgstr "Legg i papirkurv"
 
-#: ../src/eog-window.c:4410
+#: ../src/eog-window.c:4801
 #, c-format
 msgid "Edit the current image using %s"
 msgstr "Rediger dette bildet med %s"
 
-#: ../src/eog-window.c:4412
+#: ../src/eog-window.c:4803
 msgid "Edit Image"
 msgstr "Rediger bilde"
 
-#: ../src/main.c:71
+#: ../src/main.c:56
 msgid "GNOME Image Viewer"
 msgstr "GNOME bildevisning"
 
-#: ../src/main.c:78
+#: ../src/main.c:63
 msgid "Open in fullscreen mode"
 msgstr "Åpne i fullskjermmodus"
 
-#: ../src/main.c:79
+#: ../src/main.c:64
 msgid "Disable image gallery"
 msgstr "Slå av bildesamling"
 
-#: ../src/main.c:80
+#: ../src/main.c:65
 msgid "Open in slideshow mode"
 msgstr "Åpne i presentasjonsmodus"
 
-#: ../src/main.c:81
+#: ../src/main.c:66
 msgid "Start a new instance instead of reusing an existing one"
 msgstr "Starter en ny instans i stedet for å gjenbruke en eksisterende"
 
-#: ../src/main.c:82
+#: ../src/main.c:67
 msgid ""
 "Open in a single window, if multiple windows are open the first one is used"
 msgstr ""
 "Åpne i et enkelt vindu. Hvis flere vinduer er åpne vil det første bli brukt"
 
-#: ../src/main.c:84
+#: ../src/main.c:69
 msgid "Show the application's version"
 msgstr "Vis programmets versjon"
 
-#: ../src/main.c:116
+#: ../src/main.c:99
 msgid "[FILE…]"
 msgstr "[FIL…]"
 
 #. I18N: The '%s' is replaced with eog's command name.
-#: ../src/main.c:129
+#: ../src/main.c:112
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/evince.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/evince.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/evince.po	2013-01-29 09:33:51.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/evince.po	2014-01-07 06:37:10.000000000 +0000
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: evince 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-10 20:51+0000\n"
-"PO-Revision-Date: 2012-09-10 23:34+0000\n"
+"POT-Creation-Date: 2013-07-21 18:02+0000\n"
+"PO-Revision-Date: 2013-07-21 20:24+0000\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:27+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:44+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../backend/comics/comics-document.c:210
@@ -49,8 +49,8 @@
 "tegneserien"
 
 #: ../libdocument/ev-document-factory.c:364
-#: ../libdocument/ev-file-helpers.c:490 ../libdocument/ev-file-helpers.c:536
-#: ../libdocument/ev-file-helpers.c:555
+#: ../libdocument/ev-file-helpers.c:491 ../libdocument/ev-file-helpers.c:537
+#: ../libdocument/ev-file-helpers.c:556
 msgid "Unknown MIME Type"
 msgstr "Ukjent MIME-type"
 
@@ -81,11 +81,11 @@
 msgid "Comic Books"
 msgstr "Tegneserier"
 
-#: ../backend/djvu/djvu-document.c:170
+#: ../backend/djvu/djvu-document.c:175
 msgid "DjVu document has incorrect format"
 msgstr "DjVu-dokumentet har feil format"
 
-#: ../backend/djvu/djvu-document.c:247
+#: ../backend/djvu/djvu-document.c:262
 msgid ""
 "The document is composed of several files. One or more of these files cannot "
 "be accessed."
@@ -105,7 +105,7 @@
 msgid "DVI Documents"
 msgstr "DVI-dokumenter"
 
-#: ../backend/pdf/ev-poppler.cc:639
+#: ../backend/pdf/ev-poppler.cc:636
 msgid "This work is in the Public Domain"
 msgstr "Dette arbeidet er Public Domain"
 
@@ -119,51 +119,51 @@
 msgid "No"
 msgstr "Nei"
 
-#: ../backend/pdf/ev-poppler.cc:1032
+#: ../backend/pdf/ev-poppler.cc:1028
 msgid "Type 1"
 msgstr "Type 1"
 
-#: ../backend/pdf/ev-poppler.cc:1034
+#: ../backend/pdf/ev-poppler.cc:1030
 msgid "Type 1C"
 msgstr "Type 1C"
 
-#: ../backend/pdf/ev-poppler.cc:1036
+#: ../backend/pdf/ev-poppler.cc:1032
 msgid "Type 3"
 msgstr "Type 3"
 
-#: ../backend/pdf/ev-poppler.cc:1038
+#: ../backend/pdf/ev-poppler.cc:1034
 msgid "TrueType"
 msgstr "TrueType"
 
-#: ../backend/pdf/ev-poppler.cc:1040
+#: ../backend/pdf/ev-poppler.cc:1036
 msgid "Type 1 (CID)"
 msgstr "Type 1 (CID)"
 
-#: ../backend/pdf/ev-poppler.cc:1042
+#: ../backend/pdf/ev-poppler.cc:1038
 msgid "Type 1C (CID)"
 msgstr "Type 1C (CID)"
 
-#: ../backend/pdf/ev-poppler.cc:1044
+#: ../backend/pdf/ev-poppler.cc:1040
 msgid "TrueType (CID)"
 msgstr "TrueType (CID)"
 
-#: ../backend/pdf/ev-poppler.cc:1046
+#: ../backend/pdf/ev-poppler.cc:1042
 msgid "Unknown font type"
 msgstr "Ukjent skrifttype"
 
-#: ../backend/pdf/ev-poppler.cc:1077
+#: ../backend/pdf/ev-poppler.cc:1123
 msgid "No name"
 msgstr "Uten navn"
 
-#: ../backend/pdf/ev-poppler.cc:1089
+#: ../backend/pdf/ev-poppler.cc:1140
 msgid "Embedded subset"
 msgstr "Innebygd subsett"
 
-#: ../backend/pdf/ev-poppler.cc:1091
+#: ../backend/pdf/ev-poppler.cc:1142
 msgid "Embedded"
 msgstr "Innebygd"
 
-#: ../backend/pdf/ev-poppler.cc:1093
+#: ../backend/pdf/ev-poppler.cc:1144
 msgid "Not embedded"
 msgstr "Ikke innebygd"
 
@@ -213,16 +213,16 @@
 msgid "All Documents"
 msgstr "Alle dokumenter"
 
-#: ../libdocument/ev-document-factory.c:579
+#: ../libdocument/ev-document-factory.c:579 ../shell/ev-utils.c:336
 msgid "All Files"
 msgstr "Alle filer"
 
-#: ../libdocument/ev-file-helpers.c:146
+#: ../libdocument/ev-file-helpers.c:147
 #, c-format
 msgid "Failed to create a temporary file: %s"
 msgstr "Klarte ikke å lage en midlertidig fil: %s"
 
-#: ../libdocument/ev-file-helpers.c:308
+#: ../libdocument/ev-file-helpers.c:309
 #, c-format
 msgid "Failed to create a temporary directory: %s"
 msgstr "Klarte ikke å lage en midlertidig katalog: %s"
@@ -276,8 +276,7 @@
 msgid "Specify file containing saved configuration"
 msgstr "Oppgi fil med lagret konfigurasjon"
 
-#: ../cut-n-paste/smclient/eggsmclient.c:229 ../previewer/ev-previewer.c:45
-#: ../previewer/ev-previewer.c:46
+#: ../cut-n-paste/smclient/eggsmclient.c:229 ../previewer/ev-previewer.c:46
 msgid "FILE"
 msgstr "FIL"
 
@@ -338,7 +337,7 @@
 msgstr "Skillelinje"
 
 #. translators: this is the label for toolbar button
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:48 ../shell/ev-window.c:6239
+#: ../cut-n-paste/zoom-control/ephy-zoom.h:48 ../shell/ev-window.c:6161
 msgid "Best Fit"
 msgstr "Beste tilpasning"
 
@@ -346,64 +345,64 @@
 msgid "Fit Page Width"
 msgstr "Tilpass til sidebredde"
 
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:51
+#: ../shell/ev-zoom-action-widget.c:45
 msgid "50%"
 msgstr "50%"
 
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:52
+#: ../shell/ev-zoom-action-widget.c:46
 msgid "70%"
 msgstr "70%"
 
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:53
+#: ../shell/ev-zoom-action-widget.c:47
 msgid "85%"
 msgstr "85%"
 
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:54
+#: ../shell/ev-zoom-action-widget.c:48
 msgid "100%"
 msgstr "100%"
 
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:55
+#: ../shell/ev-zoom-action-widget.c:49
 msgid "125%"
 msgstr "125%"
 
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:56
+#: ../shell/ev-zoom-action-widget.c:50
 msgid "150%"
 msgstr "150%"
 
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:57
+#: ../shell/ev-zoom-action-widget.c:51
 msgid "175%"
 msgstr "175%"
 
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:58
+#: ../shell/ev-zoom-action-widget.c:52
 msgid "200%"
 msgstr "200%"
 
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:59
+#: ../shell/ev-zoom-action-widget.c:53
 msgid "300%"
 msgstr "300%"
 
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:60
+#: ../shell/ev-zoom-action-widget.c:54
 msgid "400%"
 msgstr "400%"
 
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:61
+#: ../shell/ev-zoom-action-widget.c:55
 msgid "800%"
 msgstr "800%"
 
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:62
+#: ../shell/ev-zoom-action-widget.c:56
 msgid "1600%"
 msgstr "1600%"
 
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:63
+#: ../shell/ev-zoom-action-widget.c:57
 msgid "3200%"
 msgstr "3200%"
 
-#: ../cut-n-paste/zoom-control/ephy-zoom.h:64
+#: ../shell/ev-zoom-action-widget.c:58
 msgid "6400%"
 msgstr "6400%"
 
 #. Manually set name and icon
-#: ../data/evince.desktop.in.in.h:1 ../shell/ev-window.c:4987
+#: ../data/evince.desktop.in.in.h:1 ../shell/ev-window.c:5022
 #: ../shell/ev-window-title.c:156 ../shell/main.c:318
 #, c-format
 msgid "Document Viewer"
@@ -431,81 +430,83 @@
 msgid "The document is automatically reloaded on file change."
 msgstr "Dokumentet lastes på nytt automatisk hvis filen endres."
 
-#: ../previewer/ev-previewer.c:44
+#: ../previewer/ev-previewer.c:45
 msgid "Delete the temporary file"
 msgstr "Slett midlertidig fil"
 
-#: ../previewer/ev-previewer.c:45
+#: ../previewer/ev-previewer.c:46
 msgid "Print settings file"
 msgstr "Skriv ut fil med innstillinger"
 
-#: ../previewer/ev-previewer.c:140 ../previewer/ev-previewer.c:174
+#: ../previewer/ev-previewer.c:175 ../previewer/ev-previewer.c:207
 msgid "GNOME Document Previewer"
 msgstr "GNOME dokumentvisning"
 
-#: ../previewer/ev-previewer-window.c:91 ../shell/ev-window.c:3399
+#: ../previewer/ev-previewer-window.c:91 ../shell/ev-window.c:3393
 msgid "Failed to print document"
 msgstr "Klarte ikke å skrive ut dokumentet"
 
-#: ../previewer/ev-previewer-window.c:237
+#: ../previewer/ev-previewer-window.c:223
 #, c-format
 msgid "The selected printer '%s' could not be found"
 msgstr "Valgt skriver, «%s», ble ikke funnet"
 
 #. Go menu
-#: ../previewer/ev-previewer-window.c:284 ../shell/ev-window.c:5923
+#: ../previewer/ev-previewer-window.c:270 ../shell/ev-window.c:6068
 msgid "_Previous Page"
 msgstr "_Forrige side"
 
-#: ../previewer/ev-previewer-window.c:285 ../shell/ev-window.c:5924
+#: ../previewer/ev-previewer-window.c:271 ../shell/ev-window.c:6069
 msgid "Go to the previous page"
 msgstr "Gå til forrige side"
 
-#: ../previewer/ev-previewer-window.c:287 ../shell/ev-window.c:5926
+#: ../previewer/ev-previewer-window.c:273 ../shell/ev-window.c:6071
 msgid "_Next Page"
 msgstr "_Neste side"
 
-#: ../previewer/ev-previewer-window.c:288 ../shell/ev-window.c:5927
+#: ../previewer/ev-previewer-window.c:274 ../shell/ev-window.c:6072
 msgid "Go to the next page"
 msgstr "Gå til neste side"
 
-#: ../previewer/ev-previewer-window.c:291 ../shell/ev-window.c:5910
+#: ../previewer/ev-previewer-window.c:277 ../shell/ev-window.c:6055
 msgid "Enlarge the document"
 msgstr "Forstørr dokumentet"
 
-#: ../previewer/ev-previewer-window.c:294 ../shell/ev-window.c:5913
+#: ../previewer/ev-previewer-window.c:280 ../shell/ev-window.c:6058
 msgid "Shrink the document"
 msgstr "Komprimer dokumentet"
 
-#: ../previewer/ev-previewer-window.c:297 ../libview/ev-print-operation.c:1309
+#. translators: Title of the print dialog
+#. translators: Print document currently shown in the Print Preview window
+#: ../libview/ev-print-operation.c:1322 ../previewer/ev-previewer-window.c:284
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../previewer/ev-previewer-window.c:298 ../shell/ev-window.c:5879
+#: ../previewer/ev-previewer-window.c:285 ../shell/ev-window.c:6033
 msgid "Print this document"
 msgstr "Skriv ut dette dokumentet"
 
-#: ../previewer/ev-previewer-window.c:342 ../shell/ev-window.c:6040
+#: ../previewer/ev-previewer-window.c:342 ../shell/ev-window.c:5962
 msgid "_Best Fit"
 msgstr "_Beste tilpasning"
 
-#: ../previewer/ev-previewer-window.c:343 ../shell/ev-window.c:6041
+#: ../previewer/ev-previewer-window.c:318 ../shell/ev-window.c:6213
 msgid "Make the current document fill the window"
 msgstr "La dokumentet fylle hele vinduet"
 
-#: ../previewer/ev-previewer-window.c:345 ../shell/ev-window.c:6043
+#: ../previewer/ev-previewer-window.c:345 ../shell/ev-window.c:5965
 msgid "Fit Page _Width"
 msgstr "Tilpass til side_bredde"
 
-#: ../previewer/ev-previewer-window.c:346 ../shell/ev-window.c:6044
+#: ../previewer/ev-previewer-window.c:321 ../shell/ev-window.c:6216
 msgid "Make the current document fill the window width"
 msgstr "La dokumentet fylle vinduet i bredden"
 
-#: ../previewer/ev-previewer-window.c:540 ../shell/ev-window.c:6152
+#: ../previewer/ev-previewer-window.c:514 ../shell/ev-window.c:6325
 msgid "Page"
 msgstr "Side"
 
-#: ../previewer/ev-previewer-window.c:541 ../shell/ev-window.c:6153
+#: ../previewer/ev-previewer-window.c:515 ../shell/ev-window.c:6326
 msgid "Select Page"
 msgstr "Velg side"
 
@@ -570,8 +571,18 @@
 msgid "Paper Size:"
 msgstr "Papirstørrelse:"
 
-#: ../backend/pdf/ev-poppler.cc:1082 ../properties/ev-properties-view.c:187
-#: ../libview/ev-print-operation.c:1893
+#. translators: When a font type does not have
+#. encoding information or it is unknown.  Example:
+#. Encoding: None
+#. 
+#. translators: Value for 'Page Scaling:' to not scale the document pages on printing
+#. translators: This is used when a document property does
+#. not have a value.  Examples:
+#. Author: None
+#. Keywords: None
+#. 
+#: ../backend/pdf/ev-poppler.cc:1132 ../libview/ev-print-operation.c:1907
+#: ../properties/ev-properties-view.c:192
 msgid "None"
 msgstr "Ingen"
 
@@ -581,93 +592,95 @@
 #. * Do *not* translate it to "predefinito:mm", if it
 #. * it isn't default:mm or default:inch it will not work
 #. 
-#: ../properties/ev-properties-view.c:215
+#: ../properties/ev-properties-view.c:220
 msgid "default:mm"
 msgstr "default:mm"
 
-#: ../properties/ev-properties-view.c:259
+#: ../properties/ev-properties-view.c:264
 #, c-format
 msgid "%.0f × %.0f mm"
 msgstr "%.0f x %.0f mm"
 
-#: ../properties/ev-properties-view.c:263
+#: ../properties/ev-properties-view.c:268
 #, c-format
 msgid "%.2f × %.2f inch"
 msgstr "%.2f x %.2f tomme"
 
 #. Note to translators: first placeholder is the paper name (eg.
 #. * A4), second placeholder is the paper size (eg. 297x210 mm)
-#: ../properties/ev-properties-view.c:287
+#: ../properties/ev-properties-view.c:292
 #, c-format
 msgid "%s, Portrait (%s)"
 msgstr "%s, portrett (%s)"
 
 #. Note to translators: first placeholder is the paper name (eg.
 #. * A4), second placeholder is the paper size (eg. 297x210 mm)
-#: ../properties/ev-properties-view.c:294
+#: ../properties/ev-properties-view.c:299
 #, c-format
 msgid "%s, Landscape (%s)"
 msgstr "%s, landskap (%s)"
 
-#: ../libmisc/ev-page-action-widget.c:68
+#: ../libmisc/ev-page-action-widget.c:85
+#: ../libmisc/ev-page-action-widget.c:124
 #, c-format
 msgid "(%d of %d)"
 msgstr "(%d av %d)"
 
-#: ../libmisc/ev-page-action-widget.c:70
+#: ../libmisc/ev-page-action-widget.c:87
+#: ../libmisc/ev-page-action-widget.c:126
 #, c-format
 msgid "of %d"
 msgstr "av %d"
 
 #. Create tree view
-#: ../libview/ev-loading-window.c:76 ../shell/ev-sidebar-annotations.c:131
+#: ../shell/ev-loading-message.c:50 ../shell/ev-sidebar-annotations.c:131
 #: ../shell/ev-sidebar-layers.c:125 ../shell/ev-sidebar-links.c:261
 msgid "Loading…"
 msgstr "Laster…"
 
 #. Initial state
-#: ../libview/ev-print-operation.c:335
+#: ../libview/ev-print-operation.c:347
 msgid "Preparing to print…"
 msgstr "Forbereder utskrift…"
 
-#: ../libview/ev-print-operation.c:337
+#: ../libview/ev-print-operation.c:349
 msgid "Finishing…"
 msgstr "Fullfører…"
 
-#: ../libview/ev-print-operation.c:339
+#: ../libview/ev-print-operation.c:351
 #, c-format
 msgid "Printing page %d of %d…"
 msgstr "Skriver ut side %d av %d…"
 
-#: ../libview/ev-print-operation.c:1163
+#: ../libview/ev-print-operation.c:1162
 msgid "Printing is not supported on this printer."
 msgstr "Utskrift støttes ikke på denne skriveren."
 
-#: ../libview/ev-print-operation.c:1228
+#: ../libview/ev-print-operation.c:1240
 msgid "Invalid page selection"
 msgstr "Ugyldig sideutvalg"
 
-#: ../libview/ev-print-operation.c:1229
+#: ../libview/ev-print-operation.c:1241
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../libview/ev-print-operation.c:1231
+#: ../libview/ev-print-operation.c:1243
 msgid "Your print range selection does not include any pages"
 msgstr "Ingen sider i området som er valgt for utskrift"
 
-#: ../libview/ev-print-operation.c:1888
+#: ../libview/ev-print-operation.c:1901
 msgid "Page Scaling:"
 msgstr "Skalering av side:"
 
-#: ../libview/ev-print-operation.c:1894
+#: ../libview/ev-print-operation.c:1908
 msgid "Shrink to Printable Area"
 msgstr "Krymp til utskriftsområde"
 
-#: ../libview/ev-print-operation.c:1895
+#: ../libview/ev-print-operation.c:1909
 msgid "Fit to Printable Area"
 msgstr "Tilpass utskriftsområde"
 
-#: ../libview/ev-print-operation.c:1898
+#: ../libview/ev-print-operation.c:1912
 msgid ""
 "Scale document pages to fit the selected printer page. Select from one of "
 "the following:\n"
@@ -691,11 +704,11 @@
 "• «Fit to Printable Area»: Dokumentets sider forstørres eller forminskes til "
 "å passe utskriftsområdet for skriveren etter behov.\n"
 
-#: ../libview/ev-print-operation.c:1910
+#: ../libview/ev-print-operation.c:1924
 msgid "Auto Rotate and Center"
 msgstr "Roter og sentrer automatisk"
 
-#: ../libview/ev-print-operation.c:1913
+#: ../libview/ev-print-operation.c:1927
 msgid ""
 "Rotate printer page orientation of each page to match orientation of each "
 "document page. Document pages will be centered within the printer page."
@@ -703,11 +716,11 @@
 "Roter skriverens sideorientering for hver side til å passe orientering i "
 "dokumentet. Dokumentets sider vil bli sentrert innenfor utskriftsområdet."
 
-#: ../libview/ev-print-operation.c:1918
+#: ../libview/ev-print-operation.c:1932
 msgid "Select page size using document page size"
 msgstr "Velg sidestørrelse ved bruk av dokumentets sidestørrelse"
 
-#: ../libview/ev-print-operation.c:1920
+#: ../libview/ev-print-operation.c:1934
 msgid ""
 "When enabled, each page will be printed on the same size paper as the "
 "document page."
@@ -715,112 +728,112 @@
 "Hver side vil bli skrevet ut på samme papirstørrelse som dokumentets "
 "sidestørrelse hvis dette slås på."
 
-#: ../libview/ev-print-operation.c:2002
+#: ../libview/ev-print-operation.c:2023
 msgid "Page Handling"
 msgstr "Sidehåndtering"
 
-#: ../libview/ev-jobs.c:1896
+#: ../libview/ev-jobs.c:1954
 #, c-format
 msgid "Failed to print page %d: %s"
 msgstr "Klarte ikke å skrive ut side %d: %s"
 
-#: ../libview/ev-view-accessible.c:46
+#: ../libview/ev-view-accessible.c:45
 msgid "Scroll Up"
 msgstr "Rull opp"
 
-#: ../libview/ev-view-accessible.c:47
+#: ../libview/ev-view-accessible.c:46
 msgid "Scroll Down"
 msgstr "Rull ned"
 
-#: ../libview/ev-view-accessible.c:53
+#: ../libview/ev-view-accessible.c:52
 msgid "Scroll View Up"
 msgstr "Rull visning opp"
 
-#: ../libview/ev-view-accessible.c:54
+#: ../libview/ev-view-accessible.c:53
 msgid "Scroll View Down"
 msgstr "Rull visning ned"
 
-#: ../libview/ev-view-accessible.c:883
+#: ../libview/ev-view-accessible.c:124
 msgid "Document View"
 msgstr "Dokumentvisning"
 
-#: ../libview/ev-view-presentation.c:692
+#: ../libview/ev-view-presentation.c:710
 msgid "Jump to page:"
 msgstr "Gå til side:"
 
-#: ../libview/ev-view-presentation.c:997
+#: ../libview/ev-view-presentation.c:1015
 msgid "End of presentation. Click to exit."
 msgstr "Slutt på presentasjonen. Klikk for å avslutte."
 
-#: ../libview/ev-view.c:1842
+#: ../libview/ev-view.c:1943
 msgid "Go to first page"
 msgstr "Gå til første side"
 
-#: ../libview/ev-view.c:1844
+#: ../libview/ev-view.c:1945
 msgid "Go to previous page"
 msgstr "Gå til forrige side"
 
-#: ../libview/ev-view.c:1846
+#: ../libview/ev-view.c:1947
 msgid "Go to next page"
 msgstr "Gå til neste side"
 
-#: ../libview/ev-view.c:1848
+#: ../libview/ev-view.c:1949
 msgid "Go to last page"
 msgstr "Gå til siste side"
 
-#: ../libview/ev-view.c:1850
+#: ../libview/ev-view.c:1951
 msgid "Go to page"
 msgstr "Gå til side"
 
-#: ../libview/ev-view.c:1852
+#: ../libview/ev-view.c:1953
 msgid "Find"
 msgstr "Søk"
 
-#: ../libview/ev-view.c:1880
+#: ../libview/ev-view.c:1981
 #, c-format
 msgid "Go to page %s"
 msgstr "Gå til side %s"
 
-#: ../libview/ev-view.c:1886
+#: ../libview/ev-view.c:1987
 #, c-format
 msgid "Go to %s on file “%s”"
 msgstr "Gå til %s i fil «%s»"
 
-#: ../libview/ev-view.c:1889
+#: ../libview/ev-view.c:1990
 #, c-format
 msgid "Go to file “%s”"
 msgstr "Gå til fil «%s»"
 
-#: ../libview/ev-view.c:1897
+#: ../libview/ev-view.c:1998
 #, c-format
 msgid "Launch %s"
 msgstr "Start %s"
 
-#: ../shell/eggfindbar.c:407
+#: ../shell/eggfindbar.c:310
 msgid "Find:"
-msgstr "Søk:"
+msgstr "Finn:"
 
-#: ../shell/eggfindbar.c:427 ../shell/ev-window.c:5896
+#: ../shell/eggfindbar.c:319 ../shell/ev-window.c:5818
 msgid "Find Pre_vious"
-msgstr "Søk etter forri_ge"
+msgstr "Finn forri_ge"
 
-#: ../shell/eggfindbar.c:431
+#: ../shell/eggfindbar.c:400
 msgid "Find previous occurrence of the search string"
 msgstr "Søk etter forrige oppføring av søkestrengen"
 
-#: ../shell/eggfindbar.c:435 ../shell/ev-window.c:5894
+#: ../shell/eggfindbar.c:327 ../shell/ev-window.c:5816
 msgid "Find Ne_xt"
-msgstr "Søk etter ne_ste"
+msgstr "Finn ne_ste"
 
-#: ../shell/eggfindbar.c:439
+#: ../shell/eggfindbar.c:410
 msgid "Find next occurrence of the search string"
 msgstr "Søk etter neste oppøring av søkestrengen"
 
-#: ../shell/eggfindbar.c:294
+#: ../shell/eggfindbar.c:289
 msgid "C_ase Sensitive"
 msgstr "_Skill mellom små og store bokstaver"
 
-#: ../shell/eggfindbar.c:336
+#: ../shell/eggfindbar.c:341
 msgid "Toggle case sensitive search"
 msgstr "Slå av/på søk som skiller mellom små/store bokstaver"
 
@@ -900,11 +913,11 @@
 msgid "Close"
 msgstr "Lukk"
 
-#: ../shell/ev-window.c:4110
+#: ../shell/ev-window.c:4315
 msgid "Running in presentation mode"
 msgstr "Kjører i presentasjonsmodus"
 
-#: ../shell/ev-keyring.c:102
+#: ../shell/ev-keyring.c:86
 #, c-format
 msgid "Password for document %s"
 msgstr "Passord for dokument %s"
@@ -928,29 +941,29 @@
 msgid "Enter password"
 msgstr "Oppgi passord"
 
-#: ../shell/ev-password-view.c:301
+#: ../shell/ev-password-view.c:303
 msgid "Password required"
 msgstr "Passord kreves"
 
-#: ../shell/ev-password-view.c:302
+#: ../shell/ev-password-view.c:300
 #, c-format
 msgid ""
 "The document “%s” is locked and requires a password before it can be opened."
 msgstr "Dokumentet «%s» er låst og krever et passord før det kan åpnes."
 
-#: ../shell/ev-password-view.c:332
+#: ../shell/ev-password-view.c:333
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../shell/ev-password-view.c:363
+#: ../shell/ev-password-view.c:364
 msgid "Forget password _immediately"
 msgstr "Glem passordet _med en gang"
 
-#: ../shell/ev-password-view.c:375
+#: ../shell/ev-password-view.c:376
 msgid "Remember password until you _log out"
 msgstr "Husk passordet til du _logger ut"
 
-#: ../shell/ev-password-view.c:387
+#: ../shell/ev-password-view.c:388
 msgid "Remember _forever"
 msgstr "Husk _for alltid"
 
@@ -970,11 +983,11 @@
 msgid "Document License"
 msgstr "Dokumentlisens"
 
-#: ../shell/ev-properties-fonts.c:132
+#: ../shell/ev-properties-fonts.c:142
 msgid "Font"
 msgstr "Skrifttype"
 
-#: ../shell/ev-properties-fonts.c:159
+#: ../shell/ev-properties-fonts.c:169
 #, c-format
 msgid "Gathering font information… %3d%%"
 msgstr "Samler informasjon om skrifter… %3d%%"
@@ -995,7 +1008,7 @@
 msgid "List"
 msgstr "Liste"
 
-#: ../shell/ev-sidebar-annotations.c:199 ../shell/ev-sidebar-annotations.c:527
+#: ../shell/ev-sidebar-annotations.c:199 ../shell/ev-sidebar-annotations.c:529
 msgid "Annotations"
 msgstr "Notater"
 
@@ -1011,16 +1024,16 @@
 msgid "Add"
 msgstr "Legg til"
 
-#: ../shell/ev-sidebar-annotations.c:360
+#: ../shell/ev-sidebar-annotations.c:362
 msgid "Document contains no annotations"
 msgstr "Dokumentet inneholder ingen notater"
 
-#: ../shell/ev-sidebar-annotations.c:392
+#: ../shell/ev-sidebar-annotations.c:394
 #, c-format
 msgid "Page %d"
 msgstr "Side %d"
 
-#: ../shell/ev-sidebar-attachments.c:696
+#: ../shell/ev-sidebar-attachments.c:697
 msgid "Attachments"
 msgstr "Vedlegg"
 
@@ -1036,17 +1049,18 @@
 msgid "_Remove Bookmark"
 msgstr "Fje_rn bokmerke"
 
-#: ../shell/ev-sidebar-bookmarks.c:312 ../shell/ev-window.c:926
-#: ../shell/ev-window.c:4715
+#: ../libmisc/ev-page-action-widget.c:182 ../shell/ev-history.c:426
+#: ../shell/ev-sidebar-bookmarks.c:312 ../shell/ev-window.c:875
+#: ../shell/ev-window.c:4762
 #, c-format
 msgid "Page %s"
 msgstr "Side %s"
 
-#: ../shell/ev-sidebar-bookmarks.c:603
+#: ../shell/ev-sidebar-bookmarks.c:605
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
-#: ../shell/ev-sidebar-layers.c:444
+#: ../shell/ev-sidebar-layers.c:446
 msgid "Layers"
 msgstr "Lag"
 
@@ -1054,15 +1068,15 @@
 msgid "Print…"
 msgstr "Skriv ut…"
 
-#: ../shell/ev-sidebar-links.c:719
+#: ../shell/ev-sidebar-links.c:725
 msgid "Index"
 msgstr "Indeks"
 
-#: ../shell/ev-sidebar-thumbnails.c:933
+#: ../shell/ev-sidebar-thumbnails.c:960
 msgid "Thumbnails"
 msgstr "Miniatyrer"
 
-#: ../shell/ev-window.c:923
+#: ../shell/ev-window.c:925
 #, c-format
 msgid "Page %s — %s"
 msgstr "Side %s - %s"
@@ -1075,97 +1089,97 @@
 msgid "The document contains only empty pages"
 msgstr "Dokumentet inneholder kun tomme sider"
 
-#: ../shell/ev-window.c:1751 ../shell/ev-window.c:1917
+#: ../shell/ev-window.c:1689 ../shell/ev-window.c:1851
 msgid "Unable to open document"
 msgstr "Kan ikke åpne dokument"
 
-#: ../shell/ev-window.c:1888
+#: ../shell/ev-window.c:1877
 #, c-format
 msgid "Loading document from “%s”"
 msgstr "Laster dokument fra «%s»"
 
-#: ../shell/ev-window.c:2030 ../shell/ev-window.c:2324
+#: ../shell/ev-window.c:2028 ../shell/ev-window.c:2318
 #, c-format
 msgid "Downloading document (%d%%)"
 msgstr "Laster ned dokument (%d%%)"
 
-#: ../shell/ev-window.c:2063
+#: ../shell/ev-window.c:2061
 msgid "Failed to load remote file."
 msgstr "Klarte ikke å laste ekstern fil."
 
-#: ../shell/ev-window.c:2268
+#: ../shell/ev-window.c:2262
 #, c-format
 msgid "Reloading document from %s"
 msgstr "Leser dokument fra %s på nytt"
 
-#: ../shell/ev-window.c:2300
+#: ../shell/ev-window.c:2294
 msgid "Failed to reload document."
 msgstr "Klarte ikke å lese dokumentet på nytt."
 
-#: ../shell/ev-window.c:2513
+#: ../shell/ev-window.c:2507
 msgid "Open Document"
 msgstr "Åpne dokument"
 
-#: ../shell/ev-window.c:2786
+#: ../shell/ev-window.c:2780
 #, c-format
 msgid "Saving document to %s"
 msgstr "Lagrer dokumentet til %s"
 
-#: ../shell/ev-window.c:2789
+#: ../shell/ev-window.c:2783
 #, c-format
 msgid "Saving attachment to %s"
 msgstr "Lagrer vedlegg til %s"
 
-#: ../shell/ev-window.c:2792
+#: ../shell/ev-window.c:2786
 #, c-format
 msgid "Saving image to %s"
 msgstr "Lagrer bilde til %s"
 
-#: ../shell/ev-window.c:2836 ../shell/ev-window.c:2936
+#: ../shell/ev-window.c:2830 ../shell/ev-window.c:2930
 #, c-format
 msgid "The file could not be saved as “%s”."
 msgstr "Filen kunne ikke lagres som «%s»."
 
-#: ../shell/ev-window.c:2867
+#: ../shell/ev-window.c:2861
 #, c-format
 msgid "Uploading document (%d%%)"
 msgstr "Laster opp dokument (%d%%)"
 
-#: ../shell/ev-window.c:2871
+#: ../shell/ev-window.c:2865
 #, c-format
 msgid "Uploading attachment (%d%%)"
 msgstr "Laster opp vedlegg (%d%%)"
 
-#: ../shell/ev-window.c:2875
+#: ../shell/ev-window.c:2869
 #, c-format
 msgid "Uploading image (%d%%)"
 msgstr "Laster opp bilde (%d%%)"
 
-#: ../shell/ev-window.c:2987
+#: ../shell/ev-window.c:2981
 msgid "Save a Copy"
 msgstr "Lagre en kopi"
 
-#: ../shell/ev-window.c:3051
+#: ../shell/ev-window.c:3045
 msgid "Could not send current document"
 msgstr "Kunne ikke sende dette dokumentet"
 
-#: ../shell/ev-window.c:3082
+#: ../shell/ev-window.c:3076
 msgid "Could not open the containing folder"
 msgstr "Kan ikke åpne opphavsmappen"
 
-#: ../shell/ev-window.c:3343
+#: ../shell/ev-window.c:3337
 #, c-format
 msgid "%d pending job in queue"
 msgid_plural "%d pending jobs in queue"
 msgstr[0] "%d utestående jobb i køen"
 msgstr[1] "%d utestående jobber i køen"
 
-#: ../shell/ev-window.c:3456
+#: ../shell/ev-window.c:3450
 #, c-format
 msgid "Printing job “%s”"
 msgstr "Skriver ut jobb %s"
 
-#: ../shell/ev-window.c:3633
+#: ../shell/ev-window.c:3645
 msgid ""
 "Document contains form fields that have been filled out. If you don't save a "
 "copy, changes will be permanently lost."
@@ -1173,7 +1187,7 @@
 "Dokumentet inneholder skjemafelter som ikke er fylt ut. Hvis du ikke lagrer "
 "en kopi vil disse endringene gå tapt."
 
-#: ../shell/ev-window.c:3637
+#: ../shell/ev-window.c:3649
 msgid ""
 "Document contains new or modified annotations. If you don't save a copy, "
 "changes will be permanently lost."
@@ -1181,20 +1195,20 @@
 "Dokumentet inneholder nye eller endrede anmerkninger. Hvis du ikke lagrer en "
 "kopi vil disse endringene gå tapt."
 
-#: ../shell/ev-window.c:3644
+#: ../shell/ev-window.c:3656
 #, c-format
 msgid "Save a copy of document “%s” before closing?"
 msgstr "Lagre en kopi av dokument «%s» før programmet lukkes?"
 
-#: ../shell/ev-window.c:3663
+#: ../shell/ev-window.c:3675
 msgid "Close _without Saving"
 msgstr "Fortsett _uten å lagre"
 
-#: ../shell/ev-window.c:3667
+#: ../shell/ev-window.c:3679
 msgid "Save a _Copy"
 msgstr "Lagre en _kopi"
 
-#: ../shell/ev-window.c:3741
+#: ../shell/ev-window.c:3753
 #, c-format
 msgid "Wait until print job “%s” finishes before closing?"
 msgstr "Vent med å lukke programmet til utskriftsjobb %s er fullført?"
@@ -1202,7 +1216,7 @@
 #. TRANS: the singular form is not really used as n_print_jobs > 1
 #. but some languages distinguish between different plurals forms,
 #. so the ngettext is needed.
-#: ../shell/ev-window.c:3747
+#: ../shell/ev-window.c:3759
 #, c-format
 msgid ""
 "There is %d print job active. Wait until print finishes before closing?"
@@ -1215,28 +1229,28 @@
 "Det er %d aktive utskriftsjobber. Vent med å lukke programmet til disse er "
 "fullført?"
 
-#: ../shell/ev-window.c:3762
+#: ../shell/ev-window.c:3774
 msgid "If you close the window, pending print jobs will not be printed."
 msgstr ""
 "Hvis du lukker vinduet vil utestående utskriftsjobber ikke bli fullført."
 
-#: ../shell/ev-window.c:3766
+#: ../shell/ev-window.c:3778
 msgid "Cancel _print and Close"
 msgstr "Avbryt _utskrift og lukk"
 
-#: ../shell/ev-window.c:3770
+#: ../shell/ev-window.c:3782
 msgid "Close _after Printing"
 msgstr "Lukk etter ut_skrift"
 
-#: ../shell/ev-window.c:4459 ../shell/ev-window.c:4745
+#: ../shell/ev-window.c:4373 ../shell/ev-window.c:4659
 msgid "There was an error displaying help"
 msgstr "Det oppsto en feil ved visning av hjelp"
 
-#: ../shell/ev-window.c:4487
+#: ../shell/ev-window.c:4401
 msgid "Toolbar Editor"
 msgstr "Redigering av verktøylinje"
 
-#: ../shell/ev-window.c:4983
+#: ../shell/ev-window.c:5018
 #, c-format
 msgid ""
 "Document Viewer\n"
@@ -1245,7 +1259,7 @@
 "Dokumentvisning.\n"
 "Bruker %s (%s)"
 
-#: ../shell/ev-window.c:5016
+#: ../shell/ev-window.c:5051
 msgid ""
 "Evince is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -1257,7 +1271,7 @@
 "publisert av Free Software Foundation; enten versjon 2 av lisensen, eller "
 "(hvis du ønsker) enhver senere versjon.\n"
 
-#: ../shell/ev-window.c:5020
+#: ../shell/ev-window.c:5055
 msgid ""
 "Evince is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1268,7 +1282,7 @@
 "GARANTI; selv ikke en implisitt garanti for at det er SALGBART eller PASSER "
 "ET SPESIELT FORMÅL. Se Gnu General Public License for flere detaljer.\n"
 
-#: ../shell/ev-window.c:5024
+#: ../shell/ev-window.c:5059
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Evince; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -1278,15 +1292,15 @@
 "hvis ikke kan du skrive til Free Software Foundation, Inc.,51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-1301 USA\n"
 
-#: ../shell/ev-window.c:5049
+#: ../shell/ev-window.c:5084
 msgid "Evince"
 msgstr "Evince"
 
-#: ../shell/ev-window.c:4877
+#: ../shell/ev-window.c:4966
 msgid "© 1996–2010 The Evince authors"
 msgstr "© 1996-2010 Evince-utviklerene"
 
-#: ../shell/ev-window.c:5058
+#: ../shell/ev-window.c:5093
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -1302,381 +1316,382 @@
 #. TRANS: Sometimes this could be better translated as
 #. "%d hit(s) on this page".  Therefore this string
 #. contains plural cases.
-#: ../shell/ev-window.c:5326
+#: ../shell/ev-window.c:5364
 #, c-format
 msgid "%d found on this page"
 msgid_plural "%d found on this page"
 msgstr[0] "%d funnet på denne siden"
 msgstr[1] "%d funnet på denne siden"
 
-#: ../shell/ev-window.c:5331
+#: ../shell/ev-window.c:5369
 msgid "Not found"
 msgstr "Ikke funnet"
 
-#: ../shell/ev-window.c:5337
+#: ../shell/ev-window.c:5375
 #, c-format
 msgid "%3d%% remaining to search"
 msgstr "%3d%% igjen å søke i"
 
-#: ../shell/ev-window.c:5855
+#: ../shell/ev-window.c:5777
 msgid "_File"
 msgstr "_Fil"
 
-#: ../shell/ev-window.c:5856
+#: ../shell/ev-window.c:5778
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../shell/ev-window.c:5857
+#: ../shell/ev-window.c:5779
 msgid "_View"
 msgstr "_Vis"
 
-#: ../shell/ev-window.c:5858
+#: ../shell/ev-window.c:5780
 msgid "_Go"
 msgstr "_Gå til"
 
-#: ../shell/ev-window.c:5859
+#: ../shell/ev-window.c:6013
 msgid "_Bookmarks"
 msgstr "_Bokmerker"
 
-#: ../shell/ev-window.c:5860
+#: ../shell/evince-appmenu.ui.h:1
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. File menu
-#: ../shell/ev-window.c:5863 ../shell/ev-window.c:6192
+#: ../shell/ev-window.c:6017 ../shell/ev-window.c:6363
 msgid "_Open…"
 msgstr "_Åpne…"
 
-#: ../shell/ev-window.c:5864 ../shell/ev-window.c:6193
+#: ../shell/ev-window.c:6018 ../shell/ev-window.c:6364
 msgid "Open an existing document"
 msgstr "Åpne et eksisterende dokument"
 
-#: ../shell/ev-window.c:5866
+#: ../shell/ev-window.c:6020
 msgid "Op_en a Copy"
 msgstr "Åpn_e en kopi"
 
-#: ../shell/ev-window.c:5867
+#: ../shell/ev-window.c:6021
 msgid "Open a copy of the current document in a new window"
 msgstr "Åpne en kopi av dette dokumentet i et nytt vindu"
 
-#: ../shell/ev-window.c:5869
+#: ../shell/ev-window.c:6023
 msgid "_Save a Copy…"
 msgstr "_Lagre en kopi…"
 
-#: ../shell/ev-window.c:5870
+#: ../shell/ev-window.c:6024
 msgid "Save a copy of the current document"
 msgstr "Lagre en kopi av dette dokumentet"
 
-#: ../shell/ev-window.c:5872
+#: ../shell/ev-window.c:5768
 msgid "Send _To..."
 msgstr "Send _til …"
 
-#: ../shell/ev-window.c:5873
+#: ../shell/ev-window.c:5769
 msgid "Send current document by mail, instant message..."
 msgstr "Send dette dokumentet med e-post eller lynmelding …"
 
-#: ../shell/ev-window.c:5875
+#: ../shell/ev-window.c:6029
 msgid "Open Containing _Folder"
 msgstr "Åpner opphavs_mappe"
 
-#: ../shell/ev-window.c:5876
+#: ../shell/ev-window.c:6030
 msgid "Show the folder which contains this file in the file manager"
 msgstr "Vis mappen som inneholder denne filen i filhåndterer"
 
-#: ../shell/ev-window.c:5878
+#: ../shell/ev-window.c:6032
 msgid "_Print…"
 msgstr "_Skriv ut…"
 
-#: ../shell/ev-window.c:5881
+#: ../shell/ev-window.c:6035
 msgid "P_roperties"
 msgstr "E_genskaper"
 
-#: ../shell/ev-window.c:5889
+#: ../shell/ev-window.c:6043
 msgid "Select _All"
 msgstr "Velg _alt"
 
-#: ../shell/ev-window.c:5891
+#: ../shell/ev-window.c:6180
 msgid "_Find…"
 msgstr "_Søk…"
 
-#: ../shell/ev-window.c:5892
+#: ../shell/ev-window.c:6181
 msgid "Find a word or phrase in the document"
 msgstr "Finn et ord eller en frase i dokumentet"
 
-#: ../shell/ev-window.c:5898
+#: ../shell/ev-window.c:5820
 msgid "T_oolbar"
 msgstr "V_erktøylinje"
 
-#: ../shell/ev-window.c:5900
+#: ../shell/ev-window.c:6045
 msgid "Rotate _Left"
 msgstr "Roter til _venstre"
 
-#: ../shell/ev-window.c:5902
+#: ../shell/ev-window.c:6047
 msgid "Rotate _Right"
 msgstr "_Roter til høyre"
 
-#: ../shell/ev-window.c:5904
+#: ../shell/ev-window.c:6049
 msgid "Save Current Settings as _Default"
 msgstr "Lagre nåværende innstillinger som _forvalg"
 
-#: ../shell/ev-window.c:5915
+#: ../shell/ev-window.c:6060
 msgid "_Reload"
 msgstr "L_es på nytt"
 
-#: ../shell/ev-window.c:5916
+#: ../shell/ev-window.c:6061
 msgid "Reload the document"
 msgstr "Les dokumentet på nytt"
 
-#: ../shell/ev-window.c:5919
+#: ../shell/ev-window.c:6064
 msgid "Auto_scroll"
 msgstr "Automati_sk rulling"
 
-#: ../shell/ev-window.c:5929
+#: ../shell/ev-window.c:6074
 msgid "_First Page"
 msgstr "_Første side"
 
-#: ../shell/ev-window.c:5930
+#: ../shell/ev-window.c:6075
 msgid "Go to the first page"
 msgstr "Gå til den første siden"
 
-#: ../shell/ev-window.c:5932
+#: ../shell/ev-window.c:6077
 msgid "_Last Page"
 msgstr "S_iste side"
 
-#: ../shell/ev-window.c:5933
+#: ../shell/ev-window.c:6078
 msgid "Go to the last page"
 msgstr "Gå til den siste siden"
 
-#: ../shell/ev-window.c:5935
+#: ../shell/ev-window.c:6080
 msgid "Go to Pa_ge"
 msgstr "_Gå til side"
 
-#: ../shell/ev-window.c:5936
+#: ../shell/ev-window.c:6081
 msgid "Go to Page"
 msgstr "Gå til side"
 
 #. Bookmarks menu
-#: ../shell/ev-window.c:5940
+#: ../shell/ev-window.c:6085
 msgid "_Add Bookmark"
 msgstr "_Legg til bokmerke"
 
-#: ../shell/ev-window.c:5941
+#: ../shell/ev-window.c:6086
 msgid "Add a bookmark for the current page"
 msgstr "Legg til et bokmerke for denne siden"
 
 #. Help menu
-#: ../shell/ev-window.c:5945
+#: ../shell/ev-window.c:5867
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../shell/ev-window.c:5948
+#: ../shell/ev-window.c:6089
 msgid "_About"
 msgstr "_Om"
 
 #. Toolbar-only
-#: ../shell/ev-window.c:5952
+#: ../shell/ev-window.c:6093
 msgid "Leave Fullscreen"
 msgstr "Forlat fullskjerm"
 
-#: ../shell/ev-window.c:5953
+#: ../shell/ev-window.c:6094
 msgid "Leave fullscreen mode"
 msgstr "Forlat fullskjerm-modus"
 
-#: ../shell/ev-window.c:5955
+#: ../shell/ev-window.c:6096
 msgid "Start Presentation"
 msgstr "Start presentasjon"
 
-#: ../shell/ev-window.c:5956
+#: ../shell/ev-window.c:6097
 msgid "Start a presentation"
 msgstr "Start en presentasjon"
 
 #. View Menu
-#: ../shell/ev-window.c:6019
+#: ../shell/ev-window.c:5941
 msgid "_Toolbar"
 msgstr "Verk_tøylinje"
 
-#: ../shell/ev-window.c:6020
+#: ../shell/ev-window.c:5942
 msgid "Show or hide the toolbar"
 msgstr "Vis eller skjul verktøylinjen"
 
-#: ../shell/ev-window.c:6022
+#. View Menu
+#: ../shell/ev-window.c:6158
 msgid "Side _Pane"
 msgstr "Si_defelt"
 
-#: ../shell/ev-window.c:6023
+#: ../shell/ev-window.c:6159
 msgid "Show or hide the side pane"
 msgstr "Vis eller skjul sidelinjen"
 
-#: ../shell/ev-window.c:6025
+#: ../shell/ev-window.c:6161
 msgid "_Continuous"
 msgstr "_Sammenhengende"
 
-#: ../shell/ev-window.c:6026
+#: ../shell/ev-window.c:6162
 msgid "Show the entire document"
 msgstr "Vis hele dokumentet"
 
-#: ../shell/ev-window.c:6028
+#: ../shell/ev-window.c:5950
 msgid "_Dual (Even pages left)"
 msgstr "_Tosidig (partallssider til venstre)"
 
-#: ../shell/ev-window.c:6029
+#: ../shell/ev-window.c:5951
 msgid "Show two pages at once with even pages on the left"
 msgstr "Vis to sider samtidig med partallssider til venstre"
 
-#: ../shell/ev-window.c:6031
+#: ../shell/ev-window.c:5953
 msgid "Dual (_Odd pages left)"
 msgstr "Tosidig (_Oddetallssider til venstre)"
 
-#: ../shell/ev-window.c:6032
+#: ../shell/ev-window.c:5954
 msgid "Show two pages at once with odd pages on the left"
 msgstr "Vis to sider samtidig med oddetallssider til venstre"
 
-#: ../shell/ev-window.c:6034
+#: ../shell/ev-window.c:6170
 msgid "_Fullscreen"
 msgstr "_Fullskjerm"
 
-#: ../shell/ev-window.c:6035
+#: ../shell/ev-window.c:6171
 msgid "Expand the window to fill the screen"
 msgstr "Utvid vinduet så det fyller skjermen"
 
-#: ../shell/ev-window.c:6037
+#: ../shell/ev-window.c:6173
 msgid "Pre_sentation"
 msgstr "Pre_sentasjon"
 
-#: ../shell/ev-window.c:6038
+#: ../shell/ev-window.c:6174
 msgid "Run document as a presentation"
 msgstr "Vis dokumentet som en presentasjon"
 
-#: ../shell/ev-window.c:6046
+#: ../shell/ev-window.c:6176
 msgid "_Inverted Colors"
 msgstr "_Inverterte farger"
 
-#: ../shell/ev-window.c:6047
+#: ../shell/ev-window.c:6177
 msgid "Show page contents with the colors inverted"
 msgstr "Vis sideinnhold med fargene snudd om"
 
 #. Links
-#: ../shell/ev-window.c:6055
+#: ../shell/ev-window.c:6188
 msgid "_Open Link"
 msgstr "_Åpne lenke"
 
-#: ../shell/ev-window.c:6057
+#: ../shell/ev-window.c:6190
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ../shell/ev-window.c:6059
+#: ../shell/ev-window.c:6192
 msgid "Open in New _Window"
 msgstr "Åpne i nytt _vindu"
 
-#: ../shell/ev-window.c:6061
+#: ../shell/ev-window.c:6194
 msgid "_Copy Link Address"
 msgstr "_Kopier lenkeadressen"
 
-#: ../shell/ev-window.c:6063
+#: ../shell/ev-window.c:6196
 msgid "_Save Image As…"
 msgstr "Lagre bilde _som…"
 
-#: ../shell/ev-window.c:6065
+#: ../shell/ev-window.c:6198
 msgid "Copy _Image"
 msgstr "Kopier b_ilde"
 
-#: ../shell/ev-window.c:6067
+#: ../shell/ev-window.c:6200
 msgid "Annotation Properties…"
 msgstr "Egenskaper for anmerkninger …"
 
-#: ../shell/ev-window.c:6072
+#: ../shell/ev-window.c:6205
 msgid "_Open Attachment"
 msgstr "_Åpne vedlegg"
 
-#: ../shell/ev-window.c:6074
+#: ../shell/ev-window.c:6207
 msgid "_Save Attachment As…"
 msgstr "Lagre vedlegg _som…"
 
-#: ../shell/ev-window.c:6166
+#: ../shell/ev-window.c:6339
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../shell/ev-window.c:6168
+#: ../shell/ev-window.c:6341
 msgid "Adjust the zoom level"
 msgstr "Juster nivå for zoom"
 
-#: ../shell/ev-window.c:6178
+#: ../shell/ev-window.c:6100
 msgid "Navigation"
 msgstr "Navigasjon"
 
-#: ../shell/ev-window.c:6180
+#: ../shell/ev-window.c:6102
 msgid "Back"
 msgstr "Tilbake"
 
 #. translators: this is the history action
-#: ../shell/ev-window.c:6183
+#: ../shell/ev-window.c:6105
 msgid "Move across visited pages"
 msgstr "Bla gjennom sider du har sett på"
 
 #. translators: this is the label for toolbar button
-#: ../shell/ev-window.c:6212
+#: ../shell/ev-window.c:6383
 msgid "Open Folder"
 msgstr "Åpne mappe"
 
 #. translators: this is the label for toolbar button
-#: ../shell/ev-window.c:6216
+#: ../shell/ev-window.c:6387
 msgid "Send To"
 msgstr "Send til"
 
 #. translators: this is the label for toolbar button
-#: ../shell/ev-window.c:6222
+#: ../shell/ev-window.c:6393
 msgid "Previous"
 msgstr "Forrige"
 
 #. translators: this is the label for toolbar button
-#: ../shell/ev-window.c:6227
+#: ../shell/ev-window.c:6398
 msgid "Next"
 msgstr "Neste"
 
 #. translators: this is the label for toolbar button
-#: ../shell/ev-window.c:6231
+#: ../shell/ev-window.c:6402
 msgid "Zoom In"
 msgstr "Zoom inn"
 
 #. translators: this is the label for toolbar button
-#: ../shell/ev-window.c:6235
+#: ../shell/ev-window.c:6406
 msgid "Zoom Out"
 msgstr "Zoom ut"
 
 #. translators: this is the label for toolbar button
-#: ../shell/ev-window.c:6243
+#: ../shell/ev-window.c:6130 ../shell/ev-zoom-action-widget.c:43
 msgid "Fit Width"
 msgstr "Tilpass bredde"
 
-#: ../shell/ev-window.c:6390 ../shell/ev-window.c:6406
+#: ../shell/ev-window.c:6538 ../shell/ev-window.c:6554
 msgid "Unable to launch external application."
 msgstr "Kan ikke starte eksternt program."
 
-#: ../shell/ev-window.c:6463
+#: ../shell/ev-window.c:6611
 msgid "Unable to open external link"
 msgstr "Kan ikke åpne ekstern lenke."
 
-#: ../shell/ev-window.c:6656
+#: ../shell/ev-window.c:6804
 msgid "Couldn't find appropriate format to save image"
 msgstr "Kunne ikke finne passende format for å lagre filen"
 
-#: ../shell/ev-window.c:6688
+#: ../shell/ev-window.c:6836
 msgid "The image could not be saved."
 msgstr "Bildet kunne ikke lagres."
 
-#: ../shell/ev-window.c:6720
+#: ../shell/ev-window.c:6868
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#: ../shell/ev-window.c:6851
+#: ../shell/ev-window.c:6999
 msgid "Unable to open attachment"
 msgstr "Kan ikke åpne vedlegg"
 
-#: ../shell/ev-window.c:6907
+#: ../shell/ev-window.c:7055
 msgid "The attachment could not be saved."
 msgstr "Vedlegget kunne ikke lagres."
 
-#: ../shell/ev-window.c:6952
+#: ../shell/ev-window.c:7100
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/evolution-3.2.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/evolution-3.2.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/evolution-3.2.po	2013-01-29 09:33:54.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/evolution-3.2.po	2014-01-07 06:37:01.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:01+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:02+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: Norsk bokmål\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
@@ -85,7 +85,7 @@
 msgstr "Denne adresseboken vil bli slettet for godt."
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
 msgid "Do _Not Delete"
 msgstr "Ikke s_lett"
 
@@ -165,11 +165,11 @@
 "Dine kontakter for {0} vil ikke være tilgjengelige før Evolution startes på "
 "nytt."
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Address '{0}' already exists."
 msgstr "Adressen «{0}» eksisterer allerede."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -177,16 +177,16 @@
 "En kontakt med denne adressen eksisterer allerede. Vil du legge til en ny "
 "kontakt med samme adresse likevel?"
 
-#: ../addressbook/addressbook.error.xml.h:36
-#: ../mail/em-vfolder-editor-rule.c:391 ../widgets/table/e-table-config.ui.h:6
+#: ../addressbook/addressbook.error.xml.h:33
+#: ../e-util/e-name-selector-dialog.c:997 ../mail/em-vfolder-editor-rule.c:397
 msgid "_Add"
 msgstr "_Legg til"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Some addresses already exist in this contact list."
 msgstr "Noen adresser eksisterer allerede i denne kontaktlisten."
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -194,19 +194,19 @@
 "Du prøver å legge til adresser som allerede er en del av denne listen. Vil "
 "du legge dem til likevel?"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Skip duplicates"
 msgstr "Hopp over duplikater"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Add with duplicates"
 msgstr "Legg til med duplikater"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "List '{0}' is already in this contact list."
 msgstr "Liste «{0}» er allerede i kontaktlisten."
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:39
 msgid ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
@@ -242,21 +242,21 @@
 "Evolution. Vennligst bruk en annen GroupWise-klient en gang for å få tak i "
 "dine ofte brukte kontakter og mappene for personlige kontakter fra GroupWise."
 
-#: ../addressbook/addressbook.error.xml.h:43
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1251
 msgid "Failed to delete contact"
 msgstr "Klarte ikke å slette kontakt"
 
-#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Du har ikke rettigheter til å slette kontakter i denne adresseboken."
 
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "Cannot add new contact"
 msgstr "Kan ikke legge til ny kontakt"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:47
+#: ../addressbook/addressbook.error.xml.h:44
 msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -265,9 +265,9 @@
 "adressebok fra sidelinjen i kontaktvisning."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:625
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:647
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2939
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:650
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:672
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2958
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -291,7 +291,7 @@
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:5
+#: ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "Kate_gorier …"
 
@@ -304,11 +304,11 @@
 msgstr "_Ønsker å motta HTML-formatert e-post"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:396
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:612
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:977
+#: ../addressbook/gui/merging/eab-contact-merging.c:409
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../smime/lib/e-cert.c:812
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:590
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:942
+#: ../smime/lib/e-asn1-object.c:395
 msgid "Email"
 msgstr "E-post"
 
@@ -321,7 +321,7 @@
 msgstr "Øyeblikksmeldinger"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1008
+#: ../addressbook/importers/evolution-vcard-importer.c:1003
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -330,9 +330,9 @@
 msgstr "_Hjemmeside:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:722
+#: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1858
+#: ../modules/itip-formatter/itip-view.c:1877
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -349,6 +349,7 @@
 msgstr "Hjemmeside:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../modules/cal-config-google/evolution-cal-config-google.c:97
 msgid "Calendar:"
 msgstr "Kalender:"
 
@@ -423,8 +424,8 @@
 msgstr "_Bryllupsdag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:709
-#: ../calendar/gui/e-calendar-view.c:2158
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
+#: ../calendar/gui/e-calendar-view.c:2278
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
@@ -434,13 +435,12 @@
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:708
-#: ../calendar/gui/e-calendar-view.c:2157 ../shell/main.c:135
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
+#: ../calendar/gui/e-calendar-view.c:2277 ../shell/main.c:128
 msgid "Birthday"
 msgstr "Fødselsdag"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
@@ -473,27 +473,27 @@
 msgstr "_Adresse:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-display.c:399
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:75
-#: ../widgets/misc/e-contact-map.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/e-contact-map.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:357
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
 msgid "Home"
 msgstr "Hjemme"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:396
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:74
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:690
-#: ../widgets/misc/e-contact-map.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/e-contact-map.c:314
+#: ../addressbook/gui/widgets/eab-contact-display.c:354
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
 msgid "Work"
 msgstr "Arbeid"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:76
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:385
-#: ../calendar/gui/e-cal-model.c:3607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:368
+#: ../calendar/gui/e-cal-model.c:3963
 msgid "Other"
 msgstr "Andre"
 
@@ -505,74 +505,74 @@
 msgid "Notes"
 msgstr "Notater"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:621
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:676
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:497
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:230
+#: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error modifying contact"
 msgstr "Feil under endring av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:641
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2933
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:666
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2952
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3454
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3485
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3455
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3486
 msgid "_No image"
 msgstr "_Uten bilde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3788
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3827
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -580,43 +580,43 @@
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3794
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3833
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3810
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3849
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3823
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3837
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3862
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3876
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» er tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3852
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3891
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:491
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:508
 msgid "_Full name"
 msgstr "_Fullt navn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:504
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:521
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:517
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:534
 msgid "_Select Address Book"
 msgstr "_Velg adressebok"
 
@@ -686,7 +686,7 @@
 msgstr "_Suffiks:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:818
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
@@ -706,28 +706,27 @@
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skjul adresser når du sender e-post til listen"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
-#: ../mail/mail-config.ui.h:156
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
 msgid "_Select..."
 msgstr "_Velg …"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:888
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:941
 msgid "Contact List Members"
 msgstr "Kontaktlistemedlemmer"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1533
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1597
 msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1548
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1617
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1563
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1637
 msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1414
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1475
 msgid "_Members"
 msgstr "_Medlemmer"
 
@@ -754,7 +753,7 @@
 msgstr "Endret kontakt:"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:342
+#: ../addressbook/gui/merging/eab-contact-merging.c:364
 msgid "_Merge"
 msgstr "_Flett"
 
@@ -774,102 +773,102 @@
 msgid "New Contact:"
 msgstr "Ny kontakt:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:324
+#: ../addressbook/gui/merging/eab-contact-merging.c:346
 msgid "Merge Contact"
 msgstr "Flett kontakt"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1072
+#: ../modules/addressbook/e-book-shell-view-actions.c:1154
 msgid "Name contains"
 msgstr "Navn inneholder"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1065
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
 msgid "Email begins with"
 msgstr "E-post begynner med"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
-#: ../modules/calendar/e-cal-shell-view-actions.c:1798
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/addressbook/e-book-shell-view-actions.c:1140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1771
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:990
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:164
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Ingen kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:168
+#: ../addressbook/gui/widgets/e-addressbook-model.c:167
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:371
+#: ../addressbook/gui/widgets/e-addressbook-model.c:373
 msgid "Error getting book view"
 msgstr "Feil under henting av bokvisning"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:752
+#: ../addressbook/gui/widgets/e-addressbook-model.c:820
 msgid "Search Interrupted"
 msgstr "Søk avbrutt"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:160
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:204
 msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Cut selected contacts to the clipboard"
 msgstr "Klipp ut valgte kontakter til utklippstavlen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopier valgte kontakter til utklippstavlen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:656
+#: ../addressbook/gui/widgets/e-addressbook-view.c:661
 msgid "Paste contacts from the clipboard"
 msgstr "Lim inn kontakter fra utklippstavlen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:658
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../addressbook/gui/widgets/e-addressbook-view.c:667
+#: ../modules/addressbook/e-book-shell-view-actions.c:954
 msgid "Delete selected contacts"
 msgstr "Slett valgte kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:664
+#: ../addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Select all visible contacts"
 msgstr "Velg alle synlige kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Er du sikker på at du vil slette disse kontaktlistene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1310
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Er du sikker på at du vil slette denne kontaktlisten?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Er du sikker på at du vil slette denne kontaktlisten (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Er du sikker på at du vil slette disse kontaktene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1324
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 msgid "Are you sure you want to delete this contact?"
 msgstr "Er du sikker på at du vil slette denne kontakten?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1328
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Er du sikker på at du vil slette denne kontakten (%s)?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1491
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -884,11 +883,11 @@
 "Hvis du åpner %d kontakter vil dette åpne %d vinduer også.\n"
 "Vil du virkelig vise alle disse kontaktene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1499
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "_Don't Display"
 msgstr "Ikke _vis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1500
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1486
 msgid "Display _All Contacts"
 msgstr "Vis _alle kontakter"
 
@@ -904,8 +903,8 @@
 msgid "Family Name"
 msgstr "Etternavn"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
 msgid "Nickname"
 msgstr "Kallenavn"
 
@@ -961,8 +960,8 @@
 msgid "ISDN Phone"
 msgstr "ISDN-telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:706
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
@@ -1000,8 +999,8 @@
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
 msgid "Company"
 msgstr "Firma"
 
@@ -1018,18 +1017,18 @@
 msgstr "Tittel"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:664
+#: ../calendar/gui/e-meeting-list-view.c:666
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Rolle"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
 msgid "Manager"
 msgstr "Leder"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -1045,21 +1044,21 @@
 #: ../calendar/gui/dialogs/event-page.ui.h:20
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:89
 msgid "Categories"
 msgstr "Kategorier"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:710
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:744
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:718
 msgid "Note"
 msgstr "Kommentar"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1069,7 +1068,7 @@
 "\n"
 "Søker etter kontakter …"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1083,7 +1082,7 @@
 "\n"
 "eller dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:197
 msgid ""
 "\n"
 "\n"
@@ -1097,7 +1096,7 @@
 "\n"
 "Dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../addressbook/gui/widgets/e-minicard-view.c:201
 msgid ""
 "\n"
 "\n"
@@ -1107,7 +1106,7 @@
 "\n"
 "Søk etter kontakten."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../addressbook/gui/widgets/e-minicard-view.c:203
 msgid ""
 "\n"
 "\n"
@@ -1126,7 +1125,7 @@
 msgstr "E-post hjemme"
 
 #: ../addressbook/gui/widgets/e-minicard.c:95
-#: ../addressbook/gui/widgets/e-minicard.c:817
+#: ../addressbook/gui/widgets/e-minicard.c:828
 msgid "Other Email"
 msgstr "Annen e-post"
 
@@ -1163,119 +1162,118 @@
 msgid "Contact: "
 msgstr "Kontakt: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:187
+#: ../addressbook/gui/widgets/ea-minicard.c:188
 msgid "evolution minicard"
 msgstr "evolution minikort"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:162
+#: ../addressbook/gui/widgets/eab-contact-display.c:150
 msgid "Copy _Email Address"
 msgstr "Kopier _e-postadresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:193
-#: ../widgets/misc/e-web-view.c:432
+#: ../addressbook/gui/widgets/eab-contact-display.c:152
+#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:307
 msgid "Copy the email address to the clipboard"
 msgstr "Kopier e-postadresser til utklippstavlen"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169
-#: ../widgets/misc/e-web-view.c:301 ../widgets/misc/e-web-view-gtkhtml.c:434
+#: ../addressbook/gui/widgets/eab-contact-display.c:157
+#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:312
 msgid "_Send New Message To..."
 msgstr "_Send ny melding til …"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:200
-#: ../widgets/misc/e-web-view.c:439
+#: ../addressbook/gui/widgets/eab-contact-display.c:159
+#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:314
 msgid "Send a mail message to this address"
 msgstr "Send en e-postmelding til denne adressen"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:154
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:137
 msgid "Open map"
 msgstr "Åpne kart"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:550
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:529
 msgid "List Members:"
 msgstr "Listemedlemmer:"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
 msgid "Department"
 msgstr "Avdeling"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
 msgid "Position"
 msgstr "Stilling"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:675
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
 msgid "Video Chat"
 msgstr "Videosamtale"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:676
-#: ../data/evolution.desktop.in.in.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:217
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
-#: ../modules/calendar/e-cal-shell-view.c:548
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
+#: ../data/evolution.desktop.in.in.h:8 ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view.c:591
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
-#: ../widgets/misc/e-send-options.c:546
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:677
-#: ../calendar/gui/dialogs/event-editor.c:127
-#: ../calendar/gui/dialogs/event-editor.c:354
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
+#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:678
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:705
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:707
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
 msgid "Web Log"
 msgstr "Nettdagbok"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:720
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:941
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:906
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:962
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:927
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1003
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:968
 msgid "Home page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1013
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:978
 msgid "Blog"
 msgstr "Weblogg"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1248
-#: ../widgets/misc/e-web-view.c:980
+#: ../addressbook/gui/widgets/eab-contact-display.c:291
+#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:990
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
+#: ../addressbook/gui/widgets/eab-gui-util.c:123
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1285,7 +1283,7 @@
 "for frakoblet bruk eller at den ikke er lastet ned enda. Last adresseboken i "
 "tilkoblet tilstand for å laste ned innholdet"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:142
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1294,7 +1292,7 @@
 "Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien %s eksisterer "
 "og at du har rettigheter til å aksessere den."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:155
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1303,7 +1301,7 @@
 "ønsker å bruke LDAP i Evolution må du installere en pakke som har denne "
 "støtten."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1311,11 +1309,11 @@
 "Kunne ikke åpne denne adresseboken. Dette betyr enten at du har skrevet inn "
 "en ugyldig URI, eller at tjeneren ikke kan nås."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 msgid "Detailed error message:"
 msgstr "Detaljert feilmelding:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1327,7 +1325,7 @@
 "Gjør søket ditt mer nøyaktig eller hev grensen på resultater i\n"
 "brukervalgene til mappetjeneren for denne adresseboken."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:218
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1340,50 +1338,50 @@
 "for denne adresseboken."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "Motoren for denne adresseboken forsto ikke denne spørringen. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:236
+#: ../addressbook/gui/widgets/eab-gui-util.c:231
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "Motoren for denne adresseboken nektet å utføre denne spørringen. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:242
-#: ../addressbook/gui/widgets/eab-gui-util.c:248
+#: ../addressbook/gui/widgets/eab-gui-util.c:237
+#: ../addressbook/gui/widgets/eab-gui-util.c:243
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "Denne spørringen ble ikke fullført. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:264
+#: ../addressbook/gui/widgets/eab-gui-util.c:265
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 msgid "Select Address Book"
 msgstr "Velg adressebok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:586
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:588
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:593
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
@@ -1391,12 +1389,12 @@
 msgid "Card View"
 msgstr "Kortvisning"
 
-#: ../addressbook/importers/evolution-csv-importer.c:746
-#: ../addressbook/importers/evolution-ldif-importer.c:545
-#: ../addressbook/importers/evolution-vcard-importer.c:283
-#: ../calendar/importers/icalendar-importer.c:446
-#: ../calendar/importers/icalendar-importer.c:941
-#: ../calendar/importers/icalendar-importer.c:980 ../shell/shell.error.xml.h:1
+#: ../addressbook/importers/evolution-csv-importer.c:747
+#: ../addressbook/importers/evolution-ldif-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:281
+#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:935
+#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Importerer …"
 
@@ -1424,31 +1422,30 @@
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:806
+#: ../addressbook/importers/evolution-ldif-importer.c:807
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:807
+#: ../addressbook/importers/evolution-ldif-importer.c:808
 msgid "Evolution LDIF importer"
 msgstr "LDIF-import for Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:671
+#: ../addressbook/importers/evolution-vcard-importer.c:666
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:672
+#: ../addressbook/importers/evolution-vcard-importer.c:667
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard-import"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:723
+#: ../addressbook/printing/e-contact-print.c:764
 #, c-format
 msgid "Page %d"
 msgstr "Side %d"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:688
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:625
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
 msgid "Can not open file"
 msgstr "Kan ikke åpne fil"
@@ -1458,32 +1455,32 @@
 msgid "Couldn't get list of address books: %s"
 msgstr "Kunne ikke hente liste med adressebøker: %s"
 
-#: ../plugins/face/face.c:174 ../smime/gui/certificate-manager.c:320
+#: ../plugins/face/face.c:171 ../smime/gui/certificate-manager.c:322
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:74
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:76
 #, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "Klarte ikke å åpne klient «%s»: %s"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "Oppgi utdatafil i stedet for standard utdata"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "UTDATAFIL"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "Vis lokale adressebokmapper"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:68
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
 msgstr "Vis kontakter som vcard eller csv-fil"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:69
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
@@ -1502,13 +1499,13 @@
 msgid "NUMBER"
 msgstr "ANTALL"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:149
+#: ../addressbook/tools/evolution-addressbook-export.c:136
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Feil med kommandolinjeflagg. Vennligst bruk --help for å se bruksinformasjon."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:150
 msgid "Only support csv or vcard format."
 msgstr "Støtt kun csv- eller vcard-format."
 
@@ -1520,7 +1517,7 @@
 msgid "In normal mode, there is no need for the size option."
 msgstr "I normalt modus er ikke størrelsesflagget nødvendig."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:213
+#: ../addressbook/tools/evolution-addressbook-export.c:181
 msgid "Unhandled error"
 msgstr "Uhåndtert feil"
 
@@ -1545,7 +1542,7 @@
 msgstr "_Send melding"
 
 #: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:191
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Er du sikker på at du vil slette dette møtet?"
@@ -1565,7 +1562,7 @@
 "at oppgaven er slettet."
 
 #: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:194
+#: ../calendar/gui/dialogs/delete-comp.c:196
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Er du sikker på at du vil slette denne oppgaven?"
@@ -1588,7 +1585,7 @@
 "at notatet er slettet."
 
 #: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:197
+#: ../calendar/gui/dialogs/delete-comp.c:199
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Er du sikker på at du vil slette dette notatet?"
@@ -1668,12 +1665,12 @@
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Du har endret dette møtet, men ikke lagret det."
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 #: ../composer/mail-composer.error.xml.h:16
 msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "_Save Changes"
 msgstr "_Lagre endringer"
 
@@ -1753,8 +1750,7 @@
 "Noen vedlegg blir lastet ned. Oppgaven vil bli lagret uten disse vedleggene "
 "hvis den blir lagret nå."
 
-#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
-#: ../modules/itip-formatter/itip-view.c:3094
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:297
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -1813,31 +1809,31 @@
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution-kalender har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:52
 msgid "Editor could not be loaded."
 msgstr "Redigeringskomponenten kunne ikke lastes."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:53
 msgid "Delete calendar '{0}'?"
 msgstr "Slett kalender «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:54
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalenderen vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:55
 msgid "Delete task list '{0}'?"
 msgstr "Slett oppgaveliste «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:56
 msgid "This task list will be removed permanently."
 msgstr "Denne oppgavelisten vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:57
 msgid "Delete memo list '{0}'?"
 msgstr "Slett notatliste «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:58
 msgid "This memo list will be removed permanently."
 msgstr "Denne notatlisten vil bli fjernet permanent."
 
@@ -1865,7 +1861,7 @@
 "Hvis du gir oppgaver et meningsfylt sammendrag vil det gjøre det lettere å "
 "forstå hva oppgaven gjelder."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:70
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Er du sikker på at du vil lagre notatet uten sammendrag?"
 
@@ -1873,7 +1869,7 @@
 msgid "Error loading calendar"
 msgstr "Feil under lasting av kalender"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:73
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalenderen er ikke merket for frakoblet bruk."
 
@@ -1890,12 +1886,12 @@
 "«{0}» er en skrivebeskyttet kalender og kan ikke endres. Velg en annen "
 "kalender fra sidelinjen i kalendervisning."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:74
 msgid "Cannot save event"
 msgstr "Kan ikke lagre hendelse"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:85
+#. Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:76
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -1907,7 +1903,7 @@
 msgid "Error loading task list"
 msgstr "Feil under lasting av oppgaveliste"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:82
 msgid "The task list is not marked for offline usage."
 msgstr "Oppgavelisten er ikke merket for frakoblet bruk."
 
@@ -1915,7 +1911,7 @@
 msgid "Error loading memo list"
 msgstr "Feil under lasting av notatliste"
 
-#: ../calendar/calendar.error.xml.h:92
+#: ../calendar/calendar.error.xml.h:85
 msgid "The memo list is not marked for offline usage."
 msgstr "Notatlisten er ikke merket for frakoblet bruk."
 
@@ -1939,13 +1935,13 @@
 "muligens støte på problemer. Tjeneren bør oppgraderes til en støttet versjon "
 "for å unngå problemer."
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:108
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:106
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:122
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:119
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
@@ -1954,14 +1950,14 @@
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:134
-#: ../calendar/gui/dialogs/recurrence-page.c:1209
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:132
+#: ../calendar/gui/dialogs/recurrence-page.c:1248
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dager"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:331
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:329
 msgid "Start time"
 msgstr "Starttid"
 
@@ -1973,8 +1969,7 @@
 msgid "_Snooze"
 msgstr "_Slumre"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:3
-#: ../libevolution-utils/e-alert-dialog.c:162
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:166
 msgid "_Dismiss"
 msgstr "_Lukk"
 
@@ -1985,28 +1980,25 @@
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../filter/filter.ui.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:353
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
+#: ../e-util/e-interval-chooser.c:143
+#: ../modules/calendar/e-cal-shell-view-actions.c:352
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
-#: ../widgets/misc/e-interval-chooser.c:143
 msgid "days"
 msgstr "dager"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/e-plugin-util.c:453
-#: ../filter/filter.ui.h:7
-#: ../plugins/google-account-setup/google-contacts-source.c:388
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
+#: ../e-util/e-interval-chooser.c:141
 msgid "hours"
 msgstr "timer"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
+#: ../e-util/e-interval-chooser.c:139
 #: ../mail/e-mail-config-provider-page.c:527
-#: ../modules/addressbook/ldap-config.ui.h:29
-#: ../widgets/misc/e-interval-chooser.c:139
 msgid "minutes"
 msgstr "minutter"
 
@@ -2015,41 +2007,40 @@
 msgstr "sted for avtalen"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1760
-#: ../calendar/alarm-notify/alarm-queue.c:1770
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
-#: ../modules/itip-formatter/itip-view.c:1472
-#: ../modules/itip-formatter/itip-view.c:1583
+#: ../calendar/alarm-notify/alarm-queue.c:1835
+#: ../calendar/alarm-notify/alarm-queue.c:1845
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:190
+#: ../modules/itip-formatter/itip-view.c:1489
+#: ../modules/itip-formatter/itip-view.c:1600
 msgid "Location:"
 msgstr "Sted:"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/alarm-notify/alarm-notify.ui.h:2
 msgid "Dismiss _All"
 msgstr "Lukk _alle"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1607
-#: ../calendar/alarm-notify/alarm-queue.c:1740
+#: ../calendar/alarm-notify/alarm-queue.c:1679
+#: ../calendar/alarm-notify/alarm-queue.c:1815
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1616
-#: ../calendar/alarm-notify/alarm-queue.c:1618
+#: ../calendar/alarm-notify/alarm-queue.c:1688
+#: ../calendar/alarm-notify/alarm-queue.c:1690
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1626
+#: ../calendar/alarm-notify/alarm-queue.c:1698
 msgid "No location information available."
 msgstr "Stedsinformasjon er ikke tilgjengelig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1673
+#: ../calendar/alarm-notify/alarm-queue.c:1747
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Du har %d påminnelse"
 msgstr[1] "Du har %d påminnelser"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1870
-#: ../calendar/alarm-notify/alarm-queue.c:1905
+#: ../calendar/alarm-notify/alarm-queue.c:1965
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -2065,7 +2056,7 @@
 "er konfigurert til å sende e-post. Evolution vil vise\n"
 "en vanlig dialog med påminnelsen i stedet."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1911
+#: ../calendar/alarm-notify/alarm-queue.c:1971
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2081,7 +2072,7 @@
 "\n"
 "Er du sikker på at du vil kjøre dette programmet?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1926
+#: ../calendar/alarm-notify/alarm-queue.c:1986
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
@@ -2138,25 +2129,24 @@
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:372
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:376
 msgid "Summary"
 msgstr "Sammendrag"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:11
 msgid "contains"
 msgstr "inneholder"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:17
 msgid "does not contain"
 msgstr "inneholder ikke"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
-#: ../widgets/misc/e-attachment-tree-view.c:528
-#: ../widgets/table/e-table-config.ui.h:24
+#: ../e-util/e-table-config.ui.h:4 ../e-util/e-attachment-tree-view.c:528
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -2170,30 +2160,35 @@
 msgstr "Klassifisering"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:33
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:34
 msgid "is"
 msgstr "er"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:39
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:40
 msgid "is not"
 msgstr "er ikke"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:244
-#: ../calendar/gui/e-cal-model.c:841 ../calendar/gui/e-cal-model.c:848
-#: ../calendar/gui/e-task-table.c:558 ../calendar/gui/memotypes.xml.h:10
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:454
+#: ../calendar/gui/e-cal-model.c:461 ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Offentlig"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:245
-#: ../calendar/gui/e-cal-model.c:850 ../calendar/gui/e-task-table.c:559
-#: ../calendar/gui/memotypes.xml.h:11
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:463
+#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:246
-#: ../calendar/gui/e-cal-model.c:852 ../calendar/gui/e-task-table.c:560
-#: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
+#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:465
+#: ../calendar/gui/e-task-table.c:549 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Konfidensiell"
 
@@ -2210,37 +2205,37 @@
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:880
+#: ../plugins/publish-calendar/publish-calendar.c:897
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Location"
 msgstr "Lokasjon"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:328
 msgid "Category"
 msgstr "Kategori"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:54
-#: ../em-format/e-mail-formatter-print-headers.c:198
-#: ../mail/em-filter-i18n.h:5
+#: ../em-format/e-mail-formatter-print-headers.c:204
+#: ../mail/em-filter-i18n.h:6
 msgid "Attachments"
 msgstr "Vedlegg"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:26
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:27
 msgid "Exist"
 msgstr "Eksisterer"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:23
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:24
 msgid "Do Not Exist"
 msgstr "Eksisterer ikke"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:321
-#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../calendar/gui/dialogs/event-editor.c:310
+#: ../calendar/gui/dialogs/event-editor.c:331
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
@@ -2255,26 +2250,26 @@
 msgid "Description Contains"
 msgstr "Beskrivelse inneholder"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:632
+#: ../calendar/gui/dialogs/alarm-dialog.c:669
 msgid "Edit Reminder"
 msgstr "Rediger påminnelse"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/dialogs/alarm-dialog.c:897
 #: ../calendar/gui/e-alarm-list.c:412
 msgid "Pop up an alert"
 msgstr "Vis varsling"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/dialogs/alarm-dialog.c:898
 #: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "Spill en lyd"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:899
 #: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "Kjør et program"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:826
+#: ../calendar/gui/dialogs/alarm-dialog.c:900
 #: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "Send en melding"
@@ -2291,81 +2286,81 @@
 msgid "day(s)"
 msgstr "dag(er)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.c:909
 msgid "before"
 msgstr "før"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.c:910
 msgid "after"
 msgstr "etter"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.c:919
 msgid "start of appointment"
 msgstr "ved avtalens start"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.c:920
 msgid "end of appointment"
 msgstr "slutt på avtalen"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Add Reminder"
 msgstr "Legg til påminnelse"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-#: ../calendar/gui/dialogs/event-editor.c:364
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/event-editor.c:353
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Repeat"
 msgstr "Gjenta"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Repeat the reminder"
 msgstr "_Gjenta påminnelse"
 
 #. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "extra times every"
 msgstr "ekstra ganger hver"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13 ../mail/mail-config.ui.h:30
 msgid "Options"
 msgstr "Alternativer"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "Custom _message"
 msgstr "Tilpasset _beskjed"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
 msgid "Mes_sage:"
 msgstr "Be_skjed:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom reminder sound"
 msgstr "Egendefinert lyd for påminnelse"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
 msgid "_Sound:"
 msgstr "_Lyd:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "Select A File"
 msgstr "Velg en fil"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "_Arguments:"
 msgstr "_Argumenter:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "Send To:"
 msgstr "Send til:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:241
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
 msgid "Action/Trigger"
 msgstr "Handling/utløser"
 
@@ -2379,7 +2374,7 @@
 msgid "A_dd"
 msgstr "Le_gg til"
 
-#: ../widgets/misc/e-source-config.c:680 ../widgets/misc/e-source-config.c:684
+#: ../e-util/e-source-config.c:681 ../e-util/e-source-config.c:685
 msgid "Type:"
 msgstr "Type:"
 
@@ -2388,11 +2383,10 @@
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../mail/e-mail-config-identity-page.c:313
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../e-util/e-mail-signature-script-dialog.c:417
+#: ../mail/e-mail-config-identity-page.c:311
 #: ../mail/e-mail-config-summary-page.c:341
-#: ../modules/addressbook/ldap-config.ui.h:12
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-mail-signature-script-dialog.c:417
 msgid "_Name:"
 msgstr "_Navn:"
 
@@ -2417,11 +2411,12 @@
 msgstr "Fa_rge:"
 
 #: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:19
+#: ../mail/em-folder-properties.c:266 ../mail/mail-config.ui.h:24
+#: ../modules/addressbook/autocompletion-config.c:114
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../modules/itip-formatter/plugin/config-ui.c:91
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/certificate-viewer.c:653
 msgid "General"
 msgstr "Generelt"
 
@@ -2433,30 +2428,30 @@
 msgid "Memo List"
 msgstr "Notatliste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:292
+#: ../modules/calendar/e-cal-shell-view-actions.c:291
 msgid "Calendar Properties"
 msgstr "Kalenderegenskaper"
 
-#: ../modules/calendar/e-cal-shell-backend.c:278
-#: ../modules/calendar/e-cal-shell-view-actions.c:192
+#: ../modules/calendar/e-cal-shell-backend.c:313
+#: ../modules/calendar/e-cal-shell-view-actions.c:191
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:312
+#: ../modules/calendar/e-task-shell-view-actions.c:291
 msgid "Task List Properties"
 msgstr "Egenskaper for oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-backend.c:190
-#: ../modules/calendar/e-task-shell-view-actions.c:240
+#: ../modules/calendar/e-task-shell-backend.c:205
+#: ../modules/calendar/e-task-shell-view-actions.c:219
 msgid "New Task List"
 msgstr "Ny oppgaveliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:289
+#: ../modules/calendar/e-memo-shell-view-actions.c:268
 msgid "Memo List Properties"
 msgstr "Egenskaper for notatliste"
 
-#: ../modules/calendar/e-memo-shell-backend.c:193
-#: ../modules/calendar/e-memo-shell-view-actions.c:217
+#: ../modules/calendar/e-memo-shell-backend.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
 msgid "New Memo List"
 msgstr "Ny notatliste"
 
@@ -2512,214 +2507,212 @@
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:266
 msgid "Could not save attachments"
 msgstr "Kunne ikke lagre vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:630
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:764
+#: ../calendar/gui/dialogs/comp-editor.c:754
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:771
+#: ../calendar/gui/dialogs/comp-editor.c:761
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møte- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:773
+#: ../calendar/gui/dialogs/comp-editor.c:763
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:779
+#: ../calendar/gui/dialogs/comp-editor.c:769
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:781
+#: ../calendar/gui/dialogs/comp-editor.c:771
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:786
+#: ../calendar/gui/dialogs/comp-editor.c:776
 #, c-format
 msgid "Memo - %s"
 msgstr "Notat - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:802
+#: ../calendar/gui/dialogs/comp-editor.c:792
 msgid "No Summary"
 msgstr "Ingen sammendrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:912
+#: ../calendar/gui/dialogs/comp-editor.c:913
 msgid "Keep original item?"
 msgstr "Behold opprinnelig oppføring?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1222
 msgid "Close the current window"
 msgstr "Lukk aktiv vindu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1467
-#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
-#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
+#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:121
+#: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
+#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:341
+#: ../e-util/e-web-view.c:1305 ../mail/e-mail-browser.c:136
+#: ../shell/e-shell-window-actions.c:888
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1474
-#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:114
+#: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
+#: ../e-util/e-web-view.c:1299 ../mail/e-mail-browser.c:143
+#: ../shell/e-shell-window-actions.c:895
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1146
-#: ../shell/e-shell-window-actions.c:1481
-#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
+#: ../calendar/gui/dialogs/comp-editor.c:1243 ../e-util/e-focus-tracker.c:135
+#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:902
 msgid "Delete the selection"
 msgstr "Slett utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188
+#: ../calendar/gui/dialogs/comp-editor.c:1250
 msgid "View help"
 msgstr "Vis hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:151
-#: ../shell/e-shell-window-actions.c:1509
-#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:128
+#: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
+#: ../e-util/e-web-view.c:1311 ../mail/e-mail-browser.c:150
+#: ../shell/e-shell-window-actions.c:923
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1216
+#: ../calendar/gui/dialogs/comp-editor.c:1278
 msgid "Save current changes"
 msgstr "Lagre endringer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1558
-#: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
+#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:142
+#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:157
+#: ../shell/e-shell-window-actions.c:1000
 msgid "Select all text"
 msgstr "Velg all tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237
+#: ../calendar/gui/dialogs/comp-editor.c:1299
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
-#: ../mail/e-mail-browser.c:169
+#: ../calendar/gui/dialogs/comp-editor.c:1306
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
+#: ../mail/e-mail-browser.c:171
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1586
-#: ../widgets/menus/gal-define-views.ui.h:5
+#: ../shell/e-shell-window-actions.c:1028
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1251 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1593
-#: ../widgets/misc/e-mail-signature-editor.c:306
+#: ../calendar/gui/dialogs/comp-editor.c:1313
+#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:164
+#: ../shell/e-shell-window-actions.c:1035
 msgid "_File"
 msgstr "_Fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1258
-#: ../shell/e-shell-window-actions.c:1600
+#: ../calendar/gui/dialogs/comp-editor.c:1320
+#: ../shell/e-shell-window-actions.c:1042
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1265
+#: ../calendar/gui/dialogs/comp-editor.c:1327
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1272
-#: ../composer/e-composer-actions.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:1334
+#: ../composer/e-composer-actions.c:320
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1279 ../mail/e-mail-browser.c:176
-#: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
+#: ../calendar/gui/dialogs/comp-editor.c:1341 ../mail/e-mail-browser.c:178
+#: ../shell/e-shell-window-actions.c:1077 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Vis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
-#: ../composer/e-composer-actions.c:288
+#: ../calendar/gui/dialogs/comp-editor.c:1351
+#: ../composer/e-composer-actions.c:269
 msgid "_Attachment..."
 msgstr "_Vedlegg …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1225
-#: ../composer/e-composer-actions.c:291
-#: ../widgets/misc/e-attachment-view.c:439
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../composer/e-composer-actions.c:271 ../e-util/e-attachment-view.c:413
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259
+#: ../calendar/gui/dialogs/comp-editor.c:1363
 msgid "Toggles whether to display categories"
 msgstr "Slår av/på visning av kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1307
+#: ../calendar/gui/dialogs/comp-editor.c:1369
 msgid "Time _Zone"
 msgstr "Tids_sone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1309
+#: ../calendar/gui/dialogs/comp-editor.c:1371
 msgid "Toggles whether the time zone is displayed"
 msgstr "Slår av/på visning av tidssone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1380
 msgid "Pu_blic"
 msgstr "O_ffentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1320
+#: ../calendar/gui/dialogs/comp-editor.c:1382
 msgid "Classify as public"
 msgstr "Klassifiser som offentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1327
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 msgid "Classify as private"
 msgstr "Klassifiser som privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+#: ../calendar/gui/dialogs/comp-editor.c:1394
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1334
+#: ../calendar/gui/dialogs/comp-editor.c:1396
 msgid "Classify as confidential"
 msgstr "Klassifiser som konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1342
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "R_ole Field"
 msgstr "R_olle-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1344
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Toggles whether the Role field is displayed"
 msgstr "Slår av/på visning av rolle-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1350
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1352
+#: ../calendar/gui/dialogs/comp-editor.c:1414
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Slår av/på visning av RSVP-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1358
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "_Status Field"
 msgstr "_Status-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Toggles whether the Status field is displayed"
 msgstr "Slår av/på visning av status-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366
+#: ../calendar/gui/dialogs/comp-editor.c:1428
 msgid "_Type Field"
 msgstr "_Type felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Slår av/på visning av deltakertype-feltet"
 
@@ -2728,49 +2721,49 @@
 msgid "Recent _Documents"
 msgstr "Siste _dokumenter"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2129
-#: ../composer/e-composer-actions.c:507
+#: ../calendar/gui/dialogs/comp-editor.c:2211
+#: ../composer/e-composer-actions.c:488
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2479
-#: ../calendar/gui/dialogs/comp-editor.c:2666
-#: ../calendar/gui/dialogs/comp-editor.c:3672
+#: ../calendar/gui/dialogs/comp-editor.c:2541
+#: ../calendar/gui/dialogs/comp-editor.c:2751
+#: ../calendar/gui/dialogs/comp-editor.c:3764
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjøres i denne oppføringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3636
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:118
+#: ../calendar/gui/dialogs/comp-editor.c:3726
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3704
+#: ../calendar/gui/dialogs/comp-editor.c:3796
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:114
+#: ../calendar/gui/dialogs/copy-source-dialog.c:121
 msgid "Could not open destination"
 msgstr "Kunne ikke åpne destinasjon"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:126
+#: ../calendar/gui/dialogs/copy-source-dialog.c:131
 msgid "Destination is read only"
 msgstr "Destinasjonen er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:160
+#: ../calendar/gui/dialogs/copy-source-dialog.c:173
 msgid "Cannot create object"
 msgstr "Kan ikke lage objekt"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:189
+#: ../calendar/gui/dialogs/copy-source-dialog.c:204
 msgid "Could not open source"
 msgstr "Kunne ikke åpne kilde"
 
-#: ../calendar/gui/dialogs/delete-comp.c:214
+#: ../calendar/gui/dialogs/delete-comp.c:216
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Slett denne oppføringen fra andre mottakere's postbokser?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:215
+#: ../calendar/gui/dialogs/delete-comp.c:219
 msgid "_Retract comment"
 msgstr "T_rekk tilbake kommentar"
 
@@ -2810,7 +2803,7 @@
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Notatet kunne ikke slettes fordi tilgang ble nektet"
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:83
 msgid "The item could not be deleted because permission was denied"
 msgstr "Oppføringen kunne ikke slettes fordi tilgang ble nektet"
 
@@ -2850,136 +2843,134 @@
 msgid "Contacts..."
 msgstr "Kontakter …"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Reminders"
 msgstr "_Påminnelser"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Set or unset reminders for this event"
 msgstr "Sett eller fjern påminnelser for denne hendelsen"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:215
 msgid "Show Time as _Busy"
 msgstr "Vis tiden som _opptatt"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "Toggles whether to show time as busy"
 msgstr "Slår av/på visning av tid som opptatt"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "_Recurrence"
 msgstr "Gjeninnt_reffelse"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Make this a recurring event"
 msgstr "Gjør denne hendelsen til repeterende"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:233 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Alternativer for sending"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
-#: ../calendar/gui/dialogs/task-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/task-editor.c:96
 msgid "Insert advanced send options"
 msgstr "Sett inn avanserte alternativer for sending"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:243
 msgid "All _Day Event"
 msgstr "Avtale som varer hele _dagen"
 
-#: ../calendar/gui/dialogs/event-editor.c:252
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "Toggles whether to have All Day Event"
 msgstr "Slår av/på hendelser som varer hele dagen"
 
-#: ../calendar/gui/dialogs/event-editor.c:261
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "_Free/Busy"
 msgstr "_Ledig/opptatt"
 
-#: ../calendar/gui/dialogs/event-editor.c:263
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Query free / busy information for the attendees"
 msgstr "Slå opp ledig/opptatt informasjon for deltakerene"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
+#: ../calendar/gui/dialogs/event-editor.c:307 ../calendar/gui/print.c:3505
 msgid "Appointment"
 msgstr "Avtale"
 
-#: ../calendar/gui/dialogs/event-editor.c:384
+#: ../calendar/gui/dialogs/event-editor.c:377
 #: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "Deltakere"
 
-#: ../calendar/gui/dialogs/event-editor.c:585
+#: ../calendar/gui/dialogs/event-editor.c:574
 msgid "Print this event"
 msgstr "Skriv ut denne hendelsen"
 
-#: ../calendar/gui/dialogs/event-page.c:566
+#: ../calendar/gui/dialogs/event-page.c:557
 msgid "Event's start time is in the past"
 msgstr "Starttid for hendelsen er passert"
 
-#: ../calendar/gui/dialogs/event-page.c:643
+#: ../calendar/gui/dialogs/event-page.c:634
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Hendelsen kan ikke redigeres fordi kalenderen er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:638
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Hendelsen kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/event-page.c:663
-#: ../calendar/gui/dialogs/event-page.c:3181
+#: ../calendar/gui/dialogs/event-page.c:650
+#: ../calendar/gui/dialogs/event-page.c:3168
 msgid "This event has reminders"
 msgstr "Denne hendelsen har påminnelser"
 
-#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.c:717
 #: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:1263
+#: ../calendar/gui/dialogs/event-page.c:1303
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1266
+#: ../calendar/gui/dialogs/event-page.c:1306
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1439
-#: ../calendar/gui/dialogs/memo-page.c:708
-#: ../calendar/gui/dialogs/task-page.c:819
+#: ../calendar/gui/dialogs/event-page.c:1479
+#: ../calendar/gui/dialogs/memo-page.c:726
+#: ../calendar/gui/dialogs/task-page.c:1026
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1496
+#: ../calendar/gui/dialogs/event-page.c:1490
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1472
+#: ../calendar/gui/dialogs/event-page.c:1514
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1479
+#: ../calendar/gui/dialogs/event-page.c:1522
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1644
-#: ../calendar/gui/dialogs/memo-page.c:749
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1686
+#: ../calendar/gui/dialogs/memo-page.c:765
+#: ../calendar/gui/dialogs/task-page.c:1080
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1678
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/event-page.c:1721
+#: ../calendar/gui/dialogs/task-page.c:1115
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1934
+#: ../calendar/gui/dialogs/event-page.c:1927
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:1887
+#: ../calendar/gui/dialogs/event-page.c:1929
 msgid "Atte_ndees"
 msgstr "De_ltakere"
 
@@ -3001,33 +2992,33 @@
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer på vegne av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3461
+#: ../calendar/gui/dialogs/event-page.c:3448
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag før avtalen"
 msgstr[1] "%d dager før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3331
+#: ../calendar/gui/dialogs/event-page.c:3454
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d time før avtalen"
 msgstr[1] "%d timer før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3337
+#: ../calendar/gui/dialogs/event-page.c:3460
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minutt før avtalen"
 msgstr[1] "%d minutter før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3356
+#: ../calendar/gui/dialogs/event-page.c:3481
 msgid "Customize"
 msgstr "Tilpass"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3501
+#: ../calendar/gui/dialogs/event-page.c:3488
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ingen"
@@ -3068,8 +3059,8 @@
 
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
-#: ../calendar/gui/dialogs/task-page.ui.h:7
-#: ../widgets/misc/e-attachment-dialog.c:350
+#: ../calendar/gui/dialogs/task-page.ui.h:29
+#: ../e-util/e-attachment-dialog.c:357
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
@@ -3078,7 +3069,7 @@
 msgstr "_Tid:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Time _zone:"
 msgstr "Tids_sone:"
 
@@ -3091,8 +3082,8 @@
 msgstr "Beskrivelse av hendelse"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-meeting-time-sel.c:590
+#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Atte_ndees..."
 msgstr "De_ltakere …"
 
@@ -3157,45 +3148,46 @@
 msgstr "Velg dato"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Select _Today"
 msgstr "Velg i _dag"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
+#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3509
 msgid "Memo"
 msgstr "Notat"
 
-#: ../calendar/gui/dialogs/memo-editor.c:159
+#: ../calendar/gui/dialogs/memo-editor.c:156
 msgid "Print this memo"
 msgstr "Skriv ut dette notatet"
 
-#: ../calendar/gui/dialogs/memo-page.c:423
+#: ../calendar/gui/dialogs/memo-page.c:421
 msgid "Memo's start date is in the past"
 msgstr "Startdato for notatet er passert"
 
-#: ../calendar/gui/dialogs/memo-page.c:460
+#: ../calendar/gui/dialogs/memo-page.c:457
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Notatet kan ikke redigeres fordi valgt notatliste er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/memo-page.c:464
+#: ../calendar/gui/dialogs/memo-page.c:461
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Notatet kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/memo-page.c:987
+#: ../calendar/gui/dialogs/memo-page.c:990
 #, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "Kan ikke åpne notater i «%s»: %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1144 ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1062 ../mail/em-format-html.c:2592
-#: ../mail/em-format-html.c:2657 ../mail/em-format-html.c:2681
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:74
+#: ../calendar/gui/dialogs/memo-page.c:1160
+#: ../em-format/e-mail-formatter-utils.c:203
+#: ../em-format/e-mail-formatter-utils.c:220
+#: ../em-format/e-mail-part-headers.c:49 ../mail/em-filter-i18n.h:78
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:66
 msgid "To"
 msgstr "Til"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:347
-#: ../calendar/gui/dialogs/task-page.ui.h:9
+#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.ui.h:31
 msgid "_List:"
 msgstr "_Liste:"
 
@@ -3204,12 +3196,12 @@
 msgstr "T_il:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:26
 msgid "Sta_rt date:"
 msgstr "Sta_rtdato:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:23
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
@@ -3218,18 +3210,18 @@
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Du endrer en repeterende hendelse. Hva ønsker du å endre?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:57
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid ""
 "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Du delegerer en repeterende hendelse. Hva ønsker du å delegere?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:61
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Du endrer en repeterende oppgave. Hva ønsker du å endre?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:65
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Du endrer et repeterende notat. Hva ønsker du å endre?"
@@ -3255,17 +3247,17 @@
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:964
+#: ../calendar/gui/dialogs/recurrence-page.c:1000
 msgid "Recurrence date is invalid"
 msgstr "Gjenintreffingsdato er ugyldig"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1022
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "End time of the recurrence was before event's start"
 msgstr "Tid for slutt av gjentakelse var før hendelsens start"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1073
 msgid "on"
 msgstr "på"
 
@@ -3273,7 +3265,7 @@
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1154
 msgid "first"
 msgstr "første"
 
@@ -3282,7 +3274,7 @@
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1103
+#: ../calendar/gui/dialogs/recurrence-page.c:1160
 msgid "second"
 msgstr "sekund"
 
@@ -3290,7 +3282,7 @@
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "third"
 msgstr "tredje"
 
@@ -3298,7 +3290,7 @@
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1131
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "fourth"
 msgstr "fjerde"
 
@@ -3306,7 +3298,7 @@
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1125
+#: ../calendar/gui/dialogs/recurrence-page.c:1175
 msgid "fifth"
 msgstr "femte"
 
@@ -3314,13 +3306,13 @@
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "last"
 msgstr "siste"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1147
+#: ../calendar/gui/dialogs/recurrence-page.c:1204
 msgid "Other Date"
 msgstr "Annen dato"
 
@@ -3328,7 +3320,7 @@
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1153
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 msgid "1st to 10th"
 msgstr "Første til tiende"
 
@@ -3336,7 +3328,7 @@
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1159
+#: ../calendar/gui/dialogs/recurrence-page.c:1216
 msgid "11th to 20th"
 msgstr "ellevte til tjuende"
 
@@ -3344,73 +3336,73 @@
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1183
+#: ../calendar/gui/dialogs/recurrence-page.c:1222
 msgid "21st to 31st"
 msgstr "tjueførste til trettiførste"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1210
-#: ../modules/calendar/e-calendar-preferences.ui.h:1
+#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "Mandag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1211
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1212
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1213
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
+#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1214
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "Fredag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1215
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1216
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "Søndag"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #. 
-#: ../calendar/gui/dialogs/recurrence-page.c:1321
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1532
+#: ../calendar/gui/dialogs/recurrence-page.c:1571
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2258
+#: ../calendar/gui/dialogs/recurrence-page.c:2341
 msgid "Add exception"
 msgstr "Legg til unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2255
+#: ../calendar/gui/dialogs/recurrence-page.c:2383
 msgid "Could not get a selection to modify."
 msgstr "Fant ikke et utvalg å endre."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2306
+#: ../calendar/gui/dialogs/recurrence-page.c:2389
 msgid "Modify exception"
 msgstr "Endre unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2352
+#: ../calendar/gui/dialogs/recurrence-page.c:2435
 msgid "Could not get a selection to delete."
 msgstr "Fant ikke et utvalg å slette."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2439
+#: ../calendar/gui/dialogs/recurrence-page.c:2576
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -3468,111 +3460,112 @@
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20 ../mail/mail-config.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 msgid "Preview"
 msgstr "Forhåndsvis"
 
-#: ../calendar/gui/dialogs/send-comp.c:197
+#: ../calendar/gui/dialogs/send-comp.c:173
+#: ../calendar/gui/dialogs/send-comp.c:255
 msgid "Send my reminders with this event"
 msgstr "Send mine påminnelser med denne hendelsen"
 
-#: ../calendar/gui/dialogs/send-comp.c:198
+#: ../calendar/gui/dialogs/send-comp.c:175
+#: ../calendar/gui/dialogs/send-comp.c:257
 msgid "Notify new attendees _only"
 msgstr "Varsle _kun nye deltakere"
 
-#: ../calendar/gui/dialogs/task-details-page.c:351
-#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-page.c:1175
+#: ../calendar/gui/dialogs/task-page.c:1200
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
 
-#: ../calendar/gui/dialogs/task-details-page.c:495
+#: ../calendar/gui/dialogs/task-details-page.c:490
 msgid "Web Page"
 msgstr "Nettside"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:19
-#: ../mail/message-list.c:1274 ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:320
 msgid "High"
 msgstr "Høy"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model.c:1583 ../calendar/gui/e-task-table.c:527
-#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1273
-#: ../widgets/misc/e-send-options.ui.h:5
+#: ../calendar/gui/dialogs/task-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:339
+#: ../calendar/gui/e-cal-model.c:1666 ../calendar/gui/e-task-table.c:574
+#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
+#: ../mail/message-list.c:319
 msgid "Normal"
 msgstr "Normal"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-task-table.c:528 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1272 ../widgets/misc/e-send-options.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:12
+#: ../calendar/gui/e-cal-component-preview.c:341
+#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:318
 msgid "Low"
 msgstr "Lav"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-task-table.c:529 ../calendar/gui/tasktypes.xml.h:22
-#: ../widgets/misc/e-send-options.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:14
+#: ../calendar/gui/e-task-table.c:576 ../calendar/gui/tasktypes.xml.h:22
+#: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Udefinert"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:304
-#: ../calendar/gui/e-cal-model-tasks.c:434
-#: ../calendar/gui/e-cal-model-tasks.c:719 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:603
-#: ../calendar/gui/print.c:3391 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/dialogs/task-page.ui.h:16
+#: ../calendar/gui/e-cal-component-preview.c:322
+#: ../calendar/gui/e-cal-model-tasks.c:311
+#: ../calendar/gui/e-cal-model-tasks.c:553 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:656
+#: ../calendar/gui/print.c:3591 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Ikke startet"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:294
-#: ../calendar/gui/e-cal-model-tasks.c:436
-#: ../calendar/gui/e-cal-model-tasks.c:721
-#: ../calendar/gui/e-cal-model-tasks.c:799 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:604
-#: ../calendar/gui/print.c:3394
+#: ../calendar/gui/dialogs/task-page.ui.h:18
+#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:313
+#: ../calendar/gui/e-cal-model-tasks.c:555
+#: ../calendar/gui/e-cal-model-tasks.c:633 ../calendar/gui/e-task-table.c:216
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:657
+#: ../calendar/gui/print.c:3594
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:297
-#: ../calendar/gui/e-cal-model-tasks.c:438
-#: ../calendar/gui/e-cal-model-tasks.c:723
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
+#: ../calendar/gui/dialogs/task-page.ui.h:20
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model-tasks.c:315
+#: ../calendar/gui/e-cal-model-tasks.c:557
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
+#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3597
 #: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "Completed"
 msgstr "Fullført"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:332
-#: ../calendar/gui/e-cal-model-tasks.c:497
-#: ../calendar/gui/e-cal-model-tasks.c:783 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:248 ../calendar/gui/e-task-table.c:670
-#: ../calendar/gui/print.c:3562 ../mail/mail-send-recv.c:879
+#: ../calendar/gui/dialogs/task-page.ui.h:22
+#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../calendar/gui/e-cal-model-tasks.c:317
+#: ../calendar/gui/e-cal-model-tasks.c:559 ../calendar/gui/e-task-table.c:220
+#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:659
+#: ../calendar/gui/print.c:3600 ../mail/mail-send-recv.c:878
 msgid "Canceled"
 msgstr "Avbrutt"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/dialogs/task-details-page.ui.h:17
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3661
-#: ../calendar/gui/e-meeting-list-view.c:693
+#: ../calendar/gui/e-cal-model.c:4017
+#: ../calendar/gui/e-meeting-list-view.c:695
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:74
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
 #: ../mail/message-list.etspec.h:1
 msgid "Status"
 msgstr "Status"
@@ -3585,8 +3578,7 @@
 msgid "P_ercent complete:"
 msgstr "Pros_ent fullført:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../e-util/e-send-options.ui.h:26
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
@@ -3594,59 +3586,60 @@
 msgid "_Date completed:"
 msgstr "Fullført _dato:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:23
+#: ../calendar/gui/dialogs/task-page.ui.h:37
 msgid "_Web Page:"
 msgstr "_Nettside:"
 
-#: ../calendar/gui/dialogs/task-editor.c:116
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "Detaljert _status"
 
-#: ../calendar/gui/dialogs/task-editor.c:118
+#: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
 msgstr "Klikk for å endre/vise detaljer om status for oppgaven"
 
-#: ../calendar/gui/dialogs/task-editor.c:126
+#: ../calendar/gui/dialogs/task-editor.c:94
 msgid "_Send Options"
 msgstr "Alternativer for _sending"
 
-#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
-#: ../widgets/misc/e-send-options.c:535
+#: ../calendar/gui/dialogs/task-editor.c:149 ../calendar/gui/print.c:3507
+#: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../calendar/gui/dialogs/task-editor.c:324
+#: ../calendar/gui/dialogs/task-editor.c:304
 msgid "Task Details"
 msgstr "Oppgavedetaljer"
 
-#: ../calendar/gui/dialogs/task-editor.c:368
+#: ../calendar/gui/dialogs/task-editor.c:286
 msgid "Print this task"
 msgstr "Skriv ut denne oppgaven"
 
-#: ../calendar/gui/dialogs/task-page.c:254
+#: ../calendar/gui/dialogs/task-page.c:330
 msgid "Task's start date is in the past"
 msgstr "Startdato for oppgaven er passert"
 
-#: ../calendar/gui/dialogs/task-page.c:255
+#: ../calendar/gui/dialogs/task-page.c:331
 msgid "Task's due date is in the past"
 msgstr "Ferdigdato for oppgaven er passert"
 
-#: ../calendar/gui/dialogs/task-page.c:289
+#: ../calendar/gui/dialogs/task-page.c:364
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "Oppgaven kan ikke redigeres fordi valgt oppgaveliste er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/task-page.c:293
+#: ../calendar/gui/dialogs/task-page.c:368
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Oppgaven kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/task-page.c:341
-#: ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.ui.h:24
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:801
+#: ../calendar/gui/dialogs/task-page.c:1007
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
@@ -3655,7 +3648,7 @@
 msgid "Unable to open tasks in '%s': %s"
 msgstr "Kan ikke åpne oppgaver i «%s»: %s"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:25
 msgid "D_ue date:"
 msgstr "Fer_dig-dato:"
 
@@ -3663,12 +3656,12 @@
 msgid "Categor_ies..."
 msgstr "Kategor_ier …"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:28
 msgid "Time zone:"
 msgstr "Tids_sone:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:393
+#: ../calendar/gui/e-alarm-list.c:358
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3676,7 +3669,7 @@
 msgstr[1] "%d dager"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:399
+#: ../calendar/gui/e-alarm-list.c:364
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -3687,98 +3680,91 @@
 msgid "Unknown action to be performed"
 msgstr "Ukjent handling som skal utføres"
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:441
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s før avtalen starter"
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:480
+#: ../calendar/gui/e-alarm-list.c:447
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s etter avtalen har startet"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:487
+#: ../calendar/gui/e-alarm-list.c:454
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ved avtalens start"
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:498
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s før avtalen slutter"
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:503
+#: ../calendar/gui/e-alarm-list.c:472
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s etter avtalens slutt"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:510
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ved avtalens slutt"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:534
+#: ../calendar/gui/e-alarm-list.c:503
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:542
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
-#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
+#: ../calendar/gui/e-cal-component-preview.c:223 ../e-util/e-filter-rule.c:750
+#: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: ../calendar/gui/e-cal-component-preview.c:207
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Categories:"
 msgstr "Kategorier:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Summary:"
 msgstr "Sammendrag:"
 
-#: ../calendar/gui/e-cal-component-preview.c:249
-#: ../calendar/gui/e-cal-component-preview.c:263
+#: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Start Date:"
 msgstr "Startdato:"
 
-#: ../calendar/gui/e-cal-component-preview.c:310
+#: ../calendar/gui/e-cal-component-preview.c:296
 msgid "Due Date:"
 msgstr "Ferdig-dato:"
 
-#. Status
-#: ../calendar/gui/e-cal-component-preview.c:290
-#: ../plugins/itip-formatter/itip-view.c:1083
+#: ../calendar/gui/e-cal-component-preview.c:308
+#: ../modules/itip-formatter/itip-view.c:1492
+#: ../modules/itip-formatter/itip-view.c:1609
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-component-preview.c:335
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:157
+#: ../calendar/gui/e-cal-component-preview.c:360
+#: ../mail/e-mail-config-service-page.c:672
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../calendar/gui/e-cal-component-preview.c:373
+#: ../calendar/gui/e-cal-component-preview.c:391
 msgid "Web Page:"
 msgstr "Nettside:"
 
@@ -3794,7 +3780,7 @@
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Created"
 msgstr "Opprettet"
 
@@ -3804,17 +3790,17 @@
 msgid "Last modified"
 msgstr "Sist endret"
 
-#: ../calendar/gui/e-cal-model-calendar.c:188
-#: ../calendar/gui/e-task-table.c:580
+#: ../calendar/gui/e-cal-model-calendar.c:125
+#: ../calendar/gui/e-task-table.c:631
 msgid "Free"
 msgstr "Ledig"
 
-#: ../calendar/gui/e-cal-model-calendar.c:191
-#: ../calendar/gui/e-meeting-time-sel.c:547 ../calendar/gui/e-task-table.c:581
+#: ../calendar/gui/e-cal-model-calendar.c:128
+#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:632
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../calendar/gui/e-cal-model-tasks.c:665
+#: ../calendar/gui/e-cal-model-tasks.c:499
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3825,44 +3811,44 @@
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:773
+#: ../calendar/gui/e-cal-model-tasks.c:551
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1589
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:1053
+#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1163
+#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:1024
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1589
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:190
+#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1163
+#: ../calendar/gui/e-meeting-list-view.c:210
+#: ../calendar/gui/e-meeting-store.c:189
 msgid "No"
 msgstr "Nei"
 
-#: ../calendar/gui/e-cal-model.c:781 ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1151
-#: ../calendar/gui/print.c:1168 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:102
-#: ../plugins/itip-formatter/itip-formatter.c:469
-#: ../plugins/itip-formatter/itip-formatter.c:2697
+#: ../calendar/gui/e-cal-model.c:467 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1251
+#: ../calendar/gui/print.c:1268 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3496
+#: ../modules/itip-formatter/itip-view.c:6080
+#: ../modules/plugin-manager/evolution-plugin-manager.c:100
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../calendar/gui/e-cal-model.c:1684
+#: ../calendar/gui/e-cal-model.c:1668
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: ../calendar/gui/e-cal-model.c:1587
+#: ../calendar/gui/e-cal-model.c:1670
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: ../calendar/gui/e-cal-model.c:2963
+#: ../calendar/gui/e-cal-model.c:3150
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
@@ -3876,11 +3862,11 @@
 msgstr "Startdato"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:650
+#: ../calendar/gui/e-meeting-list-view.c:652
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../mail/e-mail-account-tree-view.c:157
-#: ../widgets/misc/e-attachment-tree-view.c:586
+#: ../e-util/e-attachment-tree-view.c:586
+#: ../mail/e-mail-account-tree-view.c:159
 msgid "Type"
 msgstr "Type"
 
@@ -3888,7 +3874,7 @@
 msgid "Completion date"
 msgstr "Ferdigstillingsdato"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:880
 msgid "Complete"
 msgstr "Fullført"
 
@@ -3903,73 +3889,73 @@
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../calendar/gui/e-calendar-view.c:434
+#: ../calendar/gui/e-calendar-view.c:446
 msgid "Cut selected events to the clipboard"
 msgstr "Klipp ut valgte hendelser til utklippstavlen"
 
-#: ../calendar/gui/e-calendar-view.c:441
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Copy selected events to the clipboard"
 msgstr "Kopier valgte hendelser til utklippstavlen"
 
-#: ../calendar/gui/e-calendar-view.c:446
+#: ../calendar/gui/e-calendar-view.c:458
 msgid "Paste events from the clipboard"
 msgstr "Lim inn hendelser fra utklippstavlen"
 
-#: ../calendar/gui/e-calendar-view.c:452
+#: ../calendar/gui/e-calendar-view.c:464
 msgid "Delete selected events"
 msgstr "Slett valgte hendelser"
 
-#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:269
+#: ../calendar/gui/e-calendar-view.c:484 ../calendar/gui/e-memo-table.c:183
+#: ../calendar/gui/e-task-table.c:270
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: ../calendar/gui/e-calendar-view.c:650 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/e-task-table.c:1104
+#: ../calendar/gui/e-calendar-view.c:646 ../calendar/gui/e-memo-table.c:878
+#: ../calendar/gui/e-task-table.c:1176
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: ../calendar/gui/e-calendar-view.c:1801
-#: ../calendar/gui/e-meeting-list-view.c:214
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2685
+#: ../calendar/gui/e-cal-model.c:3958
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../modules/itip-formatter/itip-view.c:6068
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../calendar/gui/e-calendar-view.c:1802
-#: ../calendar/gui/e-meeting-list-view.c:215
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2691
+#: ../calendar/gui/e-cal-model.c:3959
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../modules/itip-formatter/itip-view.c:6074
 msgid "Declined"
 msgstr "Avslått"
 
-#: ../calendar/gui/e-calendar-view.c:1803
-#: ../calendar/gui/e-meeting-list-view.c:216
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../calendar/gui/e-meeting-time-sel.c:546
+#: ../calendar/gui/e-cal-model.c:3960
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: ../calendar/gui/e-calendar-view.c:1804
-#: ../calendar/gui/e-meeting-list-view.c:217
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2694
+#: ../calendar/gui/e-cal-model.c:3961
+#: ../calendar/gui/e-meeting-list-view.c:224
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../modules/itip-formatter/itip-view.c:6077
 msgid "Delegated"
 msgstr "Delegert"
 
-#: ../calendar/gui/e-cal-model.c:3471
+#: ../calendar/gui/e-cal-model.c:3962
 msgid "Needs action"
 msgstr "Krever handling"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1949 ../calendar/gui/e-memo-table.c:539
-#: ../calendar/gui/e-task-table.c:770
+#: ../calendar/gui/e-calendar-view.c:2084 ../calendar/gui/e-memo-table.c:553
+#: ../calendar/gui/e-task-table.c:840
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
@@ -3977,35 +3963,36 @@
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1953 ../calendar/gui/e-memo-table.c:544
-#: ../calendar/gui/e-task-table.c:774
+#: ../calendar/gui/e-calendar-view.c:2088 ../calendar/gui/e-memo-table.c:558
+#: ../calendar/gui/e-task-table.c:844
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1969 ../calendar/gui/print.c:3346
+#: ../calendar/gui/e-calendar-view.c:2104
+#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3545
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2000
+#: ../calendar/gui/e-calendar-view.c:2135
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:156
+#: ../calendar/gui/e-cell-date-edit-text.c:159
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:159
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:173
+#: ../calendar/gui/e-cell-date-edit-text.c:170
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4014,31 +4001,33 @@
 "Datoen må skrives inn på formatet: \n"
 "%s"
 
-#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
-#. * to change the length of the time division in the calendar day view, e.g.
-#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
-#. 
-#: ../calendar/gui/e-day-view-time-item.c:809
+#. Translators: %02i is the number of minutes;
+#. * this is a context menu entry to change the
+#. * length of the time division in the calendar
+#. * day view, e.g. a day is displayed in
+#. * 24 "60 minute divisions" or
+#. * 48 "30 minute divisions".
+#: ../calendar/gui/e-day-view-time-item.c:801
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
-#: ../calendar/gui/e-day-view-time-item.c:816
+#: ../calendar/gui/e-day-view-time-item.c:826
 msgid "Show the second time zone"
 msgstr "Vis den andre tidssonen"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:833
-#: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:231
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/e-day-view-time-item.c:843
+#: ../modules/calendar/e-calendar-preferences.c:306
+#: ../modules/calendar/e-calendar-preferences.c:358
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/e-day-view-time-item.c:873
-#: ../calendar/gui/e-timezone-entry.c:322
-#: ../modules/calendar/e-calendar-preferences.c:268
+#: ../calendar/gui/e-day-view-time-item.c:877
+#: ../calendar/gui/e-timezone-entry.c:324
+#: ../modules/calendar/e-calendar-preferences.c:389
 msgid "Select..."
 msgstr "Velg …"
 
@@ -4048,8 +4037,8 @@
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1819
-#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
+#: ../calendar/gui/e-day-view.c:2776 ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:210 ../calendar/gui/print.c:2093
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4059,10 +4048,10 @@
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:1881
-#: ../calendar/gui/e-day-view-top-item.c:856
-#: ../calendar/gui/e-week-view-main-item.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1110
+#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:2793
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:219
+#: ../modules/calendar/e-cal-shell-view-private.c:1229
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4071,29 +4060,29 @@
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:1897
-#: ../calendar/gui/e-day-view-top-item.c:860
-#: ../calendar/gui/e-week-view-main-item.c:247
-#: ../modules/calendar/e-cal-shell-view-private.c:1146
+#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:2809
+#: ../calendar/gui/e-day-view-top-item.c:863
+#: ../calendar/gui/e-week-view-main-item.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1265
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1019 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:977 ../calendar/gui/print.c:996
-#: ../calendar/gui/print.c:2484 ../calendar/gui/print.c:2504
+#: ../calendar/gui/e-day-view.c:1983 ../calendar/gui/e-week-view.c:1554
+#: ../calendar/gui/print.c:1074 ../calendar/gui/print.c:1093
+#: ../calendar/gui/print.c:2637 ../calendar/gui/print.c:2657
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:982 ../calendar/gui/print.c:998
-#: ../calendar/gui/print.c:2489 ../calendar/gui/print.c:2506
+#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1557
+#: ../calendar/gui/print.c:1079 ../calendar/gui/print.c:1095
+#: ../calendar/gui/print.c:2642 ../calendar/gui/print.c:2659
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2650
+#: ../calendar/gui/e-day-view.c:3433
 #, c-format
 msgid "Week %d"
 msgstr "Uke %d"
@@ -4114,76 +4103,74 @@
 msgid "Resources"
 msgstr "Ressurser"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1147
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1247
 msgid "Individual"
 msgstr "Individuell"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1148 ../widgets/table/e-table-config.ui.h:8
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/print.c:1248 ../e-util/e-table-config.ui.h:5
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1149
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/print.c:1249
 msgid "Resource"
 msgstr "Ressurs"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1150
+#: ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1250
 msgid "Room"
 msgstr "Rom"
 
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/print.c:1164
+#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/print.c:1264
 msgid "Chair"
 msgstr "Styremedlem"
 
-#: ../calendar/gui/e-meeting-list-view.c:189
-#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1165
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1265
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1166
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1266
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1167
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/print.c:1267
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:213
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/e-meeting-store.c:1060
+#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:1031
 msgid "Needs Action"
 msgstr "Trenger handling"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:626
 msgid "Attendee                          "
 msgstr "Deltaker                          "
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:623
+#: ../calendar/gui/e-meeting-list-view.c:681
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr "Under arbeid"
 
-#: ../calendar/gui/e-meeting-store.c:1887
+#: ../calendar/gui/e-meeting-store.c:1910
 #, c-format
 msgid ""
 "Enter password to access free/busy information on server %s as user %s"
@@ -4191,14 +4178,14 @@
 "Oppgi passord for å se på ledig-/opptatt-informasjon på tjener %s som bruker "
 "%s"
 
-#: ../calendar/gui/e-meeting-store.c:1897
+#: ../calendar/gui/e-meeting-store.c:1920
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Feilårsak: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1924
-#: ../plugins/publish-calendar/publish-calendar.c:338
-#: ../smime/gui/component.c:54
+#: ../calendar/gui/e-meeting-store.c:1925
+#: ../plugins/publish-calendar/publish-calendar.c:351
+#: ../smime/gui/component.c:64
 msgid "Enter password"
 msgstr "Oppgi passord"
 
@@ -4224,39 +4211,39 @@
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-meeting-time-sel.c:528
 msgid "Out of Office"
 msgstr "Borte fra kontoret"
 
-#: ../calendar/gui/e-meeting-time-sel.c:549
+#: ../calendar/gui/e-meeting-time-sel.c:530
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "O_ptions"
 msgstr "Al_ternativer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:603
+#: ../calendar/gui/e-meeting-time-sel.c:590
 msgid "Show _only working hours"
 msgstr "K_un vis arbeidstid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:614
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ut"
 
-#: ../calendar/gui/e-meeting-time-sel.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:681
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:663
+#: ../calendar/gui/e-meeting-time-sel.c:658
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: ../calendar/gui/e-meeting-time-sel.c:678
+#: ../calendar/gui/e-meeting-time-sel.c:675
 msgid ">_>"
 msgstr ">_>"
 
@@ -4264,23 +4251,23 @@
 msgid "_All people and resources"
 msgstr "_Alle personer og ressurser"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "All _people and one resource"
 msgstr "Alle _personer og en ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr "_Obligatoriske personer"
 
-#: ../calendar/gui/e-meeting-time-sel.c:725
+#: ../calendar/gui/e-meeting-time-sel.c:728
 msgid "Required people and _one resource"
 msgstr "Obligatoriske personer _og en ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:825
+#: ../calendar/gui/e-meeting-time-sel.c:767
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:814
+#: ../calendar/gui/e-meeting-time-sel.c:796
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
@@ -4308,25 +4295,25 @@
 msgid "Language"
 msgstr "Språk"
 
-#: ../calendar/gui/e-memo-table.c:433
-#: ../modules/calendar/e-cal-shell-content.c:476
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view-actions.c:248
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../calendar/gui/e-memo-table.c:434
+#: ../modules/calendar/e-cal-shell-content.c:482
+#: ../modules/calendar/e-memo-shell-view-actions.c:212
+#: ../modules/calendar/e-memo-shell-view-actions.c:227
+#: ../modules/calendar/e-memo-shell-view.c:307
 msgid "Memos"
 msgstr "Notater"
 
-#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:733
+#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:803
 msgid "* No Summary *"
 msgstr "* Ingen sammendrag *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:817
+#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:887
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:835
+#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:905
 msgid "Due: "
 msgstr "Ferdig: "
 
@@ -4343,7 +4330,7 @@
 msgstr "Lim inn notater fra utklippstavlen"
 
 #: ../calendar/gui/e-memo-table.c:760
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
 msgid "Delete selected memos"
 msgstr "Slett valgt notat"
 
@@ -4359,51 +4346,51 @@
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #. 
-#: ../calendar/gui/e-task-table.c:611
+#: ../calendar/gui/e-task-table.c:604
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:721 ../calendar/gui/print.c:2388
-#: ../calendar/importers/icalendar-importer.c:84
-#: ../calendar/importers/icalendar-importer.c:1084
+#: ../calendar/gui/e-task-table.c:721 ../calendar/gui/print.c:2418
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:1078
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:437
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view-actions.c:271
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../modules/calendar/e-cal-shell-content.c:439
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view-actions.c:250
+#: ../modules/calendar/e-task-shell-view.c:462
 msgid "Tasks"
 msgstr "Oppgaver"
 
-#: ../calendar/gui/e-task-table.c:1025
+#: ../calendar/gui/e-task-table.c:1040
 msgid "Cut selected tasks to the clipboard"
 msgstr "Klipp ut valgte oppgaver til utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:1031
+#: ../calendar/gui/e-task-table.c:1046
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopier valgte oppgaver til utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:1037
+#: ../calendar/gui/e-task-table.c:1052
 msgid "Paste tasks from the clipboard"
 msgstr "Lim inn oppgaver fra utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:1043
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../calendar/gui/e-task-table.c:1058
+#: ../modules/calendar/e-task-shell-view-actions.c:713
 msgid "Delete selected tasks"
 msgstr "Slett valgte oppgaver"
 
-#: ../calendar/gui/e-task-table.c:1049
+#: ../calendar/gui/e-task-table.c:1064
 msgid "Select all visible tasks"
 msgstr "Velg alle synlige oppgaver"
 
-#: ../calendar/gui/e-timezone-entry.c:333
+#: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "Velg tidssone"
 
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1949
+#: ../calendar/gui/e-week-view-main-item.c:227 ../calendar/gui/print.c:2072
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -4428,15 +4415,15 @@
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenderhendlelse: Har ikke sammendrag."
 
-#: ../calendar/gui/ea-cal-view-event.c:329
+#: ../calendar/gui/ea-cal-view-event.c:337
 msgid "calendar view event"
 msgstr "vis kalenderhendelse"
 
-#: ../calendar/gui/ea-cal-view-event.c:558
+#: ../calendar/gui/ea-cal-view-event.c:569
 msgid "Grab Focus"
 msgstr "Ta fokus"
 
-#: ../calendar/gui/ea-cal-view.c:320
+#: ../calendar/gui/ea-cal-view.c:324
 msgid "New Appointment"
 msgstr "Ny avtale"
 
@@ -4457,11 +4444,11 @@
 msgstr "Gå til dato"
 
 #: ../calendar/gui/ea-day-view-main-item.c:327
-#: ../calendar/gui/ea-week-view-main-item.c:353
+#: ../calendar/gui/ea-week-view-main-item.c:354
 msgid "a table to view and select the current time range"
 msgstr "en tabell som viser og velger aktivt tidsområde"
 
-#: ../calendar/gui/ea-day-view.c:154 ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-day-view.c:154 ../calendar/gui/ea-week-view.c:154
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4470,7 +4457,7 @@
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:161 ../calendar/gui/ea-week-view.c:156
+#: ../calendar/gui/ea-day-view.c:161 ../calendar/gui/ea-week-view.c:157
 msgid "It has no events."
 msgstr "Har ingen hendelser."
 
@@ -4494,21 +4481,21 @@
 
 #: ../calendar/gui/ea-gnome-calendar.c:48
 #: ../calendar/gui/ea-gnome-calendar.c:56
-#: ../calendar/importers/icalendar-importer.c:1120
+#: ../calendar/importers/icalendar-importer.c:1114
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
 #: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1106
+#: ../modules/calendar/e-cal-shell-view-private.c:1225
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:217
 #: ../calendar/gui/ea-gnome-calendar.c:220
-#: ../modules/calendar/e-cal-shell-view-private.c:1113
-#: ../modules/calendar/e-cal-shell-view-private.c:1119
-#: ../modules/calendar/e-cal-shell-view-private.c:1122
+#: ../modules/calendar/e-cal-shell-view-private.c:1232
+#: ../modules/calendar/e-cal-shell-view-private.c:1238
+#: ../modules/calendar/e-cal-shell-view-private.c:1241
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -4516,10 +4503,10 @@
 #: ../calendar/gui/ea-gnome-calendar.c:247
 #: ../calendar/gui/ea-gnome-calendar.c:254
 #: ../calendar/gui/ea-gnome-calendar.c:257
-#: ../modules/calendar/e-cal-shell-view-private.c:1139
-#: ../modules/calendar/e-cal-shell-view-private.c:1150
-#: ../modules/calendar/e-cal-shell-view-private.c:1157
-#: ../modules/calendar/e-cal-shell-view-private.c:1160
+#: ../modules/calendar/e-cal-shell-view-private.c:1258
+#: ../modules/calendar/e-cal-shell-view-private.c:1269
+#: ../modules/calendar/e-cal-shell-view-private.c:1276
+#: ../modules/calendar/e-cal-shell-view-private.c:1279
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -4531,54 +4518,54 @@
 msgid "Click here, you can find more events."
 msgstr "Klikk her for å finne flere hendelser."
 
-#: ../calendar/gui/ea-week-view.c:162
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Månedsvisning: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:167
+#: ../calendar/gui/ea-week-view.c:168
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Ukevisning: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:201
+#: ../calendar/gui/ea-week-view.c:202
 msgid "calendar view for a month"
 msgstr "kalendervisning for en måned"
 
-#: ../calendar/gui/ea-week-view.c:203
+#: ../calendar/gui/ea-week-view.c:204
 msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
-#: ../calendar/gui/gnome-cal.c:2262
+#: ../calendar/gui/gnome-cal.c:2369
 msgid "Purging"
 msgstr "Tømmer"
 
-#: ../calendar/gui/itip-utils.c:513 ../calendar/gui/itip-utils.c:568
-#: ../calendar/gui/itip-utils.c:681
+#: ../calendar/gui/itip-utils.c:646 ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/itip-utils.c:838
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:695
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: ../calendar/gui/itip-utils.c:767 ../calendar/gui/itip-utils.c:928
+#: ../calendar/gui/itip-utils.c:926 ../calendar/gui/itip-utils.c:1087
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:931
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/itip-utils.c:773 ../calendar/gui/itip-utils.c:934
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Memo information"
 msgstr "Informasjon om notat"
 
-#: ../calendar/gui/itip-utils.c:776 ../calendar/gui/itip-utils.c:952
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1111
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:938
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
@@ -4586,7 +4573,7 @@
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:975
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Godtatt"
@@ -4595,7 +4582,7 @@
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:826
+#: ../calendar/gui/itip-utils.c:982
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
@@ -4607,7 +4594,7 @@
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:833 ../calendar/gui/itip-utils.c:881
+#: ../calendar/gui/itip-utils.c:989 ../calendar/gui/itip-utils.c:1037
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Avslått"
@@ -4616,7 +4603,7 @@
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:996
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegert"
@@ -4624,7 +4611,7 @@
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:853
+#: ../calendar/gui/itip-utils.c:1009
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Oppdatert"
@@ -4632,7 +4619,7 @@
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:860
+#: ../calendar/gui/itip-utils.c:1016
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Avbryt"
@@ -4640,7 +4627,7 @@
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:867
+#: ../calendar/gui/itip-utils.c:1023
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Oppdater"
@@ -4648,253 +4635,262 @@
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:874
+#: ../calendar/gui/itip-utils.c:1030
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: ../calendar/gui/itip-utils.c:949
+#: ../calendar/gui/itip-utils.c:1108
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: ../calendar/gui/itip-utils.c:1097
+#: ../calendar/gui/itip-utils.c:1116
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../calendar/gui/itip-utils.c:1124
+#: ../calendar/gui/itip-utils.c:1144
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Klarer ikke å booke en ressurs. Den nye hendelsen er i konflikt med en annen."
 
-#: ../calendar/gui/itip-utils.c:991
+#: ../calendar/gui/itip-utils.c:1128
 msgid "Unable to book a resource, error: "
 msgstr "Kan ikke booke en ressurs. Feil: "
 
-#: ../calendar/gui/itip-utils.c:1153
+#: ../calendar/gui/itip-utils.c:1324
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:661
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:661
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:662
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:662
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:662
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:662
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:662
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:663
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:663
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:663
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:663
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:663
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:664
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:664
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:664
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:664
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:665
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:665
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:665
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:666
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:666
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:666
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:666
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:666
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:587
+#: ../calendar/gui/print.c:667
 msgid "31st"
 msgstr "31"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:644
+#. G_DATE_SUNDAY
+#: ../calendar/gui/print.c:733
 msgid "Su"
 msgstr "Sø."
 
-#: ../calendar/gui/print.c:720
+#. Translators: These are workday abbreviations,
+#. * e.g. Su=Sunday and Th=thursday
+#. G_DATE_BAD_WEEKDAY
+#. G_DATE_MONDAY
+#: ../calendar/gui/print.c:727
 msgid "Mo"
 msgstr "Ma."
 
-#: ../calendar/gui/print.c:644
+#. G_DATE_TUESDAY
+#: ../calendar/gui/print.c:728
 msgid "Tu"
 msgstr "Ti."
 
-#: ../calendar/gui/print.c:644
+#. G_DATE_WEDNESDAY
+#: ../calendar/gui/print.c:729
 msgid "We"
 msgstr "On."
 
-#: ../calendar/gui/print.c:645
+#. G_DATE_THURSDAY
+#: ../calendar/gui/print.c:730
 msgid "Th"
 msgstr "To."
 
-#: ../calendar/gui/print.c:645
+#. G_DATE_FRIDAY
+#: ../calendar/gui/print.c:731
 msgid "Fr"
 msgstr "Fr."
 
-#: ../calendar/gui/print.c:645
+#. G_DATE_SATURDAY
+#: ../calendar/gui/print.c:732
 msgid "Sa"
 msgstr "Lø."
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3295
+#: ../calendar/gui/print.c:3328
 msgid " to "
 msgstr " til "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3305
+#: ../calendar/gui/print.c:3338
 msgid " (Completed "
 msgstr " (Fullført "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3311
+#: ../calendar/gui/print.c:3344
 msgid "Completed "
 msgstr "Fullført "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3321
+#: ../calendar/gui/print.c:3354
 msgid " (Due "
 msgstr " (Ferdig "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3328
+#: ../calendar/gui/print.c:3361
 msgid "Due "
 msgstr "Ferdig "
 
-#: ../calendar/gui/print.c:3337
+#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3534
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammendrag: %s"
 
-#: ../calendar/gui/print.c:3364
+#: ../calendar/gui/print.c:3564
 msgid "Attendees: "
 msgstr "Deltakere: "
 
-#: ../calendar/gui/print.c:3407
+#: ../calendar/gui/print.c:3608
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3422
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:3440
+#: ../calendar/gui/print.c:3642
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: ../calendar/gui/print.c:3451
+#: ../calendar/gui/print.c:3656
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3464
+#: ../calendar/gui/print.c:3670
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:3475
+#: ../calendar/gui/print.c:3681
 msgid "Contacts: "
 msgstr "Kontakter: "
 
@@ -4902,6 +4898,7 @@
 msgid "In progress"
 msgstr "Under arbeid"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:244
 #: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "Avbrutt"
@@ -4911,193 +4908,189 @@
 msgid "% Completed"
 msgstr "% ferdig"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:38
 msgid "is greater than"
 msgstr "er større enn"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:39
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: ../calendar/importers/icalendar-importer.c:84
+#: ../calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr "Avtaler og møter"
 
-#: ../calendar/importers/icalendar-importer.c:435
-#: ../calendar/importers/icalendar-importer.c:868
-#: ../plugins/itip-formatter/itip-formatter.c:2170
+#: ../calendar/importers/icalendar-importer.c:462
+#: ../calendar/importers/icalendar-importer.c:901
 msgid "Opening calendar"
 msgstr "Åpner kalender"
 
-#: ../calendar/importers/icalendar-importer.c:583
+#: ../calendar/importers/icalendar-importer.c:610
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-filer (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:611
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar-import"
 
-#: ../calendar/importers/icalendar-importer.c:674
+#: ../calendar/importers/icalendar-importer.c:703
 msgid "Reminder!"
 msgstr "Påminnelse!"
 
-#: ../calendar/importers/icalendar-importer.c:793
+#: ../calendar/importers/icalendar-importer.c:787
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-filer (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:759
+#: ../calendar/importers/icalendar-importer.c:788
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar-import"
 
-#: ../calendar/importers/icalendar-importer.c:1038
+#: ../calendar/importers/icalendar-importer.c:1071
 msgid "Calendar Events"
 msgstr "Hendlelser i kalenderen"
 
-#: ../calendar/importers/icalendar-importer.c:1078
+#: ../calendar/importers/icalendar-importer.c:1115
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligent import for Evolution kalender"
 
-#: ../calendar/importers/icalendar-importer.c:1153
-#: ../calendar/importers/icalendar-importer.c:1471
+#: ../calendar/importers/icalendar-importer.c:1186
+#: ../calendar/importers/icalendar-importer.c:1500
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Møte"
 
-#: ../calendar/importers/icalendar-importer.c:1153
-#: ../calendar/importers/icalendar-importer.c:1471
+#: ../calendar/importers/icalendar-importer.c:1186
+#: ../calendar/importers/icalendar-importer.c:1500
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../calendar/importers/icalendar-importer.c:1156
-#: ../calendar/importers/icalendar-importer.c:1472
+#: ../calendar/importers/icalendar-importer.c:1189
+#: ../calendar/importers/icalendar-importer.c:1501
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../calendar/importers/icalendar-importer.c:1159
-#: ../calendar/importers/icalendar-importer.c:1473
+#: ../calendar/importers/icalendar-importer.c:1192
+#: ../calendar/importers/icalendar-importer.c:1502
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Notat"
 
-#: ../calendar/importers/icalendar-importer.c:1168
+#: ../calendar/importers/icalendar-importer.c:1201
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "har gjeninntreffelse"
 
-#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1206
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "er en instans"
 
-#: ../calendar/importers/icalendar-importer.c:1214
+#: ../calendar/importers/icalendar-importer.c:1211
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "har påminnelser"
 
-#: ../calendar/importers/icalendar-importer.c:1183
+#: ../calendar/importers/icalendar-importer.c:1216
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "har vedlegg"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1196
+#: ../calendar/importers/icalendar-importer.c:1229
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Offentlig"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1232
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privat"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1202
+#: ../calendar/importers/icalendar-importer.c:1235
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Konfidensiell"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1242
+#: ../calendar/importers/icalendar-importer.c:1239
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Klassifisering"
 
 #. Translators: Appointment's summary
-#. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1211
-#: ../calendar/importers/icalendar-importer.c:1512
+#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1544
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Sammendrag"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1217
+#: ../calendar/importers/icalendar-importer.c:1250
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Plassering"
 
 #. Translators: Appointment's start time
-#. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1508
+#: ../calendar/importers/icalendar-importer.c:1258
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Start"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1236
+#: ../calendar/importers/icalendar-importer.c:1269
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Ferdig"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1248
+#: ../calendar/importers/icalendar-importer.c:1281
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Slutt"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1258
+#: ../calendar/importers/icalendar-importer.c:1291
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategorier"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1282
+#: ../calendar/importers/icalendar-importer.c:1315
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Fullført"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1290
+#: ../calendar/importers/icalendar-importer.c:1323
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1301
-#: ../calendar/importers/icalendar-importer.c:1304
+#: ../calendar/importers/icalendar-importer.c:1334
+#: ../calendar/importers/icalendar-importer.c:1337
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organisator"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1324
-#: ../calendar/importers/icalendar-importer.c:1327
+#: ../calendar/importers/icalendar-importer.c:1357
+#: ../calendar/importers/icalendar-importer.c:1360
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Deltakere"
 
-#: ../calendar/importers/icalendar-importer.c:1341
+#: ../calendar/importers/icalendar-importer.c:1374
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Beskrivelse"
 
-#. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1504
+#: ../calendar/importers/icalendar-importer.c:1534
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Type"
@@ -5651,7 +5644,6 @@
 msgstr "Amerika/Nassau"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
@@ -6651,164 +6643,164 @@
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
-#: ../composer/e-composer-actions.c:208
+#: ../composer/e-composer-actions.c:203
 msgid "Save as..."
 msgstr "Lagre som …"
 
-#: ../composer/e-composer-actions.c:296
-#: ../widgets/misc/e-signature-editor.c:207
+#: ../composer/e-composer-actions.c:276
+#: ../e-util/e-mail-signature-editor.c:308
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:278
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:283
 msgid "New _Message"
 msgstr "Ny _melding"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:285
 msgid "Open New Message window"
 msgstr "Åpne nytt meldingsvindu"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1523
+#: ../composer/e-composer-actions.c:292 ../shell/e-shell-window-actions.c:937
 msgid "Configure Evolution"
 msgstr "Konfigurer Evolution"
 
-#: ../composer/e-composer-actions.c:319
+#: ../composer/e-composer-actions.c:299
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:304
 msgid "Save _As..."
 msgstr "L_agre som …"
 
-#: ../composer/e-composer-actions.c:326
+#: ../composer/e-composer-actions.c:306
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:313
 msgid "Character _Encoding"
 msgstr "T_egnkoding"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:330
 msgid "_Print..."
 msgstr "S_kriv ut …"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:337
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:344
 msgid "Save as _Draft"
 msgstr "Lagre som ut_kast"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:346
 msgid "Save as draft"
 msgstr "Lagre som utkast"
 
-#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
+#: ../composer/e-composer-actions.c:351
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:353
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "Krypt_er med PGP"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "Krypter denne meldingen med PGP"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "_Signer med PGP"
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "Signer denne meldingen med din PGP-nøkkel"
 
-#: ../composer/e-composer-actions.c:396
+#: ../composer/e-composer-actions.c:377
 msgid "_Picture Gallery"
 msgstr "_Bildegalleri"
 
-#: ../composer/e-composer-actions.c:398
+#: ../composer/e-composer-actions.c:379
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Vis en samling av bilder som du kan dra til din melding"
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:385
 msgid "_Prioritize Message"
 msgstr "_Prioriter melding"
 
-#: ../composer/e-composer-actions.c:407
+#: ../composer/e-composer-actions.c:387
 msgid "Set the message priority to high"
 msgstr "Sett meldingsprioritet til høy"
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:393
 msgid "Re_quest Read Receipt"
 msgstr "S_pør om lesekvittering"
 
-#: ../composer/e-composer-actions.c:415
+#: ../composer/e-composer-actions.c:395
 msgid "Get delivery notification when your message is read"
 msgstr "Motta leveringsmelding når meldingen blir lest"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME En_crypt"
 msgstr "_Krypter med S/MIME"
 
-#: ../composer/e-composer-actions.c:423
+#: ../composer/e-composer-actions.c:403
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Krypter denne meldingen med ditt S/MIME-krypteringssertifikat"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:409
 msgid "S/MIME Sig_n"
 msgstr "Sig_ner med S/MIME"
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:411
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signer denne meldingen med ditt S/MIME signatursertifikat"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:417
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ../composer/e-composer-actions.c:439
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Slå av/på visning av BCC-feltet"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:425
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ../composer/e-composer-actions.c:447
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the CC field is displayed"
 msgstr "Slå av/på visning av CC-feltet"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Slå av/på visning av Svar-til feltet"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:494
 msgid "Save Draft"
 msgstr "Lagre utkast"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../composer/e-composer-header-table.c:39
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: ../composer/e-composer-header-table.c:45
+#: ../composer/e-composer-header-table.c:44
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6816,44 +6808,44 @@
 "Skriv inn adressene som skal motta en kopi av meldingen uten å vises i "
 "mottakerlisten for meldingen."
 
-#: ../composer/e-composer-header-table.c:1021
+#: ../composer/e-composer-header-table.c:772
 msgid "Fr_om:"
 msgstr "Fr_a:"
 
-#: ../composer/e-composer-header-table.c:856
+#: ../composer/e-composer-header-table.c:779
 msgid "_Reply-To:"
 msgstr "Sva_r-til:"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:784
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-composer-header-table.c:1039
+#: ../composer/e-composer-header-table.c:790
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1044
+#: ../composer/e-composer-header-table.c:796
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:1049
+#: ../composer/e-composer-header-table.c:801
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: ../composer/e-composer-header-table.c:1053
+#: ../composer/e-composer-header-table.c:805
 msgid "S_ubject:"
 msgstr "Em_ne:"
 
-#: ../composer/e-composer-header-table.c:890
-#: ../mail/e-mail-config-identity-page.c:490
+#: ../composer/e-composer-header-table.c:813
+#: ../mail/e-mail-config-identity-page.c:489
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../composer/e-composer-name-header.c:215
+#: ../composer/e-composer-name-header.c:235
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
-#: ../composer/e-composer-post-header.c:131
+#: ../composer/e-composer-post-header.c:184
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
@@ -6873,11 +6865,11 @@
 msgid "Search for and replace text"
 msgstr "Søk etter / erstatt tekst"
 
-#: ../composer/e-composer-private.c:337
+#: ../composer/e-composer-private.c:338
 msgid "Save draft"
 msgstr "Lagre utkast"
 
-#: ../composer/e-msg-composer.c:812
+#: ../composer/e-msg-composer.c:878
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6885,7 +6877,7 @@
 "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:821
+#: ../composer/e-msg-composer.c:887
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6894,18 +6886,18 @@
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1699 ../composer/e-msg-composer.c:2083
+#: ../composer/e-msg-composer.c:1566 ../composer/e-msg-composer.c:1967
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:4185
+#: ../composer/e-msg-composer.c:4235
 msgid ""
 "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "Redigering inneholder en meldingskropp som ikke er tekst, og som ikke kan "
 "redigeres."
 
-#: ../composer/e-msg-composer.c:4965
+#: ../composer/e-msg-composer.c:4908
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
@@ -7038,7 +7030,7 @@
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "En feil oppsto under sending. Hvordan vil du fortsette?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:152
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Feilen som ble rapportert var &quot;{0}&quot;."
 
@@ -7112,7 +7104,7 @@
 msgid "Personal details:"
 msgstr "Personlige detaljer:"
 
-#: ../capplet/settings/mail-account-view.c:518 ../mail/mail-config.ui.h:180
+#: ../e-util/e-source-config.c:693 ../e-util/e-source-config.c:697
 msgid "Name:"
 msgstr "Navn:"
 
@@ -7124,7 +7116,7 @@
 msgid "Details:"
 msgstr "Detaljer:"
 
-#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:183
+#: ../mail/e-mail-config-summary-page.c:409
 msgid "Receiving"
 msgstr "Mottar"
 
@@ -7136,7 +7128,8 @@
 msgid "Server address:"
 msgstr "Tjeneradresse:"
 
-#: ../capplet/settings/mail-account-view.c:570 ../mail/mail-config.ui.h:187
+#: ../mail/e-mail-config-summary-page.c:475
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:697
 msgid "Username:"
 msgstr "Brukernavn:"
 
@@ -7149,7 +7142,7 @@
 msgid "never"
 msgstr "aldri"
 
-#: ../capplet/settings/mail-account-view.c:612 ../mail/mail-config.ui.h:184
+#: ../mail/e-mail-config-summary-page.c:421
 msgid "Sending"
 msgstr "Sender"
 
@@ -7197,8 +7190,8 @@
 "Se over innstillingene før forsøk på å koble til tjeneren for å hente e-"
 "posten din."
 
-#: ../capplet/settings/mail-account-view.c:630
-#: ../mail/em-account-editor.c:2315 ../mail/em-account-editor.c:2451
+#: ../e-util/evolution-source-viewer.c:726
+#: ../mail/e-mail-config-identity-page.c:678
 msgid "Identity"
 msgstr "Identitet"
 
@@ -7249,7 +7242,7 @@
 msgid "Back - Receiving options"
 msgstr "Tilbake - Alternativer for mottak"
 
-#: ../mail/e-mail-config-defaults-page.c:839
+#: ../mail/e-mail-config-defaults-page.c:859
 msgid "Defaults"
 msgstr "Forvalg"
 
@@ -7366,13 +7359,13 @@
 msgid "Calendar event notifications"
 msgstr "Varsling om kalenderhendelser"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:941
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1033
+#: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:83
 msgid "Groupware Suite"
 msgstr "Gruppevareløsning"
 
@@ -7384,13 +7377,13 @@
 msgid "Manage your email, contacts and schedule"
 msgstr "Håndter e-post, kontakter og kalender"
 
-#: ../data/evolution.desktop.in.in.h:5
+#: ../data/evolution.desktop.in.in.h:6
 msgid "Compose New Message"
 msgstr "Skriv en ny melding"
 
-#: ../data/evolution.desktop.in.in.h:7
-#: ../modules/addressbook/e-book-shell-backend.c:274
-#: ../modules/addressbook/e-book-shell-view.c:356
+#: ../data/evolution.desktop.in.in.h:7 ../e-util/e-name-selector-dialog.c:453
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view.c:372
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -7403,36 +7396,36 @@
 msgstr "Konfigurer e-postkonti"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:248
+#: ../e-util/e-activity.c:259
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (avbrutt)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:251
+#: ../e-util/e-activity.c:262
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (fullført)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:254
+#: ../e-util/e-activity.c:265
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (venter)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:258
+#: ../e-util/e-activity.c:269
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (avbryter)"
 
-#: ../e-util/e-activity.c:260
+#: ../e-util/e-activity.c:271
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:265
+#: ../e-util/e-activity.c:276
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
@@ -7515,26 +7508,25 @@
 msgstr "Synlig"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1863
-#: ../plugins/itip-formatter/itip-view.c:194
-#: ../widgets/table/e-cell-date-edit.c:307
+#: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1900
+#: ../modules/itip-formatter/itip-view.c:230
 msgid "Today"
 msgstr "I dag"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:222
+#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:258
 msgid "Tomorrow"
 msgstr "I morgen"
 
-#: ../e-util/e-datetime-format.c:219
+#: ../e-util/e-datetime-format.c:222
 msgid "Yesterday"
 msgstr "I går"
 
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:227
+#: ../e-util/e-datetime-format.c:230
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Neste %a"
@@ -7542,7 +7534,7 @@
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:233
+#: ../e-util/e-datetime-format.c:236
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Neste %a"
@@ -7550,7 +7542,7 @@
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:239
+#: ../e-util/e-datetime-format.c:242
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Neste %a"
@@ -7558,7 +7550,7 @@
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:245
+#: ../e-util/e-datetime-format.c:248
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Neste %a"
@@ -7566,7 +7558,7 @@
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:251
+#: ../e-util/e-datetime-format.c:254
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Neste %a"
@@ -7574,7 +7566,7 @@
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:257
+#: ../e-util/e-datetime-format.c:260
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Neste %a"
@@ -7582,40 +7574,38 @@
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:263
+#: ../e-util/e-datetime-format.c:266
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Neste %a"
 
-#: ../e-util/e-datetime-format.c:350 ../e-util/e-datetime-format.c:360
-#: ../e-util/e-datetime-format.c:369
+#: ../e-util/e-datetime-format.c:353 ../e-util/e-datetime-format.c:363
+#: ../e-util/e-datetime-format.c:372
 msgid "Use locale default"
 msgstr "Bruk forvalg for locale"
 
-#: ../e-util/e-datetime-format.c:574
+#: ../e-util/e-datetime-format.c:577
 msgid "Format:"
 msgstr "Format:"
 
-#: ../e-util/e-file-utils.c:150
+#: ../e-util/e-file-utils.c:121
 msgid "(Unknown Filename)"
 msgstr "(Ukjent filnavn)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:154
+#: ../e-util/e-file-utils.c:125
 #, c-format
 msgid "Writing \"%s\""
 msgstr "Skriver «%s»"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:159
+#: ../e-util/e-file-utils.c:130
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Skriver «%s» til %s"
 
-#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:9
-#: ../plugins/google-account-setup/google-contacts-source.c:388
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
 msgid "weeks"
 msgstr "uker"
 
@@ -7632,7 +7622,7 @@
 "The printing system did not report any additional details about the error."
 msgstr "Utskriftssystemet rapporterte ingen detaljer om feilen."
 
-#: ../e-util/e-signature.c:708
+#: ../e-util/e-mail-signature-combo-box.c:378
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
@@ -7644,7 +7634,7 @@
 msgid "Do you wish to overwrite it?"
 msgstr "Vil du overskrive den?"
 
-#: ../e-util/e-system.error.xml.h:3 ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
@@ -7660,11 +7650,11 @@
 msgid "Cannot open file \"{0}\"."
 msgstr "Kan ikke åpne fil «{0}»."
 
-#: ../e-util/e-util.c:245
+#: ../e-util/e-misc-utils.c:242
 msgid "Could not open the link."
 msgstr "Kunne ikke åpne lenken."
 
-#: ../e-util/e-util.c:296
+#: ../e-util/e-misc-utils.c:289
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjelp for Evolution."
 
@@ -7677,62 +7667,62 @@
 msgid "All further errors shown only on terminal."
 msgstr "Alle videre feil blir kun vist på konsollet."
 
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1060
-#: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:5
-#: ../modules/mail/em-mailer-prefs.c:72
+#: ../em-format/e-mail-formatter-headers.c:107
+#: ../em-format/e-mail-part-headers.c:47 ../mail/e-mail-tag-editor.c:272
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:64
 msgid "From"
 msgstr "Fra"
 
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1061
-#: ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/e-mail-part-headers.c:48 ../modules/mail/em-mailer-prefs.c:65
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1063
-#: ../mail/em-format-html.c:2593 ../mail/em-format-html.c:2661
-#: ../mail/em-format-html.c:2684 ../modules/mail/em-mailer-prefs.c:75
+#: ../em-format/e-mail-formatter-utils.c:204
+#: ../em-format/e-mail-formatter-utils.c:221
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1064
-#: ../mail/em-format-html.c:2594 ../mail/em-format-html.c:2665
-#: ../mail/em-format-html.c:2687 ../modules/mail/em-mailer-prefs.c:76
+#: ../em-format/e-mail-formatter-utils.c:205
+#: ../em-format/e-mail-formatter-utils.c:222
+#: ../em-format/e-mail-part-headers.c:51 ../modules/mail/em-mailer-prefs.c:68
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:464 ../em-format/em-format.c:1065
-#: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:77
-#: ../smime/lib/e-cert.c:1151
+#: ../em-format/e-mail-formatter-quote-headers.c:168
+#: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
+#: ../modules/mail/em-mailer-prefs.c:69 ../smime/lib/e-asn1-object.c:712
 msgid "Subject"
 msgstr "Emne"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2786
-#: ../modules/mail/em-mailer-prefs.c:1028
+#: ../em-format/e-mail-formatter-quote-headers.c:187
+#: ../em-format/e-mail-formatter-utils.c:344
+#: ../modules/mail/em-mailer-prefs.c:1145
 msgid "Mailer"
 msgstr "E-postprogram"
 
-#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1207
+#: ../mail/em-composer-utils.c:1378
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
-#: ../widgets/misc/e-dateedit.c:545
+#: ../em-format/e-mail-part-headers.c:53 ../e-util/e-dateedit.c:550
+#: ../e-util/e-dateedit.c:573 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:70
 msgid "Date"
 msgstr "Dato"
 
-#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
-#: ../em-format/em-format.c:1068 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/e-mail-part-headers.c:55 ../modules/mail/em-mailer-prefs.c:72
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Ansikt"
 
-#: ../em-format/em-format.c:1472
+#: ../em-format/e-mail-part-utils.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
@@ -7741,12 +7731,12 @@
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:81
-#: ../em-format/e-mail-parser-multipart-signed.c:97
+#: ../em-format/e-mail-parser-multipart-encrypted.c:67
+#: ../em-format/e-mail-parser-multipart-signed.c:81
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: ../em-format/em-format.c:1788
+#: ../em-format/e-mail-parser-multipart-encrypted.c:83
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
 
@@ -7758,7 +7748,7 @@
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Kunne ikke lese PGP/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:2030
+#: ../em-format/e-mail-parser-multipart-signed.c:114
 msgid "Unsupported signature format"
 msgstr "Ustøttet signaturformat"
 
@@ -7777,131 +7767,131 @@
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../filter/e-filter-datespec.c:66
+#: ../e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: ../filter/e-filter-datespec.c:67
+#: ../e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekund i fremtiden"
 msgstr[1] "%d sekunder i fremtiden"
 
-#: ../filter/e-filter-datespec.c:68
+#: ../e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minutt siden"
 msgstr[1] "%d minutter siden"
 
-#: ../filter/e-filter-datespec.c:69
+#: ../e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "om 1 minutt"
 msgstr[1] "om %d minutter"
 
-#: ../filter/e-filter-datespec.c:70
+#: ../e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 time siden"
 msgstr[1] "%d timer siden"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "om 1 time"
 msgstr[1] "om %d timer"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 dag siden"
 msgstr[1] "%d dager siden"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "om 1 dag"
 msgstr[1] "om %d dager"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 uke siden"
 msgstr[1] "%d uker siden"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 uke i fremtiden"
 msgstr[1] "%d uker i fremtiden"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../e-util/e-filter-datespec.c:78
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "om 1 måned"
 msgstr[1] "om %d måneder"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../e-util/e-filter-datespec.c:79
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 år siden"
 msgstr[1] "%d år siden"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../e-util/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "Om 1 år"
 msgstr[1] "Om %d år"
 
-#: ../filter/e-filter-datespec.c:129
+#: ../e-util/e-filter-datespec.c:130
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velge en dato>"
 
-#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
-#: ../filter/e-filter-datespec.c:154
+#: ../e-util/e-filter-datespec.c:133 ../e-util/e-filter-datespec.c:144
+#: ../e-util/e-filter-datespec.c:155
 msgid "now"
 msgstr "nå"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:139
+#: ../e-util/e-filter-datespec.c:140
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y"
 
-#: ../filter/e-filter-datespec.c:286
+#: ../e-util/e-filter-datespec.c:289
 msgid "Select a time to compare against"
 msgstr "Velg en tid å sammenligne mot"
 
-#: ../filter/e-filter-file.c:188
+#: ../e-util/e-filter-file.c:187
 msgid "Choose a File"
 msgstr "Velg en fil"
 
-#: ../filter/e-filter-rule.c:666
+#: ../e-util/e-filter-rule.c:743
 msgid "R_ule name:"
 msgstr "Regel_navn:"
 
-#: ../filter/e-filter-rule.c:718
+#: ../e-util/e-filter-rule.c:823
 msgid "Find items that meet the following conditions"
 msgstr "Finn oppføringer som møter følgende kriterier"
 
@@ -7919,56 +7909,61 @@
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:754
+#. protocol:
+#. name:
+#: ../e-util/e-filter-rule.c:838 ../e-util/e-mail-signature-combo-box.c:369
+#: ../libemail-engine/camel-null-store.c:28
+#: ../mail/e-mail-config-summary-page.c:139
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
 msgid "None"
 msgstr "Ingen"
 
-#: ../filter/e-filter-rule.c:755
+#: ../e-util/e-filter-rule.c:839
 msgid "All related"
 msgstr "Alle relaterte"
 
-#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
+#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:840
 msgid "Replies"
 msgstr "Svar"
 
-#: ../filter/e-filter-rule.c:757
+#: ../e-util/e-filter-rule.c:841
 msgid "Replies and parents"
 msgstr "Svar med opphav"
 
-#: ../filter/e-filter-rule.c:758
+#: ../e-util/e-filter-rule.c:842
 msgid "No reply or parent"
 msgstr "Ingen svar eller opphav"
 
-#: ../filter/e-filter-rule.c:846
+#: ../e-util/e-filter-rule.c:845
 msgid "I_nclude threads:"
 msgstr "Ta _med tråder:"
 
-#: ../filter/e-filter-rule.c:808
+#: ../e-util/e-filter-rule.c:922
 msgid "A_dd Condition"
 msgstr "Legg til _kriterie"
 
-#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:1
-#: ../mail/em-utils.c:321
+#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
+#: ../mail/em-utils.c:240
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:322
+#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:241
 msgid "Outgoing"
 msgstr "Utgående"
 
-#: ../filter/e-rule-editor.c:270
+#: ../e-util/e-rule-editor.c:185
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: ../filter/e-rule-editor.c:359
+#: ../e-util/e-rule-editor.c:287
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
-#: ../filter/filter.error.xml.h:1
+#: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Mangler dato."
 
-#: ../filter/filter.error.xml.h:2
+#: ../e-util/filter.error.xml.h:2
 msgid "You must choose a date."
 msgstr "Du må velge en dato."
 
@@ -7980,80 +7975,80 @@
 msgid "You must specify a file name."
 msgstr "Du må oppgi et filnavn."
 
-#: ../filter/filter.error.xml.h:5
+#: ../e-util/filter.error.xml.h:5
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
 msgstr "Filen &quot;{0}&quot; eksisterer ikke eller er ikke en vanlig fil."
 
-#: ../filter/filter.error.xml.h:6
+#: ../e-util/filter.error.xml.h:6
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "Ugyldig regulært uttrykk &quot;{0}&quot;."
 
-#: ../filter/filter.error.xml.h:7
+#: ../e-util/filter.error.xml.h:7
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Kunne ikke sette sammen regulært uttrykk &quot;{1}&quot;."
 
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
 msgid "Missing name."
 msgstr "Mangler navn."
 
-#: ../filter/filter.error.xml.h:9
+#: ../e-util/filter.error.xml.h:9
 msgid "You must name this filter."
 msgstr "Du må gi navn til dette filteret."
 
-#: ../filter/filter.error.xml.h:10
+#: ../e-util/filter.error.xml.h:10
 msgid "Name &quot;{0}&quot; already used."
 msgstr "Navnet &quot;{0}&quot; er allerede i bruk."
 
-#: ../filter/filter.error.xml.h:11
+#: ../e-util/filter.error.xml.h:11
 msgid "Please choose another name."
 msgstr "Vennligst velg et annet navn."
 
-#: ../filter/filter.ui.h:2
+#: ../e-util/filter.ui.h:2
 msgid "the current time"
 msgstr "tiden nå"
 
-#: ../filter/filter.ui.h:3
+#: ../e-util/filter.ui.h:3
 msgid "the time you specify"
 msgstr "tiden du oppgir"
 
-#: ../filter/filter.ui.h:4
+#: ../e-util/filter.ui.h:4
 msgid "a time relative to the current time"
 msgstr "et klokkeslett relativt til klokkeslettet nå"
 
-#: ../filter/filter.ui.h:5 ../mail/mail-config.ui.h:78
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:78
 msgid "seconds"
 msgstr "sekunder"
 
-#: ../filter/filter.ui.h:10
+#: ../e-util/filter.ui.h:10
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
 msgstr "måneder"
 
-#: ../filter/filter.ui.h:11
+#: ../e-util/filter.ui.h:11
 msgid "years"
 msgstr "år"
 
-#: ../filter/filter.ui.h:12
+#: ../e-util/filter.ui.h:12
 msgid "ago"
 msgstr "siden"
 
-#: ../filter/filter.ui.h:13
+#: ../e-util/filter.ui.h:13
 msgid "in the future"
 msgstr "i fremtiden"
 
-#: ../filter/filter.ui.h:14
+#: ../e-util/filter.ui.h:14
 msgid "Show filters for mail:"
 msgstr "Vis filtre for e-post:"
 
-#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:194
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:166
 msgid "_Filter Rules"
 msgstr "_Filterregler"
 
-#: ../filter/filter.ui.h:17
+#: ../e-util/filter.ui.h:17
 msgid "Compare against"
 msgstr "Sammenligne med"
 
-#: ../filter/filter.ui.h:18
+#: ../e-util/filter.ui.h:18
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -8061,7 +8056,7 @@
 "Meldingens dato vil bli sammenlignet med\n"
 "tiden da filtreringen skjer."
 
-#: ../filter/filter.ui.h:20
+#: ../e-util/filter.ui.h:20
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -8069,7 +8064,7 @@
 "Meldingens dato vil bli sammenlignet med\n"
 "12:00 på spesifiserert dato."
 
-#: ../filter/filter.ui.h:22
+#: ../e-util/filter.ui.h:22
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -8083,15 +8078,15 @@
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/e-mail-config-defaults-page.c:756
+#: ../mail/e-mail-config-defaults-page.c:776
 msgid "Never"
 msgstr "Aldri"
 
-#: ../mail/e-mail-config-defaults-page.c:762
+#: ../mail/e-mail-config-defaults-page.c:782
 msgid "Always"
 msgstr "Alltid"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/e-mail-config-defaults-page.c:788
 msgid "Ask for each message"
 msgstr "Spør for hver melding"
 
@@ -8123,7 +8118,7 @@
 "\n"
 "Klikk «Fortsett» for å begynne."
 
-#: ../mail/em-account-editor.c:2985
+#: ../mail/e-mail-config-identity-page.c:266
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -8133,7 +8128,7 @@
 "under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../mail/em-account-editor.c:2318 ../mail/em-account-editor.c:2510
+#: ../mail/e-mail-config-receiving-page.c:50
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
@@ -8141,7 +8136,7 @@
 msgid "Please configure the following account settings."
 msgstr "Vennligst konfigurer følgende kontoinnstillinger."
 
-#: ../mail/em-account-editor.c:2321 ../mail/em-account-editor.c:3107
+#: ../mail/e-mail-config-sending-page.c:50
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
@@ -8153,7 +8148,8 @@
 "Vennligst skriv inn informasjon om måten du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/e-mail-config-identity-page.c:294
+#: ../mail/e-mail-config-summary-page.c:324
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
@@ -8165,11 +8161,11 @@
 "Vennligst oppgi et beskrivende navn for denne kontoen i feltet under.\n"
 "Dette navnet vil kun bli brukt som et visningsnavn."
 
-#: ../mail/em-account-editor.c:2998
+#: ../mail/e-mail-config-confirm-page.c:169
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/em-account-editor.c:2999
+#: ../mail/e-mail-config-confirm-page.c:157
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8183,7 +8179,7 @@
 "\n"
 "Klikk «Bruk» for å lagre dine innstillinger."
 
-#: ../mail/em-account-editor.c:2869
+#: ../mail/e-mail-config-provider-page.c:501
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hver(t)"
 
@@ -8191,13 +8187,14 @@
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:3546 ../mail/mail-config.ui.h:164
+#: ../em-format/e-mail-formatter-print-headers.c:171
+#: ../mail/e-mail-config-security-page.c:645
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
 msgid "Security"
 msgstr "Sikkerhet"
 
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3601 ../mail/em-account-editor.c:3684
+#: ../mail/e-mail-config-provider-page.c:700
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
@@ -8205,106 +8202,103 @@
 msgid "Checking for New Messages"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1418 ../mail/mail-config.ui.h:57
-#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-paned.c:128
-#: ../widgets/misc/e-attachment-paned.c:133
+#: ../em-format/e-mail-formatter-attachment.c:397
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
+#: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Vedlegg"
 msgstr[1] "Vedlegg"
 
-#: ../mail/e-mail-attachment-bar.c:619
-#: ../widgets/misc/e-attachment-paned.c:703
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
 msgid "Icon View"
 msgstr "Ikonvisning"
 
-#: ../widgets/misc/e-attachment-bar.c:662
-#: ../widgets/misc/e-attachment-paned.c:705
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
 msgid "List View"
 msgstr "Listevisning"
 
-#: ../mail/e-mail-browser.c:130 ../shell/e-shell-window-actions.c:1439
-#: ../shell/e-shell-window-actions.c:1446
-#: ../shell/e-shell-window-actions.c:1453
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:860
+#: ../shell/e-shell-window-actions.c:867 ../shell/e-shell-window-actions.c:874
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: ../mail/e-mail-browser.c:289
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr "(Uten emne)"
 
-#: ../mail/e-mail-display.c:68
+#: ../mail/e-mail-display.c:96
 msgid "_Add to Address Book..."
 msgstr "Legg til i _adressebok …"
 
-#: ../mail/e-mail-display.c:75
+#: ../mail/e-mail-display.c:103
 msgid "_To This Address"
 msgstr "_Til denne adressen"
 
-#: ../mail/e-mail-display.c:82
+#: ../mail/e-mail-display.c:110
 msgid "_From This Address"
 msgstr "_Fra denne adressen"
 
-#: ../mail/e-mail-display.c:140
+#: ../mail/e-mail-display.c:117
 msgid "Send _Reply To..."
 msgstr "Send sva_r til …"
 
-#: ../mail/e-mail-display.c:142
+#: ../mail/e-mail-display.c:119
 msgid "Send a reply message to this address"
 msgstr "Send svarmelding til denne adressen"
 
-#: ../mail/e-mail-display.c:98
+#: ../mail/e-mail-display.c:126
 msgid "Create Search _Folder"
 msgstr "Opprett _søkemappe"
 
-#: ../libemail-engine/e-mail-folder-utils.c:109
+#: ../libemail-engine/e-mail-folder-utils.c:114
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Lagrer melding til mappe «%s»"
 
-#: ../libemail-engine/e-mail-folder-utils.c:270
+#: ../libemail-engine/e-mail-folder-utils.c:572
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: ../libemail-engine/e-mail-folder-utils.c:770
+#: ../libemail-engine/e-mail-folder-utils.c:776
 msgid "Scanning messages for duplicates"
 msgstr "Sjekker meldinger for duplikater"
 
-#: ../libemail-engine/e-mail-folder-utils.c:378
-#: ../libemail-engine/e-mail-folder-utils.c:627
+#: ../libemail-engine/e-mail-folder-utils.c:682
+#: ../libemail-engine/e-mail-folder-utils.c:933
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:875
+#: ../libemail-engine/e-mail-folder-utils.c:1184
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Fjerner mappe «%s»"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1315
+#: ../libemail-engine/e-mail-folder-utils.c:1321
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Filen «%s» ble fjernet."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1319
+#: ../libemail-engine/e-mail-folder-utils.c:1325
 msgid "File has been removed."
 msgstr "Filen er fjernet."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1378
+#: ../libemail-engine/e-mail-folder-utils.c:1384
 msgid "Removing attachments"
 msgstr "Fjerner vedlegg"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1234
+#: ../libemail-engine/e-mail-folder-utils.c:1548
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d meldinger"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1898 ../mail/em-folder-utils.c:613
+#: ../libemail-engine/e-mail-folder-utils.c:1926
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Ugyldig URI for mappe «%s»"
@@ -8319,36 +8313,36 @@
 msgid "_Label name:"
 msgstr "Etikett_navn:"
 
-#: ../mail/e-mail-label-list-store.c:41
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "V_iktig"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:42
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "Ar_beid"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:43
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "_Personlig"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:44
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "_Oppgaver"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:45
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "_Senere"
 
-#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:684
+#: ../mail/e-mail-label-manager.c:170
+#: ../modules/mail/e-mail-shell-view-actions.c:1025
 msgid "Add Label"
 msgstr "Legg til etikett"
 
-#: ../mail/e-mail-label-manager.c:216
+#: ../mail/e-mail-label-manager.c:221
 msgid "Edit Label"
 msgstr "Rediger etikett"
 
@@ -8360,48 +8354,50 @@
 "Merk: Understrek i etikettnavnet brukes som\n"
 "hurtigtastidentifikator i menyen."
 
-#: ../mail/e-mail-label-tree-view.c:88
+#: ../mail/e-mail-label-tree-view.c:89
 msgid "Color"
 msgstr "Farge"
 
 #: ../em-format/e-mail-formatter-print.c:54
+#: ../e-util/gal-view-instance-save-as-dialog.c:95
 #: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1270
-#: ../modules/cal-config-google/e-google-chooser.c:209
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/menus/gal-define-views-dialog.c:361
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:94
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1328
+#: ../modules/cal-config-google/e-google-chooser.c:237
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Name"
 msgstr "Navn"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
-#: ../mail/em-folder-tree-model.c:720
-#: ../modules/mail/e-mail-shell-view-private.c:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1077
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:342
+#: ../mail/em-folder-tree-model.c:786
+#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../modules/mail/e-mail-shell-view-private.c:1087
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:713
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#. E_MAIL_LOCAL_FOLDER_INBOX
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:779
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Drafts"
 msgstr "Skisser"
 
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:724
-#: ../modules/mail/e-mail-shell-view-private.c:1068
+#. E_MAIL_LOCAL_FOLDER_DRAFTS
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:790
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Outbox"
 msgstr "Utboks"
 
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:728
-#: ../modules/mail/e-mail-shell-view-private.c:1070
+#. E_MAIL_LOCAL_FOLDER_OUTBOX
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:794
+#: ../modules/mail/e-mail-shell-view-private.c:1080
 msgid "Sent"
 msgstr "Sendt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:782
+#: ../modules/mail/e-mail-shell-view-private.c:1082
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1041 ../plugins/templates/templates.c:1341
-#: ../plugins/templates/templates.c:1351
+#: ../plugins/templates/templates.c:1082 ../plugins/templates/templates.c:1381
+#: ../plugins/templates/templates.c:1391
 msgid "Templates"
 msgstr "Maler"
 
@@ -8434,32 +8430,32 @@
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper …"
 
-#: ../mail/e-mail-migrate.c:1269
+#: ../mail/e-mail-migrate.c:332
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
 
-#: ../mail/e-mail-notebook-view.c:627
+#: ../mail/e-mail-notebook-view.c:269
 msgid "Please select a folder"
 msgstr "Vennligst velg en mappe"
 
-#: ../mail/e-mail-reader.c:432 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:346 ../mail/em-filter-i18n.h:12
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:517
 msgid "C_opy"
 msgstr "K_opier"
 
-#: ../mail/e-mail-reader.c:824 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:846 ../mail/em-filter-i18n.h:54
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../mail/e-mail-reader.c:966 ../mail/em-folder-utils.c:492
+#: ../mail/e-mail-reader.c:846 ../mail/em-folder-utils.c:517
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../mail/e-mail-reader.c:1202 ../mail/e-mail-reader.c:1384
+#: ../mail/e-mail-reader.c:1172 ../mail/e-mail-reader.c:1384
 #: ../mail/e-mail-reader.c:1424
 msgid "_Do not ask me again."
 msgstr "_Ikke spør meg igjen."
@@ -8468,35 +8464,35 @@
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Alltid ignorer Reply-To: for e-postlister."
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1860
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1862
 msgid "Add sender to address book"
 msgstr "Legg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1867
 msgid "Check for _Junk"
 msgstr "Sjekk etter _uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1869
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter uønsket e-poststatus"
 
-#: ../mail/e-mail-reader.c:1799
+#: ../mail/e-mail-reader.c:1874
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe …"
 
-#: ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1876
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1881
 msgid "_Delete Message"
 msgstr "_Slett melding"
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1883
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
@@ -8504,7 +8500,7 @@
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer på e-post_liste …"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1890
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
 
@@ -8512,7 +8508,7 @@
 msgid "Filter on _Recipients..."
 msgstr "Filtrer på mottake_re …"
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1897
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Lag en regel for å filtrere meldinger til disse mottakerene"
 
@@ -8520,7 +8516,7 @@
 msgid "Filter on Se_nder..."
 msgstr "Filtrer på se_nder …"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1904
 msgid "Create a rule to filter messages from this sender"
 msgstr "Lag en regel for å filtrere meldinger fra denne avsenderen"
 
@@ -8528,374 +8524,374 @@
 msgid "Filter on _Subject..."
 msgstr "Filtrer på e_mne …"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1911
 msgid "Create a rule to filter messages with this subject"
 msgstr "Lag en regel for filtrering av meldinger med dette emnet"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:1916
 msgid "A_pply Filters"
 msgstr "_Påfør filtre"
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1918
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler på de valgte meldingene"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1923
 msgid "_Find in Message..."
 msgstr "_Finn i melding …"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1925
 msgid "Search for text in the body of the displayed message"
 msgstr "Søk etter tekst i kroppen av vist melding"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:1930
 msgid "_Clear Flag"
 msgstr "F_jern flagg"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1932
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Fjern flagg for oppfølging fra valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1937
 msgid "_Flag Completed"
 msgstr "Merk som _fullført"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1939
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Sett flagg for oppfølging til fullført på valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1944
 msgid "Follow _Up..."
 msgstr "Følg _opp …"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1946
 msgid "Flag the selected messages for follow-up"
 msgstr "Merk valgte meldinger for oppfølging"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1951
 msgid "_Attached"
 msgstr "L_agt ved"
 
-#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1953 ../mail/e-mail-reader.c:1960
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1958
 msgid "Forward As _Attached"
 msgstr "Videresend s_om vedlegg"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1965
 msgid "_Inline"
 msgstr "_I meldingen"
 
-#: ../mail/e-mail-reader.c:2067 ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:1967 ../mail/e-mail-reader.c:1974
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1972
 msgid "Forward As _Inline"
 msgstr "V_ideresend som vedlegg"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1979
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ../mail/e-mail-reader.c:1916 ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1981 ../mail/e-mail-reader.c:1988
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1986
 msgid "Forward As _Quoted"
 msgstr "Videresend s_om sitat"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1993
 msgid "_Load Images"
 msgstr "_Last bilder"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1995
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2000
 msgid "_Important"
 msgstr "V_iktig"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2007
 msgid "_Junk"
 msgstr "_Uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:2009
 msgid "Mark the selected messages as junk"
 msgstr "Merk valgte meldinger som uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2014
 msgid "_Not Junk"
 msgstr "_Ikke uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:2016
 msgid "Mark the selected messages as not being junk"
 msgstr "Merk valgte meldinger som ønsket e-post"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:2021
 msgid "_Read"
 msgstr "_Les"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:2023
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:2028
 msgid "Uni_mportant"
 msgstr "_Ikke viktig"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:2030
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:2035
 msgid "_Unread"
 msgstr "_Ulest"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2037
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ulest"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:2042
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding …"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2044
 msgid "Open the selected messages in the composer for editing"
 msgstr "Åpne valgte meldinger i redigeringskomponenten"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2049
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2051
 msgid "Open a window for composing a mail message"
 msgstr "Åpne et vindu for å skrive en e-post melding"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:2056
 msgid "_Open in New Window"
 msgstr "_Åpne i _nytt vindu"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2058
 msgid "Open the selected messages in a new window"
 msgstr "Åpne valgte meldinger i et nytt vindu"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2063
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe …"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2065
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2172
 msgid "_Switch to Folder"
 msgstr "_Bytt til mappe"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2174
 msgid "Display the parent folder"
 msgstr "Vis opphavsmappe"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2179
 msgid "Switch to _next tab"
 msgstr "Bytt til _neste fane"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2181
 msgid "Switch to the next tab"
 msgstr "Bytt til neste fane"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2186
 msgid "Switch to _previous tab"
 msgstr "Bytt til _forrige fane"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2188
 msgid "Switch to the previous tab"
 msgstr "Bytt til forrige fane"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2193
 msgid "Cl_ose current tab"
 msgstr "L_ukk aktiv fane"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2195
 msgid "Close current tab"
 msgstr "Lukk aktiv fane"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2070
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2072
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2077
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2079
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2084
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2086
 msgid "Display the next thread"
 msgstr "Vis neste tråd"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2091
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2093
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2098
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2100
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2105
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2107
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2112
 msgid "Previous T_hread"
 msgstr "Forrige trå_d"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2114
 msgid "Display the previous thread"
 msgstr "Vis forrige tråd"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2119
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2121
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2128
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2135
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis meldingen som skal skrives ut"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2140
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2142
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2147
 msgid "Remo_ve Attachments"
 msgstr "Fjern _vedlegg"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2149
 msgid "Remove attachments"
 msgstr "Fjern vedlegg"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2154
 msgid "Remove Du_plicate Messages"
 msgstr "Fjern du_plikatmeldinger"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2156
 msgid "Checks selected messages for duplicates"
 msgstr "Sjekk valgte meldinger for duplikater"
 
-#: ../mail/e-mail-reader.c:2114 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
-#: ../modules/mail/e-mail-attachment-handler.c:177
+#: ../mail/e-mail-reader.c:2161 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-attachment-handler.c:214
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2163
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:2121 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2168 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2170
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:2128
-#: ../modules/mail/e-mail-attachment-handler.c:184
+#: ../mail/e-mail-reader.c:2175
+#: ../modules/mail/e-mail-attachment-handler.c:221
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2177
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv et svar til avsender av den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2182
 msgid "_Save as mbox..."
 msgstr "Lagre _som mbox …"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2184
 msgid "Save selected messages as an mbox file"
 msgstr "Lagre valgte meldinger som en mbox-fil"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2189
 msgid "_Message Source"
 msgstr "_Meldingskilde"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2191
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin råe form"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2203
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2205
 msgid "Undelete the selected messages"
 msgstr "Angre sletting av valgte meldinger"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2210
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2212
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2217
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2219
 msgid "Increase the text size"
 msgstr "Større tekst"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2224
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2226
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
@@ -8903,31 +8899,31 @@
 msgid "Create R_ule"
 msgstr "Opprett _regel"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2240
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2247
 msgid "F_orward As"
 msgstr "Videresend s_om"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2254
 msgid "_Group Reply"
 msgstr "_Gruppesvar"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2261
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2268
 msgid "Mar_k As"
 msgstr "Mer_k som"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2275
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2282
 msgid "_Zoom"
 msgstr "_Zoom"
 
@@ -8935,7 +8931,7 @@
 msgid "Search Folder from Mailing _List..."
 msgstr "Søkemappe på e-post_liste …"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2294
 msgid "Create a search folder for this mailing list"
 msgstr "Lag en søkemappe for denne e-postlisten"
 
@@ -8943,7 +8939,7 @@
 msgid "Search Folder from Recipien_ts..."
 msgstr "Søkemappe fra mo_ttakere …"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2301
 msgid "Create a search folder for these recipients"
 msgstr "Lag en søkemappe for disse mottakerene"
 
@@ -8951,7 +8947,7 @@
 msgid "Search Folder from Sen_der..."
 msgstr "Søkemappe for avsen_der …"
 
-#: ../mail/e-mail-reader.c:2436
+#: ../mail/e-mail-reader.c:2308
 msgid "Create a search folder for this sender"
 msgstr "Lag en søkemappe for denne avsenderen"
 
@@ -8959,118 +8955,113 @@
 msgid "Search Folder from S_ubject..."
 msgstr "Søkemappe for _emne …"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2315
 msgid "Create a search folder for this subject"
 msgstr "Lag en søkemappe for dette emnet"
 
-#: ../mail/e-mail-reader.c:2291
+#: ../mail/e-mail-reader.c:2338
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging …"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2346
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2350
 msgid "Mark as _Junk"
 msgstr "Merk som _uønsket e-post"
 
-#: ../mail/e-mail-reader.c:2307
+#: ../mail/e-mail-reader.c:2354
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/e-mail-reader.c:2311
+#: ../mail/e-mail-reader.c:2358
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2362
 msgid "Mark as Uni_mportant"
 msgstr "_Merk som uviktig"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2366
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2410
 msgid "_Caret Mode"
 msgstr "Markør_modus"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2412
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Vis en blinkende markør i kroppen av meldinger som vises"
 
-#: ../mail/e-mail-reader.c:2381
+#: ../mail/e-mail-reader.c:2418
 msgid "All Message _Headers"
 msgstr "Alle meldings_hoder"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2420
 msgid "Show messages with all email headers"
 msgstr "Vis meldinger med alle meldingshoder"
 
-#: ../mail/e-mail-reader.c:2712
+#: ../mail/e-mail-reader.c:1672 ../mail/e-mail-reader.c:2774
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Henter melding «%s»"
 
-#. we changed user, thus reset the chosen calendar combo too, because
-#. * other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3302 ../mail/mail-config.ui.h:50
-#: ../plugins/google-account-setup/google-source.c:316
-#: ../plugins/google-account-setup/google-source.c:566
-#: ../plugins/google-account-setup/google-source.c:705
-#: ../widgets/misc/e-account-tree-view.c:253
+#: ../mail/e-mail-account-tree-view.c:136
+#: ../mail/e-mail-config-security-page.c:335
+#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3532
+#: ../mail/mail-config.ui.h:49
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/e-mail-reader.c:3471
-#: ../modules/mail/e-mail-attachment-handler.c:170
+#: ../mail/e-mail-reader.c:3702
+#: ../modules/mail/e-mail-attachment-handler.c:207
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-mail-reader.c:3633
+#: ../mail/e-mail-reader.c:3703
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:3652
+#: ../mail/e-mail-reader.c:3722
 msgid "Group Reply"
 msgstr "Gruppesvar"
 
-#: ../mail/e-mail-reader.c:3653
+#: ../mail/e-mail-reader.c:3723
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Svar til e-postlisten eller til alle mottakere"
 
-#: ../mail/e-mail-reader.c:3545 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3789 ../mail/em-filter-i18n.h:15
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/e-mail-reader.c:3743
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../widgets/misc/e-calendar.c:202
+#: ../mail/e-mail-reader.c:3801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Next"
 msgstr "Neste"
 
-#: ../mail/e-mail-reader.c:3747
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
-#: ../widgets/misc/e-calendar.c:178
+#: ../mail/e-mail-reader.c:3805
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:3756 ../mail/mail-dialogs.ui.h:20
+#: ../mail/e-mail-reader.c:3814 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/e-mail-reader.c:4457
+#: ../mail/e-mail-reader.c:4753
 #, c-format
 msgid "Folder '%s'"
 msgstr "Mappe «%s»"
 
-#: ../mail/e-mail-reader-utils.c:154
+#: ../mail/e-mail-reader-utils.c:151
 msgid "Do not warn me again"
 msgstr "Ikke varsle meg igjen"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1136
+#: ../mail/e-mail-reader-utils.c:1211
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -9085,7 +9076,7 @@
 "Mappen «%s» inneholder %u duplikatmeldinger. Er du sikker på at du vil "
 "slette dem?"
 
-#: ../mail/e-mail-reader-utils.c:1020
+#: ../mail/e-mail-reader-utils.c:2026
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -9096,7 +9087,7 @@
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1041
+#: ../mail/e-mail-reader-utils.c:2047
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Melding"
@@ -9141,15 +9132,14 @@
 msgid "Cannot get transport for account '%s'"
 msgstr "Kan ikke hente transport for konto «%s»"
 
-#: ../libemail-engine/e-mail-session-utils.c:505
-#: ../libemail-engine/mail-ops.c:658
+#: ../libemail-engine/e-mail-session-utils.c:640
+#: ../libemail-engine/mail-ops.c:730
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under påføring av utgående filtre: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:534
-#: ../libemail-engine/e-mail-session-utils.c:568
-#: ../libemail-engine/mail-ops.c:677 ../libemail-engine/mail-ops.c:713
+#: ../libemail-engine/e-mail-session-utils.c:689
+#: ../libemail-engine/mail-ops.c:774
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -9158,14 +9148,14 @@
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: ../libemail-engine/e-mail-session-utils.c:588
-#: ../libemail-engine/mail-ops.c:735
+#: ../libemail-engine/e-mail-session-utils.c:715
+#: ../libemail-engine/mail-ops.c:798
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:816
-#: ../libemail-engine/mail-ops.c:863 ../libemail-engine/mail-ops.c:964
+#: ../libemail-engine/e-mail-session-utils.c:916
+#: ../libemail-engine/mail-ops.c:929 ../libemail-engine/mail-ops.c:1031
 msgid "Sending message"
 msgstr "Sender melding"
 
@@ -9174,22 +9164,22 @@
 msgid "Unsubscribing from folder '%s'"
 msgstr "Fjerner abonnement på mappe «%s»"
 
-#: ../libemail-engine/e-mail-store-utils.c:169
+#: ../libemail-engine/e-mail-store-utils.c:190
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Kobler fra «%s»"
 
-#: ../libemail-engine/e-mail-store-utils.c:260
+#: ../libemail-engine/e-mail-store-utils.c:279
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Kobler til «%s» på nytt"
 
-#: ../libemail-engine/e-mail-store-utils.c:335
+#: ../libemail-engine/e-mail-store-utils.c:370
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Forbereder konto «%s» for frakoblet bruk"
 
-#: ../mail/e-mail-tag-editor.c:293
+#: ../mail/e-mail-tag-editor.c:238
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
@@ -9197,7 +9187,7 @@
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1201
+#: ../mail/em-composer-utils.c:1372
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9205,13 +9195,13 @@
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1212
+#: ../mail/em-composer-utils.c:1383
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:323
+#: ../modules/mdn/evolution-mdn.c:311
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Din melding til %s om «%s» den %s er har blitt lest."
@@ -9221,19 +9211,19 @@
 msgid "Delivery Notification for: \"%s\""
 msgstr "Varsling om ny e-post for «%s»"
 
-#: ../mail/em-composer-utils.c:2573
+#: ../mail/em-composer-utils.c:2528
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: ../mail/em-composer-utils.c:2991
+#: ../mail/em-composer-utils.c:2949
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:3032
+#: ../mail/em-composer-utils.c:2950
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
-#: ../mail/em-filter-folder-element.c:241
+#: ../mail/em-filter-editor-folder-element.c:157
 msgid "Select Folder"
 msgstr "Velg mappe"
 
@@ -9242,245 +9232,245 @@
 msgid "Adjust Score"
 msgstr "Juster poeng"
 
-#: ../mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Color"
 msgstr "Tilegn farge"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:5
 msgid "Assign Score"
 msgstr "Gi poeng"
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:7
 msgid "BCC"
 msgstr "Bcc"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:8
 msgid "Beep"
 msgstr "Pip"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:9
 msgid "CC"
 msgstr "Cc"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:10
 msgid "Completed On"
 msgstr "Fullført"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:13
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:14
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:16
 msgid "Deleted"
 msgstr "Slettet"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:18
 msgid "does not end with"
 msgstr "slutter ikke med"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:19
 msgid "does not exist"
 msgstr "eksisterer ikke"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:21
 msgid "does not return"
 msgstr "returnerer ikke"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:22
 msgid "does not sound like"
 msgstr "ligner ikke"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:23
 msgid "does not start with"
 msgstr "starter ikke med"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:25
 msgid "Draft"
 msgstr "Skisse"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:26
 msgid "ends with"
 msgstr "slutter med"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:28
 msgid "exists"
 msgstr "eksisterer"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:29
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:30
 msgid "Follow Up"
 msgstr "Følg opp"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:31
 msgid "Forward to"
 msgstr "Videresend til"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "Important"
 msgstr "Viktig"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:35
 msgid "is after"
 msgstr "er etter"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:36
 msgid "is before"
 msgstr "er før"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:37
 msgid "is Flagged"
 msgstr "er merket"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:41
 msgid "is not Flagged"
 msgstr "er ikke merket"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:42
 msgid "is not set"
 msgstr "er ikke satt"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:43
 msgid "is set"
 msgstr "er satt"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:112
+#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:108
 msgid "Junk"
 msgstr "Uønsket e-post"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:45
 msgid "Junk Test"
 msgstr "Uønsket e-posttest"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:46
 msgid "Label"
 msgstr "Etikett"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:47
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:48
 msgid "Match All"
 msgstr "Treff på alle"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:49
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:50
 msgid "Message Header"
 msgstr "Meldingshode"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:51
 msgid "Message is Junk"
 msgstr "Uønsket e-post"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:52
 msgid "Message is not Junk"
 msgstr "Ikke uønsket e-post"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:53
 msgid "Message Location"
 msgstr "Meldingsadresse"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:55
 msgid "Pipe to Program"
 msgstr "Send til program"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:56
 msgid "Play Sound"
 msgstr "Spill lyd"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:19
+#: ../mail/em-filter-i18n.h:57 ../mail/mail-dialogs.ui.h:14
 msgid "Read"
 msgstr "Les"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:16
+#: ../mail/em-filter-i18n.h:58 ../mail/message-list.etspec.h:16
 msgid "Recipients"
 msgstr "Mottakere"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:59
 msgid "Regex Match"
 msgstr "Treff på vanlig uttrykk"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:60
 msgid "Replied to"
 msgstr "Svart til"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:61
 msgid "returns"
 msgstr "returnerer"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:62
 msgid "returns greater than"
 msgstr "returnerer større enn"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:63
 msgid "returns less than"
 msgstr "returnerer mindre enn"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:64
 msgid "Run Program"
 msgstr "Kjør program"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:3
+#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:3
 msgid "Score"
 msgstr "Gi poeng"
 
-#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:15
+#: ../mail/em-filter-i18n.h:66 ../mail/message-list.etspec.h:15
 msgid "Sender"
 msgstr "Avsender"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:67
 msgid "Sender or Recipients"
 msgstr "Sender eller mottakere"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:68
 msgid "Set Label"
 msgstr "Sett etikett"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:69
 msgid "Set Status"
 msgstr "Sett status"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:70
 msgid "Size (kB)"
 msgstr "Størrelse (kB)"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:71
 msgid "sounds like"
 msgstr "lyder som"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:72
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:73
 msgid "Specific header"
 msgstr "Spesifikk header"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:74
 msgid "starts with"
 msgstr "starter med"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:76
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: ../mail/em-filter-i18n.h:75
+#: ../mail/em-filter-i18n.h:80
 msgid "Unset Status"
 msgstr "Nullstill status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:583
 msgid "Then"
 msgstr "Så etter"
 
@@ -9510,90 +9500,87 @@
 msgid "Quota usage"
 msgstr "Bruk av kvote"
 
-#: ../mail/em-folder-properties.c:317
+#: ../mail/em-folder-properties.c:347
 msgid "Folder Properties"
 msgstr "Egenskaper for mappe"
 
-#: ../mail/em-folder-selection-button.c:79
+#: ../mail/em-folder-selection-button.c:80
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: ../mail/em-folder-selector.c:436
+#: ../mail/em-folder-selector.c:390
 msgid "C_reate"
 msgstr "Opp_rett"
 
-#: ../mail/em-folder-selector.c:442
+#: ../mail/em-folder-selector.c:396
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: ../mail/em-folder-tree.c:644
+#: ../mail/em-folder-tree.c:637
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenavn kan ikke inneholde tegnet «/»"
 
-#: ../mail/em-folder-tree.c:781
+#: ../mail/em-folder-tree.c:774
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1590
+#: ../mail/em-folder-tree.c:1599
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:2069 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2168 ../mail/em-folder-utils.c:112
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:2072 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2171 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:2079 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2178 ../mail/message-list.c:2280
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:2083 ../mail/message-list.c:2305
+#: ../mail/em-folder-tree.c:2182 ../mail/message-list.c:2282
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2201
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:157
-#: ../mail/em-folder-tree-model.c:163 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
-#: ../mail/mail-vfolder.c:1121 ../mail/mail-vfolder.c:1235
+#: ../mail/mail-vfolder-ui.c:78
 msgid "Search Folders"
 msgstr "Søkemapper"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:179 ../mail/em-folder-tree-model.c:181
+#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:790 ../mail/em-folder-tree-model.c:1075
+#: ../mail/em-folder-tree-model.c:870 ../mail/em-folder-tree-model.c:1165
 msgid "Loading..."
 msgstr "Laster …"
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:518
 msgid "Move Folder To"
 msgstr "Flytt mappe til"
 
-#: ../mail/em-folder-utils.c:493
+#: ../mail/em-folder-utils.c:518
 msgid "Copy Folder To"
 msgstr "Kopier mappe til"
 
-#: ../mail/em-folder-utils.c:590
+#: ../mail/em-folder-utils.c:616
 msgid "Create Folder"
 msgstr "Opprett mappe"
 
-#: ../mail/em-folder-utils.c:591
+#: ../mail/em-folder-utils.c:617
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
@@ -9610,39 +9597,39 @@
 msgid "Retrieving '%s'"
 msgstr "Henter «%s»"
 
-#: ../mail/em-format-html.c:1723 ../mail/em-format-html-display.c:89
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: ../mail/em-format-html.c:1724 ../mail/em-format-html-display.c:90
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: ../mail/em-format-html.c:1725 ../mail/em-format-html-display.c:91
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format-html-display.c:92
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gyldig signatur, men kan ikke verifisere avsender"
 
-#: ../mail/em-format-html.c:1727 ../mail/em-format-html-display.c:93
+#: ../em-format/e-mail-formatter-secure-button.c:56
 msgid "Signature exists, but need public key"
 msgstr "Signatur eksisterer, men trenger offentlig nøkkel"
 
-#: ../mail/em-format-html.c:1733 ../mail/em-format-html-display.c:100
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: ../mail/em-format-html.c:1734 ../mail/em-format-html-display.c:101
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: ../mail/em-format-html.c:1735 ../mail/em-format-html-display.c:102
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: ../mail/em-format-html.c:1736 ../mail/em-format-html-display.c:103
+#: ../em-format/e-mail-formatter-secure-button.c:66
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
@@ -9654,50 +9641,48 @@
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: ../mail/em-format-html.c:2177
+#: ../em-format/e-mail-parser-message-external.c:102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: ../mail/em-format-html.c:2188
+#: ../em-format/e-mail-parser-message-external.c:113
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted «%s»"
 
-#: ../mail/em-format-html.c:2190
+#: ../em-format/e-mail-parser-message-external.c:115
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:2211
+#: ../em-format/e-mail-parser-message-external.c:134
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:2226
+#: ../em-format/e-mail-parser-message-external.c:152
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../mail/em-format-html.c:3043
 #: ../plugins/mail-notification/mail-notification.c:395
 #, c-format
 msgid "From: %s"
 msgstr "Fra: %s"
 
-#: ../em-format/e-mail-formatter-headers.c:135
-#: ../em-format/e-mail-formatter-headers.c:140
+#: ../em-format/e-mail-formatter-headers.c:133
 msgid "(no subject)"
 msgstr "(uten emne)"
 
-#: ../mail/em-format-html.c:3141
+#: ../em-format/e-mail-formatter-headers.c:333
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Denne meldingen ble sendt av %s på vegne av %s"
 
-#: ../mail/em-format-html-display.c:89
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -9705,7 +9690,7 @@
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:90
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9713,7 +9698,7 @@
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
-#: ../mail/em-format-html-display.c:91
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -9721,7 +9706,7 @@
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: ../em-format/e-mail-formatter-secure-button.c:68
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9729,7 +9714,7 @@
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../mail/em-format-html-display.c:93
+#: ../em-format/e-mail-formatter-secure-button.c:56
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -9737,7 +9722,7 @@
 "Denne meldingen er signert med en gyldig signatur, men det finnes ingen "
 "tilhørende offentlig nøkkel."
 
-#: ../mail/em-format-html-display.c:100
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9745,7 +9730,7 @@
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overføring over "
 "Internett."
 
-#: ../mail/em-format-html-display.c:101
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -9755,7 +9740,7 @@
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
-#: ../mail/em-format-html-display.c:102
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -9763,7 +9748,7 @@
 "Denne meldingen er kryptert. Det vil være vanskelig for en utenforstående å "
 "se innholdet i denne meldingen."
 
-#: ../mail/em-format-html-display.c:103
+#: ../em-format/e-mail-formatter-secure-button.c:66
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -9772,11 +9757,12 @@
 "Denne meldingen er kryptert med en sterk algoritme. Det vil være meget "
 "vanskelig for en utenforstående å se innholdet i denne meldingen på kort tid."
 
-#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:43
+#: ../em-format/e-mail-formatter-secure-button.c:187
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../mail/em-format-html-display.c:254
+#: ../em-format/e-mail-formatter-secure-button.c:202
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
@@ -9788,15 +9774,15 @@
 "Evolution kan ikke rendre denne e-posten da den er for stor. Du kan vise den "
 "uformattert eller åpne den i et eksternt redigeringsprogram."
 
-#: ../mail/e-mail-reader.c:350
+#: ../e-util/e-web-view.c:3082
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#: ../mail/e-mail-display.c:159
+#: ../e-util/e-web-view.c:329
 msgid "Save _Image..."
 msgstr "Lagre b_ilde …"
 
-#: ../mail/e-mail-display.c:161
+#: ../e-util/e-web-view.c:331
 msgid "Save the image to a file"
 msgstr "Lagre bildet til en fil"
 
@@ -9824,7 +9810,7 @@
 msgid "O_pen With"
 msgstr "Å_pne med"
 
-#: ../mail/em-format-html-print.c:176
+#: ../mail/e-mail-printer.c:167
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
@@ -9835,61 +9821,61 @@
 msgid "No HTML stream available"
 msgstr "Ingen HTML-strøm tilgjengelig."
 
-#: ../mail/em-subscription-editor.c:1675
+#: ../mail/em-subscription-editor.c:1707
 msgid "Folder Subscriptions"
 msgstr "Abonnement på mapper"
 
-#: ../mail/em-subscription-editor.c:1722
+#: ../mail/em-subscription-editor.c:1746
 msgid "_Account:"
 msgstr "K_onto:"
 
-#: ../mail/em-subscription-editor.c:1737
+#: ../mail/em-subscription-editor.c:1759
 msgid "Clear Search"
 msgstr "Tøm søk"
 
-#: ../mail/em-subscription-editor.c:1755
+#: ../mail/em-subscription-editor.c:1776
 msgid "Sho_w items that contain:"
 msgstr "_Vis oppføringer som inneholder:"
 
-#: ../mail/em-subscription-editor.c:1800
+#: ../mail/em-subscription-editor.c:1822
 msgid "Subscribe to the selected folder"
 msgstr "Abonner på valgt mappe"
 
-#: ../mail/em-subscription-editor.c:1801
+#: ../mail/em-subscription-editor.c:1823
 msgid "Su_bscribe"
 msgstr "A_bonner"
 
-#: ../mail/em-subscription-editor.c:1839
-#: ../modules/mail/e-mail-shell-view-actions.c:1294
+#: ../mail/em-subscription-editor.c:1868
+#: ../modules/mail/e-mail-shell-view-actions.c:1632
 msgid "Unsubscribe from the selected folder"
 msgstr "Fjern abonnement på valgt mappe"
 
-#: ../mail/em-subscription-editor.c:987 ../mail/em-subscription-editor.c:1840
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1630
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: ../mail/em-subscription-editor.c:1886
+#: ../mail/em-subscription-editor.c:1908
 msgid "Collapse all folders"
 msgstr "Slå sammen alle mapper"
 
-#: ../mail/em-subscription-editor.c:1887
+#: ../mail/em-subscription-editor.c:1909
 msgid "C_ollapse All"
 msgstr "Slå sammen _alle"
 
-#: ../mail/em-subscription-editor.c:1897
+#: ../mail/em-subscription-editor.c:1919
 msgid "Expand all folders"
 msgstr "Utvid alle mapper"
 
-#: ../mail/em-subscription-editor.c:1898
+#: ../mail/em-subscription-editor.c:1920
 msgid "E_xpand All"
 msgstr "Ut_vid alle"
 
-#: ../mail/em-subscription-editor.c:1908
+#: ../mail/em-subscription-editor.c:1930
 msgid "Refresh the folder list"
 msgstr "Oppdater mappelisten"
 
-#: ../mail/em-subscription-editor.c:1920
+#: ../mail/em-subscription-editor.c:1942
 msgid "Stop the current operation"
 msgstr "Stopp aktiv operasjon"
 
@@ -9897,23 +9883,23 @@
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:86
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Er du sikker på at du vil åpne %d melding samtidig?"
 msgstr[1] "Er du sikker på at du vil åpne %d meldinger samtidig?"
 
-#: ../mail/em-utils.c:166
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+#: ../mail/em-utils.c:142
+#: ../modules/mailto-handler/evolution-mailto-handler.c:150
 msgid "_Do not show this message again"
 msgstr "Ikke vis _denne meldingen igjen"
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:252
 msgid "Message Filters"
 msgstr "Meldingsfiltre"
 
-#: ../mail/em-utils.c:918
+#: ../mail/em-utils.c:982
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
@@ -9922,7 +9908,7 @@
 msgid "Search _Folders"
 msgstr "Søke_mapper"
 
-#: ../mail/em-vfolder-editor-rule.c:339
+#: ../mail/em-vfolder-editor-rule.c:397
 msgid "Add Folder"
 msgstr "Legg til mappe"
 
@@ -9935,29 +9921,26 @@
 msgstr "Forvalgt tegnsett for nye meldinger."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
-#: ../mail/evolution-mail.schemas.in.h:3
 msgid "Spell check inline"
 msgstr "Stavekontroll i meldingen"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Vis indikatorer for stavefeil mens du skriver."
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
 msgid "Automatic link recognition"
 msgstr "Automatisk gjenkjenning av lenker"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
-#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Recognize links in text and replace them."
 msgstr "Gjenkjenn lenker i tekst og erstatt dem."
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
 msgid "Automatic emoticon recognition"
 msgstr "Automatisk gjenkjenning av smilefjes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Gjenkjenn smilefjes i tekst og erstatt dem med bilder."
 
@@ -9966,7 +9949,6 @@
 msgstr "Gruppesvar svarer til listen"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
-#: ../mail/evolution-mail.schemas.in.h:10
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -9975,12 +9957,10 @@
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
-#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Put the cursor at the bottom of replies"
 msgstr "Plasser markør ved bunnen av svar"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-#: ../mail/evolution-mail.schemas.in.h:14
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -9990,12 +9970,11 @@
 "melding. Dette angir om markøren skal plasseres i topp eller bunn av "
 "meldingen."
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
 msgid "Always request read receipt"
 msgstr "Alltid be om lesekvittering"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Whether a read receipt request gets added to every message by default."
 msgstr ""
@@ -10003,7 +9982,6 @@
 "forvalg."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
-#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Send HTML mail by default"
 msgstr "Send HTML e-post som forvalg"
 
@@ -10012,18 +9990,15 @@
 msgstr "Send HTML e-post som forvalg."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Spell checking color"
 msgstr "Farge for stavekontroll"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Farge for understreking av feilstavede ord ved bruk av stavekontroll."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Spell checking languages"
 msgstr "Språk for stavekontroll"
 
@@ -10032,12 +10007,10 @@
 msgstr "Liste med språkkoder for ordliste som skal brukes for stavekontroll."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
-#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Vis «Bcc» feltet når meldinger sendes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10046,12 +10019,10 @@
 "når en e-postkonto velges."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Vis «Cc» feltet når meldinger sendes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:26
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10060,7 +10031,6 @@
 "når en e-postkonto velges."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Vis «Svar-til» feltet når meldinger sendes"
 
@@ -10073,12 +10043,10 @@
 "menyen når en e-postkonto velges."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Vis «Fra» feltet når du poster til en nyhetsgruppe"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#: ../mail/evolution-mail.schemas.in.h:30
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -10087,12 +10055,10 @@
 "kontrolleres fra «Vis»-menyen når en e-postkonto velges."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Vis «Svar-til» feltet når du poster til en nyhetsgruppe"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-#: ../mail/evolution-mail.schemas.in.h:32
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -10116,12 +10082,10 @@
 "ikke følger RFC 2231, men bruker den feilaktive RFC 2047-standarden."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Put personalized signatures at the top of replies"
 msgstr "Plasser personlige signaturer på toppen av svar"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-#: ../mail/evolution-mail.schemas.in.h:36
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -10132,12 +10096,10 @@
 "meldingen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Do not add signature delimiter"
 msgstr "Ikke legg til skillelinje for signatur"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -10160,12 +10122,10 @@
 msgstr "Forvalgt høyde for redigeringsvinduet."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Ignore list Reply-To:"
 msgstr "Ignorer Reply-To: for lister"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
-#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -10217,13 +10177,11 @@
 "set path is not pointing to the existent folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "Show image animations"
 msgstr "Vis bildeanimasjoner"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -10231,12 +10189,11 @@
 "Slå på animerte bilder i HTML-meldinger. Mange brukere synes at animerte "
 "bilder er plagsomme og foretrekker å se et statisk bilde i stedet."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Enable or disable type ahead search feature"
 msgstr "Aktiver eller deaktiver funksjon for å søke mens du skriver"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -10244,21 +10201,19 @@
 "Slår på søkefunksjonen for sidelinjen for å muliggjøre interaktive søk etter "
 "mappenavn."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Slå av eller på bruk av ellipse for mappenavn i sidelinjen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Slå av eller på bruk av ellipse for mappenavn i sidelinjen."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid "Enable or disable magic space bar"
 msgstr "Aktiver eller deaktiver magisk mellomrom"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10266,57 +10221,53 @@
 "Aktiver dette for å bruke mellomrom-tasten til å gå forover i "
 "meldingsvisning, meldingsliste og mapper."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Slå på for å bruke like innstillinger for meldingslistevisning i alle mapper"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "Slå på for å bruke en lignende meldingslistevisning for alle mapper."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merk sitat in e-posten «Forhåndsvisning»"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merk sitat in e-posten «Forhåndsvisning»."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Citation highlight color"
 msgstr "Farge for utheving av sitattekst"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Citation highlight color."
 msgstr "Farge for utheving av sitattekst."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Enable/disable caret mode"
 msgstr "Aktiver/deaktiver markørmodus"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Slå på skrivemerkemodus slik at insettingspunktet vises når du leser e-post."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Default charset in which to display messages"
 msgstr "Forvalgt tegnsett for visning av meldinger"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Default charset in which to display messages."
 msgstr "Forvalgt tegnsett for visning av meldinger."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Load images for HTML messages over HTTP"
 msgstr "Last bilder for HTML-meldinger og HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -10326,31 +10277,27 @@
 "last bilder fra nettet «1» - Last bilder i e-poster fra kontakter «2» - "
 "Alltid last bilder fra nettet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Show Animations"
 msgstr "Vis animasjoner"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
-#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilder som animasjoner."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Show all message headers"
 msgstr "Vis alle meldingshoder"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Show all the headers when viewing a messages."
 msgstr "Vis alle meldingshoder når en melding vises."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste over tillpassede topptekster og om de er slått på."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is "
@@ -10363,32 +10310,26 @@
 "postvisningen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
-#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Show photo of the sender"
 msgstr "Vis bilde av avsender"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Vis bilde av avsender i meldingsområdet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Search for the sender photo in local address books"
 msgstr "Søk etter bilde av avsender i lokale adressebøker"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "This option would help in improving the speed of fetching."
 msgstr "Dette valget vil øke hastigheten ved henting."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "Liste over MIME-typer som skal se etter bonobo-komponentvisere"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -10399,27 +10340,25 @@
 "enhver MIME-type i denne listen som har en tilsvarende Bonobo-komponent for "
 "visnin."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Mark as Seen after specified timeout"
 msgstr "Merk som «lest» etter spesifisert tidsgrense"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Mark as Seen after specified timeout."
 msgstr "Merk som «sett» etter spesifisert tidsgrense."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Sender email-address column in the message list"
 msgstr "Kolonne for avsenders e-postadresse i meldingslisten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Vis avsenders e-postadresse i en egen kolonne i meldingslisten."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -10435,13 +10374,11 @@
 msgid "Timeout for marking message as seen."
 msgstr "Tidsavbrydd å merke e-poster som sett."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show deleted messages in the message-list"
 msgstr "Vis slettede meldinger i meldingslisten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Vis slettede meldinger i meldingslisten (gjennomstreket)."
 
@@ -10453,12 +10390,11 @@
 msgid "Enable search folders on startup."
 msgstr "Aktiver søkemapper ved oppstart."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Skjuler per-mappe forhåndsvisning og fjerner utvalget"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -10467,31 +10403,27 @@
 "Dette fjerner markering fra e-posten i listen og fjerner forhåndsvisning for "
 "den mappen."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Height of the message-list pane"
 msgstr "Høyde på e-postlistefeltet"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Height of the message-list pane."
 msgstr "Høyde på e-postlistefeltet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Width of the message-list pane"
 msgstr "Bredde på e-postlistefeltet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Width of the message-list pane."
 msgstr "Bredde på e-postlistefeltet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Layout style"
 msgstr "Stil for utforming"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -10499,41 +10431,35 @@
 "message list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Variable width font"
 msgstr "Skrift for variabel bredde"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "The variable width font for mail display."
 msgstr "Skrift med variabel bredde for meldingsvisning."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Terminal font"
 msgstr "Terminalskrift"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "The terminal font for mail display."
 msgstr "Terminalskrift for meldingsvisning."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Use custom fonts"
 msgstr "Bruk egendefinerte skrifter"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Use custom fonts for displaying mail."
 msgstr "Bruk tilpassede skrifttyper for e-postvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Komprimer visning av adresser i Til/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -10569,12 +10495,11 @@
 "Forvalg er 4MB / 4096 KB og oppgis i KB. Verdien brukes kun hvis nøkkelen "
 "«force_message_limit» er slått på."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Antall adresser som skal vises i Til/Cc/Bcc"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -10582,13 +10507,11 @@
 "Setter antall adresser som skal vises i forvalgt listevisning for meldinger. "
 "Etter dette vises «…»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Thread the message-list based on Subject"
 msgstr "Lag tråder av e-postlisten basert på emne"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -10596,7 +10519,7 @@
 "Om e-poster skal sorteres etter emner når de ikke inneholder «In-Reply-To» "
 "eller referansetopptekster."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Default value for thread expand state"
 msgstr "Forvalgt verdi for trådutvidelsestilstand"
 
@@ -10609,13 +10532,11 @@
 "sammenslått tilstand som forvalg. Evolution må startes på nytt hvis denne "
 "endres."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Om tråder sorteres basert på siste melding i den tråden"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -10625,7 +10546,7 @@
 "melding i hver tråd i stedet for meldingens dato. Evolution må startes på "
 "nytt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "State of message headers in paned view"
 msgstr "Tilstand for meldingshoder i vertikal visning"
 
@@ -10695,39 +10616,38 @@
 "Initiell bredde på «Abonnement på mapper»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer størrelse på vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Log filter actions"
 msgstr "Loggfør filterhandlinger"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Log filter actions to the specified log file."
 msgstr "Logg filterhandlinger til oppgitt loggfil."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Logfile to log filter actions"
 msgstr "Loggfil med filterhandlinger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Logfile to log filter actions."
 msgstr "Loggfil med filterhandlinger."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "Flush Outbox after filtering"
 msgstr "Tøm utboks etter filtrering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
 "one minute after the last action invocation."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Default forward style"
 msgstr "Forvalgt videresendingsstil"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Default reply style"
 msgstr "Forvalgt svarstil"
 
@@ -10735,37 +10655,37 @@
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Stil på e-postvisning («normal», «full headers», «source»)"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Prompt on empty subject"
 msgstr "Stopp og spør ved tomt emne"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Stopp og spør når en en e-post uten emne skal bli sendt."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Prompt when user expunges"
 msgstr "Stopp og spør før tømming"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Stopp og spør før en mappe blir tømt."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt when user only fills Bcc"
 msgstr "Stopp og spør når bare «Bcc» er utfylt"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Spør når bruker prøver å sende en melding uten Til- eller Cc-mottakere."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Spør når bruker prøver å sende uønsket HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -10773,11 +10693,11 @@
 "Spør når bruker prøver å sende HTML-meldinger til mottakere som ikke ønsker "
 "å motta HTML-meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Spør når bruker prøver å åpne 10 eller flere meldinger samtidig"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -10785,20 +10705,19 @@
 "Spør brukeren om han virkelig vil gjøre det hvis han prøver å åpne 10 eller "
 "flere e-poster på en gang."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Prompt while marking multiple messages"
 msgstr "Spør ved merking av flere meldinger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Slå av/på spørring ved merking av flere meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt when deleting messages in search folder"
 msgstr "Spør ved sletting av meldinger fra søkemappe"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -10808,13 +10727,11 @@
 "en søkemappe sletter meldingene permanent, og ikke bare fjerner dem fra "
 "søkeresultatene."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt when replying privately to list messages"
 msgstr "Spør ved privat svar til meldinger fra e-postlister"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -10822,31 +10739,28 @@
 "Aktiverer/deaktiverer funksjonen som varsler om at du sender et privat svar "
 "på en melding som har kommet via en e-postliste."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Spør når e-postlister stikker av med private svar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Prompt when replying to many recipients"
 msgstr "Spør ved svar til mange mottakere"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr "Slår av/på varsel om at du sender et svar til mange personer."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid ""
 "Asks whether to close the message window when the user forwards or replies "
 "to the message shown in the window"
@@ -10858,12 +10772,12 @@
 "always close browser window ask - (or any other value) will ask user"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Varsle før utsending til mottakere som ikke er oppgitt som e-postadresser"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -10871,47 +10785,43 @@
 "Aktiverer/deaktiverer funksjonen som varsler om at du prøver å sende en "
 "melding til mottakere som ikke er oppgitt som e-postadresser"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Empty Trash folders on exit"
 msgstr "Tøm papirkurven når programmet avsluttes"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tøm alle papirkurver når programmet avsluttes."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum antall dager mellom tømming av papirkurven ved avslutting"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tømming av papirkurven ved avslutting, i dager."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Last time Empty Trash was run"
 msgstr "Siste gang papirkurven ble tømt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Sist gang papirkurven ble tømt, i dager siden 1 januar, 1970 (Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:175
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid ""
 "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Antall sekunder feilen skal vises i statuslinjen."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Level beyond which the message should be logged."
 msgstr "Over dette nivået skal meldingen logges."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -10919,24 +10829,22 @@
 "Denne har tre mulige verdier. «0» for feil. «1» for advarsler. «2» for "
 "feilsøkingsmeldinger."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Show original \"Date\" header value."
 msgstr "Vis opprinnelig verdi for «Date»-meldingshode."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "List of Labels and their associated colors"
 msgstr "Liste over etiketter og deres assosierte farger"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -10945,54 +10853,50 @@
 "inneholder strenger som inneholder «name:color» hvor «color» bruker HTML hex "
 "koding."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Check incoming mail being junk"
 msgstr "Sjekk om innkommende meldinger er uønsket e-post"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Run junk test on incoming mail."
 msgstr "Sjekk om innkommende e-post er uønsket."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Empty Junk folders on exit"
 msgstr "Tøm mappe for uønsket e-post når programmet avsluttes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tøm alle mapper for uønsket e-post når programmet avsluttes."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Minimum antall dager mellom tømming av mapper for uønsket e-post ved "
 "avslutting"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tømming av mapper for uønsket e-post ved "
 "avslutting, i dager."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid "Last time Empty Junk was run"
 msgstr "Siste gang mapper for uønsket e-post ble tømt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Sist gang mapper for uønsket e-post ble tømt i dager siden 1 januar 1970 "
 "(epoch)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "The default plugin for Junk hook"
 msgstr "Forvalgt tillegg for uønsket e-post"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11002,11 +10906,11 @@
 "tillegg er aktivert. Hvis forvalgt tillegg deaktiveres vil ikke de andre "
 "brukes."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Bestemmer om avsenders e-post skal slås opp i adresseboken"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11018,7 +10922,7 @@
 "som er merket for automatisk fullføring. Operasjonen kan være treg hvils "
 "eksterne adressebøker som LDAP er merket for automatisk fullføring."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11026,21 +10930,20 @@
 "Bestemmer om oppslag for filtrering av uønsket e-post kun skal slås opp i "
 "lokale adressebøker"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Bestemmer om egendefinerte meldingshoder skal brukes for å se etter uønsket "
 "e-post"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11050,11 +10953,11 @@
 "post. Hvis dette alternativet er aktivert og meldingshodene finnes vil  "
 "dette forbedre hastigheten for denne sjekken."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Custom headers to use while checking for junk."
 msgstr "Egendefinert meldingshode som skal sjekkes for uønsket e-post."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11062,8 +10965,7 @@
 "Egendefinerte meldingshoder som brukes ved sjekk etter uønsket e-post. "
 "Formatet for listeelementene er «headername=value»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "UID string of the default account."
 msgstr "UID-streng for forvalgt konto."
 
@@ -11088,20 +10990,19 @@
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste over protokollnavn som har en godkjent lisens."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Save directory"
 msgstr "Lagre katalog"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Directory for saving mail component files."
 msgstr "Katalog for å lagre komponentfiler for e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Composer load/attach directory"
 msgstr "Katalog for å laste/legge ved vedlegg i redigeringsprogrammet"
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Directory for loading/attaching files to composer."
 msgstr "Katalog for å laste/legge ved filer i redigering av ny e-post."
 
@@ -11141,7 +11042,7 @@
 "Initiell bredde på «Meldingsfiltre»-vinduet. Verdien oppdateres ettersom "
 "bruker endrer størrelse på vinduet horisontalt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Check for new messages on start"
 msgstr "Se etter nye meldinger ved oppstart"
 
@@ -11151,7 +11052,7 @@
 "sending messages from Outbox."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Check for new messages in all active accounts"
 msgstr "Se etter nye meldinger i alle aktive kontoer"
 
@@ -11240,11 +11141,11 @@
 "Initiell bredde på «Søkemapper»-vinduet. Verdien oppdateres ettersom bruker "
 "endrer størrelse på vinduet horisontalt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Server synchronization interval"
 msgstr "Intervall for serversynkronisering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11252,57 +11153,57 @@
 "Kontrollerer hvor ofte lokale endringer synkroniseres med ekstern e-"
 "posttjener. Intervallet må være minst 30 sekunder."
 
-#: ../mail/importers/elm-importer.c:181
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
 
-#: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:456
-#: ../modules/mail/e-mail-shell-view.c:1051
-#: ../widgets/misc/e-send-options.c:520
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
+#: ../mail/importers/pine-importer.c:419
+#: ../modules/mail/e-mail-shell-view.c:1075
 msgid "Mail"
 msgstr "E-post"
 
-#: ../mail/importers/elm-importer.c:400
+#: ../mail/importers/elm-importer.c:378
 msgid "Evolution Elm importer"
 msgstr "Import fra Elm for Evolution"
 
-#: ../mail/importers/elm-importer.c:401
+#: ../mail/importers/elm-importer.c:379
 msgid "Import mail from Elm."
 msgstr "Importer e-post fra Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../mail/importers/evolution-mbox-importer.c:140
+#: ../plugins/dbx-import/dbx-importer.c:250
 msgid "_Destination folder:"
 msgstr "_Målmappe:"
 
-#: ../mail/importers/evolution-mbox-importer.c:148
-#: ../plugins/dbx-import/dbx-importer.c:261
-#: ../plugins/pst-import/pst-importer.c:570
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:256
+#: ../plugins/pst-import/pst-importer.c:545
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:262
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../mail/importers/evolution-mbox-importer.c:147
+#: ../plugins/dbx-import/dbx-importer.c:257
+#: ../plugins/pst-import/pst-importer.c:546
 msgid "Select folder to import into"
 msgstr "Velg mappe å importere til"
 
-#: ../mail/importers/evolution-mbox-importer.c:438
+#: ../mail/importers/evolution-mbox-importer.c:437
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Emne"
 
-#: ../mail/importers/evolution-mbox-importer.c:443
+#: ../mail/importers/evolution-mbox-importer.c:442
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Fra"
 
-#: ../mail/importers/evolution-mbox-importer.c:487
-#: ../shell/e-shell-utils.c:195
+#: ../mail/importers/evolution-mbox-importer.c:486
+#: ../shell/e-shell-utils.c:172
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:488
+#: ../mail/importers/evolution-mbox-importer.c:487
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer mapper i Berkeley Mailbox format"
 
@@ -11312,8 +11213,8 @@
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:617
-#: ../plugins/pst-import/pst-importer.c:784
+#: ../plugins/dbx-import/dbx-importer.c:612
+#: ../plugins/pst-import/pst-importer.c:764
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importerer «%s»"
@@ -11323,43 +11224,44 @@
 msgid "Scanning %s"
 msgstr "Søker i %s"
 
-#: ../mail/importers/pine-importer.c:262
+#: ../mail/importers/pine-importer.c:247
 msgid "Importing Pine data"
 msgstr "Importerer data fra Pine"
 
-#: ../mail/importers/pine-importer.c:430
+#: ../e-util/e-name-selector-dialog.c:450
+#: ../mail/importers/pine-importer.c:426
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../mail/importers/pine-importer.c:515
+#: ../mail/importers/pine-importer.c:474
 msgid "Evolution Pine importer"
 msgstr "Import fra Pine for Evolutions"
 
-#: ../mail/importers/pine-importer.c:516
+#: ../mail/importers/pine-importer.c:475
 msgid "Import mail from Pine."
 msgstr "Importer e-post fra Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: ../mail/mail-autofilter.c:229 ../mail/mail-autofilter.c:272
+#: ../mail/mail-autofilter.c:226 ../mail/mail-autofilter.c:269
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: ../mail/mail-autofilter.c:255
+#: ../mail/mail-autofilter.c:252
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: ../mail/mail-autofilter.c:296
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: ../mail/mail-autofilter.c:406
+#: ../mail/mail-autofilter.c:403
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
@@ -11368,7 +11270,7 @@
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:513
+#: ../mail/mail-autofilter.c:512
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11423,7 +11325,7 @@
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:5
 msgid "Default Behavior"
 msgstr "Forvalgt oppførsel"
 
@@ -11431,11 +11333,11 @@
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:7
 msgid "Automatically insert _emoticon images"
 msgstr "S_ett inn smilefjes automatisk"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:8
 msgid "Always request rea_d receipt"
 msgstr "Allti_d be om lesekvittering"
 
@@ -11447,15 +11349,15 @@
 msgid "Replies and Forwards"
 msgstr "Svar og videresending"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:12
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:13
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:14
 msgid "Start _typing at the bottom on replying"
 msgstr "S_tart skriving under meldingen ved svar"
 
@@ -11471,19 +11373,19 @@
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "Gruppesvar går kun til e-postliste hvis mulig"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:25
 msgid "Sig_natures"
 msgstr "Sig_naturer"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:26
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:27
 msgid "_Languages"
 msgstr "_Språk"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:29
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -11491,28 +11393,28 @@
 "Språklisten som vises her reflekterer kun de språkene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:28
 msgid "Languages Table"
 msgstr "Språktabell"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:31
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:32
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:33
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:34
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:35
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -11521,60 +11423,64 @@
 "hjelpe med å unngå uhell og flauser med e-post:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:37
 msgid "Sending a message with an _empty subject line"
 msgstr "Ved sending av en melding med tomt _emnefelt"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:39
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Ved sending av en melding med kun _Bcc-mottakere definert"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Ved sending av _privat svar til meldinger fra e-postlister"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:43
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Ved sending av svar til et stort a_ntall mottakere"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:45
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "En e-postliste tillates å o_mdirigere private svar til listen"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:47
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Sender en melding med mottakere oppgitt uten e-postadresser"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:48
 msgid "Confirmations"
 msgstr "Bekreftelser"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/e-mail-config-security-page.c:338
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:50
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/e-mail-config-security-page.c:341
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:51
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/e-mail-config-security-page.c:344
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:52
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/e-mail-config-security-page.c:347
+#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:53
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:54 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:57 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:55 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
@@ -11594,35 +11500,36 @@
 msgid "Inline"
 msgstr "I meldingen"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:56
 msgid "Proxy Settings"
 msgstr "Innstillinger for proxy"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:57
 msgid "_Use system defaults"
 msgstr "Br_uk systemets forvalg"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:58
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte tilkobling til internett"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:59
 msgid "_Manual proxy configuration:"
 msgstr "_Manuell konfigurasjon av proxy:"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:60
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-proxy:"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:61
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sikker HTTP-proxy:"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:63
 msgid "No _Proxy for:"
 msgstr "Ingen _proxy for:"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:64
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:614
 msgid "Port:"
 msgstr "Port:"
 
@@ -11634,7 +11541,7 @@
 msgid "Us_ername:"
 msgstr "Bruk_ernavn:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:67
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
@@ -11650,23 +11557,23 @@
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Se etter nye meldin_ger i alle aktive kontoer"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:71
 msgid "Message Display"
 msgstr "Meldingsvisning"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:72
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre programmer"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:73
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:74
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:75
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
@@ -11674,11 +11581,11 @@
 msgid "Fix_ed Width Font:"
 msgstr "Skrift med fast br_edde:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:79
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:80
 msgid "color"
 msgstr "farge"
 
@@ -11686,19 +11593,19 @@
 msgid "Default character e_ncoding:"
 msgstr "Forvalgt teg_nkoding:"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:82
 msgid "Apply the same _view settings to all folders"
 msgstr "Bruk samme _visningsinnstillinger for alle mapper"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:83
 msgid "F_all back to threading messages by subject"
 msgstr "F_all tilbake til tråding av meldinger etter emne"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:84
 msgid "Delete Mail"
 msgstr "Slett e-post"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:85
 msgid "Empty trash folders on e_xit"
 msgstr "_Tøm papirkurven når programmet avsluttes"
 
@@ -11711,16 +11618,16 @@
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilder"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:89
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:90
 msgid "Loading Images"
 msgstr "Laster bilder"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:91
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
@@ -11728,49 +11635,49 @@
 msgid "_Load images only in messages from contacts"
 msgstr "_Last kun bilder i meldinger fra kontakter"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:93
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:94
 msgid "HTML Messages"
 msgstr "HTML-meldinger"
 
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Etiketter"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:96
 msgid "Sender Photograph"
 msgstr "Bilde av avsender"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:97
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Vi_s bilde av avsender i forhåndsvisning av meldingen"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:98
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Kun søk etter bilde av avs_ender i lokale adressebøker"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:98
 msgid "Displayed Message Headers"
 msgstr "Viste meldingshoder"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:99
 msgid "Mail Headers Table"
 msgstr "Tabell med meldingshoder"
 
-#: ../mail/mail-config.ui.h:106
-#: ../modules/addressbook/autocompletion-config.c:188
+#: ../mail/mail-config.ui.h:100
+#: ../modules/addressbook/autocompletion-config.c:117
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "Fromat for dato ogklokkeslett"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/e-mail-printer.c:125 ../mail/mail-config.ui.h:101
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:102
 msgid "Check incoming _messages for junk"
 msgstr "Sjekk om innkommende _meldinger er uønsket"
 
@@ -11778,39 +11685,39 @@
 msgid "Delete junk messages on e_xit"
 msgstr "Slett uønsket e-post når programmet a_vsluttes"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:104
 msgid "Check cu_stom headers for junk"
 msgstr "_Sjekk egendefinerte meldingshoder for uønsket e-post"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:105
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ikke mer_k meldinger som uønsket hvis avsender finnes i adresseboken"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:106
 msgid "_Lookup in local address book only"
 msgstr "S_lå kun opp i lokale adressebokmapper"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:107
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Alternativet vil ignoreres hvis det finnes treff for egendefinerte "
 "meldingshoder for uønsket e-post."
 
-#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:3
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:237
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:161
+#: ../mail/mail-config.ui.h:109
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:225
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:159
 msgid "No encryption"
 msgstr "Ingen kryptering"
 
-#: ../mail/mail-config.ui.h:111 ../modules/addressbook/ldap-config.ui.h:1
+#: ../mail/mail-config.ui.h:110
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
 
-#: ../mail/mail-config.ui.h:112 ../modules/addressbook/ldap-config.ui.h:2
+#: ../mail/mail-config.ui.h:111
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
-#: ../mail/e-mail-config-defaults-page.c:549
+#: ../mail/e-mail-config-defaults-page.c:552
 msgid "Special Folders"
 msgstr "Spesielle mapper"
 
@@ -11818,7 +11725,7 @@
 msgid "Drafts _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/e-mail-config-defaults-page.c:585
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
@@ -11830,23 +11737,23 @@
 msgid "_Junk Folder:"
 msgstr "Mappe for _uønsket e-post:"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/e-mail-config-defaults-page.c:673
 msgid "Composing Messages"
 msgstr "Skriver meldinger"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/e-mail-config-defaults-page.c:707
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alltid _blindkopi (bcc) til:"
 
-#: ../mail/e-mail-config-defaults-page.c:662
+#: ../mail/e-mail-config-defaults-page.c:682
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "All_tid _kopi (cc) til:"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/e-mail-config-defaults-page.c:742
 msgid "Message Receipts"
 msgstr "Meldingsmottakere"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/e-mail-config-defaults-page.c:751
 msgid "S_end message receipts:"
 msgstr "Send kvittering for m_eldinger:"
 
@@ -11858,19 +11765,19 @@
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/e-mail-config-identity-page.c:348
 msgid "Required Information"
 msgstr "Nødvendig informasjon"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/e-mail-config-identity-page.c:384
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/e-mail-config-identity-page.c:357
 msgid "Full Nam_e:"
 msgstr "_Fullt navn:"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/e-mail-config-identity-page.c:431
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Valgfri informasjon"
@@ -11879,15 +11786,15 @@
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/e-mail-config-identity-page.c:523
+#: ../mail/e-mail-config-identity-page.c:522
 msgid "Add Ne_w Signature..."
 msgstr "Legg til n_y signatur …"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/e-mail-config-identity-page.c:467
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/e-mail-config-identity-page.c:440
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
@@ -11895,7 +11802,7 @@
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/e-mail-config-security-page.c:269
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
@@ -11907,23 +11814,23 @@
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/e-mail-config-security-page.c:322
 msgid "Si_gning algorithm:"
 msgstr "Si_gneringsalgoritme:"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/e-mail-config-security-page.c:363
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "All_tid signer utgående meldinger når denne kontoen brukes"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/e-mail-config-security-page.c:375
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Alltid krypter til _meg selv ved sending av krypterte meldinger"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/e-mail-config-security-page.c:387
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Alltid s_tol på nøkler i min nøkkelring ved kryptering"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/e-mail-config-security-page.c:411
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
@@ -11943,7 +11850,7 @@
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat for kry_ptering:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/e-mail-config-security-page.c:420
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
@@ -11955,7 +11862,7 @@
 msgid "Clea_r"
 msgstr "Tø_m"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/e-mail-config-security-page.c:462
 msgid "Signing _algorithm:"
 msgstr "Signerings_algoritme:"
 
@@ -11963,7 +11870,7 @@
 msgid "Cle_ar"
 msgstr "_Tøm"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/e-mail-config-service-page.c:640
 msgid "Server _Type:"
 msgstr "Tjener_type:"
 
@@ -11971,13 +11878,15 @@
 msgid "description"
 msgstr "beskrivelse"
 
-#: ../mail/mail-config.ui.h:161
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:80
+#: ../modules/plugin-manager/evolution-plugin-manager.c:159
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:167
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:100
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:98
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "Tj_ener:"
@@ -12014,23 +11923,22 @@
 msgid "Server Configuration"
 msgstr "Tjeneroppsett"
 
-#: ../modules/addressbook/ldap-config.ui.h:13
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:113
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../mail/mail-config.ui.h:174
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:656
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:258
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:654
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:246
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:180
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../mail/mail-config.ui.h:176
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:209
 msgid "T_ype:"
 msgstr "T_ype:"
 
@@ -12038,27 +11946,27 @@
 msgid "Remember _password"
 msgstr "Husk _passord"
 
-#: ../mail/mail-dialogs.ui.h:1
+#: ../mail/em-vfolder-editor-rule.c:523
 msgid "Search Folder Sources"
 msgstr "Kilder for søkemapper"
 
-#: ../mail/mail-dialogs.ui.h:2
+#: ../mail/em-vfolder-editor-rule.c:567
 msgid "All local folders"
 msgstr "Alle lokale mapper"
 
-#: ../mail/em-vfolder-editor-rule.c:562
+#: ../mail/em-vfolder-editor-rule.c:568
 msgid "All active remote folders"
 msgstr "Alle aktive eksterne mapper"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/em-vfolder-editor-rule.c:569
 msgid "All local and active remote folders"
 msgstr "Alle lokale og aktive eksterne mapper"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/em-vfolder-editor-rule.c:570
 msgid "Specific folders"
 msgstr "Spesifikke mapper"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:1
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12066,16 +11974,16 @@
 "Meldingene du har valgt for oppfølging er listet under.\n"
 "Vennligst velg en handling for oppfølging fra menyen «Flagg»."
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:3
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:4
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "Fu_llført"
 
@@ -12083,7 +11991,7 @@
 msgid "Call"
 msgstr "Ring"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
@@ -12091,19 +11999,19 @@
 msgid "Follow-Up"
 msgstr "Følg opp"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "Videresend"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:12
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Reply to All"
 msgstr "Svar til alle"
 
@@ -12111,31 +12019,31 @@
 msgid "Review"
 msgstr "Gjennomgå"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:18
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Digital Signature"
 msgstr "Digital signatur"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: ../libemail-engine/mail-folder-cache.c:882
+#: ../libemail-engine/mail-folder-cache.c:1241
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -12144,11 +12052,11 @@
 msgid "Filtering Selected Messages"
 msgstr "Filtrerer valgte meldinger"
 
-#: ../libemail-engine/mail-ops.c:216
+#: ../libemail-engine/mail-ops.c:219
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: ../libemail-engine/mail-ops.c:874
+#: ../libemail-engine/mail-ops.c:940
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
@@ -12158,35 +12066,35 @@
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: ../libemail-engine/mail-ops.c:931 ../mail/mail-send-recv.c:886
+#: ../libemail-engine/mail-ops.c:998
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: ../libemail-engine/mail-ops.c:933 ../mail/mail-send-recv.c:888
+#: ../libemail-engine/mail-ops.c:1000
 msgid "Complete."
 msgstr "Fullført."
 
-#: ../libemail-engine/mail-ops.c:1045
+#: ../libemail-engine/mail-ops.c:1112
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Flytter meldinger til «%s»"
 
-#: ../libemail-engine/mail-ops.c:1046
+#: ../libemail-engine/mail-ops.c:1113
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopierer meldinger til «%s»"
 
-#: ../libemail-engine/mail-ops.c:1226
+#: ../libemail-engine/mail-ops.c:1232
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: ../libemail-engine/mail-ops.c:1300
+#: ../libemail-engine/mail-ops.c:1360
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../libemail-engine/mail-ops.c:1237
+#: ../libemail-engine/mail-ops.c:1361
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
@@ -12201,7 +12109,7 @@
 msgid "Expunging folder '%s'"
 msgstr "Tømmer mappe «%s»"
 
-#: ../libemail-engine/mail-ops.c:1610
+#: ../libemail-engine/mail-ops.c:1435
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
@@ -12211,23 +12119,23 @@
 msgid "Disconnecting %s"
 msgstr "Kobler fra %s"
 
-#: ../mail/mail-send-recv.c:208
+#: ../mail/mail-send-recv.c:202
 msgid "Canceling..."
 msgstr "Avbryter …"
 
-#: ../mail/mail-send-recv.c:535
+#: ../mail/mail-send-recv.c:546
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: ../mail/mail-send-recv.c:551
+#: ../mail/mail-send-recv.c:562
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: ../mail/mail-send-recv.c:651 ../mail/mail-send-recv.c:1035
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1047
 msgid "Updating..."
 msgstr "Oppdaterer …"
 
-#: ../mail/mail-send-recv.c:651 ../mail/mail-send-recv.c:737
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:736
 msgid "Waiting..."
 msgstr "Venter …"
 
@@ -12241,21 +12149,21 @@
 msgid "Could not create spool directory '%s': %s"
 msgstr "Kan ikke opprette spool-katalog «%s»: %s"
 
-#: ../libemail-engine/mail-tools.c:112
+#: ../libemail-engine/mail-tools.c:111
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Prøver å bruke movemail på en kilde, «%s», som ikke er i mbox-format"
 
-#: ../libemail-engine/mail-tools.c:224
+#: ../libemail-engine/mail-tools.c:237
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: ../libemail-engine/mail-tools.c:226
+#: ../libemail-engine/mail-tools.c:239
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: ../libemail-engine/mail-vfolder.c:77
+#: ../libemail-engine/mail-vfolder.c:153
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setter opp søkemappe: %s"
@@ -12270,7 +12178,7 @@
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:554
+#: ../libemail-engine/mail-vfolder.c:670
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12288,11 +12196,11 @@
 "%s ble oppdatert fordi de brukte en mappe som ble slettet\n"
 "«%s»."
 
-#: ../mail/mail-vfolder-ui.c:159
+#: ../mail/mail-vfolder-ui.c:158
 msgid "Edit Search Folder"
 msgstr "Rediger søkemappe"
 
-#: ../mail/mail-vfolder-ui.c:270
+#: ../mail/mail-vfolder-ui.c:279
 msgid "New Search Folder"
 msgstr "Ny søkemappe"
 
@@ -12496,7 +12404,7 @@
 "permanent?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../modules/mail/e-mail-shell-view-actions.c:1518
 msgid "_Empty Trash"
 msgstr "_Tøm papirkurven"
 
@@ -12579,15 +12487,15 @@
 "Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
 "endre navn på, flytte eller slette disse."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Kan ikke endre navn på eller flytte systemmappe «{0}»."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Vil du virkelig slette mappen «{0}» og alle undermapper?"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -12595,11 +12503,11 @@
 "Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
 "permanent."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\"?"
 msgstr "Vil du virkelig slette mappen «{0}»?"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
@@ -12623,7 +12531,7 @@
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Kan ikke endre navn på «{0}» til «{1}»."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 "En mappe med navn «{1}» eksisterer allerede. Vennligst bruk et annet navn."
@@ -12632,43 +12540,43 @@
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kunne ikke flytte mappe «{0}» til «{1}»."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot open source \"{2}\"."
 msgstr "Kan ikke åpne kilde «{2}»."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "Cannot open target \"{2}\"."
 msgstr "Kan ikke åpne mål «{2}»."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kan ikke kopiere mappe «{0}» til «{1}»."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot create folder \"{0}\"."
 msgstr "Kan ikke opprette mappe «{0}»."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot open source \"{1}\"."
 msgstr "Kan ikke åpne kilde «{1}»."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot save changes to account."
 msgstr "Kan ikke lagre endringer for kontoen."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nødvendig informasjon."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil slette denne kontoen?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
 
@@ -12677,7 +12585,7 @@
 msgstr ""
 "Er du sikker på at du vil slette denne kontoen med alle stedfortredere?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12685,22 +12593,22 @@
 "Hvis du fortsetter vil all kontoinformasjon og\n"
 "mellomtjenerinformasjon bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Er du sikker på at du vil slette denne kontoen med alle stedfortredere?"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Hvis du fortsetter vil stedfortrederkontoer bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
 msgid "Do _Not Disable"
 msgstr "I_kke slå av"
 
-#: ../mail/mail.error.xml.h:87
-#: ../plugins/publish-calendar/publish-calendar.c:617
+#: ../mail/mail.error.xml.h:90
+#: ../plugins/publish-calendar/publish-calendar.c:649
 msgid "_Disable"
 msgstr "_Deaktiver"
 
@@ -12716,23 +12624,23 @@
 msgid "The script file must exist and be executable."
 msgstr "Skriptfilen må eksistere og være kjørbar."
 
-#: ../mail/mail.error.xml.h:91
+#: ../e-util/widgets.error.xml.h:1
 msgid "Do you wish to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
-#: ../mail/mail.error.xml.h:92
+#: ../e-util/widgets.error.xml.h:2
 msgid "This signature has been changed, but has not been saved."
 msgstr "Denne signaturen er endret, men er ikke lagret."
 
-#: ../mail/mail.error.xml.h:93
+#: ../e-util/widgets.error.xml.h:3
 msgid "_Discard changes"
 msgstr "_Forkast endringene"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:91
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Kan ikke redigere søkemappe «{0}» da den ikke eksisterer."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:92
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12740,40 +12648,40 @@
 "Denne mappen er lagt til implisitt. Gå til redigering av søkemapper og legg "
 "den inn eksplisitt hvis det er nødvendig."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:94
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Kan ikke legge til søkemappe «{0}»."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:95
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 "En mappe med navn «{0}» eksisterer allerede. Vennligst bruk et annet navn."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:96
 msgid "Search Folders automatically updated."
 msgstr "Søkemapper oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:97
 msgid "Mail filters automatically updated."
 msgstr "E-postfiltre oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:98
 msgid "Missing folder."
 msgstr "Mangler mappe."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:99
 msgid "You must specify a folder."
 msgstr "Du må oppgi en mappe."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:101
 msgid "You must name this Search Folder."
 msgstr "Du må gi navn til denne søkemappen."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:102
 msgid "No sources selected."
 msgstr "Ingen kilder valgt."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -12783,11 +12691,11 @@
 "Enten ved å velge mappene individuelt og/eller å velge alle lokale mapper, "
 "alle eksterne mapper eller begge deler."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:105
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Det oppsto et problem under migrering av gammel meldingsmappe «{0}»."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -12799,11 +12707,11 @@
 "Du kan velge å ignorere denne mappen, overskrive eller legge til innhold "
 "der, eller avslutte."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "_Append"
 msgstr "_Legg til"
 
@@ -12837,11 +12745,11 @@
 msgid "_Migrate Now"
 msgstr "_Migrer nå"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "Unable to read license file."
 msgstr "Kan ikke lese lisensfilen."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -12849,11 +12757,11 @@
 "Kan ikke lese lisensfil «{0}» pga et installasjonsproblem. Du vil ikke kunne "
 "bruke denne tilbyderen før du har mulighet til å godta lisensen."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "Please wait."
 msgstr "Vennligst vent."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Spør tjener etter en liste med støttede autentiseringsmekanismer."
 
@@ -12892,33 +12800,33 @@
 msgid "_Send Receipt"
 msgstr "_Send kvittering"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:123
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synkroniser mapper lokalt for frakoblet bruk?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "Vil du synkronisere mapper som er merket for frakoblet bruk lokalt?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:125
 msgid "Do _Not Synchronize"
 msgstr "Ikke sy_nkroniser"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:126
 msgid "_Synchronize"
 msgstr "_Synkroniser"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:127
 msgid "Do you want to mark all messages as read?"
 msgstr "Vil du merke alle meldinger som lest?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:128
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Dette vil merke alle meldinger i valgt mappe som lest."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -12933,19 +12841,19 @@
 msgid "Would you like to close the message window?"
 msgstr "Vil du lukke meldingsvinduet?"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:138
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:139
 msgid "_No"
 msgstr "_Nei"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:140
 msgid "_Always"
 msgstr "_Alltid"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:141
 msgid "N_ever"
 msgstr "A_ldri"
 
@@ -12960,55 +12868,55 @@
 msgstr ""
 "En signatur med navn «{0}» eksisterer allerede. Vennligst bruk et annet navn."
 
-#: ../mail/mail.error.xml.h:143
+#: ../e-util/widgets.error.xml.h:4
 msgid "Blank Signature"
 msgstr "Tom signatur"
 
-#: ../mail/mail.error.xml.h:144
+#: ../e-util/widgets.error.xml.h:5
 msgid "Please provide an unique name to identify this signature."
 msgstr "Oppgi et unikt navn for å identifisere denne signaturen."
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 "Denne meldingen kan ikke sendes fordi kontoen du sender med ikke er aktiv"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:145
 msgid "Please enable the account or send using another account."
 msgstr "Vennligst sjekk kontoen eller send fra en annen konto."
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:146
 msgid "Mail Deletion Failed"
 msgstr "Sletting av e-post feilet"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:147
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har ikke tilstrekkelige rettigheter til å slette denne meldingen."
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:148
 msgid "\"Check Junk\" Failed"
 msgstr "Sjekk etter uønsket e-post feilet"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:149
 msgid "\"Report Junk\" Failed"
 msgstr "Feil under rapportering av uønsket e-post"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:150
 msgid "\"Report Not Junk\" Failed"
 msgstr "Feil under rapportering av e-post som ønsket"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:151
 msgid "Remove duplicate messages?"
 msgstr "Fjern duplikatmeldinger?"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:152
 msgid "No duplicate messages found."
 msgstr "Ingen duplikatmeldinger funnet."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:154
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Mappe «{0}» inneholder ingen duplikatmeldinger."
 
@@ -13016,119 +12924,118 @@
 msgid "Failed to unsubscribe from folder."
 msgstr "Klarte ikke å fjerne abonnement på mappe."
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:158
 msgid "Unable to retrieve message."
 msgstr "Kunne ikke hente melding."
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:159
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to open folder."
 msgstr "Klarte ikke å åpne mappe."
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to find duplicate messages."
 msgstr "Klarte ikke å finne duplikatmeldinger."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to retrieve messages."
 msgstr "Klarte ikke å hente meldinger."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to remove attachments from messages."
 msgstr "Klarte ikke å fjerne vedlegg fra meldinger."
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to download messages for offline viewing."
 msgstr "Klarte ikke å laste ned meldinger for frakoblet visning."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to save messages to disk."
 msgstr "Klarte ikke å lagre meldinger til disk."
 
-#: ../mail/message-list.c:1272
+#: ../mail/message-list.c:298
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:1273
+#: ../mail/message-list.c:299
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1274
+#: ../mail/message-list.c:300
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:1265
+#: ../mail/message-list.c:301
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:302
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:1277
+#: ../mail/message-list.c:303
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1281
+#: ../mail/message-list.c:316
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1282
+#: ../mail/message-list.c:317
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1286
+#: ../mail/message-list.c:321
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:1277
+#: ../mail/message-list.c:322
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1900 ../widgets/table/e-cell-date.c:51
+#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1851
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:208
+#: ../mail/message-list.c:1858 ../modules/itip-formatter/itip-view.c:244
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1925
+#: ../mail/message-list.c:1867
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1937
+#: ../mail/message-list.c:1879
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1945
+#: ../mail/message-list.c:1887
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1947
+#: ../mail/message-list.c:1889
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2752
+#: ../mail/message-list.c:2767
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
-#: ../mail/message-list.c:2888 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3395 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Meldinger"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4132
+#: ../mail/message-list.c:4764
 msgid "Follow-up"
 msgstr "Følg opp"
 
-#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4644 ../mail/message-list.c:5064
+#: ../mail/message-list.c:466 ../mail/message-list.c:5719
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -13140,7 +13047,7 @@
 "Ingen meldinger passer dine søkekriterier. Du kan enten tømme søket med "
 "menyoppføringen Søk->Tøm eller endre det."
 
-#: ../mail/message-list.c:4883
+#: ../mail/message-list.c:5665
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -13152,8 +13059,8 @@
 msgid "Received"
 msgstr "Mottatt"
 
-#: ../mail/message-list.etspec.h:10
-#: ../widgets/misc/e-attachment-tree-view.c:574
+#: ../em-format/e-mail-formatter-print.c:54
+#: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Størrelse"
 
@@ -13182,27 +13089,27 @@
 msgstr "Emne eller adresser inneholder"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:2001
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1994
 msgid "Message contains"
 msgstr "Melding inneholder"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1666
+#: ../modules/mail/e-mail-shell-view-actions.c:2015
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1659
+#: ../modules/mail/e-mail-shell-view-actions.c:2008
 msgid "Sender contains"
 msgstr "Avsender inneholder"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1987
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
@@ -13271,29 +13178,29 @@
 "søkebase. Et søkeområde som «one» vil kun ta med oppføringer ett nivå under "
 "basen."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:589
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:587
 msgid "Server Information"
 msgstr "Tjenerinformasjon"
 
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/certificate-viewer.c:679
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:724
-#: ../modules/mail/e-mail-shell-view.c:116
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
+#: ../modules/mail/e-mail-shell-view.c:117
 msgid "Searching"
 msgstr "Søker"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:806
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:804
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:204
+#: ../modules/addressbook/e-book-shell-view-actions.c:198
 msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
-#: ../modules/addressbook/e-book-shell-backend.c:229
-#: ../modules/addressbook/e-book-shell-view-actions.c:131
+#: ../modules/addressbook/e-book-shell-backend.c:259
+#: ../modules/addressbook/e-book-shell-view-actions.c:125
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
@@ -13317,12 +13224,10 @@
 "Antall tegn som må skrives før Evolution forsøker automatisk fullføring."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show autocompleted name with an address"
 msgstr "Vis automatisk fullført navn med adresse"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
@@ -13339,12 +13244,10 @@
 msgstr "URI for sist brukt mappe i dialogen for å velge navn."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Contact layout style"
 msgstr "Stil for utforming av kontakt"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -13363,19 +13266,16 @@
 msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "Contact preview pane position (horizontal)"
 msgstr "Plassering av horisontalt felt for forhåndsvisning av kontakter"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid "Position of the contact preview pane when oriented horizontally."
 msgstr ""
 "Posisjon for forhåndsvisningsområdet for kontakter med horisontal "
 "orientering."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid "Contact preview pane position (vertical)"
 msgstr "Plassering av vertikalt felt for forhåndsvisning av kontakter"
 
@@ -13401,16 +13301,16 @@
 msgstr "Om kart skal vises i forhåndsvisningsområdet."
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:194
-#: ../modules/mail/em-mailer-prefs.c:1067
+#: ../modules/addressbook/autocompletion-config.c:123
+#: ../modules/mail/em-mailer-prefs.c:1213
 msgid "_Table column:"
 msgstr "Kolonne i _tabell:"
 
-#: ../modules/addressbook/autocompletion-config.c:111
+#: ../modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "Autofullføring"
 
-#: ../modules/addressbook/autocompletion-config.c:212
+#: ../modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "Alltid vi_s adresse for automatisk fullført kontakt"
 
@@ -13420,303 +13320,305 @@
 msgid "On LDAP Servers"
 msgstr "På LDAP-tjenere"
 
-#: ../modules/addressbook/e-book-shell-backend.c:238
+#: ../modules/addressbook/e-book-shell-backend.c:268
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:240
-#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/addressbook/e-book-shell-backend.c:270
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:245
+#: ../modules/addressbook/e-book-shell-backend.c:275
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: ../modules/addressbook/e-book-shell-backend.c:247
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-backend.c:277
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
-#: ../modules/addressbook/e-book-shell-backend.c:255
+#: ../modules/addressbook/e-book-shell-backend.c:285
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Adresse_bok"
 
-#: ../modules/addressbook/e-book-shell-backend.c:257
-#: ../modules/addressbook/e-book-shell-view-actions.c:834
+#: ../modules/addressbook/e-book-shell-backend.c:287
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new address book"
 msgstr "Opprett en ny adressebok"
 
-#: ../modules/addressbook/e-book-shell-backend.c:285
+#: ../modules/addressbook/e-book-shell-backend.c:315
 msgid "Certificates"
 msgstr "Sertifikater"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:391
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:479
+#: ../modules/addressbook/e-book-shell-view-actions.c:775
 msgid "Save as vCard"
 msgstr "Lagre som vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:816
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pier alle kontakter til …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:813
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Kopier kontakter fra valgt adressebok til en annen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:823
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "D_elete Address Book"
 msgstr "Sl_ett adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Delete the selected address book"
 msgstr "Slett valgt adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "Mo_ve All Contacts To..."
 msgstr "Fl_ytt alle kontakter til …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:832
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "Move the contacts of the selected address book to another"
 msgstr "Flytt kontakter fra valgt adressebok til en annen"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:832
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Address Book"
 msgstr "_Ny adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "Address _Book Properties"
 msgstr "Egenskaper for adresse_bok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:846
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Show properties of the selected address book"
 msgstr "Vis egenskaper for valgt adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:846
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
 msgid "Address Book _Map"
 msgstr "Adressebok_kart"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:848
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
 msgid "Show map with all contacts from selected address book"
 msgstr "Vis kart med alle kontakter fra valgt adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:853
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
-#: ../modules/calendar/e-task-shell-view-actions.c:789
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/addressbook/e-book-shell-view-actions.c:931
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/mail/e-mail-shell-view-actions.c:1609
 msgid "_Rename..."
 msgstr "End_re navn …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
 msgid "Rename the selected address book"
 msgstr "Endre navn på valgt adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
 msgid "Stop loading"
 msgstr "Stopp lasting"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:945
 msgid "_Copy Contact To..."
 msgstr "_Kopier kontakt til …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
+#: ../modules/addressbook/e-book-shell-view-actions.c:947
 msgid "Copy selected contacts to another address book"
 msgstr "Kopier valgte kontakter til en annen adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/addressbook/e-book-shell-view-actions.c:952
 msgid "_Delete Contact"
 msgstr "_Slett kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../modules/addressbook/e-book-shell-view-actions.c:959
 msgid "_Find in Contact..."
 msgstr "_Finn i kontakt …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 msgid "Search for text in the displayed contact"
 msgstr "Søk etter tekst i innholdet av vist kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:893
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
 msgid "_Forward Contact..."
 msgstr "_Videresend kontakt …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:895
+#: ../modules/addressbook/e-book-shell-view-actions.c:968
 msgid "Send selected contacts to another person"
 msgstr "Send valgte kontakter til en annen person"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:900
+#: ../modules/addressbook/e-book-shell-view-actions.c:973
 msgid "_Move Contact To..."
 msgstr "_Flytt kontakt til …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/addressbook/e-book-shell-view-actions.c:975
 msgid "Move selected contacts to another address book"
 msgstr "Flytt valgte kontakter til en annen adressebok"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/addressbook/e-book-shell-view-actions.c:980
 msgid "_New Contact..."
 msgstr "_Ny kontakt …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-view-actions.c:987
 msgid "New Contact _List..."
 msgstr "Ny kontakt_liste …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:994
 msgid "_Open Contact"
 msgstr "_Åpne kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "View the current contact"
 msgstr "Vis aktiv kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:928
+#: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Send Message to Contact..."
 msgstr "_Send melding til kontakt …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:1003
 msgid "Send a message to the selected contacts"
 msgstr "Send en melding til valgte kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
-#: ../modules/calendar/e-task-shell-view-actions.c:822
+#: ../modules/addressbook/e-book-shell-view-actions.c:1010
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
-#: ../modules/calendar/e-memo-shell-view-actions.c:677
-#: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1429
+#: ../modules/addressbook/e-book-shell-view-actions.c:1017
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
+#: ../modules/calendar/e-task-shell-view-actions.c:832
+#: ../modules/mail/e-mail-shell-view-actions.c:1774
 msgid "_Preview"
 msgstr "_Forhåndsvis"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
-#: ../modules/calendar/e-cal-shell-view-actions.c:1621
-#: ../modules/calendar/e-memo-shell-view-actions.c:715
-#: ../modules/calendar/e-task-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:1026
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:693
+#: ../modules/calendar/e-task-shell-view-actions.c:845
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:952
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/mail/e-mail-shell-view-actions.c:1525
 msgid "_Properties"
 msgstr "Egenska_per …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:1038
 msgid "Address Book Map"
 msgstr "Adressebokkart"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:993
+#: ../modules/addressbook/e-book-shell-view-actions.c:1070
 msgid "Contact _Preview"
 msgstr "_Forhåndsvisning av kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:1072
 msgid "Show contact preview window"
 msgstr "Vis vindu for forhåndsvisning av kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:996
+#: ../modules/addressbook/e-book-shell-view-actions.c:1078
 msgid "Show _Maps"
 msgstr "Vis _kart"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:998
+#: ../modules/addressbook/e-book-shell-view-actions.c:1080
 msgid "Show maps in contact preview window"
 msgstr "Vis kart i forhåndsvisning av kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
-#: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1548
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/mail/e-mail-shell-view-actions.c:1904
 msgid "_Classic View"
 msgstr "_Klassisk visning"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1024
+#: ../modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "Show contact preview below the contact list"
 msgstr "Vis forhåndsvisning av kontakt under kontaktlisten"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1029
-#: ../modules/calendar/e-memo-shell-view-actions.c:754
-#: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../modules/addressbook/e-book-shell-view-actions.c:1106
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/mail/e-mail-shell-view-actions.c:1911
 msgid "_Vertical View"
 msgstr "_Vertikal visning"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1031
+#: ../modules/addressbook/e-book-shell-view-actions.c:1108
 msgid "Show contact preview alongside the contact list"
 msgstr "Vis forhåndsvisning av kontakt ved siden av kontaktlisten"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../e-util/e-name-selector-dialog.c:368
+#: ../e-util/e-name-selector-dialog.c:1276
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:938
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1041
-#: ../modules/calendar/e-cal-shell-view-actions.c:1781
-#: ../modules/calendar/e-memo-shell-view-actions.c:796
-#: ../modules/calendar/e-task-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:1123
+#: ../modules/calendar/e-cal-shell-view-actions.c:1754
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1056
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
-#: ../shell/e-shell-content.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:1133
+#: ../modules/calendar/e-cal-shell-view-actions.c:1764
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:1980
+#: ../shell/e-shell-content.c:658
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1089
+#: ../modules/addressbook/e-book-shell-view-actions.c:1166
 msgid "Print all shown contacts"
 msgstr "Skriv ut alle viste kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1096
+#: ../modules/addressbook/e-book-shell-view-actions.c:1173
 msgid "Preview the contacts to be printed"
 msgstr "Forhåndsvis kontaktene som skal skrives ut"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1103
+#: ../modules/addressbook/e-book-shell-view-actions.c:1180
 msgid "Print selected contacts"
 msgstr "Skriv ut valgte kontakter"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1118
+#: ../modules/addressbook/e-book-shell-view-actions.c:1195
 msgid "S_ave Address Book as vCard"
 msgstr "L_agre adressebok som vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1120
+#: ../modules/addressbook/e-book-shell-view-actions.c:1197
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Lagre kontakter i valgt adressebok som vCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1126
-#: ../modules/addressbook/e-book-shell-view-actions.c:1136
+#: ../modules/addressbook/e-book-shell-view-actions.c:1203
+#: ../modules/addressbook/e-book-shell-view-actions.c:1213
 msgid "_Save as vCard..."
 msgstr "Lagre _som vCard …"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1128
+#: ../modules/addressbook/e-book-shell-view-actions.c:1205
 msgid "Save selected contacts as a vCard"
 msgstr "Lagre valgte kontakter som et vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:312
 msgid "_Forward Contacts"
 msgstr "_Videresend kontakter"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:314
 msgid "_Forward Contact"
 msgstr "_Videresend kontakt"
 
-#: ../modules/addressbook/e-book-shell-view.c:379
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Send Message to Contacts"
 msgstr "_Send melding til kontakter"
 
-#: ../modules/addressbook/e-book-shell-view.c:381
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Send Message to List"
 msgstr "_Send melding til liste"
 
-#: ../modules/addressbook/e-book-shell-view.c:383
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Send Message to Contact"
 msgstr "_Send melding til kontakt"
 
@@ -13744,13 +13646,11 @@
 msgid "Anonymously"
 msgstr "Anonymt"
 
-#: ../modules/addressbook/ldap-config.ui.h:5
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:680
 msgid "Using email address"
 msgstr "Bruker e-postadresse"
 
-#: ../modules/addressbook/ldap-config.ui.h:6
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid "Using distinguished name (DN)"
 msgstr "Bruk distinguished name (DN)"
 
@@ -13831,38 +13731,36 @@
 msgid "B_rowse this book until limit reached"
 msgstr "B_la gjennom denne boken til grensen nås"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:149
+#: ../modules/bogofilter/evolution-bogofilter.c:145
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Klarte ikke å starte Bogofilter (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:167
+#: ../modules/bogofilter/evolution-bogofilter.c:163
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Klarte ikke å sende innhold i e-postmelding til Bogofilter: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:216
+#: ../modules/bogofilter/evolution-bogofilter.c:212
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter krasjet eller klarte ikke å prosessere en e-postmelding"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:311
+#: ../modules/bogofilter/evolution-bogofilter.c:308
 msgid "Bogofilter Options"
 msgstr "Alternativer for Bogofilter"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:327
+#: ../modules/bogofilter/evolution-bogofilter.c:317
 msgid "Convert message text to _Unicode"
 msgstr "Konverter tekst i meldinger til _Unicode"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:483
+#: ../modules/bogofilter/evolution-bogofilter.c:474
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Konverter meldinger til Unicode"
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
 msgid ""
 "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
 "different character sets."
@@ -13870,117 +13768,117 @@
 "Konverter meldingstekst til Unicode UTF-8 for å gjøre innsamling av "
 "egenskaper for uønskede meldinger mer enhetlig."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Minutes"
 msgstr "Minutter"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Hours"
 msgstr "Timer"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Days"
 msgstr "Dager"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "60 minutes"
 msgstr "60 minutter"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "30 minutes"
 msgstr "30 minutter"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "15 minutes"
 msgstr "15 minutter"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "10 minutes"
 msgstr "10 minutter"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
 msgid "05 minutes"
 msgstr "05 minutter"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
-#: ../widgets/misc/e-dateedit.c:595
+#: ../e-util/e-dateedit.c:627
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Tid"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Se_cond zone:"
 msgstr "Se_kundær sone:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "(Shown in a Day View)"
 msgstr "(Vises i dagvisning)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "Bruk s_ystemets tidssone"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "Work Week"
 msgstr "Arbeidsuke"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Wee_k starts on:"
 msgstr "Uk_en starter på:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Work days:"
 msgstr "Arbeidsdager:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "_Day begins:"
 msgstr "_Dagen begynner:"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
 msgid "_Mon"
 msgstr "_Ma."
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "_Ti."
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "_On."
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "T_o."
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "_Fr."
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "L_ø."
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "S_ø."
 
@@ -14083,7 +13981,6 @@
 msgstr "Publiserer informasjon"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Primary calendar"
 msgstr "Primær kalender"
 
@@ -14105,8 +14002,7 @@
 "Den forvalgte tidssonen å bruke for datoer og tidspunkt i kalenderen som en "
 "uoversatt Olsen tidssonedatabaseplassering som «America/New York»."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Use system timezone"
 msgstr "Bruk systemets tidssone"
 
@@ -14117,7 +14013,6 @@
 "Bruk systemets tidssone i stedet for tidssonen som er valgt i Evolution."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "The second timezone for a Day View"
 msgstr "Sekundær tidssone for dagvisning"
 
@@ -14130,7 +14025,6 @@
 "som brukes i nøkkelen «tidssone»."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid "Recently used second time zones in a Day View"
 msgstr "Sist brukte sekundærtidssoner i en dagvisning"
 
@@ -14311,7 +14205,6 @@
 "Plassering av vertikalt felt mellom kalenderlisten og minikalenderen."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Memo layout style"
 msgstr "Stil for utforming av notat"
 
@@ -14322,8 +14215,7 @@
 "list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Show the memo preview pane"
 msgstr "Vis forhåndsvisningsvinduet for notat"
 
@@ -14332,7 +14224,6 @@
 msgstr "Vis forhåndsvisningsområdet for notater i hovedvinduet hvis «true»."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Memo preview pane position (horizontal)"
 msgstr "Posisjon for forhåndsvisningsområde for notater (horisontal)"
 
@@ -14343,7 +14234,6 @@
 "orientering."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid "Memo preview pane position (vertical)"
 msgstr "Plassering av vertikalt felt for forhåndsvisning"
 
@@ -14352,8 +14242,7 @@
 msgstr ""
 "Posisjon for forhåndsvisningsområdet for notater med vertikal orientering."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid "Task layout style"
 msgstr "Stil for utforming av oppgaver"
 
@@ -14364,8 +14253,7 @@
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Show the task preview pane"
 msgstr "Vis forhåndsvisningsområdet for oppgave"
 
@@ -14373,13 +14261,11 @@
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "Vis forhåndsvisningsområdet for oppgaver i hovedvinduet hvis «true»."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Task preview pane position (horizontal)"
 msgstr "Posisjon for forhåndsvisning av oppgaver (horisontal)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Task preview pane position (vertical)"
 msgstr "Posisjon for forhåndsvisning av oppgaver (vertikal)"
 
@@ -14457,7 +14343,6 @@
 "venstre."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
 msgid "Primary memo list"
 msgstr "Primær notatliste"
 
@@ -14468,7 +14353,6 @@
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
 msgid "Primary task list"
 msgstr "Primær oppgaveliste"
 
@@ -14594,8 +14478,7 @@
 msgstr ""
 "Enhet for forvalgt påminnelse for jubileum. «minutes», «hours», eller «days»."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "Vis ukenummer i dagvisning, arbeidsukevisning og datonavigator"
 
@@ -14677,23 +14560,23 @@
 "feilsøkingsmeldinger."
 
 #: ../modules/calendar/e-cal-attachment-handler.c:320
-#: ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "I_mporter"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:401
+#: ../modules/calendar/e-cal-attachment-handler.c:406
 msgid "Select a Calendar"
 msgstr "Velg en kalender"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:428
+#: ../modules/calendar/e-cal-attachment-handler.c:433
 msgid "Select a Task List"
 msgstr "Velg en oppgaveliste"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:438
+#: ../modules/calendar/e-cal-attachment-handler.c:443
 msgid "I_mport to Calendar"
 msgstr "I_mporter til kalenderen"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:445
+#: ../modules/calendar/e-cal-attachment-handler.c:450
 msgid "I_mport to Tasks"
 msgstr "I_mporter til oppgaver"
 
@@ -14701,11 +14584,11 @@
 msgid "Selected Calendars for Reminders"
 msgstr "Kalendere valgt for påminnelse"
 
-#: ../modules/calendar/e-calendar-preferences.c:829
+#: ../modules/calendar/e-calendar-preferences.c:925
 msgid "Ti_me and date:"
 msgstr "T_id og dato:"
 
-#: ../modules/calendar/e-calendar-preferences.c:892
+#: ../modules/calendar/e-calendar-preferences.c:926
 msgid "_Date only:"
 msgstr "Kun _dato:"
 
@@ -14729,45 +14612,45 @@
 msgid "Birthdays & Anniversaries"
 msgstr "Fødselsdager og jubileum"
 
-#: ../modules/calendar/e-cal-shell-backend.c:287
+#: ../modules/calendar/e-cal-shell-backend.c:322
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Avtale"
 
-#: ../modules/calendar/e-cal-shell-backend.c:289
-#: ../modules/calendar/e-cal-shell-view-actions.c:1548
+#: ../modules/calendar/e-cal-shell-backend.c:324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1521
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: ../modules/calendar/e-cal-shell-backend.c:294
+#: ../modules/calendar/e-cal-shell-backend.c:329
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Avtale for hele _dagen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:296
+#: ../modules/calendar/e-cal-shell-backend.c:331
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:301
+#: ../modules/calendar/e-cal-shell-backend.c:336
 msgctxt "New"
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: ../modules/calendar/e-cal-shell-backend.c:303
+#: ../modules/calendar/e-cal-shell-backend.c:338
 msgid "Create a new meeting request"
 msgstr "Opprett en ny møteforespørsel"
 
-#: ../modules/calendar/e-cal-shell-backend.c:311
+#: ../modules/calendar/e-cal-shell-backend.c:346
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../modules/calendar/e-cal-shell-backend.c:313
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-backend.c:348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
-#: ../modules/calendar/e-cal-shell-backend.c:632
+#: ../modules/calendar/e-cal-shell-backend.c:703
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
@@ -14779,7 +14662,7 @@
 msgid "_New Calendar..."
 msgstr "_Ny kalender …"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:778
+#: ../modules/calendar/e-cal-shell-sidebar.c:591
 msgid "Calendar Selector"
 msgstr "Kalendervelger"
 
@@ -14789,13 +14672,12 @@
 msgid "Opening calendar at %s"
 msgstr "Åpner kalender på %s"
 
-#: ../mail/e-mail-printer.c:549
-#: ../modules/calendar/e-cal-shell-view-actions.c:217
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:322
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -14806,305 +14688,306 @@
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:340
+#: ../modules/calendar/e-cal-shell-view-actions.c:339
 msgid "Purge events older than"
 msgstr "Slett hendelser eldre enn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:564
+#: ../modules/calendar/e-cal-shell-view-actions.c:585
 msgid "Copying Items"
 msgstr "Kopierer oppføringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:848
+#: ../modules/calendar/e-cal-shell-view-actions.c:878
 msgid "Moving Items"
 msgstr "Flytter oppføringer"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1218
+#: ../modules/calendar/e-cal-shell-view-actions.c:1211
 msgid "event"
 msgstr "hendelse"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1177
-#: ../modules/calendar/e-cal-shell-view-memopad.c:219
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1213
+#: ../modules/calendar/e-cal-shell-view-memopad.c:231
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:527
+#: ../modules/calendar/e-task-shell-view-actions.c:644
 msgid "Save as iCalendar"
 msgstr "Lagre som iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
-#: ../modules/calendar/e-memo-shell-view-actions.c:630
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "_Copy..."
 msgstr "_Kopier …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "D_elete Calendar"
 msgstr "Sl_ett kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Delete the selected calendar"
 msgstr "Slett valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1367
 msgid "Go Back"
 msgstr "Gå tilbake"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1374
 msgid "Go Forward"
 msgstr "Gå fremover"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1381
 msgid "Select today"
 msgstr "Velg i dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Select _Date"
 msgstr "Velg _dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1388
 msgid "Select a specific date"
 msgstr "Velg en spesifikk dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "Purg_e"
 msgstr "Fj_ern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Purge old appointments and meetings"
 msgstr "Fjern gamle avtaler og møter"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Re_fresh"
 msgstr "O_ppdater"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1416
 msgid "Refresh the selected calendar"
 msgstr "Oppdater valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Rename the selected calendar"
 msgstr "Endre navn på valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Show _Only This Calendar"
 msgstr "Vis k_un denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "_Delegate Meeting..."
 msgstr "_Deleger møte …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "_Delete Appointment"
 msgstr "_Slett avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1472
 msgid "Delete selected appointments"
 msgstr "Slett valgte avtaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
 msgid "Delete This _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "Delete this occurrence"
 msgstr "Slett denne oppføringen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Delete All Occ_urrences"
 msgstr "Slett alle oppf_øringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Delete all occurrences"
 msgstr "Slett alle oppføringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "New All Day _Event..."
 msgstr "Ny avtale som varer h_ele dagen …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Create a new all day event"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
-#: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1505
 msgid "New _Meeting..."
 msgstr "Nytt _møte …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1507
 msgid "Create a new meeting"
 msgstr "Lag et nytt møte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1512
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 msgid "New _Appointment..."
 msgstr "Ny _avtale …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1489
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 msgid "Make this Occurrence _Movable"
 msgstr "Gjør denne hendelsen _flyttbar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1533
 msgid "_Open Appointment"
 msgstr "_Åpne avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
 msgid "View the current appointment"
 msgstr "Vis denne avtalen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1554
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "Converts an appointment to a meeting"
 msgstr "Konverter en avtale til et møte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1561
 msgid "Conv_ert to Appointment..."
 msgstr "Konv_erter til avtale …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1563
 msgid "Converts a meeting to an appointment"
 msgstr "Konverterer et møte til en avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
 msgid "Day"
 msgstr "Dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1690
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-cal-shell-view-actions.c:1697
 msgid "Show as list"
 msgstr "Vis som liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
 msgid "Month"
 msgstr "Måned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-cal-shell-view-actions.c:1704
 msgid "Show one month"
 msgstr "Vis en måned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+#: ../modules/calendar/e-cal-shell-view-actions.c:1709
 msgid "Week"
 msgstr "Uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-cal-shell-view-actions.c:1711
 msgid "Show one week"
 msgstr "Vis en uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+#: ../modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Show one work week"
 msgstr "Vis en arbeidsuke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-cal-shell-view-actions.c:1726
 msgid "Active Appointments"
 msgstr "Aktive avtaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
 msgid "Next 7 Days' Appointments"
 msgstr "Avtaler for de neste 7 dagene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:994
+#: ../modules/calendar/e-cal-shell-view-actions.c:1778
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:997
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1812
-#: ../modules/calendar/e-memo-shell-view-actions.c:827
-#: ../modules/calendar/e-task-shell-view-actions.c:1026
+#: ../modules/calendar/e-cal-shell-view-actions.c:1785
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1797
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1804
 msgid "Preview the calendar to be printed"
 msgstr "Forhåndsvis kalenderen som skal skrives ut"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1853
+#: ../modules/calendar/e-cal-shell-view-actions.c:1826
 #: ../modules/calendar/e-cal-shell-view-memopad.c:306
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:393
-#: ../modules/calendar/e-memo-shell-view-actions.c:868
-#: ../modules/calendar/e-task-shell-view-actions.c:1067
+#: ../modules/calendar/e-memo-shell-view-actions.c:846
+#: ../modules/calendar/e-task-shell-view-actions.c:1045
 msgid "_Save as iCalendar..."
 msgstr "_Lagre som iCalendar …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1866
+#: ../modules/calendar/e-cal-shell-view-actions.c:1903
 msgid "Go To"
 msgstr "Gå til"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:217
-#: ../modules/calendar/e-memo-shell-view-actions.c:522
+#: ../modules/calendar/e-cal-shell-view-memopad.c:229
+#: ../modules/calendar/e-memo-shell-view-actions.c:525
 msgid "memo"
 msgstr "notat"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
 msgid "New _Memo"
 msgstr "Nytt _notat"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../modules/calendar/e-memo-shell-backend.c:300
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-memo-shell-backend.c:219
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
 msgid "Create a new memo"
 msgstr "Lag et nytt notat"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:686
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
 msgid "_Open Memo"
 msgstr "_Åpne notat"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:269
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-cal-shell-view-memopad.c:281
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
 msgid "View the selected memo"
 msgstr "Vis valgt notat"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-memo-shell-view-actions.c:668
-#: ../modules/calendar/e-task-shell-view-actions.c:806
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "Open _Web Page"
 msgstr "_Åpne nettside"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
+#: ../modules/calendar/e-cal-shell-view-memopad.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:831
 msgid "Print the selected memo"
 msgstr "Skriv ut valgt notat"
 
@@ -15112,90 +14995,90 @@
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:284
-#: ../modules/calendar/e-task-shell-view-actions.c:639
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
+#: ../modules/calendar/e-task-shell-view-actions.c:642
 msgid "task"
 msgstr "oppgave"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-task-shell-view-actions.c:704
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "_Mark as Complete"
 msgstr "_Merk som fullført"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Mark selected tasks as complete"
 msgstr "Merk valgte oppgaver som fullført"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
 msgid "_Mark as Incomplete"
 msgstr "_Merk som ikke fullført"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:790
 msgid "Mark selected tasks as incomplete"
 msgstr "Merk valgte oppgaver som ikke fullført"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "New _Task"
 msgstr "Ny _oppgave"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
-#: ../modules/calendar/e-task-shell-backend.c:299
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-task-shell-backend.c:216
+#: ../modules/calendar/e-task-shell-view-actions.c:797
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Open Task"
 msgstr "_Åpne oppgave"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
+#: ../modules/calendar/e-task-shell-view-actions.c:804
 msgid "View the selected task"
 msgstr "Vis valgt oppgave"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:385
+#: ../modules/calendar/e-task-shell-view-actions.c:1030
 msgid "Print the selected task"
 msgstr "Skriv ut valgt oppgave"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-backend.c:217
 msgctxt "New"
 msgid "Mem_o"
 msgstr "N_otat"
 
-#: ../modules/calendar/e-memo-shell-backend.c:315
+#: ../modules/calendar/e-memo-shell-backend.c:224
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Delt notat"
 
-#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-backend.c:226
 msgid "Create a new shared memo"
 msgstr "Lag et nytt delt notat"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:234
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Notatli_ste"
 
-#: ../modules/calendar/e-memo-shell-backend.c:221
-#: ../modules/calendar/e-memo-shell-view-actions.c:646
+#: ../modules/calendar/e-memo-shell-backend.c:236
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
 msgid "Create a new memo list"
 msgstr "Lag en ny notatliste"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:179
+#: ../modules/calendar/e-memo-shell-sidebar.c:206
 msgid "Loading memos"
 msgstr "Laster notater"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:663
+#: ../modules/calendar/e-memo-shell-sidebar.c:547
 msgid "Memo List Selector"
 msgstr "Valgt av notatliste"
 
@@ -15205,121 +15088,121 @@
 msgid "Opening memos at %s"
 msgstr "Åpner notat på %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:231
-#: ../modules/calendar/e-memo-shell-view-actions.c:246
+#: ../modules/calendar/e-memo-shell-view-actions.c:212
+#: ../modules/calendar/e-memo-shell-view-actions.c:227
 msgid "Print Memos"
 msgstr "Skriv ut notater"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "_Delete Memo"
 msgstr "_Slett notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "_Find in Memo..."
 msgstr "_Finn i notat …"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:596
 msgid "Search for text in the displayed memo"
 msgstr "Søk etter tekst i kroppen av vist notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "D_elete Memo List"
 msgstr "Sl_ett notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Delete the selected memo list"
 msgstr "Slett valgt notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "_New Memo List"
 msgstr "_Ny notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
 msgid "Refresh the selected memo list"
 msgstr "Oppdater valgt notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 msgid "Rename the selected memo list"
 msgstr "Endre navn på valgt notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-memo-shell-view-actions.c:650
 msgid "Show _Only This Memo List"
 msgstr "Vis k_un denne notatlisten"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Memo _Preview"
 msgstr "_Forhåndsvisning av notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:731
 msgid "Show memo preview pane"
 msgstr "Vis forhåndsvisningsområde for notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:749
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview below the memo list"
 msgstr "Vis forhåndsvisning av notat under notatlisten"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:756
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Show memo preview alongside the memo list"
 msgstr "Vis forhåndsvisning av notat ved siden av notatlisten"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
 msgid "Print the list of memos"
 msgstr "Skriv ut denne listen med notater"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
 msgid "Preview the list of memos to be printed"
 msgstr "Forhåndsvis listen med notater som skal skrives ut"
 
-#: ../modules/calendar/e-memo-shell-view.c:227
+#: ../modules/calendar/e-memo-shell-view.c:239
 msgid "Delete Memos"
 msgstr "Slett notater"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:241
 msgid "Delete Memo"
 msgstr "Slett notat"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
+#: ../modules/calendar/e-memo-shell-view-private.c:538
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d notat"
 msgstr[1] "%d notater"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:609
+#: ../modules/calendar/e-memo-shell-view-private.c:542
+#: ../modules/calendar/e-task-shell-view-private.c:746
 #, c-format
 msgid "%d selected"
 msgstr "%d valgt"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-backend.c:214
 msgctxt "New"
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../modules/calendar/e-task-shell-backend.c:304
+#: ../modules/calendar/e-task-shell-backend.c:221
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Til_delt oppgave"
 
-#: ../modules/calendar/e-task-shell-backend.c:306
+#: ../modules/calendar/e-task-shell-backend.c:223
 msgid "Create a new assigned task"
 msgstr "Opprett en ny tildelt oppgave"
 
-#: ../modules/calendar/e-task-shell-backend.c:320
+#: ../modules/calendar/e-task-shell-backend.c:231
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "_Oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-backend.c:316
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-backend.c:233
+#: ../modules/calendar/e-task-shell-view-actions.c:748
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:179
+#: ../modules/calendar/e-task-shell-sidebar.c:206
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:703
+#: ../modules/calendar/e-task-shell-sidebar.c:547
 msgid "Task List Selector"
 msgstr "Valg av oppgaveliste"
 
@@ -15329,12 +15212,12 @@
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:254
-#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view-actions.c:250
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:583
+#: ../modules/calendar/e-task-shell-view-actions.c:586
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15346,126 +15229,126 @@
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:590
+#: ../modules/calendar/e-task-shell-view-actions.c:593
 msgid "Do not ask me again"
 msgstr "Ikke spør meg igjen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:711
 msgid "_Delete Task"
 msgstr "_Slett oppgave"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "_Find in Task..."
 msgstr "_Finn i oppgave …"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:720
 msgid "Search for text in the displayed task"
 msgstr "Søk etter tekst i vist oppgave"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "Copy..."
 msgstr "Kopier …"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "D_elete Task List"
 msgstr "Sl_ett oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "Delete the selected task list"
 msgstr "Slett valgt oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "_New Task List"
 msgstr "_Ny oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "Refresh the selected task list"
 msgstr "Oppdater valgt oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "Rename the selected task list"
 msgstr "Endre navn på valgt oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Show _Only This Task List"
 msgstr "Vis k_un denne oppgavelisten"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "Mar_k as Incomplete"
 msgstr "Merk som _ikke fullført"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-task-shell-view-actions.c:818
 msgid "Delete completed tasks"
 msgstr "Slett fullførte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Task _Preview"
 msgstr "Forhåndsvisning av _oppgave"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:917
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Show task preview pane"
 msgstr "Vis forhåndsvisningsområde for oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:913
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview below the task list"
 msgstr "Vis forhåndsvisning av oppgave under oppgavelisten"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:920
+#: ../modules/calendar/e-task-shell-view-actions.c:923
 msgid "Show task preview alongside the task list"
 msgstr "Vis forhåndsvisning av oppgave ved siden av oppgavelisten"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:953
+#: ../modules/calendar/e-task-shell-view-actions.c:931
 msgid "Active Tasks"
 msgstr "Aktive oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/calendar/e-task-shell-view-actions.c:945
 msgid "Completed Tasks"
 msgstr "Fullførte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:974
+#: ../modules/calendar/e-task-shell-view-actions.c:952
 msgid "Next 7 Days' Tasks"
 msgstr "Oppgaver for de neste 7 dagene"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Overdue Tasks"
 msgstr "Utgåtte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Tasks with Attachments"
 msgstr "Oppgaver med vedlegg"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-task-shell-view-actions.c:1016
 msgid "Print the list of tasks"
 msgstr "Skriv ut denne listen over oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#: ../modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Preview the list of tasks to be printed"
 msgstr "Forhåndsvis listen over oppgaver som skal skrives ut"
 
-#: ../modules/calendar/e-task-shell-view.c:362
+#: ../modules/calendar/e-task-shell-view.c:374
 msgid "Delete Tasks"
 msgstr "Slett oppgaver"
 
-#: ../modules/calendar/e-task-shell-view.c:364
+#: ../modules/calendar/e-task-shell-view.c:376
 msgid "Delete Task"
 msgstr "Slett oppgave"
 
-#: ../modules/calendar/e-task-shell-view-private.c:472
+#: ../modules/calendar/e-task-shell-view-private.c:631
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: ../modules/calendar/e-task-shell-view-private.c:579
+#: ../modules/calendar/e-task-shell-view-private.c:742
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: ../modules/mail/em-account-prefs.c:219
+#: ../mail/e-mail-config-assistant.c:562
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: ../modules/mail/em-account-prefs.c:268
+#: ../mail/e-mail-config-window.c:327
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
@@ -15475,306 +15358,307 @@
 msgid "%d attached messages"
 msgstr "%d vedlagte meldinger"
 
-#: ../modules/mail/e-mail-shell-backend.c:230
+#: ../modules/mail/e-mail-shell-backend.c:237
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "E-post_melding"
 
-#: ../modules/mail/e-mail-shell-backend.c:246
+#: ../modules/mail/e-mail-shell-backend.c:239
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: ../modules/mail/e-mail-shell-backend.c:247
+#: ../modules/mail/e-mail-shell-backend.c:254
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-post_mappe"
 
-#: ../modules/mail/e-mail-shell-backend.c:249
+#: ../modules/mail/e-mail-shell-backend.c:256
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: ../modules/mail/e-mail-shell-backend.c:412
+#: ../modules/mail/e-mail-shell-backend.c:551
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: ../modules/mail/e-mail-shell-backend.c:420
+#: ../modules/mail/e-mail-shell-backend.c:560
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: ../modules/mail/e-mail-shell-backend.c:428
+#: ../modules/mail/e-mail-shell-backend.c:569
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
-#: ../modules/mail/e-mail-shell-backend.c:436
+#: ../modules/mail/e-mail-shell-backend.c:578
 msgid "Network Preferences"
 msgstr "Brukervalg for nettverk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
-#: ../modules/mail/e-mail-shell-view.c:947
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
 msgid "_Disable Account"
 msgstr "_Deaktiver konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1513
 msgid "Disable this account"
 msgstr "Deaktiver denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1520
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1539
 msgid "_Download Messages for Offline Usage"
 msgstr "Last ne_d meldinger for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1541
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Last ned meldinger fra kontoer og mapper som er merket for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1546
 msgid "Fl_ush Outbox"
 msgstr "T_øm utboks"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1553
 msgid "_Copy Folder To..."
 msgstr "_Kopier mappe til …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "Copy the selected folder into another folder"
 msgstr "Kopier valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1562
 msgid "Permanently remove this folder"
 msgstr "Fjern denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1567
 msgid "E_xpunge"
 msgstr "T_øm"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1569
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1574
+#: ../modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_k alle meldinger som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1238
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
+#: ../modules/mail/e-mail-shell-view-actions.c:1676
 msgid "Mark all messages in the folder as read"
 msgstr "Merk alle meldinger i en mappe som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
 msgid "_Move Folder To..."
 msgstr "Flytt _mappe til …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Move the selected folder into another folder"
 msgstr "Flytt valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1250
+#: ../modules/mail/e-mail-shell-view-actions.c:1588
 msgid "_New..."
 msgstr "_Ny …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
 msgid "Create a new folder for storing mail"
 msgstr "Lag en ny mappe for lagring av meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1604
 msgid "Refresh the folder"
 msgstr "Oppdater mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1611
 msgid "Change the name of this folder"
 msgstr "Endre navn på denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1616
 msgid "Select Message _Thread"
 msgstr "Velg meldings_tråd"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1326
+#: ../modules/mail/e-mail-shell-view-actions.c:1618
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Velg alle meldinger i samme tråd som den valgte meldingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Select Message S_ubthread"
 msgstr "Velg _undertråd for melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1625
 msgid "Select all replies to the currently selected message"
 msgstr "Velg alle svar til den valgt melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1637
 msgid "Empty _Trash"
 msgstr "Tøm _papirkurven"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Fjern alle slettede meldinger fra alle kontoer permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1644
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "N_one"
 msgstr "_Ingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1375
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
 msgid "_Manage Subscriptions"
 msgstr "_Håndter abonnement"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../modules/mail/e-mail-shell-view-actions.c:1669
+#: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonner eller fjern abonnement på mapper på eksterne tjenere"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../modules/mail/e-mail-shell-view-actions.c:1681
+#: ../modules/mail/e-mail-shell-view-actions.c:1702
 msgid "Send / _Receive"
 msgstr "Send / _motta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1683
 msgid "Send queued items and retrieve new items"
 msgstr "Send kølagte oppføringer og hent nye oppføringer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/mail/e-mail-shell-view-actions.c:1688
 msgid "R_eceive All"
 msgstr "Motta all_e"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1690
 msgid "Receive new items from all accounts"
 msgstr "Motta nye oppføringer fra alle kontoer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1396
+#: ../modules/mail/e-mail-shell-view-actions.c:1695
 msgid "_Send All"
 msgstr "_Send alle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1398
+#: ../modules/mail/e-mail-shell-view-actions.c:1697
 msgid "Send queued items in all accounts"
 msgstr "Send kølagte oppføringer i alle kontoer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
-#: ../widgets/misc/e-activity-proxy.c:310
+#: ../e-util/e-activity-proxy.c:311
+#: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1385
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "Collapse All _Threads"
 msgstr "Slå sammen alle _tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1387
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Collapse all message threads"
 msgstr "Slå sammen alle meldingstråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1392
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "E_xpand All Threads"
 msgstr "Ut_vid alle tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Expand all message threads"
 msgstr "Utvid alle meldingstråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "_Message Filters"
 msgstr "_Meldingsfiltre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Create or edit rules for filtering new mail"
 msgstr "Opprett eller rediger regler for filtrering av ny e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1406
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Subscriptions..."
 msgstr "_Abonnement …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1415
+#: ../modules/mail/e-mail-shell-view-actions.c:1760
 msgid "F_older"
 msgstr "M_appe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1767
 msgid "_Label"
 msgstr "_Etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1367
+#: ../modules/mail/e-mail-shell-view-actions.c:1784
 msgid "C_reate Search Folder From Search..."
 msgstr "Opp_rett søkemappe fra søk …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1492
+#: ../modules/mail/e-mail-shell-view-actions.c:1791
 msgid "Search F_olders"
 msgstr "Søk i _mapper"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1448
+#: ../modules/mail/e-mail-shell-view-actions.c:1793
 msgid "Create or edit search folder definitions"
 msgstr "Opprett eller rediger søkemappedefinisjoner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1832
 msgid "_New Folder..."
 msgstr "_Ny mappe …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Show Message _Preview"
 msgstr "Vis _forhåndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1862
 msgid "Show message preview pane"
 msgstr "Vis område for forhåndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1868
 msgid "Show _Deleted Messages"
 msgstr "Vis slette_de meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1870
 msgid "Show deleted messages with a line through them"
 msgstr "Vis slettede meldinger som gjennomstreket i meldingslisten."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1527
+#: ../modules/mail/e-mail-shell-view-actions.c:1876
 msgid "_Group By Threads"
 msgstr "_Grupper etter tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1878
 msgid "Threaded message list"
 msgstr "Meldingsliste med tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1906
 msgid "Show message preview below the message list"
 msgstr "Vis meldingen under meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1913
 msgid "Show message preview alongside the message list"
 msgstr "Vis meldingen ved siden av meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1489
+#: ../modules/mail/e-mail-shell-view-actions.c:1921
 msgid "All Messages"
 msgstr "Alle meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1496
+#: ../modules/mail/e-mail-shell-view-actions.c:1928
 msgid "Important Messages"
 msgstr "Viktige meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1503
+#: ../modules/mail/e-mail-shell-view-actions.c:1935
 msgid "Last 5 Days' Messages"
 msgstr "Meldinger fra de siste 5 dagene"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-shell-view-actions.c:1942
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uønsket e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1517
+#: ../modules/mail/e-mail-shell-view-actions.c:1949
 msgid "Messages with Attachments"
 msgstr "Meldinger med vedlegg"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1524
+#: ../modules/mail/e-mail-shell-view-actions.c:1956
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1531
+#: ../modules/mail/e-mail-shell-view-actions.c:1963
 msgid "Read Messages"
 msgstr "Leste meldinger"
 
@@ -15782,31 +15666,31 @@
 msgid "Recent Messages"
 msgstr "Nye meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1970
 msgid "Unread Messages"
 msgstr "Uleste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1719
+#: ../modules/mail/e-mail-shell-view-actions.c:2022
 msgid "Subject or Addresses contain"
 msgstr "Emne eller adresser inneholder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1683
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
 msgid "All Accounts"
 msgstr "Alle konti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1736
+#: ../modules/mail/e-mail-shell-view-actions.c:2039
 msgid "Current Account"
 msgstr "Denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1697
+#: ../modules/mail/e-mail-shell-view-actions.c:2046
 msgid "Current Folder"
 msgstr "Denne mappen"
 
-#: ../modules/mail/e-mail-shell-view.c:613
+#: ../modules/mail/e-mail-shell-view.c:630
 msgid "All Account Search"
 msgstr "Søk i alle konti"
 
-#: ../modules/mail/e-mail-shell-view.c:736
+#: ../modules/mail/e-mail-shell-view.c:734
 msgid "Account Search"
 msgstr "Søk i konto"
 
@@ -15814,79 +15698,80 @@
 msgid "Proxy _Logout"
 msgstr "_Logg ut proxy"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1028
+#: ../modules/mail/e-mail-shell-view-private.c:988
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valgt, "
 msgstr[1] "%d valgt, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../modules/mail/e-mail-shell-view-private.c:997
+#: ../modules/mail/e-mail-shell-view-private.c:1014
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1045
-#: ../modules/mail/e-mail-shell-view-private.c:1052
+#: ../modules/mail/e-mail-shell-view-private.c:1023
+#: ../modules/mail/e-mail-shell-view-private.c:1029
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d uønsket e-post"
 msgstr[1] "%d uønsket e-poster"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../modules/mail/e-mail-shell-view-private.c:1036
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../modules/mail/e-mail-shell-view-private.c:1042
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1124
+#: ../modules/mail/e-mail-shell-view-private.c:1048
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1082
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ulest, "
 msgstr[1] "%d uleste, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1085
+#: ../modules/mail/e-mail-shell-view-private.c:1063
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1162
+#: ../modules/mail/e-mail-shell-view-private.c:1084
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1578
+#: ../modules/mail/e-mail-shell-view-private.c:1522
 msgid "Send / Receive"
 msgstr "Send / motta"
 
-#: ../modules/mail/em-composer-prefs.c:495
-#: ../modules/plugin-manager/evolution-plugin-manager.c:361
-#: ../plugins/publish-calendar/publish-calendar.c:857
-#: ../widgets/misc/e-account-tree-view.c:224
+#: ../mail/e-mail-account-tree-view.c:85
+#: ../modules/mail/em-composer-prefs.c:443
+#: ../modules/plugin-manager/evolution-plugin-manager.c:359
+#: ../plugins/publish-calendar/publish-calendar.c:890
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: ../modules/mail/em-composer-prefs.c:499
+#: ../modules/mail/em-composer-prefs.c:447
 msgid "Language(s)"
 msgstr "Språk"
 
@@ -15894,48 +15779,46 @@
 msgid "Every time"
 msgstr "Hver gang"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:87
 msgid "Once per day"
 msgstr "En gang om dagen"
 
-#: ../modules/mail/em-mailer-prefs.c:93
+#: ../modules/mail/em-mailer-prefs.c:88
 msgid "Once per week"
 msgstr "En gang i uken"
 
-#: ../modules/mail/em-mailer-prefs.c:94
+#: ../modules/mail/em-mailer-prefs.c:89
 msgid "Once per month"
 msgstr "En gang i måneden"
 
-#: ../modules/mail/em-mailer-prefs.c:318
+#: ../modules/mail/em-mailer-prefs.c:356
 msgid "Header"
 msgstr "Topptekst"
 
-#: ../modules/mail/em-mailer-prefs.c:297
+#: ../modules/mail/em-mailer-prefs.c:360
 msgid "Contains Value"
 msgstr "Inneholder verdi"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1069
+#: ../modules/mail/em-mailer-prefs.c:1215
 msgid "_Date header:"
 msgstr "_Datohode:"
 
-#: ../modules/mail/em-mailer-prefs.c:1070
+#: ../modules/mail/em-mailer-prefs.c:1216
 msgid "Show _original header value"
 msgstr "Vis _opprinnelig verdi for hode"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Undersøk om Evolution er den forvalgte e-postklienten"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Undersøk om Evolution er den forvalgte e-postklienten ved hver oppstart."
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../modules/mailto-handler/evolution-mailto-handler.c:142
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Vil du sette Evolution som forvalgt e-postprogram?"
 
@@ -15959,7 +15842,7 @@
 "Evolution vil gå tilbake i tilkoblet modus når en nettverkstilkobling er "
 "tilgjengelig."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:417
+#: ../modules/online-accounts/camel-sasl-xoauth.c:298
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an authentication token."
@@ -15967,43 +15850,43 @@
 "Kan ikke finne en passende konto å hente autentiseringsinformasjon for fra "
 "org.gnome.OnlineAccounts-tjenesten."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:504
+#: ../modules/online-accounts/camel-sasl-xoauth.c:380
 msgid "OAuth"
 msgstr "OAuth"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:506
+#: ../modules/online-accounts/camel-sasl-xoauth.c:382
 msgid ""
 "This option will connect to the server by way of the GNOME Online Accounts "
 "service"
 msgstr "Dette valget vil koble til tjeneren via GNOME nettkontotjenesten"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Author(s)"
 msgstr "Fofatter(e)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:255
+#: ../modules/plugin-manager/evolution-plugin-manager.c:254
 msgid "Plugin Manager"
 msgstr "Tilleggshåndterer"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:270
+#: ../modules/plugin-manager/evolution-plugin-manager.c:269
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 "Merk: Noen endringer vil ikke tre i kraft før programmet startes på nytt"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:299
+#: ../modules/plugin-manager/evolution-plugin-manager.c:298
 msgid "Overview"
 msgstr "Oversikt"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:368
-#: ../modules/plugin-manager/evolution-plugin-manager.c:451
+#: ../modules/plugin-manager/evolution-plugin-manager.c:367
+#: ../modules/plugin-manager/evolution-plugin-manager.c:450
 msgid "Plugin"
 msgstr "Tillegg"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "_Plugins"
 msgstr "_Tillegg"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "Enable and disable plugins"
 msgstr "Aktiver og deaktiver tillegg"
 
@@ -16023,77 +15906,75 @@
 msgid "Hello Python"
 msgstr "Hallo Python"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
+#: ../modules/spamassassin/evolution-spamassassin.c:151
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Klarte ikke å starte SpamAssassin (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:215
+#: ../modules/spamassassin/evolution-spamassassin.c:174
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "Klarte ikke å sende innhold i e-postmelding til SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:234
+#: ../modules/spamassassin/evolution-spamassassin.c:193
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Klarte ikke å skrive «%s» til SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:262
+#: ../modules/spamassassin/evolution-spamassassin.c:221
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Klarte ikke å lese utdata fra SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:317
+#: ../modules/spamassassin/evolution-spamassassin.c:276
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "SpamAssassin krasjet eller klarte ikke å prosessere en e-postmelding"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:834
+#: ../modules/spamassassin/evolution-spamassassin.c:356
 msgid "SpamAssassin Options"
 msgstr "Alternativer for SpamAssassin"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:849
+#: ../modules/spamassassin/evolution-spamassassin.c:371
 msgid "I_nclude remote tests"
 msgstr "Inkluder eksterne tester"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:914
+#: ../modules/spamassassin/evolution-spamassassin.c:385
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Dette vil gjøre SpamAssassin mer pålitelig, men tregere."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1123
+#: ../modules/spamassassin/evolution-spamassassin.c:559
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
 msgid "Use only local spam tests."
 msgstr "Bruk bare lokale tester for uønsket e-post."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Bruk bare lokale tester for uønsket e-post (ingen DNS)."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
 msgid "Use SpamAssassin daemon and client"
 msgstr "Bruk SpamAssassin tjener og klient"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Bruk SpamAssassin tjener og klient (spamd/spamc)."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:297
-#: ../widgets/misc/e-import-assistant.c:403
+#: ../e-util/e-import-assistant.c:403
+#: ../modules/startup-wizard/e-mail-config-import-page.c:202
 msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du ønsker å importere:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:329
-#: ../widgets/misc/e-import-assistant.c:559
+#: ../e-util/e-import-assistant.c:559
+#: ../modules/startup-wizard/e-mail-config-import-page.c:231
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:340
-#: ../modules/startup-wizard/evolution-startup-wizard.c:438
+#. Keep the title identical to EMailConfigImportPage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/startup-wizard/e-mail-config-import-page.c:262
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
 msgid "Importing Files"
 msgstr "Importerer filer"
 
@@ -16109,7 +15990,8 @@
 msgid "Evolution Setup Assistant"
 msgstr "Konfigurasjonsassistent for Evolution"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:514
+#: ../mail/e-mail-config-welcome-page.c:167
+#: ../modules/startup-wizard/e-startup-assistant.c:152
 msgid "Welcome"
 msgstr "Velkommen"
 
@@ -16126,7 +16008,7 @@
 "\n"
 "Vennligst klikk «Fremover» for å fortsette. "
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:242
+#: ../modules/startup-wizard/evolution-startup-wizard.c:229
 msgid "Loading accounts..."
 msgstr "Laster kontoer …"
 
@@ -16138,8 +16020,7 @@
 msgid "Add local address books to Evolution."
 msgstr "Legg til lokale adressebøker i Evolution."
 
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:1
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -16147,12 +16028,12 @@
 "Liste med hint om ting å se etter i meldingskroppen for tillegg for "
 "vedleggspåminnelse"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../plugins/attachment-reminder/attachment-reminder.c:121
 msgid "_Do not show this message again."
 msgstr "Ikke vis _denne meldingen igjen."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:484
-#: ../plugins/templates/templates.c:462
+#: ../plugins/attachment-reminder/attachment-reminder.c:583
+#: ../plugins/templates/templates.c:480
 msgid "Keywords"
 msgstr "Nøkkelord"
 
@@ -16201,11 +16082,11 @@
 msgid "_Restart Evolution after backup"
 msgstr "Sta_rt Evolution på nytt etter sikkerhetskopiering"
 
-#: ../plugins/backup-restore/backup-restore.c:285
+#: ../modules/backup-restore/evolution-backup-restore.c:277
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Velg navn på sikkerhetskopifil for Evolution som skal gjenopprettes"
 
-#: ../plugins/backup-restore/backup-restore.c:298
+#: ../modules/backup-restore/evolution-backup-restore.c:290
 msgid "_Restart Evolution after restore"
 msgstr "Sta_rt Evolution på nytt etter gjenoppretting"
 
@@ -16247,67 +16128,67 @@
 msgid "R_estore Evolution Data..."
 msgstr "Gjenopp_rett data for Evolution …"
 
-#: ../plugins/backup-restore/backup-restore.c:479
+#: ../modules/backup-restore/evolution-backup-restore.c:317
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Gjenopprett data og innstillinger fra en arkivfil"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:84
 msgid "Back up Evolution directory"
 msgstr "Ta sikkerhetskopi av Evolution-mappe"
 
-#: ../plugins/backup-restore/backup.c:79
+#: ../modules/backup-restore/evolution-backup-tool.c:86
 msgid "Restore Evolution directory"
 msgstr "Gjenopprett Evolution-mapper"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:88
 msgid "Check Evolution Back up"
 msgstr "Sjekk sikkerhetskopi for Evolution"
 
-#: ../plugins/backup-restore/backup.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:90
 msgid "Restart Evolution"
 msgstr "Start Evolution på nytt"
 
-#: ../plugins/backup-restore/backup.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:92
 msgid "With Graphical User Interface"
 msgstr "Med grafisk brukergrensesnitt"
 
 #. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:308
-#: ../plugins/backup-restore/backup.c:432
+#: ../modules/backup-restore/evolution-backup-tool.c:322
+#: ../modules/backup-restore/evolution-backup-tool.c:516
 msgid "Shutting down Evolution"
 msgstr "Avslutter Evolution"
 
-#: ../plugins/backup-restore/backup.c:317
+#: ../modules/backup-restore/evolution-backup-tool.c:331
 msgid "Backing Evolution accounts and settings"
 msgstr "Sikkerhetskopiering av kontoer og innstillinger for Evolution"
 
-#: ../plugins/backup-restore/backup.c:329
+#: ../modules/backup-restore/evolution-backup-tool.c:348
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Sikkerhetskopiering av data (e-post, kontakter, kalendere, oppgaver, notater)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:357
+#: ../modules/backup-restore/evolution-backup-tool.c:364
 msgid "Back up complete"
 msgstr "Sikkerhetskopiering fullført"
 
-#: ../plugins/backup-restore/backup.c:352
-#: ../plugins/backup-restore/backup.c:570
+#: ../modules/backup-restore/evolution-backup-tool.c:371
+#: ../modules/backup-restore/evolution-backup-tool.c:703
 msgid "Restarting Evolution"
 msgstr "Starter Evolution på nytt"
 
-#: ../plugins/backup-restore/backup.c:438
+#: ../modules/backup-restore/evolution-backup-tool.c:522
 msgid "Back up current Evolution data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:483
+#: ../modules/backup-restore/evolution-backup-tool.c:529
 msgid "Extracting files from back up"
 msgstr "Henter ut filer fra sikkerhetskopien"
 
-#: ../plugins/backup-restore/backup.c:515
+#: ../modules/backup-restore/evolution-backup-tool.c:611
 msgid "Loading Evolution settings"
 msgstr "Laster innstillinger for Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:629
+#: ../modules/backup-restore/evolution-backup-tool.c:677
 msgid "Removing temporary back up files"
 msgstr "Fjerner midlertidige sikkerhetskopifiler"
 
@@ -16315,12 +16196,12 @@
 msgid "Ensuring local sources"
 msgstr "Sikrer lokale kilder"
 
-#: ../plugins/backup-restore/backup.c:768
+#: ../modules/backup-restore/evolution-backup-tool.c:916
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sikkerhetskopierer til mappe %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:872
+#: ../modules/backup-restore/evolution-backup-tool.c:921
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Gjenoppretter fra mappe %s"
@@ -16330,27 +16211,27 @@
 msgid "Evolution Back up"
 msgstr "Evolution sikkerhetskopiering"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:871
+#: ../modules/backup-restore/evolution-backup-tool.c:920
 msgid "Evolution Restore"
 msgstr "Evolution gjenoppretting"
 
-#: ../plugins/backup-restore/backup.c:841
+#: ../modules/backup-restore/evolution-backup-tool.c:991
 msgid "Backing up Evolution Data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:842
+#: ../modules/backup-restore/evolution-backup-tool.c:992
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Vennligst vent mens Evolution tar sikkerhetskopi av dine data."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:943
+#: ../modules/backup-restore/evolution-backup-tool.c:994
 msgid "Restoring Evolution Data"
 msgstr "Gjenoppretter data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:845
+#: ../modules/backup-restore/evolution-backup-tool.c:995
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Vennligst vent mens Evolution gjenoppretter dine data."
 
-#: ../plugins/backup-restore/backup.c:863
+#: ../modules/backup-restore/evolution-backup-tool.c:1017
 msgid ""
 "This may take a while depending on the amount of data in your account."
 msgstr "Dette kan ta en stund avhengig av hvor mye data du har i din konto."
@@ -16373,7 +16254,7 @@
 msgid "Please select a valid back up file to restore."
 msgstr "Velg en gyldig sikkerhetskopifil for gjenoppretting."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid "Are you sure you want to close Evolution?"
 msgstr "Er du sikker på at du vil avslutte Evolution?"
 
@@ -16411,43 +16292,43 @@
 msgid "Close and Restore Evolution"
 msgstr "Lukk og gjenopprett Evolution"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid "Insufficient Permissions"
 msgstr "Ikke tilstrekkelige rettigheter"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
 msgid "The selected folder is not writable."
 msgstr "Valgt mappe er ikke skrivbar."
 
-#: ../plugins/bbdb/bbdb.c:668 ../plugins/bbdb/bbdb.c:677
+#: ../plugins/bbdb/bbdb.c:635 ../plugins/bbdb/bbdb.c:644
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatiske kontakter"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:659
 msgid "Create _address book entries when sending mails"
 msgstr "Opprett oppføringer i adresseboken _automatisk når du sender e-post"
 
-#: ../plugins/bbdb/bbdb.c:700
+#: ../plugins/bbdb/bbdb.c:666
 msgid "Select Address book for Automatic Contacts"
 msgstr "Velg adressebok for automatiske kontakter"
 
-#: ../plugins/bbdb/bbdb.c:717
+#: ../plugins/bbdb/bbdb.c:683
 msgid "Instant Messaging Contacts"
 msgstr "Kontakter for lynmeldinger"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:732
+#: ../plugins/bbdb/bbdb.c:698
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Synkroniser kontaktinformasjon og bilder fra vennelisten i Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:740
+#: ../plugins/bbdb/bbdb.c:705
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Velg adressebok for venneliste fra Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:753
+#: ../plugins/bbdb/bbdb.c:718
 msgid "Synchronize with _buddy list now"
 msgstr "Synkroniser med _vennelisten nå"
 
@@ -16583,10 +16464,8 @@
 msgid "Use _secure connection"
 msgstr "Bruk _sikker forbindelse"
 
-#: ../mail/mail-config.ui.h:163 ../plugins/caldav/caldav-source.c:250
-#: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:273
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:227
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
@@ -16729,7 +16608,7 @@
 msgid "Add weather calendars to Evolution."
 msgstr "Legg til værkalendere i Evolution."
 
-#: ../plugins/dbx-import/dbx-importer.c:292
+#: ../plugins/dbx-import/dbx-importer.c:282
 msgid "Importing Outlook Express data"
 msgstr "Importerer data fra Outlook Express"
 
@@ -16778,7 +16657,6 @@
 msgstr "Liste med egendefinerte meldingshoder"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
 "The key specifies the list of custom headers that you can add to an outgoing "
 "message. The format for specifying a Header and Header value is: Name of the "
@@ -16789,52 +16667,52 @@
 "og verdi er: Navn på egendefinert meldingshode fulgt av «=» og verdiene "
 "adskilt med «;»"
 
-#: ../plugins/email-custom-header/email-custom-header.c:292
+#: ../plugins/email-custom-header/email-custom-header.c:291
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Sikkerhet:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:296
+#: ../plugins/email-custom-header/email-custom-header.c:295
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../plugins/email-custom-header/email-custom-header.c:297
+#: ../plugins/email-custom-header/email-custom-header.c:296
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Uklassifisert"
 
-#: ../plugins/email-custom-header/email-custom-header.c:298
+#: ../plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Beskyttet"
 
-#: ../plugins/email-custom-header/email-custom-header.c:299
+#: ../plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: ../plugins/email-custom-header/email-custom-header.c:300
+#: ../plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Hemmelig"
 
-#: ../plugins/email-custom-header/email-custom-header.c:301
+#: ../plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Topphemmelig"
 
-#: ../plugins/email-custom-header/email-custom-header.c:367
+#: ../plugins/email-custom-header/email-custom-header.c:360
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ingen"
 
-#: ../plugins/email-custom-header/email-custom-header.c:540
+#: ../plugins/email-custom-header/email-custom-header.c:536
 msgid "_Custom Header"
 msgstr "E_gendefinert meldingshode"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:803
+#: ../plugins/email-custom-header/email-custom-header.c:806
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16842,12 +16720,12 @@
 "Format for spesifisering av nøkkelvedi for egendefinert meldingshode er:\n"
 "Navn på nøkkelverdi for egendefinert meldingshode delt med «;»."
 
-#: ../plugins/email-custom-header/email-custom-header.c:857
+#: ../plugins/email-custom-header/email-custom-header.c:859
 msgid "Key"
 msgstr "Nøkkel"
 
-#: ../plugins/email-custom-header/email-custom-header.c:873
-#: ../plugins/templates/templates.c:470
+#: ../plugins/email-custom-header/email-custom-header.c:876
+#: ../plugins/templates/templates.c:489
 msgid "Values"
 msgstr "Verdier"
 
@@ -16865,7 +16743,6 @@
 msgstr "Egendefinert meldingshode i e-post"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Default External Editor"
 msgstr "Forvalgt eksternt redigeringsprogram"
 
@@ -16874,7 +16751,6 @@
 msgstr "Forvalgt kommando som må brukes som redigeringsprogram."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-#: ../plugins/external-editor/external-editor.c:125
 msgid "Automatically launch when a new mail is edited"
 msgstr "Start automatisk når en ny e-post redigeres"
 
@@ -16883,7 +16759,7 @@
 msgstr ""
 "Start redigeringsprogram automatisk når tasten trykkes i e-postredigering"
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Kommando som skal kjøres for å starte redigering: "
 
@@ -16895,8 +16771,8 @@
 "Bruk «xemacs» for Emacs\n"
 "Bruk «gvim -f» for VI"
 
-#: ../plugins/external-editor/external-editor.c:396
-#: ../plugins/external-editor/external-editor.c:398
+#: ../plugins/external-editor/external-editor.c:413
+#: ../plugins/external-editor/external-editor.c:415
 msgid "Compose in External Editor"
 msgstr "Skriv i eksternt redigeringsprogram"
 
@@ -16947,34 +16823,32 @@
 "lukkes så lenge redigeringsprogrammet er aktivt."
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
 msgstr "Sett inn ansiktsbilde som forvalg"
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
 "Whether insert Face picture to outgoing messages by default. The picture "
 "should be set before checking this, otherwise nothing happens."
 msgstr ""
 
-#: ../plugins/face/face.c:292
+#: ../plugins/face/face.c:289
 msgid "Select a Face Picture"
 msgstr "Velg en et ansiktsbilde"
 
-#: ../plugins/face/face.c:302
+#: ../plugins/face/face.c:299
 msgid "Image files"
 msgstr "Bildefiler"
 
-#: ../plugins/face/face.c:361
+#: ../plugins/face/face.c:358
 msgid "_Insert Face picture by default"
 msgstr "Sett _inn ansiktsbilde som forvalg"
 
-#: ../plugins/face/face.c:374
+#: ../plugins/face/face.c:371
 msgid "Load new _Face picture"
 msgstr "Last nytt ansikts_bilde"
 
-#: ../plugins/face/face.c:435
+#: ../plugins/face/face.c:432
 msgid "Include _Face"
 msgstr "Ta _med ansikt"
 
@@ -17056,13 +16930,12 @@
 msgid "View image attachments directly in mail messages."
 msgstr "Vis bildevedlegg direkte i e-postmeldinger."
 
-#: ../plugins/imap-features/imap-headers.c:334
-#: ../plugins/imap-features/imap-headers.ui.h:10
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:330
 msgid "Custom Headers"
 msgstr "Egendefinerte meldingshoder"
 
-#: ../plugins/imap-features/imap-headers.c:356
-#: ../plugins/imap-features/imap-headers.ui.h:7
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:225
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:395
 msgid "IMAP Headers"
 msgstr "IMAP-meldingshoder"
 
@@ -17075,7 +16948,7 @@
 "Hvis du velger flere meldingshoder her vil dette påvirke tiden det tar å "
 "laste dem ned."
 
-#: ../plugins/imap-features/imap-headers.ui.h:3
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:243
 msgid "_Fetch All Headers"
 msgstr "Hent alle meldin_gshoder"
 
@@ -17112,145 +16985,147 @@
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:505
+#: ../modules/itip-formatter/itip-view.c:3512
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Kunne ikke åpne kalender «%s» (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:665
+#: ../modules/itip-formatter/itip-view.c:3750
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "En avtale i kalender «%s» er i konflikt med dette møtet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:689
+#: ../modules/itip-formatter/itip-view.c:3779
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fant avtalen i kalender «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../modules/itip-formatter/itip-view.c:3892
 msgid "Unable to find any calendars"
 msgstr "Kan ikke finne noen kalendere"
 
-#: ../plugins/itip-formatter/itip-formatter.c:809
+#: ../modules/itip-formatter/itip-view.c:3900
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kan ikke finne dette møtet i noen kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:813
+#: ../modules/itip-formatter/itip-view.c:3905
 msgid "Unable to find this task in any task list"
 msgstr "Kan ikke finne denne oppgaven i noen oppgaveliste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:817
+#: ../modules/itip-formatter/itip-view.c:3910
 msgid "Unable to find this memo in any memo list"
 msgstr "Kan ikke finne dette notatet i noen notatliste"
 
-#: ../modules/itip-formatter/itip-view.c:4179
+#: ../modules/itip-formatter/itip-view.c:4254
 msgid "Opening the calendar. Please wait..."
 msgstr "Åpner kalender. Vennligst vent …"
 
-#: ../modules/itip-formatter/itip-view.c:4184
+#: ../modules/itip-formatter/itip-view.c:4259
 msgid "Searching for an existing version of this appointment"
 msgstr "Søker etter en eksisterende versjon av denne avtalen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1620
+#: ../modules/itip-formatter/itip-view.c:4746
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppføring"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1484
+#: ../modules/itip-formatter/itip-view.c:4652
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kunne ikke sende oppføring til kalender «%s». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1498
+#: ../modules/itip-formatter/itip-view.c:4667
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender «%s» som godtatt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../modules/itip-formatter/itip-view.c:4672
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender «%s» som tentativ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1507
+#: ../modules/itip-formatter/itip-view.c:4678
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender «%s» som avslått"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1512
+#: ../modules/itip-formatter/itip-view.c:4684
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalender «%s» som avlyst"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1800
+#: ../modules/itip-formatter/itip-view.c:4939
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1807
+#: ../modules/itip-formatter/itip-view.c:4956
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Avlysningsvarsel sendt til delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1809
+#: ../modules/itip-formatter/itip-view.c:4960
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende avlysningsmelding til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1947
+#: ../modules/itip-formatter/itip-view.c:5127
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1855
+#: ../modules/itip-formatter/itip-view.c:5008
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1861
+#: ../modules/itip-formatter/itip-view.c:3571
+#: ../modules/itip-formatter/itip-view.c:5016
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1737
+#: ../modules/itip-formatter/itip-view.c:5199
+#: ../modules/itip-formatter/itip-view.c:5238
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppføringen ikke eksisterer lenger"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2086
+#: ../modules/itip-formatter/itip-view.c:5301
 msgid "Meeting information sent"
 msgstr "Informasjon om møte sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2089
+#: ../modules/itip-formatter/itip-view.c:5306
 msgid "Task information sent"
 msgstr "Informasjon om oppgave sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2092
+#: ../modules/itip-formatter/itip-view.c:5311
 msgid "Memo information sent"
 msgstr "Informasjon om notat sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2101
+#: ../modules/itip-formatter/itip-view.c:5322
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kan ikke sende møteinformasjon. Møtet eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2104
+#: ../modules/itip-formatter/itip-view.c:5327
 msgid "Unable to send task information, the task does not exist"
 msgstr "Kan ikke sende informasjon om oppgave. Oppgaven eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2107
+#: ../modules/itip-formatter/itip-view.c:5332
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Kan ikke sende informasjon om notat. Notatet eksisterer ikke"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:2173
+#: ../modules/itip-formatter/itip-view.c:5397
 msgid "calendar.ics"
 msgstr "kalender.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2178
+#: ../modules/itip-formatter/itip-view.c:5402
 msgid "Save Calendar"
 msgstr "Lagre kalender"
 
-#: ../modules/itip-formatter/itip-view.c:5365
-#: ../modules/itip-formatter/itip-view.c:5378
+#: ../modules/itip-formatter/itip-view.c:5451
+#: ../modules/itip-formatter/itip-view.c:5464
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2242
-#: ../plugins/itip-formatter/itip-formatter.c:2253
+#: ../modules/itip-formatter/itip-view.c:5452
+#: ../modules/itip-formatter/itip-view.c:5465
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17258,15 +17133,15 @@
 "Meldingen påstår at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2293
-#: ../plugins/itip-formatter/itip-formatter.c:2321
-#: ../plugins/itip-formatter/itip-formatter.c:2432
+#: ../modules/itip-formatter/itip-view.c:5507
+#: ../modules/itip-formatter/itip-view.c:5537
+#: ../modules/itip-formatter/itip-view.c:5638
 msgid "The item in the calendar is not valid"
 msgstr "Oppføringen i kalenderen er ikke gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2294
-#: ../plugins/itip-formatter/itip-formatter.c:2322
-#: ../plugins/itip-formatter/itip-formatter.c:2433
+#: ../modules/itip-formatter/itip-view.c:5508
+#: ../modules/itip-formatter/itip-view.c:5538
+#: ../modules/itip-formatter/itip-view.c:5639
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17274,11 +17149,11 @@
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../modules/itip-formatter/itip-view.c:5553
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppføringer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2336
+#: ../modules/itip-formatter/itip-view.c:5554
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17286,24 +17161,24 @@
 "Du må lagre filen og importere kalenderen for å prosessere alle disse "
 "oppføringene"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2860
+#: ../modules/itip-formatter/itip-view.c:6055
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ingen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2688
+#: ../modules/itip-formatter/itip-view.c:6071
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2994
+#: ../modules/itip-formatter/itip-view.c:6231
 msgid "This meeting recurs"
 msgstr "Dettee møtet gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2997
+#: ../modules/itip-formatter/itip-view.c:6234
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3000
+#: ../modules/itip-formatter/itip-view.c:6237
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
@@ -17311,12 +17186,12 @@
 msgid "Meeting Invitations"
 msgstr "Møteinvitasjoner"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3257
+#: ../modules/itip-formatter/plugin/config-ui.c:108
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utført handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3271
-#: ../plugins/itip-formatter/itip-formatter.c:3304
+#: ../modules/itip-formatter/plugin/config-ui.c:122
+#: ../modules/itip-formatter/plugin/config-ui.c:153
 msgid "Conflict Search"
 msgstr "Søk etter konflikter"
 
@@ -17327,194 +17202,194 @@
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:240
+#: ../modules/itip-formatter/itip-view.c:235
 msgid "Today %H:%M"
 msgstr "I dag %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:203
+#: ../modules/itip-formatter/itip-view.c:239
 msgid "Today %H:%M:%S"
 msgstr "I dag %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:212
+#: ../modules/itip-formatter/itip-view.c:248
 msgid "Today %l:%M:%S %p"
 msgstr "I dag %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../modules/itip-formatter/itip-view.c:263
 msgid "Tomorrow %H:%M"
 msgstr "I morgen %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../modules/itip-formatter/itip-view.c:267
 msgid "Tomorrow %H:%M:%S"
 msgstr "I morgen %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../modules/itip-formatter/itip-view.c:272
 msgid "Tomorrow %l:%M %p"
 msgstr "I morgen %l.%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:240
+#: ../modules/itip-formatter/itip-view.c:276
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "I morgen %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../modules/itip-formatter/itip-view.c:295
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:264
+#: ../modules/itip-formatter/itip-view.c:300
 msgid "%A %H:%M"
 msgstr "%A %H.%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../modules/itip-formatter/itip-view.c:304
 msgid "%A %H:%M:%S"
 msgstr "%A %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:273
+#: ../modules/itip-formatter/itip-view.c:309
 msgid "%A %l:%M %p"
 msgstr "%A %l.%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:277
+#: ../modules/itip-formatter/itip-view.c:313
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../modules/itip-formatter/itip-view.c:322
 msgid "%A, %B %e"
 msgstr "%A, %e %B"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:292
+#: ../modules/itip-formatter/itip-view.c:328
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../modules/itip-formatter/itip-view.c:332
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../modules/itip-formatter/itip-view.c:337
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../modules/itip-formatter/itip-view.c:341
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:352
+#: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:316
+#: ../modules/itip-formatter/itip-view.c:352
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../modules/itip-formatter/itip-view.c:356
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B %Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:325
+#: ../modules/itip-formatter/itip-view.c:361
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:329
+#: ../modules/itip-formatter/itip-view.c:365
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l.%M.%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:364
-#: ../plugins/itip-formatter/itip-view.c:365
-#: ../plugins/itip-formatter/itip-view.c:452
-#: ../plugins/itip-formatter/itip-view.c:453
-#: ../plugins/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:403
+#: ../modules/itip-formatter/itip-view.c:404
+#: ../modules/itip-formatter/itip-view.c:493
+#: ../modules/itip-formatter/itip-view.c:494
+#: ../modules/itip-formatter/itip-view.c:583
 msgid "An unknown person"
 msgstr "En ukjent person"
 
-#: ../plugins/itip-formatter/itip-view.c:372
-#: ../plugins/itip-formatter/itip-view.c:460
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Vennligst svar på vegne av %s"
 
-#: ../plugins/itip-formatter/itip-view.c:374
-#: ../plugins/itip-formatter/itip-view.c:462
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../modules/itip-formatter/itip-view.c:410
+#: ../modules/itip-formatter/itip-view.c:500
+#: ../modules/itip-formatter/itip-view.c:589
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Mottatt på vegne av %s"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../modules/itip-formatter/itip-view.c:415
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s har publisert følgende møteinformasjon gjennom %s:"
 
-#: ../modules/itip-formatter/itip-view.c:422
+#: ../modules/itip-formatter/itip-view.c:417
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s har publisert følgende møteinformasjon:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../modules/itip-formatter/itip-view.c:422
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s har delegert følgende møte til deg:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../modules/itip-formatter/itip-view.c:425
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s ber om din tilstedeværelse i et møte gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../modules/itip-formatter/itip-view.c:427
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s ber om din tilstedeværelse i følgende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../modules/itip-formatter/itip-view.c:433
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s ønsker å legge til informasjon i et eksisterende møte gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../modules/itip-formatter/itip-view.c:435
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s ønsker å legge til informasjon i et eksisterende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../modules/itip-formatter/itip-view.c:439
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -17522,23 +17397,23 @@
 msgstr ""
 "%s ønsker å motta den seneste informasjon for følgende møte gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../modules/itip-formatter/itip-view.c:441
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s ønsker å motta den seneste informasjon for følgende møte:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../modules/itip-formatter/itip-view.c:445
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s har sendt tilbake følgende svar på møteinnkalling gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:411
+#: ../modules/itip-formatter/itip-view.c:447
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s har sendt tilbake følgende svar på møteinnkalling:"
 
-#: ../plugins/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s har avlyst følgende møte gjennom %s:"
@@ -17548,7 +17423,7 @@
 msgid "%s has canceled the following meeting."
 msgstr "%s har avlyst følgende møte."
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../modules/itip-formatter/itip-view.c:457
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s har foreslått følgende endringer i møte gjennom %s."
@@ -17558,7 +17433,7 @@
 msgid "%s has proposed the following meeting changes."
 msgstr "%s har foreslått følgende endringer i møte."
 
-#: ../modules/itip-formatter/itip-view.c:468
+#: ../modules/itip-formatter/itip-view.c:463
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s har avslått følgende endringer for møte gjennom %s:"
@@ -17568,43 +17443,43 @@
 msgid "%s has declined the following meeting changes."
 msgstr "%s har avslått følgende endringer for møte."
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../modules/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s har publisert følgende oppgave gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../modules/itip-formatter/itip-view.c:507
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s har publisert følgende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../modules/itip-formatter/itip-view.c:512
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s ber om at %s tildeles følgende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../modules/itip-formatter/itip-view.c:515
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s har tildelt deg en oppgave gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../modules/itip-formatter/itip-view.c:517
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s har tildelt deg en oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../modules/itip-formatter/itip-view.c:523
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr ""
 "%s forespør å legge til informasjon i eksisterende oppgave gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../modules/itip-formatter/itip-view.c:525
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s ønsker å legge til informasjon i en eksisterende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../modules/itip-formatter/itip-view.c:529
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -17613,164 +17488,149 @@
 "%s ønsker å motta den seneste informasjon for følgende tildelt oppgave "
 "gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../modules/itip-formatter/itip-view.c:531
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr ""
 "%s ønsker å motta den seneste informasjon for følgende tildelt oppgave:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:535
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s har sendt tilbake følgende svar på tildelt oppgave gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:499
+#: ../modules/itip-formatter/itip-view.c:537
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s har sendt tilbake følgende svar på tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:503
+#: ../modules/itip-formatter/itip-view.c:541
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s har avlyst følgende tildelt oppgave gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:543
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s har avlyst følgende tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:509
+#: ../modules/itip-formatter/itip-view.c:547
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s har foreslått følgende endringer i oppgavetildeling gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:511
+#: ../modules/itip-formatter/itip-view.c:549
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s har foreslått følgende endringer i oppgavetildeling:"
 
-#: ../plugins/itip-formatter/itip-view.c:515
+#: ../modules/itip-formatter/itip-view.c:553
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s har avslått følgende tildelt oppgave gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:517
+#: ../modules/itip-formatter/itip-view.c:555
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s har avslått følgende tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:554
+#: ../modules/itip-formatter/itip-view.c:594
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s har publisert følgende notat gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:556
+#: ../modules/itip-formatter/itip-view.c:596
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s har publisert følgende notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:561
+#: ../modules/itip-formatter/itip-view.c:601
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr ""
 "%s ønsker å legge til informasjon i et eksisterende notat gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:563
+#: ../modules/itip-formatter/itip-view.c:603
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s ønsker å legge til informasjon i et eksisterende notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:567
+#: ../modules/itip-formatter/itip-view.c:607
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s har avlyst følgende delt notat gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:569
+#: ../modules/itip-formatter/itip-view.c:609
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s har avlyst følgende delt notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:693
+#: ../modules/itip-formatter/itip-view.c:682
 msgid "All day:"
 msgstr "Hele dagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:703
+#: ../modules/itip-formatter/itip-view.c:688
 msgid "Start day:"
 msgstr "Startdag:"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:703
-#: ../plugins/itip-formatter/itip-view.c:1061
+#: ../modules/itip-formatter/itip-view.c:688
+#: ../modules/itip-formatter/itip-view.c:1490
 msgid "Start time:"
 msgstr "Start-tid:"
 
-#: ../modules/itip-formatter/itip-view.c:702
+#: ../modules/itip-formatter/itip-view.c:697
 msgid "End day:"
 msgstr "Sluttdag:"
 
-#: ../modules/itip-formatter/itip-view.c:702
-#: ../modules/itip-formatter/itip-view.c:1474
+#: ../modules/itip-formatter/itip-view.c:697
+#: ../modules/itip-formatter/itip-view.c:1491
 msgid "End time:"
 msgstr "Slutt-tid:"
 
-#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../modules/itip-formatter/itip-view.c:1021
 msgid "_Open Calendar"
 msgstr "_Åpne kalender"
 
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:861
-#: ../plugins/itip-formatter/itip-view.c:867
-#: ../plugins/itip-formatter/itip-view.c:884
-#: ../plugins/itip-formatter/itip-view.c:889
+#: ../modules/itip-formatter/itip-view.c:1022
 msgid "_Decline"
 msgstr "Av_slå"
 
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
-#: ../plugins/itip-formatter/itip-view.c:870
-#: ../plugins/itip-formatter/itip-view.c:886
-#: ../plugins/itip-formatter/itip-view.c:891
+#: ../modules/itip-formatter/itip-view.c:1039
 msgid "A_ccept"
 msgstr "_Godta"
 
-#: ../modules/itip-formatter/itip-view.c:1025
+#: ../modules/itip-formatter/itip-view.c:1019
 msgid "_Decline all"
 msgstr "A_vslå alle"
 
-#: ../plugins/itip-formatter/itip-view.c:862
+#: ../modules/itip-formatter/itip-view.c:1025
 msgid "_Tentative all"
 msgstr "Gjør alle _tentative"
 
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:868
-#: ../plugins/itip-formatter/itip-view.c:885
-#: ../plugins/itip-formatter/itip-view.c:890
+#: ../modules/itip-formatter/itip-view.c:1028
 msgid "_Tentative"
 msgstr "_Tentativ"
 
-#: ../plugins/itip-formatter/itip-view.c:863
+#: ../modules/itip-formatter/itip-view.c:1036
 msgid "A_ccept all"
 msgstr "_Godta alle"
 
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:874
+#: ../modules/itip-formatter/itip-view.c:1042
 msgid "_Send Information"
 msgstr "_Send informasjon"
 
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:878
+#: ../modules/itip-formatter/itip-view.c:1040
 msgid "_Update Attendee Status"
 msgstr "_Oppdater status for deltaker"
 
-#: ../plugins/itip-formatter/itip-view.c:881
+#: ../modules/itip-formatter/itip-view.c:1043
 msgid "_Update"
 msgstr "_Oppdater"
 
-#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1092
-#: ../plugins/itip-formatter/itip-view.c:1148
+#: ../modules/itip-formatter/itip-view.c:1493
+#: ../modules/itip-formatter/itip-view.c:1541
+#: ../modules/itip-formatter/itip-view.c:1612
 msgid "Comment:"
 msgstr "Kommentar:"
 
@@ -17778,53 +17638,55 @@
 msgid "Send _reply to sender"
 msgstr "Send sva_r til avsender"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
+#. Updates
+#: ../modules/itip-formatter/itip-view.c:1544
 msgid "Send _updates to attendees"
 msgstr "Send _oppdateringer til deltakere"
 
-#: ../plugins/itip-formatter/itip-view.c:1180
+#. The recurrence check button
+#: ../modules/itip-formatter/itip-view.c:1547
 msgid "_Apply to all instances"
 msgstr "B_ruk på alle instanser"
 
-#: ../plugins/itip-formatter/itip-view.c:1191
+#: ../modules/itip-formatter/itip-view.c:1548
 msgid "Show time as _free"
 msgstr "Vis tid som _ledig"
 
-#: ../plugins/itip-formatter/itip-view.c:1194
+#: ../modules/itip-formatter/itip-view.c:1549
 msgid "_Preserve my reminder"
 msgstr "_Bevar min påminnelse"
 
-#: ../modules/itip-formatter/itip-view.c:1533
+#: ../modules/itip-formatter/itip-view.c:1550
 msgid "_Inherit reminder"
 msgstr "Arv påm_innelse"
 
-#: ../plugins/itip-formatter/itip-view.c:1982
+#: ../modules/itip-formatter/itip-view.c:1880
 msgid "_Tasks:"
 msgstr "_Oppgaver:"
 
-#: ../plugins/itip-formatter/itip-view.c:1984
+#: ../modules/itip-formatter/itip-view.c:1883
 msgid "_Memos:"
 msgstr "_Notater:"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Itip Formatter"
 msgstr "Formattering av iTip"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Viser MIME-deler av type «text/calender» i e-poster."
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "Dette svaret er ikke fra en nåværende deltaker. Legg til sender som deltaker?"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "Dette møtet er delegert"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid ""
 "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "'{0}' har delegert møtet. Vil du legge til delegat '{1}'?"
@@ -17881,13 +17743,11 @@
 "Lydfil som skal spilles av når nye meldinger ankommer hvis pip-modus ikke er "
 "aktivert."
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
 msgid "Use sound theme"
 msgstr "Bruk lydtema"
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "Spill av lyd fra lydtema når nye meldinger ankommer hvis ikke pip-modus er "
@@ -17915,6 +17775,7 @@
 msgid "Subject: %s"
 msgstr "Emne: %s"
 
+#: ../plugins/mail-notification/mail-notification.c:384
 #: ../plugins/mail-notification/mail-notification.c:420
 #, c-format
 msgid "You have received %d new message."
@@ -17930,36 +17791,36 @@
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:458
+#: ../plugins/mail-notification/mail-notification.c:461
 #, c-format
 msgid "Show %s"
 msgstr "Vis %s"
 
-#: ../plugins/mail-notification/mail-notification.c:660
+#: ../plugins/mail-notification/mail-notification.c:663
 msgid "_Play sound when a new message arrives"
 msgstr "S_pill en lyd når nye meldinger ankommer"
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:695
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../plugins/mail-notification/mail-notification.c:708
 msgid "Use sound _theme"
 msgstr "Bruk lyd_tema"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "Play _file:"
 msgstr "Spill av lyd_fil:"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "Select sound file"
 msgstr "Velg en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Notify new messages for _Inbox only"
 msgstr "Varslingsmelding kun for _innboks"
 
-#: ../plugins/mail-notification/mail-notification.c:799
+#: ../plugins/mail-notification/mail-notification.c:802
 msgid "Show _notification when a new message arrives"
 msgstr "Vis varsli_ng når en ny melding ankommer"
 
@@ -17972,12 +17833,12 @@
 msgstr "Varsler når nye meldinger ankommer."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:243
+#: ../plugins/mail-to-task/mail-to-task.c:232
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Opprettet av en e-post fra %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:618
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -17986,7 +17847,7 @@
 "Valgt kalender inneholder hendelsen «%s» allerede. Vil du redigere den gamle "
 "hendelsen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:621
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -17995,7 +17856,7 @@
 "Valgt oppgaveliste inneholder oppgave «%s» allerede. Vil du redigere den "
 "gamle oppgaven?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:624
+#: ../plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18031,19 +17892,19 @@
 "Du har valgt %d meldinger som skal konverteres til notater. Vil du virkelig "
 "legge dem til?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:686
+#: ../plugins/mail-to-task/mail-to-task.c:677
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Vil du fortsette med konvertering av gjenstående meldinger?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:751
+#: ../plugins/mail-to-task/mail-to-task.c:753
 msgid "[No Summary]"
 msgstr "[Ingen sammendrag]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../plugins/mail-to-task/mail-to-task.c:766
 msgid "Invalid object returned from a server"
 msgstr "Ugyldig objekt returnert fra en tjener"
 
-#: ../plugins/mail-to-task/mail-to-task.c:828
+#: ../plugins/mail-to-task/mail-to-task.c:821
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "En feil oppsto under prosessering: %s"
@@ -18053,7 +17914,7 @@
 msgid "Cannot open calendar. %s"
 msgstr "Kan ikke åpne kalender. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:847
+#: ../plugins/mail-to-task/mail-to-task.c:861
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18061,7 +17922,7 @@
 "Valgt kilde er skrivebeskyttet og hendelser kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:850
+#: ../plugins/mail-to-task/mail-to-task.c:864
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18069,7 +17930,7 @@
 "Valgt kilde er skrivebeskyttet og oppgaver kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:853
+#: ../plugins/mail-to-task/mail-to-task.c:867
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18082,7 +17943,7 @@
 msgid "Cannot get source list. %s"
 msgstr "Fant ikke kildeliste %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1197
+#: ../plugins/mail-to-task/mail-to-task.c:1203
 msgid "No writable calendar is available."
 msgstr "Ingen skrivbar kalender tilgjengelig."
 
@@ -18090,31 +17951,31 @@
 msgid "Create an _Event"
 msgstr "Lag en h_endelse"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1260
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 msgid "Create a new event from the selected message"
 msgstr "Lag en ny hendelse fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1288
+#: ../plugins/mail-to-task/mail-to-task.c:1287
 msgid "Create a Mem_o"
 msgstr "Lag et n_otat"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1267
+#: ../plugins/mail-to-task/mail-to-task.c:1289
 msgid "Create a new memo from the selected message"
 msgstr "Lag et nytt notat fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1272
+#: ../plugins/mail-to-task/mail-to-task.c:1294
 msgid "Create a _Task"
 msgstr "Lag en o_ppgave"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1274
+#: ../plugins/mail-to-task/mail-to-task.c:1296
 msgid "Create a new task from the selected message"
 msgstr "Lag en ny oppgave fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1305
+#: ../plugins/mail-to-task/mail-to-task.c:1304
 msgid "Create a _Meeting"
 msgstr "Lag et _møte"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
+#: ../plugins/mail-to-task/mail-to-task.c:1306
 msgid "Create a new meeting from the selected message"
 msgstr "Lag et nytt møte fra den valgte meldingen"
 
@@ -18122,36 +17983,36 @@
 msgid "Convert a mail message to a task."
 msgstr "Konverter en e-postmelding til en oppgave."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:350
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
 msgid "Get List _Archive"
 msgstr "Hent liste_arkiv"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:370
 msgid "Get an archive of the list this message belongs to"
 msgstr "Få et arkiv av listen denne e-posten hører til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:357
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
 msgid "Get List _Usage Information"
 msgstr "Hent informasjon om br_uk av liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:377
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 "Få informasjon om bruken av e-postlisten som denne e-posten hører til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Contact List _Owner"
 msgstr "Eier av k_ontaktliste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:384
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Kontakt eieren til e-postlisten som denne e-posten hører til"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
 msgid "_Post Message to List"
 msgstr "_Skriv e-post til liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:391
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Skriv en e-post til e-postlisten som denne e-posten hører til"
 
@@ -18159,7 +18020,7 @@
 msgid "_Subscribe to List"
 msgstr "_Abonner på listen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:398
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Abonner på e-postlisten som denne e-posten hører til"
 
@@ -18167,7 +18028,7 @@
 msgid "_Unsubscribe from List"
 msgstr "_Fjern abonnement på listen"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:405
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Avslutt abonnementet på e-postlisten som denne meldingen tilhører"
 
@@ -18263,11 +18124,11 @@
 "\n"
 "Hode: {0}"
 
-#: ../plugins/mark-all-read/mark-all-read.c:43
+#: ../mail/mail.error.xml.h:129
 msgid "Also mark messages in subfolders?"
 msgstr "Merk meldinger i undermapper også?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:45
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18275,15 +18136,15 @@
 "Vil du merke meldinger som lest kun i denne mappen, eller i valgt mappe og "
 "undermapper i tillegg?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:216
+#: ../mail/mail.error.xml.h:131
 msgid "In Current Folder and _Subfolders"
 msgstr "I denne mappen og _undermapper"
 
-#: ../plugins/mark-all-read/mark-all-read.c:230
+#: ../mail/mail.error.xml.h:132
 msgid "In Current _Folder Only"
 msgstr "Kun i _denne mappen"
 
-#: ../plugins/mark-all-read/mark-all-read.c:545
+#: ../plugins/mark-all-read/mark-all-read.c:544
 msgid "Mark Me_ssages as Read"
 msgstr "Merk meldinger _som lest"
 
@@ -18295,33 +18156,37 @@
 msgid "Mark all messages in a folder as read."
 msgstr "Merk alle meldinger i en mappe som lest."
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
 msgid "Prefer Plain Text"
 msgstr "Foretrekk vanlig tekst"
 
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
 msgid "Plain Text Mode"
 msgstr "Tekstmodus"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 "Vis e-postmeldinger som vanlig tekst, selv om de inneholder HTML-innhold."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Show HTML if present"
 msgstr "Vis HTML hvis det finnes"
 
-#: ../plugins/prefer-plain/prefer-plain.c:251
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:45
 msgid "Let Evolution choose the best part to show."
 msgstr "La Evolution velge den beste delen å vise."
 
-#: ../plugins/prefer-plain/prefer-plain.c:254
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid "Show plain text if present"
 msgstr "Vis ren tekst hvis det finnes"
 
-#: ../plugins/prefer-plain/prefer-plain.c:255
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:49
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18329,23 +18194,24 @@
 "Vis tekstdelen hvis den finnes. La Evolution velge hvilken del som skal "
 "vises ellers."
 
-#: ../plugins/prefer-plain/prefer-plain.c:259
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid "Only ever show plain text"
 msgstr "Vis kun ren tekst"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:92
-#: ../modules/prefer-plain/plugin/config-ui.c:56
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:54
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
 "Alltid vis ren tekst delen og vis de andre delene som vedlegg hvis forespurt."
 
-#: ../plugins/prefer-plain/prefer-plain.c:311
+#: ../modules/prefer-plain/plugin/config-ui.c:105
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Vis _undertrykte HTML-deler som vedlegg"
 
-#: ../plugins/prefer-plain/prefer-plain.c:333
+#: ../modules/prefer-plain/plugin/config-ui.c:127
 msgid "HTML _Mode"
 msgstr "HTML-_modus"
 
@@ -18361,38 +18227,37 @@
 msgid "Import Outlook messages from PST file"
 msgstr "Importer Outlook-meldinger fra PST-fil"
 
-#: ../plugins/pst-import/pst-importer.c:555
+#: ../plugins/pst-import/pst-importer.c:530
 msgid "_Mail"
 msgstr "_E-post"
 
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../plugins/pst-import/pst-importer.c:559
 msgid "Destination folder:"
 msgstr "Målmappe:"
 
-#: ../plugins/pst-import/pst-importer.c:581
+#: ../plugins/pst-import/pst-importer.c:569
 msgid "_Address Book"
 msgstr "_Adressebok"
 
-#: ../plugins/pst-import/pst-importer.c:586
+#: ../plugins/pst-import/pst-importer.c:574
 msgid "A_ppointments"
 msgstr "A_vtaler"
 
-#: ../plugins/pst-import/pst-importer.c:604 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:579 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Oppgaver"
 
-#: ../plugins/pst-import/pst-importer.c:596
+#: ../plugins/pst-import/pst-importer.c:584
 msgid "_Journal entries"
 msgstr "_Journaloppføringer"
 
-#: ../plugins/pst-import/pst-importer.c:707
+#: ../plugins/pst-import/pst-importer.c:701
 msgid "Importing Outlook data"
 msgstr "Importerer data fra Outlook"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:147
-#: ../plugins/publish-calendar/publish-calendar.c:155
-#: ../plugins/publish-calendar/publish-calendar.c:157
+#: ../plugins/publish-calendar/publish-calendar.c:141
+#: ../plugins/publish-calendar/publish-calendar.c:148
 msgid "Calendar Publishing"
 msgstr "Publisering av kalendere"
 
@@ -18404,18 +18269,18 @@
 msgid "Publish calendars to the web."
 msgstr "Publiser kalendere på nettet."
 
-#: ../plugins/publish-calendar/publish-calendar.c:218
-#: ../plugins/publish-calendar/publish-calendar.c:469
+#: ../plugins/publish-calendar/publish-calendar.c:217
+#: ../plugins/publish-calendar/publish-calendar.c:484
 #, c-format
 msgid "Could not open %s:"
 msgstr "Kunne ikke åpne %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:220
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Kunne ikke åpne %s: Ukjent feil"
 
-#: ../plugins/publish-calendar/publish-calendar.c:233
+#: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Det oppsto en feil under publisering til %s:"
@@ -18425,28 +18290,28 @@
 msgid "Publishing to %s finished successfully"
 msgstr "Publisering til %s fullført"
 
-#: ../plugins/publish-calendar/publish-calendar.c:286
+#: ../plugins/publish-calendar/publish-calendar.c:290
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Montering av %s feilet:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:617
+#: ../plugins/publish-calendar/publish-calendar.c:649
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "A_ktiver"
 
-#: ../plugins/publish-calendar/publish-calendar.c:765
+#: ../plugins/publish-calendar/publish-calendar.c:799
 msgid "Are you sure you want to remove this location?"
 msgstr "Er du sikker på at du vil fjerne denne plasseringen?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1099
+#: ../plugins/publish-calendar/publish-calendar.c:1138
 msgid "Could not create publish thread."
 msgstr "Kunne ikke opprette tråd for publisering."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1107
+#: ../plugins/publish-calendar/publish-calendar.c:1148
 msgid "_Publish Calendar Information"
 msgstr "_Publiser kalenderinformasjon"
 
@@ -18538,17 +18403,17 @@
 msgid "Publishing Location"
 msgstr "Plassering for publisering"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:94
-#: ../plugins/publish-calendar/publish-format-ical.c:91
+#: ../plugins/publish-calendar/publish-format-fb.c:97
+#: ../plugins/publish-calendar/publish-format-ical.c:95
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Kunne ikke publisere kalender: Kalendermotor eksisterer ikke lenger"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:521
+#: ../plugins/publish-calendar/url-editor-dialog.c:540
 msgid "New Location"
 msgstr "Ny adresse"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:523
+#: ../plugins/publish-calendar/url-editor-dialog.c:542
 msgid "Edit Location"
 msgstr "Rediger adresse"
 
@@ -18559,79 +18424,79 @@
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Description List"
 msgstr "Beskrivelsesliste"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Categories List"
 msgstr "Liste med kategorier"
 
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Comment List"
 msgstr "Liste med kommentarer"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "End"
 msgstr "Slutt"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Due"
 msgstr "Ferdig"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "percent Done"
 msgstr "Prosent fullført"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Attendees List"
 msgstr "Deltakerliste"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "Modified"
 msgstr "Endret"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:564
 msgid "A_dvanced options for the CSV format"
 msgstr "A_vanserte alternativer for CVS-format"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Prepend a _header"
 msgstr "Legg til et _hode i starten"
 
-#: ../plugins/save-calendar/csv-format.c:590
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "_Value delimiter:"
 msgstr "Skilletegn for _verdier:"
 
-#: ../plugins/save-calendar/csv-format.c:601
+#: ../plugins/save-calendar/csv-format.c:592
 msgid "_Record delimiter:"
 msgstr "Skilletegn for poste_r:"
 
-#: ../plugins/save-calendar/csv-format.c:612
+#: ../plugins/save-calendar/csv-format.c:603
 msgid "_Encapsulate values with:"
 msgstr "Pakk inn v_erdier med:"
 
-#: ../plugins/save-calendar/csv-format.c:627
+#: ../plugins/save-calendar/csv-format.c:629
 msgid "Comma separated values (.csv)"
 msgstr "Kommaseparert verdiformat (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:175 ../shell/e-shell-utils.c:199
+#: ../plugins/save-calendar/ical-format.c:184 ../shell/e-shell-utils.c:178
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -18648,36 +18513,35 @@
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:152
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:378
+#: ../plugins/save-calendar/rdf-format.c:385
 msgid "RDF (.rdf)"
 msgstr "RDF-format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:127
+#: ../plugins/save-calendar/save-calendar.c:121
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/save-calendar/save-calendar.c:189
+#: ../plugins/save-calendar/save-calendar.c:187
 msgid "Select destination file"
 msgstr "Velg målfil"
 
-#: ../plugins/save-calendar/save-calendar.c:344
+#: ../plugins/save-calendar/save-calendar.c:343
 msgid "Save the selected calendar to disk"
 msgstr "Lagre valgt kalender til disk"
 
-#: ../plugins/save-calendar/save-calendar.c:375
+#: ../plugins/save-calendar/save-calendar.c:374
 msgid "Save the selected memo list to disk"
 msgstr "Lagre valgt notatliste til disk"
 
-#: ../plugins/save-calendar/save-calendar.c:406
+#: ../plugins/save-calendar/save-calendar.c:405
 msgid "Save the selected task list to disk"
 msgstr "Lagre valgt oppgaveliste til disk"
 
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
-#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
@@ -18695,15 +18559,15 @@
 "$ORIG[subject], $ORIG[from], $ORIG[to] eller $ORIG[body], der disse vil bli "
 "erstattet av verdier fra en e-post du svarer på."
 
-#: ../plugins/templates/templates.c:1105
+#: ../plugins/templates/templates.c:1148
 msgid "No Title"
 msgstr "Ingen tittel"
 
-#: ../plugins/templates/templates.c:1217
+#: ../plugins/templates/templates.c:1257
 msgid "Save as _Template"
 msgstr "Lagre som _mal"
 
-#: ../plugins/templates/templates.c:1219
+#: ../plugins/templates/templates.c:1259
 msgid "Save as Template"
 msgstr "Lagre som mal"
 
@@ -18732,11 +18596,11 @@
 msgid "Show Compact vCard"
 msgstr "Vis kompakt vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:272
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:178
 msgid "There is one other contact."
 msgstr "Det finnes en annen kontakt."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:171
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
@@ -18759,7 +18623,9 @@
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:136
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:205
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:128
 msgid "URL:"
 msgstr "URL:"
 
@@ -18795,12 +18661,10 @@
 "major/minor/konfigurasjonsnivå (for eksempel «2.6.0»)."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Skip development warning dialog"
 msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
@@ -18811,7 +18675,6 @@
 msgstr "Forvalgt vedleggsvisning"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
@@ -18827,12 +18690,11 @@
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Forvalgt mappe for GtkFileChooser-dialoger."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:317
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid ""
 "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
@@ -18886,12 +18748,10 @@
 msgstr "Om vinduet skal være maksimert."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Window buttons are visible"
 msgstr "Vindusknapper er synlige"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
-#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether the window buttons should be visible."
 msgstr "Om vinduknappene skal være synlige."
 
@@ -18900,7 +18760,6 @@
 msgstr "Knappestil for vindu"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18911,47 +18770,38 @@
 "instillingene."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Toolbar is visible"
 msgstr "Verktøylinjen er synlig"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the toolbar should be visible."
 msgstr "Om verktøylinjen skal være synlig."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
-#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Sidebar is visible"
 msgstr "Sidelinjen er synlig"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
-#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Whether the sidebar should be visible."
 msgstr "Om sidelinjen skal være synlig."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
-#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "Statuslinjen er synlig"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Whether the status bar should be visible."
 msgstr "Om statuslinjen skal være synlig."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID eller alias for komponenten som skal være forvalgt ved oppstart."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Default sidebar width"
 msgstr "Forvalgt bredde på sidelinje"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
-#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "Forvalgt bredde på sidelinjen i piksler."
 
@@ -19092,20 +18942,18 @@
 msgstr "URL som oppgir verdier for konfigurasjon av proxy."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Enable express mode"
 msgstr "Slå på ekspressmodus"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
-#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Flag that enables a much simplified user interface."
 msgstr "Flagg som slår på et forenklet brukergrensesnitt."
 
-#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
+#: ../shell/e-shell-content.c:721 ../shell/e-shell-content.c:722
 msgid "Searches"
 msgstr "Søk"
 
-#: ../shell/e-shell-content.c:771
+#: ../shell/e-shell-content.c:765
 msgid "Save Search"
 msgstr "Lagre søk"
 
@@ -19113,81 +18961,80 @@
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:940
+#: ../shell/e-shell-searchbar.c:1102
 msgid "Sho_w:"
 msgstr "_Vis:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:973
+#: ../shell/e-shell-searchbar.c:1136
 msgid "Sear_ch:"
 msgstr "Sø_k:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1036
+#: ../shell/e-shell-searchbar.c:1217
 msgid "i_n"
 msgstr "_i"
 
-#: ../shell/e-shell-utils.c:197
+#: ../shell/e-shell-utils.c:175
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:220
+#: ../shell/e-shell-utils.c:199
 msgid "All Files (*)"
 msgstr "Alle filer (*)"
 
-#: ../shell/e-shell-view.c:304
+#: ../shell/e-shell-view.c:292
 msgid "Saving user interface state"
 msgstr "Lagrer tilstand for brukergrensesnitt"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:645
+#: ../shell/e-shell-window-actions.c:74
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
 "\n"
 "Launchpad Contributions:\n"
-"  Audun Sæther https://launchpad.net/~izte\n"
+"  Audun Sæther https://launchpad.net/~auduns\n"
 "  Håvard Berland https://launchpad.net/~berland\n"
-"  Kim Skråmo https://launchpad.net/~akrosikam\n"
 "  Kjartan Maraas https://launchpad.net/~kmaraas\n"
 "  Kjetil Birkeland Moe https://launchpad.net/~kjetilbmoe\n"
 "  Rune C. Akselsen https://launchpad.net/~runeakselsen\n"
-"  Terje Andre Arnøy https://launchpad.net/~terjeaar"
+"  Terje Andre Arnøy https://launchpad.net/~terjeaar\n"
+"  Åka Sikrom https://launchpad.net/~akrosikam"
 
-#: ../shell/e-shell-window-actions.c:656
+#: ../shell/e-shell-window-actions.c:85
 msgid "Evolution Website"
 msgstr "Evolution nettsted"
 
-#: ../shell/e-shell-window-actions.c:891
+#: ../shell/e-shell-window-actions.c:341
 msgid "Categories Editor"
 msgstr "Redigering av kategorier"
 
-#: ../shell/e-shell-window-actions.c:1249
+#: ../shell/e-shell-window-actions.c:672
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy er ikke installert."
 
-#: ../shell/e-shell-window-actions.c:1251
+#: ../shell/e-shell-window-actions.c:673
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy kunne ikke kjøres."
 
-#: ../shell/e-shell-window-actions.c:1411
+#: ../shell/e-shell-window-actions.c:853
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ../shell/e-shell-window-actions.c:1437
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:858 ../shell/e-shell-window-actions.c:872
 msgid "_Close Window"
 msgstr "_Lukk vindu"
 
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:879
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../shell/e-shell-window-actions.c:1460
+#: ../shell/e-shell-window-actions.c:881
 msgid "Open the Evolution User Guide"
 msgstr "Åpne Evolutions brukermanual"
 
@@ -19199,257 +19046,257 @@
 msgid "Forget all remembered passwords"
 msgstr "Glem alle lagrede passord"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:907
 msgid "I_mport..."
 msgstr "I_mporter …"
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:909
 msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:914
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:916
 msgid "Create a new window displaying this view"
 msgstr "Opprett et nytt vindu med denne visningen"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:928
 msgid "Available Cate_gories"
 msgstr "Tilgjengelige kate_gorier"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:930
 msgid "Manage available categories"
 msgstr "Håndter tilgjengelige kategorier"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:942
 msgid "_Quick Reference"
 msgstr "_Hurtigreferanse"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:944
 msgid "Show Evolution's shortcut keys"
 msgstr "Vis snarveitaster for Evolution"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:951
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:956
 msgid "_Advanced Search..."
 msgstr "_Avansert søk …"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:958
 msgid "Construct a more advanced search"
 msgstr "Sett sammen et mer avansert søk"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:965
 msgid "Clear the current search parameters"
 msgstr "Tøm aktive søkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:970
 msgid "_Edit Saved Searches..."
 msgstr "R_ediger lagrede søk …"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:972
 msgid "Manage your saved searches"
 msgstr "Håndter dine lagrede søk"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:979
 msgid "Click here to change the search type"
 msgstr "Klikk her for å endre søketype"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:984
 msgid "_Find Now"
 msgstr "_Finn nå"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:986
 msgid "Execute the current search parameters"
 msgstr "Kjør aktive søkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:991
 msgid "_Save Search..."
 msgstr "_Lagre søk …"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:993
 msgid "Save the current search parameters"
 msgstr "Lagre aktive søkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1005
 msgid "Submit _Bug Report..."
 msgstr "Sen_d inn feilrapport …"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1007
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1012
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1014
 msgid "Put Evolution into offline mode"
 msgstr "Sett Evolution i frakoblet modus"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1019
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1021
 msgid "Put Evolution into online mode"
 msgstr "Sett Evolution i tilkoblet modus"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1049
 msgid "Lay_out"
 msgstr "Utf_orming"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1056
 msgid "_New"
 msgstr "_Ny"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1063
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1070
 msgid "_Switcher Appearance"
 msgstr "Ut_seende for bytter"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1084
 msgid "_Window"
 msgstr "_Vindu"
 
-#: ../shell/e-shell-window-actions.c:1699
+#: ../shell/e-shell-window-actions.c:1113
 msgid "Show Side _Bar"
 msgstr "Vis si_delinje"
 
-#: ../shell/e-shell-window-actions.c:1701
+#: ../shell/e-shell-window-actions.c:1115
 msgid "Show the side bar"
 msgstr "Vis sidelinjen"
 
-#: ../shell/e-shell-window-actions.c:1707
+#: ../shell/e-shell-window-actions.c:1121
 msgid "Show _Buttons"
 msgstr "Vis _knapper"
 
-#: ../shell/e-shell-window-actions.c:1709
+#: ../shell/e-shell-window-actions.c:1123
 msgid "Show the switcher buttons"
 msgstr "Vis knapper for bytter"
 
-#: ../shell/e-shell-window-actions.c:1687
+#: ../shell/e-shell-window-actions.c:1129
 msgid "Show _Status Bar"
 msgstr "Vis _statuslinje"
 
-#: ../shell/e-shell-window-actions.c:1717
+#: ../shell/e-shell-window-actions.c:1131
 msgid "Show the status bar"
 msgstr "Vis statuslinjen"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1137
 msgid "Show _Tool Bar"
 msgstr "Vis verk_tøylinjen"
 
-#: ../shell/e-shell-window-actions.c:1725
+#: ../shell/e-shell-window-actions.c:1139
 msgid "Show the tool bar"
 msgstr "Vis verktøylinjen"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1161
 msgid "_Icons Only"
 msgstr "Kun _ikoner"
 
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1163
 msgid "Display window buttons with icons only"
 msgstr "Vis bare ikoner på vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1168
 msgid "_Text Only"
 msgstr "Kun _tekst"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1170
 msgid "Display window buttons with text only"
 msgstr "Vis bare tekst på vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1733
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Icons _and Text"
 msgstr "Ikoner _og tekst"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1177
 msgid "Display window buttons with icons and text"
 msgstr "Vis tekst og ikoner på vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Tool_bar Style"
 msgstr "S_til for verktøylinje"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1184
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Vis vinduknapper ved å bruke instillinger for verktøylinjen på skrivebordet"
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1180
 msgid "Define Views..."
 msgstr "Definer visninger …"
 
-#: ../shell/e-shell-window-actions.c:1780
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Create or edit views"
 msgstr "Opprett eller rediger visninger"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1199
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning …"
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1201
 msgid "Save current custom view"
 msgstr "Lagre aktiv egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1208
 msgid "C_urrent View"
 msgstr "A_ktiv visning"
 
-#: ../shell/e-shell-window-actions.c:1804
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1806
+#: ../shell/e-shell-window-actions.c:1220
 msgid "Current view is a customized view"
 msgstr "Aktiv visning er en egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1816
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Change the page settings for your current printer"
 msgstr "Endre sideinnstillingene for din skriver"
 
-#: ../shell/e-shell-window-actions.c:2206
+#: ../shell/e-shell-window-actions.c:1591
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
 
-#: ../shell/e-shell-window-actions.c:2428
+#: ../shell/e-shell-window-actions.c:1825
 msgid "Execute these search parameters"
 msgstr "Kjør disse søkeparameterene"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:582
+#: ../shell/e-shell-window-private.c:580
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:494
+#: ../shell/e-shell-window.c:455
 msgid "New"
 msgstr "Ny"
 
-#: ../shell/e-shell.c:312
+#: ../shell/e-shell.c:278
 msgid "Preparing to go offline..."
 msgstr "Forbereder frakoblet bruk …"
 
-#: ../shell/e-shell.c:365
+#: ../shell/e-shell.c:331
 msgid "Preparing to go online..."
 msgstr "Forbereder tilkoblet bruk …"
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:418
 msgid "Preparing to quit..."
 msgstr "Forbereder avslutting …"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:190
+#: ../shell/main.c:183
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19484,7 +19331,7 @@
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: ../shell/main.c:214
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19492,13 +19339,13 @@
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:221
+#: ../shell/main.c:213
 msgid "Do not tell me again"
 msgstr "Ikke gi beskjed igjen"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:311
+#: ../shell/main.c:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19506,23 +19353,23 @@
 "Start Evolution med oppgitt komponent. Tilgjengelige valg er «mail», "
 "«calendar», «contacts», «tasks» og «memos»"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr "Bruk oppgitt geometri på hovedvinduet"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:321
+#: ../shell/main.c:312
 msgid "Ignore network availability"
 msgstr "Ignorer nettverkstilgjengelighet"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:316
 msgid "Start in \"express\" mode"
 msgstr "Start i «ekspress»-modus"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:315
 msgid "Forcibly shut down Evolution"
 msgstr "Tvungen nedstenging av Evolution"
 
@@ -19530,11 +19377,11 @@
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:329
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "Slå av lasting av tillegg."
 
-#: ../shell/main.c:332
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Deaktiver forhåndsvisningsområdet for e-post, kontakter og oppgaver."
 
@@ -19542,15 +19389,15 @@
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Importer URIer eller filnavn gitt som argumenter."
 
-#: ../shell/main.c:338
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr "Be en kjørende Evolution-prosess om å stenge ned"
 
-#: ../shell/main.c:515 ../shell/main.c:523
+#: ../shell/main.c:499 ../shell/main.c:504
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution personlig informasjonshåndterer og e-postklient"
 
-#: ../shell/main.c:600
+#: ../shell/main.c:571
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19559,7 +19406,7 @@
 "%s: --online og --offline kan ikke brukes samtidig.\n"
 "  Bruk «%s --help» for mer informasjon.\n"
 
-#: ../shell/main.c:606
+#: ../shell/main.c:577
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19703,7 +19550,7 @@
 msgid "Show session management options"
 msgstr "Vis alternativer for økthåndtering"
 
-#: ../smime/gui/ca-trust-dialog.c:107
+#: ../smime/gui/ca-trust-dialog.c:109
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19714,7 +19561,7 @@
 "\n"
 "Rediger innstillinger for tillit:"
 
-#: ../smime/gui/cert-trust-dialog.c:148
+#: ../smime/gui/cert-trust-dialog.c:153
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19724,7 +19571,7 @@
 "stoler du også på at dette sertifikatet er autentisk med mindre annet "
 "indikeres her"
 
-#: ../smime/gui/cert-trust-dialog.c:152
+#: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19734,119 +19581,118 @@
 "sertifikatet stoler du heller ikke på at dette sertifikatet er autentisk med "
 "mindre annet indikeres her"
 
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:116
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
 msgid "Certificate Name"
 msgstr "Navn på sertifikat"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
 msgid "Issued To Organization"
 msgstr "Utstedt til organisasjon"
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
 msgid "Issued To Organizational Unit"
 msgstr "Utstedt til organisasjonsenhet"
 
-#: ../smime/gui/certificate-manager.c:80
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:118 ../smime/gui/smime-ui.ui.h:12
-#: ../smime/lib/e-cert.c:544
+#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-viewer.c:638 ../smime/lib/e-asn1-object.c:134
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
 msgid "Purposes"
 msgstr "Hensikter"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
-#: ../smime/gui/certificate-manager.c:120 ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116
+#: ../smime/gui/certificate-viewer.c:640
 msgid "Issued By"
 msgstr "Utstedt av"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
 msgid "Issued By Organization"
 msgstr "Utstedt av organisasjon:"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
 msgid "Issued By Organizational Unit"
 msgstr "Utstedt av organisasjonsenhet"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
 msgid "Issued"
 msgstr "Utstedt"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
 msgid "Expires"
 msgstr "Utgår"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125 ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-viewer.c:650
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-fingeravtrykk"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126 ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-viewer.c:651
 msgid "MD5 Fingerprint"
 msgstr "MD5-fingeravtrykk"
 
-#: ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:117
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
 msgid "Email Address"
 msgstr "E-post_adresse"
 
-#: ../smime/gui/certificate-manager.c:584
+#: ../smime/gui/certificate-manager.c:614
 msgid "Select a certificate to import..."
 msgstr "Velg et sertifikat som skal importeres …"
 
-#: ../smime/gui/certificate-manager.c:597
+#: ../smime/gui/certificate-manager.c:628
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../smime/gui/certificate-manager.c:651
+#: ../smime/gui/certificate-manager.c:664
 msgid "Failed to import certificate"
 msgstr "Klarte ikke å importere sertifikat"
 
-#: ../smime/gui/certificate-manager.c:1006
+#: ../smime/gui/certificate-manager.c:1046
 msgid "All PKCS12 files"
 msgstr "Alle PKCS12-filer"
 
-#: ../smime/gui/certificate-manager.c:1023
+#: ../smime/gui/certificate-manager.c:1063
 msgid "All email certificate files"
 msgstr "Alle sertifikatfiler for e-post"
 
-#: ../smime/gui/certificate-manager.c:1040
+#: ../smime/gui/certificate-manager.c:1080
 msgid "All CA certificate files"
 msgstr "Alle CA-sertifikatfiler"
 
-#: ../smime/gui/certificate-viewer.c:349
+#: ../smime/gui/certificate-viewer.c:362
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikatvisning: %s"
 
-#: ../smime/gui/component.c:50
+#: ../smime/gui/component.c:58
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "Oppgi passord for «%s»"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:76
+#: ../smime/gui/component.c:86
 msgid "Enter new password for certificate database"
 msgstr "Oppgi passordet for «%s»"
 
-#: ../smime/gui/component.c:79
+#: ../smime/gui/component.c:89
 msgid "Enter new password"
 msgstr "Oppgi nytt passord"
 
@@ -19873,51 +19719,51 @@
 msgid "Select certificate"
 msgstr "Velg sertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:803
+#: ../smime/gui/certificate-viewer.c:604 ../smime/lib/e-asn1-object.c:387
 msgid "SSL Client Certificate"
 msgstr "SSL-klientsertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:807
+#: ../smime/gui/certificate-viewer.c:609 ../smime/lib/e-asn1-object.c:391
 msgid "SSL Server Certificate"
 msgstr "SSL-tjenersertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:5
+#: ../smime/gui/certificate-viewer.c:614
 msgid "Email Signer Certificate"
 msgstr "Sertifikat for signering av e-post"
 
-#: ../smime/gui/smime-ui.ui.h:6
+#: ../smime/gui/certificate-viewer.c:619
 msgid "Email Recipient Certificate"
 msgstr "Sertifikat for e-postmottaker"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/certificate-viewer.c:600
 msgid "This certificate has been verified for the following uses:"
 msgstr "Dette sertifikatet er verifisert for følgende bruk:"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/certificate-viewer.c:634
 msgid "Issued To"
 msgstr "Utstedt til"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/certificate-viewer.c:635 ../smime/gui/certificate-viewer.c:641
 msgid "Common Name (CN)"
 msgstr "Vanlig navn (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/certificate-viewer.c:636 ../smime/gui/certificate-viewer.c:642
 msgid "Organization (O)"
 msgstr "Organisasjon (O)"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/certificate-viewer.c:637 ../smime/gui/certificate-viewer.c:643
 msgid "Organizational Unit (OU)"
 msgstr "Organisasjonsenhet (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/certificate-viewer.c:646
 msgid "Issued On"
 msgstr "Utstedt"
 
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../smime/gui/certificate-viewer.c:647
 msgid "Expires On"
 msgstr "Utgår"
 
-#: ../smime/gui/smime-ui.ui.h:16
+#: ../smime/gui/certificate-viewer.c:649
 msgid "Fingerprints"
 msgstr "Fingeravtrykk"
 
@@ -19925,62 +19771,62 @@
 msgid "<Not Part of Certificate>"
 msgstr "<Ikke en del av sertifikatet>"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/certificate-viewer.c:645
 msgid "Validity"
 msgstr "Gyldighet"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/certificate-viewer.c:671
 msgid "Certificate Hierarchy"
 msgstr "Sertifikathierarki"
 
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/certificate-viewer.c:674
 msgid "Certificate Fields"
 msgstr "Sertifikatfelt"
 
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../smime/gui/certificate-viewer.c:677
 msgid "Field Value"
 msgstr "Feltverdi"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Du har sertifikater som identifiserer deg fra disse organisasjonene:"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Certificates Table"
 msgstr "Tabell med sertifikater"
 
 #. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "_Backup"
 msgstr "_Sikkerhetskopier"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Backup _All"
 msgstr "Ta sikkerhetskopi av _alle"
 
-#: ../smime/gui/smime-ui.ui.h:33
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Your Certificates"
 msgstr "Dine sertifikater"
 
-#: ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "You have certificates on file that identify these people:"
 msgstr "Du har sertifikater som identifiserer disse menneskene på lager:"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Kontaktsertifikater"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:13
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Du har sertifikater på lager som identifiserer disse sertifikatmyndighetene:"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Authorities"
 msgstr "Autoriteter"
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Certificate Authority Trust"
 msgstr "Tillit til sertifikatmyndighet"
 
@@ -19996,7 +19842,7 @@
 msgid "Trust this CA to identify software developers."
 msgstr "Stol på denne CAen for å identifisere programvareutviklere."
 
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:19
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20004,40 +19850,40 @@
 "Før du stoler på denne CAen for noe formål bør du undersøke sertifikatet og "
 "dets regelsett og prosedyrer (hvis tilgjengelig)."
 
-#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1072
+#: ../smime/gui/smime-ui.ui.h:21 ../smime/lib/e-asn1-object.c:658
 msgid "Certificate"
 msgstr "Sertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "Certificate details"
 msgstr "Detaljer om sertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Email Certificate Trust Settings"
 msgstr "Innstillinger for tillit til e-postsertifikater"
 
-#: ../smime/gui/smime-ui.ui.h:47
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Trust the authenticity of this certificate"
 msgstr "Stol på at dette sertifikatet er autentisk"
 
-#: ../smime/gui/smime-ui.ui.h:48
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ikke stol på at dette sertifikatet er autentisk"
 
-#: ../smime/gui/smime-ui.ui.h:49
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "_Edit CA Trust"
 msgstr "R_ediger tillit til CA"
 
-#: ../smime/lib/e-cert-db.c:859
+#: ../smime/lib/e-cert-db.c:864
 msgid "Certificate already exists"
 msgstr "Sertifikatet eksisterer allerede"
 
-#: ../smime/lib/e-cert.c:202 ../smime/lib/e-cert.c:214
+#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:391
+#: ../smime/lib/e-cert.c:392
 msgid "Sign"
 msgstr "Signer"
 
@@ -20045,140 +19891,140 @@
 msgid "Encrypt"
 msgstr "Krypter"
 
-#: ../smime/lib/e-cert.c:504
+#: ../smime/lib/e-asn1-object.c:95
 msgid "Version"
 msgstr "Versjon"
 
-#: ../smime/lib/e-cert.c:519
+#: ../smime/lib/e-asn1-object.c:110
 msgid "Version 1"
 msgstr "Versjon 1"
 
-#: ../smime/lib/e-cert.c:522
+#: ../smime/lib/e-asn1-object.c:113
 msgid "Version 2"
 msgstr "Versjon 2"
 
-#: ../smime/lib/e-cert.c:525
+#: ../smime/lib/e-asn1-object.c:116
 msgid "Version 3"
 msgstr "Versjon 3"
 
-#: ../smime/lib/e-cert.c:608
+#: ../smime/lib/e-asn1-object.c:192
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:611
+#: ../smime/lib/e-asn1-object.c:195
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:614
+#: ../smime/lib/e-asn1-object.c:198
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-asn1-object.c:201
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-asn1-object.c:204
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-asn1-object.c:207
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-asn1-object.c:234
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-asn1-object.c:237
 msgid "Certificate Key Usage"
 msgstr "Bruksområde for sertifikatnøkkel"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-asn1-object.c:240
 msgid "Netscape Certificate Type"
 msgstr "Netscape sertifikattype"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-asn1-object.c:243
 msgid "Certificate Authority Key Identifier"
 msgstr "Nøkkelidentifikator for sertifikatmyndighet"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-asn1-object.c:255
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objektidentifikator (%s)"
 
-#: ../smime/lib/e-cert.c:723
+#: ../smime/lib/e-asn1-object.c:306
 msgid "Algorithm Identifier"
 msgstr "Algoritmeidentifikator"
 
-#: ../smime/lib/e-cert.c:731
+#: ../smime/lib/e-asn1-object.c:314
 msgid "Algorithm Parameters"
 msgstr "Parametere for algoritme"
 
-#: ../smime/lib/e-cert.c:753
+#: ../smime/lib/e-asn1-object.c:336
 msgid "Subject Public Key Info"
 msgstr "Informasjon om subjektets offentlige nøkkel"
 
-#: ../smime/lib/e-cert.c:758
+#: ../smime/lib/e-asn1-object.c:341
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritme for subjektets offentlige nøkkel"
 
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-asn1-object.c:356
 msgid "Subject's Public Key"
 msgstr "Subjektets offentlige nøkkel"
 
-#: ../smime/lib/e-cert.c:794 ../smime/lib/e-cert.c:844
+#: ../smime/lib/e-asn1-object.c:378 ../smime/lib/e-asn1-object.c:428
 msgid "Error: Unable to process extension"
 msgstr "Feil: Kan ikke prosessere utvidelse"
 
-#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:827
+#: ../smime/lib/e-asn1-object.c:399 ../smime/lib/e-asn1-object.c:411
 msgid "Object Signer"
 msgstr "Signeringspart for objekt"
 
-#: ../smime/lib/e-cert.c:819
+#: ../smime/lib/e-asn1-object.c:403
 msgid "SSL Certificate Authority"
 msgstr "SSL-sertifikatmyndighet"
 
-#: ../smime/lib/e-cert.c:823
+#: ../smime/lib/e-asn1-object.c:407
 msgid "Email Certificate Authority"
 msgstr "Sertifikatmyndighet for e-post"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-asn1-object.c:436
 msgid "Signing"
 msgstr "Signering"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-asn1-object.c:440
 msgid "Non-repudiation"
 msgstr "Ikke-benekting"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-asn1-object.c:444
 msgid "Key Encipherment"
 msgstr "Nøkkelchiffer"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-asn1-object.c:448
 msgid "Data Encipherment"
 msgstr "Datachiffer"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-asn1-object.c:452
 msgid "Key Agreement"
 msgstr "Nøkkelavtale"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-asn1-object.c:456
 msgid "Certificate Signer"
 msgstr "Sertifikatsignerer"
 
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-asn1-object.c:460
 msgid "CRL Signer"
 msgstr "CRL-signerer"
 
-#: ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-asn1-object.c:509
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../smime/lib/e-cert.c:927 ../smime/lib/e-cert.c:930
+#: ../smime/lib/e-asn1-object.c:511 ../smime/lib/e-asn1-object.c:514
 msgid "Not Critical"
 msgstr "Ikke-kritisk"
 
-#: ../smime/lib/e-cert.c:951
+#: ../smime/lib/e-asn1-object.c:535
 msgid "Extensions"
 msgstr "Utvidelser"
 
@@ -20190,28 +20036,28 @@
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1031
+#: ../smime/lib/e-asn1-object.c:615
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1086 ../smime/lib/e-cert.c:1209
+#: ../smime/lib/e-asn1-object.c:672 ../smime/lib/e-asn1-object.c:807
 msgid "Certificate Signature Algorithm"
 msgstr "Signeringsalgoritme for sertifikat"
 
-#: ../smime/lib/e-cert.c:1095
+#: ../smime/lib/e-asn1-object.c:681
 msgid "Issuer"
 msgstr "Utsteder"
 
-#: ../smime/lib/e-cert.c:1150
+#: ../smime/lib/e-asn1-object.c:735
 msgid "Issuer Unique ID"
 msgstr "Unik ID for utsteder"
 
-#: ../smime/lib/e-cert.c:1170
+#: ../smime/lib/e-asn1-object.c:754
 msgid "Subject Unique ID"
 msgstr "Unik ID for subjekt"
 
-#: ../smime/lib/e-cert.c:1215
+#: ../smime/lib/e-asn1-object.c:813
 msgid "Certificate Signature Value"
 msgstr "Signaturverdi for sertifikat"
 
@@ -20223,7 +20069,7 @@
 msgid "Enter password for PKCS12 file:"
 msgstr "Oppgi passord for PKCS12-fil:"
 
-#: ../smime/lib/e-pkcs12.c:306
+#: ../smime/lib/e-pkcs12.c:307
 msgid "Imported Certificate"
 msgstr "Importert sertifikat"
 
@@ -20300,19 +20146,17 @@
 msgstr "Med _status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:202
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:416
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:420
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:770
+#: ../e-util/e-timezone-dialog.c:207 ../e-util/e-timezone-dialog.c:429
+#: ../e-util/e-timezone-dialog.c:433 ../e-util/e-timezone-dialog.c:437
+#: ../e-util/e-timezone-dialog.c:803
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
+#: ../e-util/e-timezone-dialog.ui.h:1
 msgid "Select a Time Zone"
 msgstr "Velg en tidssone"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
+#: ../e-util/e-timezone-dialog.ui.h:2
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -20322,71 +20166,70 @@
 "tidssone.\n"
 "Bru høyre musknapp til å zoome ut."
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+#: ../e-util/e-timezone-dialog.ui.h:4
 msgid "Time Zones"
 msgstr "Tidssoner"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
+#: ../e-util/e-timezone-dialog.ui.h:5
 msgid "_Selection"
 msgstr "_Utvalg"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
+#: ../e-util/e-timezone-dialog.ui.h:6
 msgid "Timezone drop-down combination box"
 msgstr "Kombinasjonsboks med nedtrekksvalg for tidssone"
 
-#: ../widgets/menus/gal-define-views-dialog.c:364
-#: ../widgets/menus/gal-define-views.ui.h:4
+#: ../e-util/gal-define-views.ui.h:4 ../e-util/gal-define-views-dialog.c:375
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definer visninger for %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:385
-#: ../widgets/menus/gal-define-views-dialog.c:388
+#: ../e-util/gal-define-views-dialog.c:385
+#: ../e-util/gal-define-views-dialog.c:388
 msgid "Define Views"
 msgstr "Definer visninger"
 
-#: ../widgets/menus/gal-define-views.ui.h:2
+#: ../e-util/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "Definer visninger for «%s»"
 
-#: ../widgets/menus/gal-view-factory-etable.c:115
+#: ../e-util/gal-view-factory-etable.c:114
 msgid "Table"
 msgstr "Tabell"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:289
+#: ../e-util/gal-view-instance-save-as-dialog.c:296
 msgid "Save Current View"
 msgstr "Lagre aktiv visning"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "_Opprett en ny visning"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "E_rstatt eksisterende visning"
 
-#: ../widgets/menus/gal-view-new-dialog.c:172
+#: ../e-util/gal-view-new-dialog.c:173
 msgid "Define New View"
 msgstr "Definer ny visning"
 
-#: ../widgets/menus/gal-view-new-dialog.ui.h:1
+#: ../e-util/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
 msgstr "Navn på ny visning:"
 
-#: ../widgets/menus/gal-view-new-dialog.ui.h:2
+#: ../e-util/gal-view-new-dialog.ui.h:2
 msgid "Type of view:"
 msgstr "Type visning:"
 
-#: ../widgets/menus/gal-view-new-dialog.ui.h:3
+#: ../e-util/gal-view-new-dialog.ui.h:3
 msgid "Type of View"
 msgstr "Type visning"
 
-#: ../mail/e-mail-account-manager.c:518
+#: ../mail/e-mail-account-manager.c:746
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: ../mail/e-mail-account-tree-view.c:105
+#: ../mail/e-mail-account-tree-view.c:109
 msgid "Account Name"
 msgstr "Kontonavn"
 
@@ -20394,7 +20237,7 @@
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../widgets/misc/e-attachment-dialog.c:311
+#: ../e-util/e-attachment-dialog.c:318
 msgid "Attachment Properties"
 msgstr "Egenskaper for vedlegg"
 
@@ -20402,110 +20245,108 @@
 msgid "_Filename:"
 msgstr "_Filnavn:"
 
-#: ../widgets/misc/e-attachment-dialog.c:368
+#: ../e-util/e-attachment-dialog.c:375
 msgid "MIME Type:"
 msgstr "MIME-type:"
 
-#: ../widgets/misc/e-attachment-dialog.c:376
-#: ../widgets/misc/e-attachment-store.c:442
+#: ../e-util/e-attachment-dialog.c:383 ../e-util/e-attachment-store.c:483
 msgid "_Suggest automatic display of attachment"
 msgstr "Fore_slå automatisk visning av vedlegg"
 
-#: ../widgets/misc/e-attachment-handler-image.c:99
+#: ../e-util/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "Kunne ikke sette som bakgrunn"
 
-#: ../widgets/misc/e-attachment-handler-image.c:145
+#: ../e-util/e-attachment-handler-image.c:147
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:93
+#: ../e-util/e-attachment-handler-sendto.c:93
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "Kunne ikke sende vedlegg"
 msgstr[1] "Kunne ikke sende vedlegg"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:135
+#: ../e-util/e-attachment-handler-sendto.c:135
 msgid "_Send To..."
 msgstr "_Send til:"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:137
+#: ../e-util/e-attachment-handler-sendto.c:137
 msgid "Send the selected attachments somewhere"
 msgstr "Send valgte vedlegg til noen"
 
-#: ../widgets/misc/e-attachment-icon-view.c:166
-#: ../widgets/misc/e-attachment-tree-view.c:549
+#: ../e-util/e-attachment-icon-view.c:166
+#: ../e-util/e-attachment-tree-view.c:549
 msgid "Loading"
 msgstr "Laster"
 
-#: ../widgets/misc/e-attachment-icon-view.c:178
-#: ../widgets/misc/e-attachment-tree-view.c:561
+#: ../e-util/e-attachment-icon-view.c:178
+#: ../e-util/e-attachment-tree-view.c:561
 msgid "Saving"
 msgstr "Lagrer"
 
-#: ../widgets/misc/e-attachment-paned.c:104
+#: ../e-util/e-attachment-paned.c:104
 msgid "Hide Attachment _Bar"
 msgstr "Skjul ve_dleggsfelt"
 
-#: ../widgets/misc/e-attachment-paned.c:106
-#: ../widgets/misc/e-attachment-paned.c:719
+#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
 msgid "Show Attachment _Bar"
 msgstr "Vis ve_dleggsfelt"
 
-#: ../widgets/misc/e-attachment-store.c:430
+#: ../e-util/e-attachment-store.c:463
 msgid "Add Attachment"
 msgstr "Legg til vedlegg"
 
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../e-util/e-attachment-store.c:466
 msgid "A_ttach"
 msgstr "Le_gg ved"
 
-#: ../widgets/misc/e-attachment-store.c:496
+#: ../e-util/e-attachment-store.c:537
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Lagre vedlegg"
 msgstr[1] "Lagre vedlegg"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1821 ../widgets/misc/e-attachment.c:2369
-#: ../widgets/misc/e-attachment-store.c:525
+#: ../e-util/e-attachment-store.c:568 ../e-util/e-attachment.c:2048
+#: ../e-util/e-attachment.c:2708
 msgid "attachment.dat"
 msgstr "vedlegg.dat"
 
-#: ../widgets/misc/e-attachment-view.c:379
+#: ../e-util/e-attachment-view.c:378
 msgid "Open With Other Application..."
 msgstr "Åpne med et annet program …"
 
-#: ../widgets/misc/e-attachment-view.c:411
+#: ../e-util/e-attachment-view.c:385
 msgid "S_ave All"
 msgstr "L_agre alle"
 
-#: ../widgets/misc/e-attachment-view.c:412
+#: ../e-util/e-attachment-view.c:411
 msgid "A_dd Attachment..."
 msgstr "Legg til ve_dlegg …"
 
-#: ../widgets/misc/e-attachment-view.c:461
+#: ../e-util/e-attachment-view.c:435
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: ../widgets/misc/e-attachment-view.c:443
+#: ../e-util/e-attachment-view.c:442
 msgid "Hid_e All"
 msgstr "Skj_ul alle"
 
-#: ../widgets/misc/e-attachment-view.c:475
+#: ../e-util/e-attachment-view.c:449
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: ../widgets/misc/e-attachment-view.c:457
+#: ../e-util/e-attachment-view.c:456
 msgid "Vie_w All Inline"
 msgstr "_Vis alle i meldingsteksten"
 
-#: ../widgets/misc/e-attachment-view.c:778
+#: ../e-util/e-attachment-view.c:786
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Åpne med «%s»"
 
-#: ../widgets/misc/e-attachment-view.c:781
+#: ../e-util/e-attachment-view.c:789
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Åpne dette vedlegget i %s"
@@ -20514,54 +20355,54 @@
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1000
+#: ../e-util/e-attachment.c:1103
 msgid "Attached message"
 msgstr "Vedlagt melding"
 
-#: ../widgets/misc/e-attachment.c:1869 ../widgets/misc/e-attachment.c:2671
+#: ../e-util/e-attachment.c:2129 ../e-util/e-attachment.c:3014
 msgid "A load operation is already in progress"
 msgstr "En lasteoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1877 ../widgets/misc/e-attachment.c:2679
+#: ../e-util/e-attachment.c:2137 ../e-util/e-attachment.c:3022
 msgid "A save operation is already in progress"
 msgstr "En lagreoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1974
+#: ../e-util/e-attachment.c:2254
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Kunne ikke laste «%s»"
 
-#: ../widgets/misc/e-attachment.c:1977
+#: ../e-util/e-attachment.c:2257
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Kunne ikke laste vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2250
+#: ../e-util/e-attachment.c:2561
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Kunne ikke åpne «%s»"
 
-#: ../widgets/misc/e-attachment.c:2253
+#: ../e-util/e-attachment.c:2564
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Kunne ikke åpne vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2687
+#: ../e-util/e-attachment.c:3031
 msgid "Attachment contents not loaded"
 msgstr "Vedleggets innhold ble ikke lastet"
 
-#: ../widgets/misc/e-attachment.c:2763
+#: ../e-util/e-attachment.c:3107
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Kunne ikke lagre «%s»"
 
-#: ../widgets/misc/e-attachment.c:2766
+#: ../e-util/e-attachment.c:3110
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Kunne ikke lagre vedlegget"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:389
+#: ../e-util/e-buffer-tagger.c:410
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-klikk for å åpne en lenke"
 
@@ -20570,72 +20411,72 @@
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:290
+#: ../e-util/e-calendar.c:290
 msgid "Month Calendar"
 msgstr "Månedskalender"
 
-#: ../widgets/misc/e-charset-combo-box.c:100
+#: ../e-util/e-charset-combo-box.c:100
 msgid "Character Encoding"
 msgstr "Tegnkoding"
 
-#: ../widgets/misc/e-charset-combo-box.c:123
+#: ../e-util/e-charset-combo-box.c:123
 msgid "Enter the character set to use"
 msgstr "Skriv inn tegnsett som skal brukes"
 
-#: ../widgets/misc/e-charset-combo-box.c:342
+#: ../e-util/e-charset-combo-box.c:342
 msgid "Other..."
 msgstr "Andre …"
 
-#: ../widgets/misc/e-contact-map-window.c:364
+#: ../addressbook/gui/widgets/e-contact-map-window.c:363
 msgid "Contacts Map"
 msgstr "Kontaktkart"
 
-#: ../widgets/misc/e-dateedit.c:504
+#: ../e-util/e-dateedit.c:524
 msgid "Date and Time"
 msgstr "Dato og klokkeslett"
 
-#: ../widgets/misc/e-dateedit.c:525
+#: ../e-util/e-dateedit.c:549
 msgid "Text entry to input date"
 msgstr "Tekstfelt for å oppgi dato"
 
-#: ../widgets/misc/e-dateedit.c:547
+#: ../e-util/e-dateedit.c:572
 msgid "Click this button to show a calendar"
 msgstr "Klikk på denne knappen for å vise en kalender"
 
-#: ../widgets/misc/e-dateedit.c:595
+#: ../e-util/e-dateedit.c:626
 msgid "Drop-down combination box to select time"
 msgstr "Kombinasjonsboks med nedtrekksmeny for å velge tid"
 
-#: ../widgets/misc/e-dateedit.c:666
+#: ../e-util/e-dateedit.c:701
 msgid "No_w"
 msgstr "N_å"
 
-#: ../widgets/misc/e-dateedit.c:673
+#: ../e-util/e-dateedit.c:708
 msgid "_Today"
 msgstr "I _dag"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../widgets/misc/e-dateedit.c:686
+#: ../e-util/e-dateedit.c:717
 msgid "_None"
 msgstr "I_ngen"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1694 ../widgets/misc/e-dateedit.c:1927
+#: ../e-util/e-dateedit.c:1813 ../e-util/e-dateedit.c:2061
 msgctxt "date"
 msgid "None"
 msgstr "Ingen"
 
-#: ../widgets/misc/e-dateedit.c:1821
+#: ../e-util/e-dateedit.c:1953
 msgid "Invalid Date Value"
 msgstr "Ugyldig datoverdi"
 
-#: ../widgets/misc/e-dateedit.c:1865
+#: ../e-util/e-dateedit.c:1998
 msgid "Invalid Time Value"
 msgstr "Ugyldig verdi for tid"
 
-#: ../widgets/misc/e-import-assistant.c:256
+#: ../e-util/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -20643,39 +20484,35 @@
 "Velg filen du ønsker å importere til Evolution og velg hvilken type fil det "
 "er fra listen."
 
-#: ../plugins/calendar-file/calendar-file.c:155
-#: ../widgets/misc/e-attachment-dialog.c:333
-#: ../widgets/misc/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:340 ../e-util/e-import-assistant.c:273
 msgid "F_ilename:"
 msgstr "F_ilnavn:"
 
-#: ../widgets/misc/e-import-assistant.c:283
+#: ../e-util/e-import-assistant.c:283
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../widgets/misc/e-import-assistant.c:297
-#: ../widgets/misc/e-import-assistant.c:472
+#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: ../widgets/misc/e-import-assistant.c:340
-#: ../widgets/misc/e-import-assistant.c:920
+#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:921
 msgid "Choose the destination for this import"
 msgstr "Velg mål det skal importeres til"
 
-#: ../widgets/misc/e-import-assistant.c:365
+#: ../e-util/e-import-assistant.c:365
 msgid "Choose the type of importer to run:"
 msgstr "Velg type importerer som skal kjøres:"
 
-#: ../widgets/misc/e-import-assistant.c:373
+#: ../e-util/e-import-assistant.c:373
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og innstillinger fra _eldre programmer"
 
-#: ../widgets/misc/e-import-assistant.c:381
+#: ../e-util/e-import-assistant.c:381
 msgid "Import a _single file"
 msgstr "Importer en en_kelt fil"
 
-#: ../widgets/misc/e-import-assistant.c:533
+#: ../e-util/e-import-assistant.c:533
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -20686,37 +20523,33 @@
 "Hvis du vil prøve igjen kan du klikke på «Tilbake»-knappen."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:775
+#: ../e-util/e-import-assistant.c:775
 msgid "_Cancel Import"
 msgstr "A_vbryt import"
 
-#: ../widgets/misc/e-import-assistant.c:919
+#: ../e-util/e-import-assistant.c:920
 msgid "Preview data to be imported"
 msgstr "Forhåndsvis data som skal importeres"
 
-#: ../widgets/misc/e-import-assistant.c:925
-#: ../widgets/misc/e-import-assistant.c:938
-#: ../widgets/misc/e-import-assistant.c:1291
-#: ../widgets/misc/e-import-assistant.c:1367
-#: ../widgets/misc/e-import-assistant.c:1376
+#: ../e-util/e-import-assistant.c:926 ../e-util/e-import-assistant.c:939
+#: ../e-util/e-import-assistant.c:1292 ../e-util/e-import-assistant.c:1368
+#: ../e-util/e-import-assistant.c:1377
 msgid "Import Data"
 msgstr "Importer data"
 
-#: ../widgets/misc/e-import-assistant.c:933
+#: ../e-util/e-import-assistant.c:934
 msgid "Select what type of file you want to import from the list."
 msgstr "Velg hvilken type fil du vil importere fra listen."
 
-#: ../widgets/misc/e-import-assistant.c:1281
-#: ../widgets/misc/e-import-assistant.c:1316
+#: ../e-util/e-import-assistant.c:1282 ../e-util/e-import-assistant.c:1317
 msgid "Evolution Import Assistant"
 msgstr "Importeringsassistent for Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1298
-#: ../widgets/misc/e-import-assistant.c:1354
+#: ../e-util/e-import-assistant.c:1299 ../e-util/e-import-assistant.c:1355
 msgid "Import Location"
 msgstr "Importer adresse"
 
-#: ../widgets/misc/e-import-assistant.c:1309
+#: ../e-util/e-import-assistant.c:1310
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -20726,27 +20559,27 @@
 "Gjennom denne veiviseren vil du ledes gjennom import av eksterne filer til "
 "Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1326
+#: ../e-util/e-import-assistant.c:1327
 msgid "Importer Type"
 msgstr "Type import"
 
-#: ../widgets/misc/e-import-assistant.c:1336
+#: ../e-util/e-import-assistant.c:1337
 msgid "Select Information to Import"
 msgstr "Velg informasjon som skal importeres"
 
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../e-util/e-import-assistant.c:1346
 msgid "Select a File"
 msgstr "Velg en fil"
 
-#: ../widgets/misc/e-import-assistant.c:1362
+#: ../e-util/e-import-assistant.c:1363
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Klikk på «Bruk» for å starte import av filen til Evolution."
 
-#: ../widgets/misc/e-map.c:889
+#: ../e-util/e-map.c:886
 msgid "World Map"
 msgstr "Verdenskart"
 
-#: ../widgets/misc/e-map.c:889
+#: ../e-util/e-map.c:889
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -20754,21 +20587,21 @@
 "Mus-basert interaktivt kartfelt for å velge tidssone. Tastaturbrukere må "
 "velge tiddsone fra kombinasjonsboksen nedenfor."
 
-#: ../widgets/misc/e-online-button.c:31
+#: ../e-util/e-online-button.c:31
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
 "Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
 
-#: ../widgets/misc/e-online-button.c:34
+#: ../e-util/e-online-button.c:34
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
 "Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
 
-#: ../widgets/misc/e-online-button.c:37
+#: ../e-util/e-online-button.c:37
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution er frakoblet fordi nettverket ikke er tilgjengelig."
 
-#: ../widgets/misc/e-preferences-window.c:317
+#: ../e-util/e-preferences-window.c:318
 msgid "Evolution Preferences"
 msgstr "Evolution brukervalg"
 
@@ -20777,213 +20610,210 @@
 msgid "Matches: %d"
 msgstr "Treff på: %d"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../e-util/e-search-bar.c:565
 msgid "Close the find bar"
 msgstr "Lukk søkelinjen"
 
-#: ../widgets/misc/e-search-bar.c:535
+#: ../e-util/e-search-bar.c:573
 msgid "Fin_d:"
 msgstr "Fin_n:"
 
-#: ../widgets/misc/e-search-bar.c:586
+#: ../e-util/e-search-bar.c:585
 msgid "Clear the search"
 msgstr "Tøm søket"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../e-util/e-search-bar.c:609
 msgid "_Previous"
 msgstr "_Forrige"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../e-util/e-search-bar.c:615
 msgid "Find the previous occurrence of the phrase"
 msgstr "Finn forrige oppføring av teksten"
 
-#: ../widgets/misc/e-search-bar.c:626
+#: ../e-util/e-search-bar.c:624
 msgid "_Next"
 msgstr "_Neste"
 
-#: ../widgets/misc/e-search-bar.c:635
+#: ../e-util/e-search-bar.c:630
 msgid "Find the next occurrence of the phrase"
 msgstr "Finn neste oppføring av teksten"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../e-util/e-search-bar.c:639
 msgid "Mat_ch case"
 msgstr "Tre_ff på små/store bokstaver"
 
-#: ../widgets/misc/e-search-bar.c:676
+#: ../e-util/e-search-bar.c:667
 msgid "Reached bottom of page, continued from top"
 msgstr "Nådde bunnen av siden og fortsatte fra toppen"
 
-#: ../widgets/misc/e-search-bar.c:698
+#: ../e-util/e-search-bar.c:689
 msgid "Reached top of page, continued from bottom"
 msgstr "Nådde toppen av siden og fortsatte fra bunnen"
 
-#: ../widgets/misc/e-send-options.c:570
+#: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "Når s_lettet:"
 
-#: ../widgets/misc/e-send-options.ui.h:3
+#: ../e-util/e-send-options.ui.h:3
 msgid "Standard"
 msgstr "Standard"
 
-#: ../widgets/misc/e-send-options.ui.h:6
+#: ../e-util/e-send-options.ui.h:6
 msgid "Proprietary"
 msgstr "Proprietær"
 
-#: ../widgets/misc/e-send-options.ui.h:8
+#: ../e-util/e-send-options.ui.h:8
 msgid "Secret"
 msgstr "Hemmelig"
 
-#: ../widgets/misc/e-send-options.ui.h:9
+#: ../e-util/e-send-options.ui.h:9
 msgid "Top Secret"
 msgstr "Topphemmelig"
 
-#: ../widgets/misc/e-send-options.ui.h:10
+#: ../e-util/e-send-options.ui.h:10
 msgid "For Your Eyes Only"
 msgstr "Kun for dine øyne"
 
 #. Translators: Used in send options dialog
-#: ../widgets/misc/e-send-options.ui.h:12
+#: ../e-util/e-send-options.ui.h:12
 msgctxt "send-options"
 msgid "None"
 msgstr "Ingen"
 
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../e-util/e-send-options.ui.h:13
 msgid "Mail Receipt"
 msgstr "E-postkvittering"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../e-util/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "Svar for_espurt"
 
-#: ../widgets/misc/e-send-options.ui.h:16
+#: ../e-util/e-send-options.ui.h:16
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "I_nnen"
 
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../e-util/e-send-options.ui.h:17
 msgctxt "ESendOptionsWithin"
 msgid "days"
 msgstr "dager"
 
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../e-util/e-send-options.ui.h:18
 msgid "_When convenient"
 msgstr "_Når det passer"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../e-util/e-send-options.ui.h:20
 msgid "_Delay message delivery"
 msgstr "_Utsett meldingslevering"
 
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../e-util/e-send-options.ui.h:21
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "_Etter"
 
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../e-util/e-send-options.ui.h:22
 msgctxt "ESendOptionsAfter"
 msgid "days"
 msgstr "dager"
 
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../e-util/e-send-options.ui.h:23
 msgid "_Set expiration date"
 msgstr "_Sett utløpsdato"
 
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../e-util/e-send-options.ui.h:24
 msgctxt "ESendOptions"
 msgid "_Until"
 msgstr "_Inntil"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../e-util/e-send-options.ui.h:25
 msgid "Delivery Options"
 msgstr "Alternativer for levering"
 
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../e-util/e-send-options.ui.h:27
 msgid "_Classification:"
 msgstr "_Klassifisering:"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#: ../e-util/e-send-options.ui.h:28
 msgid "Gene_ral Options"
 msgstr "Gene_relle alternativer"
 
-#: ../widgets/misc/e-send-options.ui.h:29
+#: ../e-util/e-send-options.ui.h:29
 msgid "Creat_e a sent item to track information"
 msgstr "Oppr_ett en sendt-oppføring for å spore informasjonen"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../e-util/e-send-options.ui.h:30
 msgid "_Delivered"
 msgstr "_Levert"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../e-util/e-send-options.ui.h:31
 msgid "Deli_vered and opened"
 msgstr "Le_vert og åpnet"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../e-util/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_All informasjon"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../e-util/e-send-options.ui.h:33
 msgid "A_uto-delete sent item"
 msgstr "Slett sendt-oppføring a_utomatisk"
 
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../e-util/e-send-options.ui.h:34
 msgid "Status Tracking"
 msgstr "Statusoppfølging"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../e-util/e-send-options.ui.h:35
 msgid "_When opened:"
 msgstr "_Ved åpning:"
 
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../e-util/e-send-options.ui.h:36
 msgid "When decli_ned:"
 msgstr "Ved _avslag:"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../e-util/e-send-options.ui.h:37
 msgid "When co_mpleted:"
 msgstr "Ved full_føring:"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../e-util/e-send-options.ui.h:38
 msgid "When acce_pted:"
 msgstr "Ved go_dkjenning:"
 
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../e-util/e-send-options.ui.h:39
 msgid "Return Notification"
 msgstr "Returvarsling"
 
-#: ../widgets/misc/e-send-options.ui.h:40
+#: ../e-util/e-send-options.ui.h:40
 msgid "Sta_tus Tracking"
 msgstr "Sta_tusoppfølging"
 
-#: ../widgets/misc/e-signature-editor.c:138
-#: ../widgets/misc/e-signature-editor.c:564
-#: ../widgets/misc/e-signature-manager.c:372
-#: ../widgets/misc/e-signature-script-dialog.c:219
+#: ../e-util/e-mail-signature-editor.c:595
 msgid "Unnamed"
 msgstr "Uten navn"
 
-#: ../widgets/misc/e-signature-editor.c:218
+#: ../e-util/e-mail-signature-editor.c:315
 msgid "_Save and Close"
 msgstr "L_agre og lukk"
 
-#: ../widgets/misc/e-signature-editor.c:434
+#: ../e-util/e-mail-signature-editor.c:529
 msgid "Edit Signature"
 msgstr "Rediger signatur"
 
-#: ../widgets/misc/e-signature-editor.c:449
+#: ../e-util/e-mail-signature-editor.c:549
 msgid "_Signature Name:"
 msgstr "Navn på _signatur:"
 
-#: ../widgets/misc/e-signature-manager.c:321
+#: ../e-util/e-mail-signature-manager.c:422
 msgid "Add Signature Script"
 msgstr "Legg til signaturskript"
 
-#: ../widgets/misc/e-signature-manager.c:386
+#: ../e-util/e-mail-signature-manager.c:492
 msgid "Edit Signature Script"
 msgstr "Rediger signaturskript"
 
-#: ../widgets/misc/e-signature-manager.c:605
+#: ../e-util/e-mail-signature-manager.c:337
 msgid "Add _Script"
 msgstr "Legg til _skript"
 
-#: ../widgets/misc/e-signature-script-dialog.c:270
+#: ../e-util/e-mail-signature-script-dialog.c:395
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -20993,225 +20823,223 @@
 "signatur. Navnet du oppgir vil kun brukes for\n"
 "visning på skjermen."
 
-#: ../widgets/misc/e-mail-signature-script-dialog.c:446
+#: ../e-util/e-mail-signature-script-dialog.c:446
 msgid "S_cript:"
 msgstr "S_kript:"
 
-#: ../widgets/misc/e-mail-signature-script-dialog.c:477
+#: ../e-util/e-mail-signature-script-dialog.c:477
 msgid "Script file must be executable."
 msgstr "Skriptfilen må være kjørbar."
 
-#: ../widgets/misc/e-url-entry.c:78
+#: ../e-util/e-url-entry.c:80
 msgid "Click here to go to URL"
 msgstr "Klikk her for å vise URL"
 
-#: ../widgets/misc/e-web-view.c:274 ../widgets/misc/e-web-view-gtkhtml.c:407
+#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:285
 msgid "_Copy Link Location"
 msgstr "_Kopier adressen til lenke"
 
-#: ../widgets/misc/e-web-view.c:412
+#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:287
 msgid "Copy the link to the clipboard"
 msgstr "Kopier lenken til utklippstavlen"
 
-#: ../widgets/misc/e-web-view.c:284 ../widgets/misc/e-web-view-gtkhtml.c:417
+#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:295
 msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: ../widgets/misc/e-web-view.c:422
+#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:297
 msgid "Open the link in a web browser"
 msgstr "Åpne lenken i en nettleser"
 
-#: ../widgets/misc/e-web-view.c:430
+#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:305
 msgid "_Copy Email Address"
 msgstr "_Kopier e-postadresse"
 
-#: ../widgets/misc/e-web-view.c:311 ../widgets/misc/e-web-view-gtkhtml.c:444
+#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:322
 msgid "_Copy Image"
 msgstr "_Kopier bilde"
 
-#: ../widgets/misc/e-web-view.c:313 ../widgets/misc/e-web-view-gtkhtml.c:446
+#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:324
 msgid "Copy the image to the clipboard"
 msgstr "Kopier bildet til utklippstavlen"
 
-#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
+#: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1308
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1317
 msgid "Select all text and images"
 msgstr "Velg all tekst og alle bilder"
 
-#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
-#: ../widgets/misc/e-web-view.c:986
+#: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
+#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:992
+#: ../e-util/e-web-view.c:994 ../e-util/e-web-view.c:996
 #, c-format
 msgid "Click to call %s"
 msgstr "Klikk for å ringe %s"
 
-#: ../widgets/misc/e-web-view.c:988
+#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:998
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for å skjule/vise adresser"
 
-#: ../widgets/misc/e-web-view.c:1108 ../widgets/misc/e-web-view-gtkhtml.c:983
+#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:1000
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
-#: ../widgets/misc/ea-calendar-item.c:314
-#: ../widgets/misc/ea-calendar-item.c:323
+#: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../widgets/misc/ea-calendar-item.c:326
+#: ../e-util/ea-calendar-item.c:327
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalender (fra %s til %s)"
 
-#: ../widgets/misc/ea-calendar-item.c:363
+#: ../e-util/ea-calendar-item.c:364
 msgid "evolution calendar item"
 msgstr "Evolution kalenderoppføring"
 
-#: ../widgets/table/e-cell-combo.c:187
+#: ../e-util/e-cell-combo.c:186
 msgid "popup list"
 msgstr "oppsprettliste"
 
-#: ../widgets/table/e-cell-date-edit.c:302
+#: ../e-util/e-cell-date-edit.c:299
 msgid "Now"
 msgstr "Nå"
 
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../widgets/table/e-cell-date-edit.c:317
+#: ../e-util/e-cell-date-edit.c:317
 msgctxt "table-date"
 msgid "None"
 msgstr "Ingen"
 
-#: ../widgets/table/e-cell-date-edit.c:325
+#: ../e-util/e-cell-date-edit.c:325
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:876
+#: ../e-util/e-cell-date-edit.c:873
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen må skrives inn på formatet: %s"
 
-#: ../widgets/table/e-cell-percent.c:80
+#: ../e-util/e-cell-percent.c:80
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 
-#: ../widgets/table/e-table-click-to-add.c:643
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
+#: ../e-util/e-table-click-to-add.c:680
+#: ../e-util/gal-a11y-e-table-click-to-add.c:62
+#: ../e-util/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
 msgstr "klikk for å legge til"
 
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
+#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
 msgid "(Ascending)"
 msgstr "(Stigende)"
 
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
+#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
 msgid "(Descending)"
 msgstr "(Synkende)"
 
-#: ../widgets/table/e-table-config.c:400
+#: ../e-util/e-table-config.c:396
 msgid "Not sorted"
 msgstr "Ikke sortert"
 
-#: ../widgets/table/e-table-config.c:441
+#: ../e-util/e-table-config.c:441
 msgid "No grouping"
 msgstr "Ingen gruppering"
 
-#: ../widgets/table/e-table-config.c:666
-#: ../widgets/table/e-table-config.ui.h:1
+#: ../e-util/e-table-config.c:546
 msgid "Show Fields"
 msgstr "Vis felter"
 
-#: ../widgets/table/e-table-config.c:686
+#: ../e-util/e-table-config.c:690
 msgid "Available Fields"
 msgstr "Tilgjengelige felt"
 
-#: ../widgets/table/e-table-config.ui.h:2
+#: ../e-util/e-table-config.ui.h:2
 msgid "A_vailable Fields:"
 msgstr "T_ilgjengelige felter:"
 
-#: ../widgets/table/e-table-config.ui.h:3
+#: ../e-util/e-table-config.ui.h:3
 msgid "_Show these fields in order:"
 msgstr "_Vis disse feltene i rekkefølge:"
 
-#: ../widgets/table/e-table-config.ui.h:4
+#: ../e-util/e-table-config.ui.h:4
 msgid "Move _Up"
 msgstr "Flytt _opp"
 
-#: ../widgets/table/e-table-config.ui.h:5
+#: ../e-util/e-table-config.ui.h:5
 msgid "Move _Down"
 msgstr "Flytt _ned"
 
-#: ../widgets/table/e-table-config.ui.h:7
+#: ../e-util/e-name-selector-dialog.c:1001
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../widgets/table/e-table-config.ui.h:9
+#: ../e-util/e-table-config.ui.h:7
 msgid "_Show field in View"
 msgstr "Vi_s felt i visning"
 
-#: ../widgets/table/e-table-config.ui.h:10
-#: ../widgets/table/e-table-header-item.c:1736
+#: ../e-util/e-table-config.ui.h:8 ../e-util/e-table-header-item.c:1753
 msgid "Ascending"
 msgstr "Stigende"
 
-#: ../widgets/table/e-table-config.ui.h:11
-#: ../widgets/table/e-table-header-item.c:1736
+#: ../e-util/e-table-config.ui.h:9 ../e-util/e-table-header-item.c:1753
 msgid "Descending"
 msgstr "Synkende"
 
-#: ../widgets/table/e-table-config.ui.h:12
+#: ../e-util/e-table-config.ui.h:10
 msgid "Group Items By"
 msgstr "Grupper elementer etter"
 
-#: ../widgets/table/e-table-config.ui.h:13
+#: ../e-util/e-table-config.ui.h:11
 msgid "Show _field in View"
 msgstr "Vis _felt i visning"
 
-#: ../widgets/table/e-table-config.ui.h:14
+#: ../e-util/e-table-config.ui.h:12
 msgid "Then By"
 msgstr "Så etter"
 
-#: ../widgets/table/e-table-config.ui.h:15
+#: ../e-util/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "Vis felt i vis_ning"
 
-#: ../widgets/table/e-table-config.ui.h:16
+#: ../e-util/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "Vis felt i _visning"
 
-#: ../widgets/table/e-table-config.ui.h:17
+#: ../e-util/e-table-config.ui.h:6
 msgid "Clear _All"
 msgstr "Fjern _alt"
 
-#: ../widgets/table/e-table-config.ui.h:18
+#: ../e-util/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "Sorter"
 
-#: ../widgets/table/e-table-config.ui.h:19
+#: ../e-util/e-table-config.ui.h:17
 msgid "Sort Items By"
 msgstr "Sorter elementer etter"
 
-#: ../widgets/table/e-table-config.ui.h:20
+#: ../e-util/e-table-config.ui.h:16
 msgid "Clear All"
 msgstr "Fjern alt"
 
-#: ../widgets/table/e-table-config.ui.h:21
+#: ../e-util/e-table-config.ui.h:1
 msgid "_Sort..."
 msgstr "_Sorter …"
 
-#: ../widgets/table/e-table-config.ui.h:22
+#: ../e-util/e-table-config.ui.h:2
 msgid "_Group By..."
 msgstr "_Grupper etter …"
 
-#: ../widgets/table/e-table-config.ui.h:23
+#: ../e-util/e-table-config.ui.h:3
 msgid "_Fields Shown..."
 msgstr "_Viste felt …"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:224
+#: ../e-util/e-table-field-chooser-dialog.c:227
 msgid "Add a Column"
 msgstr "Legg til en kolonne"
 
-#: ../widgets/table/e-table-field-chooser.c:153
+#: ../e-util/e-table-field-chooser.c:167
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -21219,114 +21047,114 @@
 "For å legge til en kolonne i din tabell kan\n"
 "du dra den dit du vil ha den."
 
-#: ../widgets/table/e-table-group-container.c:364
+#: ../e-util/e-table-group-container.c:369
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s: %s (%d oppføring)"
 msgstr[1] "%s: %s (%d oppføringer)"
 
-#: ../widgets/table/e-table-group-container.c:378
+#: ../e-util/e-table-group-container.c:383
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d oppføring)"
 msgstr[1] "%s (%d oppføringer)"
 
-#: ../widgets/table/e-table-header-item.c:1580
+#: ../e-util/e-table-header-item.c:1576
 msgid "Customize Current View"
 msgstr "Tilpass aktiv visning"
 
-#: ../widgets/table/e-table-header-item.c:1596
+#: ../e-util/e-table-header-item.c:1599
 msgid "Sort _Ascending"
 msgstr "Sorter s_tigende"
 
-#: ../widgets/table/e-table-header-item.c:1599
+#: ../e-util/e-table-header-item.c:1602
 msgid "Sort _Descending"
 msgstr "Sorter s_ynkende"
 
-#: ../widgets/table/e-table-header-item.c:1602
+#: ../e-util/e-table-header-item.c:1605
 msgid "_Unsort"
 msgstr "_Fjern sortering"
 
-#: ../widgets/table/e-table-header-item.c:1605
+#: ../e-util/e-table-header-item.c:1608
 msgid "Group By This _Field"
 msgstr "Grupper etter dette _feltet"
 
-#: ../widgets/table/e-table-header-item.c:1608
+#: ../e-util/e-table-header-item.c:1611
 msgid "Group By _Box"
 msgstr "Grupper etter _boks"
 
-#: ../widgets/table/e-table-header-item.c:1612
+#: ../e-util/e-table-header-item.c:1615
 msgid "Remove This _Column"
 msgstr "Fjern denne _kolonnen"
 
-#: ../widgets/table/e-table-header-item.c:1615
+#: ../e-util/e-table-header-item.c:1618
 msgid "Add a C_olumn..."
 msgstr "Legg til en k_olonne …"
 
-#: ../widgets/table/e-table-header-item.c:1619
+#: ../e-util/e-table-header-item.c:1622
 msgid "A_lignment"
 msgstr "_Justering"
 
-#: ../widgets/table/e-table-header-item.c:1622
+#: ../e-util/e-table-header-item.c:1625
 msgid "B_est Fit"
 msgstr "B_este tilpasning"
 
-#: ../widgets/table/e-table-header-item.c:1625
+#: ../e-util/e-table-header-item.c:1628
 msgid "Format Column_s..."
 msgstr "For_mater kolonner …"
 
-#: ../widgets/table/e-table-header-item.c:1636
+#: ../e-util/e-table-header-item.c:1632
 msgid "Custo_mize Current View..."
 msgstr "T_ilpass aktiv visning …"
 
-#: ../widgets/table/e-table-header-item.c:1691
+#: ../e-util/e-table-header-item.c:1703
 msgid "_Sort By"
 msgstr "_Sorter etter"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1716
+#: ../e-util/e-table-header-item.c:1726
 msgid "_Custom"
 msgstr "E_gendefinert"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:128
+#: ../e-util/gal-a11y-e-cell-popup.c:128
 msgid "popup a child"
 msgstr "vis et avkom"
 
 #. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:180
+#: ../e-util/gal-a11y-e-cell-toggle.c:180
 msgid "toggle the cell"
 msgstr "vend cellen"
 
 #. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:215
+#: ../e-util/gal-a11y-e-cell-tree.c:215
 msgid "expands the row in the ETree containing this cell"
 msgstr "utvider raden i ETree som inneholder denne cellen"
 
 #. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:223
+#: ../e-util/gal-a11y-e-cell-tree.c:223
 msgid "collapses the row in the ETree containing this cell"
 msgstr "slår sammen raden i ETree som inneholder denne cellen"
 
-#: ../widgets/table/gal-a11y-e-cell.c:123
+#: ../e-util/gal-a11y-e-cell.c:123
 msgid "Table Cell"
 msgstr "Celle i tabell"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
+#: ../e-util/gal-a11y-e-table-click-to-add.c:72
 msgid "click"
 msgstr "klikk"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:161
+#: ../e-util/gal-a11y-e-table-column-header.c:163
 msgid "sort"
 msgstr "sortere"
 
-#: ../widgets/text/e-text.c:2338
+#: ../e-util/e-text.c:2098
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ../widgets/text/e-text.c:2351
+#: ../e-util/e-text.c:2111
 msgid "Input Methods"
 msgstr "Inndatametoder"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/evolution-data-server-3.2.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/evolution-data-server-3.2.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/evolution-data-server-3.2.po	2013-01-29 09:33:52.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/evolution-data-server-3.2.po	2014-01-07 06:37:01.000000000 +0000
@@ -16,69 +16,68 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:04+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:07+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1587
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:519
+#: ../addressbook/backends/file/e-book-backend-file.c:1248
 msgid "Loading..."
 msgstr "Laster …"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1590
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4981
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:521
+#: ../addressbook/backends/file/e-book-backend-file.c:1250
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4995
 msgid "Searching..."
 msgstr "Søker …"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:648
+#: ../addressbook/backends/google/e-book-backend-google.c:733
 msgid "Querying for updated contacts…"
 msgstr "Spør etter oppdaterte kontakter …"
 
-#: ../addressbook/backends/google/e-book-google-utils.c:1568
-#: ../data/sources/system-address-book.source.in.h:1
-#: ../data/sources/system-calendar.source.in.h:1
-#: ../data/sources/system-memo-list.source.in.h:1
-#: ../data/sources/system-task-list.source.in.h:1
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1606
+#: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-task-list.source.in.h:1
 msgid "Personal"
 msgstr "Personlig"
 
-#. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1569
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1608
 msgid "Friends"
 msgstr "Venner"
 
-#. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1570
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1610
 msgid "Family"
 msgstr "Familie"
 
-#. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1571
+#. System Group: Coworkers
+#: ../addressbook/backends/google/e-book-google-utils.c:1612
 msgid "Coworkers"
 msgstr "Kolleger"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:785
+#: ../addressbook/backends/google/e-book-backend-google.c:885
 msgid "Querying for updated groups…"
 msgstr "Spør etter oppdaterte grupper …"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1243
+#: ../addressbook/backends/google/e-book-backend-google.c:1366
 msgid "Creating new contact…"
 msgstr "Lager ny kontakt …"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1362
+#: ../addressbook/backends/google/e-book-backend-google.c:1485
 msgid "Deleting contact…"
 msgstr "Sletter kontakt …"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1654
+#: ../addressbook/backends/google/e-book-backend-google.c:1777
 msgid "Modifying contact…"
 msgstr "Endrer kontakt …"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1825
+#: ../addressbook/backends/google/e-book-backend-google.c:1948
 msgid "Loading…"
 msgstr "Laster …"
 
@@ -86,8 +85,9 @@
 msgid "Authenticating with the server…"
 msgstr "Autentiserer mot tjener …"
 
-#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165
+#. Translators: An error message shown to a user when trying to do an
+#. * operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:174
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
 
@@ -99,58 +99,55 @@
 msgid "Using Email Address"
 msgstr "Bruker e-post-adresse"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1094
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1091
 msgid "Reconnecting to LDAP server..."
 msgstr "Kobler til LDAP-tjener på nytt …"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1220
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1221
 msgid "Invalid DN syntax"
 msgstr "Ugyldig DN-syntaks"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1770
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1769
 msgid "Adding contact to LDAP server..."
 msgstr "Legger til kontakt på LDAP-tjener …"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1908
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1907
 msgid "Removing contact from LDAP server..."
 msgstr "Fjerner kontakt fra LDAP-tjener …"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2371
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2373
 msgid "Modifying contact from LDAP server..."
 msgstr "Endrer kontakt fra LDAP-tjener …"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4827
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4838
 msgid "Receiving LDAP search results..."
 msgstr "Mottar søkeresultater fra LDAP-tjener …"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5003
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5017
 msgid "Error performing search"
 msgstr "Feil ved utføring av søk"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5126
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5145
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Laster ned kontakter (%d) … "
 
-#: ../addressbook/backends/file/e-book-backend-file.c:116
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4879
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:950
-#: ../addressbook/libebook/e-book-client.c:106
-#: ../addressbook/libedata-book/e-data-book.c:432
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:605
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:626
-#: ../calendar/libecal/e-cal.c:4048 ../calendar/libecal/e-cal-client.c:148
-#: ../camel/camel-imapx-command.c:594
-#: ../camel/providers/imap/camel-imap-command.c:525
-#: ../camel/providers/imap/camel-imap-store.c:469
-#: ../libedataserver/e-client.c:165
+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1240
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4890
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:386
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1108
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
+#: ../addressbook/libebook-contacts/e-phone-number.c:58
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:562
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:592
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604
+#: ../calendar/libecal/e-cal.c:2339 ../calendar/libecal/e-cal-client.c:275
+#: ../camel/camel-imapx-command.c:606 ../libedataserver/e-client.c:179
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:358
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:367
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "Oppretting av ressurs «%s» feilet med HTTP-status: %d (%s)"
@@ -160,35 +157,35 @@
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: ingen kilde lagret i GConf for uid «%s»."
 
-#: ../data/sources/local.source.in.h:1
-#: ../data/sources/local-stub.source.in.h:1
+#: ../services/evolution-source-registry/builtin/local.source.in.h:1
+#: ../services/evolution-source-registry/builtin/local-stub.source.in.h:1
 msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../addressbook/libedata-book/e-data-book.c:804
 msgid "Address book does not exist"
 msgstr "Adresseboken eksisterer ikke"
 
-#: ../addressbook/libebook/e-book-client.c:95
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:24
 msgid "No such book"
 msgstr "Boken eksisterer ikke"
 
-#: ../addressbook/libebook/e-book-client.c:97
-#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:26
+#: ../addressbook/libedata-book/e-data-book.c:797
 msgid "Contact not found"
 msgstr "Kontakten ble ikke funnet"
 
-#: ../addressbook/libebook/e-book-client.c:99
-#: ../addressbook/libedata-book/e-data-book.c:307
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:28
+#: ../addressbook/libedata-book/e-data-book.c:798
 msgid "Contact ID already exists"
 msgstr "Kontakt-ID eksisterer allerede"
 
-#: ../addressbook/libebook/e-book-client.c:101
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:30
 msgid "No such source"
 msgstr "Kilden eksisterer ikke"
 
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:32
+#: ../addressbook/libedata-book/e-data-book.c:814
 msgid "No space"
 msgstr "Ingen plass"
 
@@ -221,13 +218,13 @@
 msgid "There was no source for UID '%s' stored in a source list."
 msgstr "Ingen kilde lagret i en kildeliste for UID «%s»."
 
-#: ../addressbook/libebook/e-book-client.c:2264
+#: ../addressbook/libebook/e-book-client.c:2272
 #: ../calendar/libecal/e-cal-client.c:4632
 msgid "Cannot get connection to view"
 msgstr "Kan ikke hente tilkobling som skal vises"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:121
+#: ../addressbook/libebook-contacts/e-contact.c:120
 msgid "Unique ID"
 msgstr "Unik ID"
 
@@ -235,7 +232,7 @@
 #. * so we can generate its value if necessary in the getter
 #. Translators: This is an EContact field description, in this case it's a
 #. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
-#: ../addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook-contacts/e-contact.c:125
 msgid "File Under"
 msgstr "Arkiver under"
 
@@ -248,435 +245,434 @@
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook-contacts/e-contact.c:133
 msgid "Full Name"
 msgstr "Fullt navn"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook-contacts/e-contact.c:134
 msgid "Given Name"
 msgstr "Gitt navn"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook-contacts/e-contact.c:135
 msgid "Family Name"
 msgstr "Etternavn"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook-contacts/e-contact.c:136
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook-contacts/e-contact.c:139
 msgid "Email 1"
 msgstr "E-post 1"
 
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook-contacts/e-contact.c:140
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook-contacts/e-contact.c:141
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook-contacts/e-contact.c:142
 msgid "Email 4"
 msgstr "E-post 4"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook-contacts/e-contact.c:144
 msgid "Mailer"
 msgstr "Postprogram"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook-contacts/e-contact.c:147
 msgid "Home Address Label"
 msgstr "Etikett for hjemmeadresse"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook-contacts/e-contact.c:148
 msgid "Work Address Label"
 msgstr "Etikett for jobbadresse"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook-contacts/e-contact.c:149
 msgid "Other Address Label"
 msgstr "Etikett for annen adresse"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Assistant Phone"
 msgstr "Assistents telefon"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook-contacts/e-contact.c:153
 msgid "Business Phone"
 msgstr "Arbeidstelefon"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:154
 msgid "Business Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook-contacts/e-contact.c:155
 msgid "Business Fax"
 msgstr "Faks på arbeid"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook-contacts/e-contact.c:156
 msgid "Callback Phone"
 msgstr "Telefon for tilbakeringing"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:157
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Home Phone"
 msgstr "Hjemmetelefon"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook-contacts/e-contact.c:160
 msgid "Home Phone 2"
 msgstr "Hjemmetelefon 2"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook-contacts/e-contact.c:161
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:162
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:163
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Other Phone"
 msgstr "Annen telefon"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook-contacts/e-contact.c:166
 msgid "Pager"
 msgstr "Personsøker"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook-contacts/e-contact.c:167
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:168
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook-contacts/e-contact.c:169
 msgid "Telex"
 msgstr "Teleks"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook-contacts/e-contact.c:174
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: ../addressbook/libebook/e-contact.c:176
+#: ../addressbook/libebook-contacts/e-contact.c:175
 msgid "Organizational Unit"
 msgstr "Organisasjonsenhet"
 
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook-contacts/e-contact.c:176
 msgid "Office"
 msgstr "Kontor"
 
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook-contacts/e-contact.c:177
 msgid "Title"
 msgstr "Tittel"
 
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:178
 msgid "Role"
 msgstr "Rolle"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook-contacts/e-contact.c:179
 msgid "Manager"
 msgstr "Leder"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook-contacts/e-contact.c:180
 msgid "Assistant"
 msgstr "Assistent"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook-contacts/e-contact.c:183
 msgid "Homepage URL"
 msgstr "URL til hjemmeside"
 
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook-contacts/e-contact.c:184
 msgid "Weblog URL"
 msgstr "URL til weblog"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:188
-#: ../libedataserverui/e-categories-dialog.c:90
+#: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Categories"
 msgstr "Kategorier"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook-contacts/e-contact.c:190
 msgid "Calendar URI"
 msgstr "Kalender URI"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook-contacts/e-contact.c:191
 msgid "Free/Busy URL"
 msgstr "Ledig/opptatt URL"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook-contacts/e-contact.c:192
 msgid "ICS Calendar"
 msgstr "ICS-kalender"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook-contacts/e-contact.c:193
 msgid "Video Conferencing URL"
 msgstr "Videokonferanse-URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook-contacts/e-contact.c:196
 msgid "Spouse's Name"
 msgstr "Ektefelles navn"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook-contacts/e-contact.c:197
 msgid "Note"
 msgstr "Kommentar"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook-contacts/e-contact.c:200
 msgid "AIM Home Screen Name 1"
 msgstr "AIM-skjermnavn 1 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook-contacts/e-contact.c:201
 msgid "AIM Home Screen Name 2"
 msgstr "AIM-skjermnavn 2 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook-contacts/e-contact.c:202
 msgid "AIM Home Screen Name 3"
 msgstr "AIM-skjermnavn 3 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook-contacts/e-contact.c:203
 msgid "AIM Work Screen Name 1"
 msgstr "AIM-skjermnavn 1 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook-contacts/e-contact.c:204
 msgid "AIM Work Screen Name 2"
 msgstr "AIM-skjermnavn 2 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook-contacts/e-contact.c:205
 msgid "AIM Work Screen Name 3"
 msgstr "AIM-skjermnavn 3 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:206
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise skjermnavn 1 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:207
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise skjermnavn 2 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook-contacts/e-contact.c:208
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise skjermnavn 3 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook-contacts/e-contact.c:209
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise-skjermnavn 1 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:210
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise-skjermnavn 2 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:211
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise-skjermnavn 3 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:212
 msgid "Jabber Home ID 1"
 msgstr "Jabber-ID 1 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:213
 msgid "Jabber Home ID 2"
 msgstr "Jabber-ID 2 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:214
 msgid "Jabber Home ID 3"
 msgstr "Jabber-ID 3 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:215
 msgid "Jabber Work ID 1"
 msgstr "Jabber-ID 1 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:216
 msgid "Jabber Work ID 2"
 msgstr "Jabber-ID 2 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:217
 msgid "Jabber Work ID 3"
 msgstr "Jabber-ID 3 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook-contacts/e-contact.c:218
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Skjermnavn 1 for Yahoo!, hjemme"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook-contacts/e-contact.c:219
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Skjermnavn 2 for Yahoo!, hjemme"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook-contacts/e-contact.c:220
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Skjermnavn 3 for Yahoo!, hjemme"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook-contacts/e-contact.c:221
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Skjermnavn 1 for Yahoo!, arbeid"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook-contacts/e-contact.c:222
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Skjermnavn 2 for Yahoo!, arbeid"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook-contacts/e-contact.c:223
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Skjermnavn 3 for Yahoo!, arbeid"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook-contacts/e-contact.c:224
 msgid "MSN Home Screen Name 1"
 msgstr "Skjermnavn 1 for MSN, hjemme"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook-contacts/e-contact.c:225
 msgid "MSN Home Screen Name 2"
 msgstr "Skjermnavn 2 for MSN, hjemme"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:226
 msgid "MSN Home Screen Name 3"
 msgstr "Skjermnavn 3 for MSN, hjemme"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook-contacts/e-contact.c:227
 msgid "MSN Work Screen Name 1"
 msgstr "Skjermnavn 1 for MSN, arbeid"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook-contacts/e-contact.c:228
 msgid "MSN Work Screen Name 2"
 msgstr "Skjermnavn 2 for MSN, arbeid"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook-contacts/e-contact.c:229
 msgid "MSN Work Screen Name 3"
 msgstr "Skjermnavn 3 for MSN, arbeid"
 
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook-contacts/e-contact.c:230
 msgid "ICQ Home ID 1"
 msgstr "ICQ-ID 1 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook-contacts/e-contact.c:231
 msgid "ICQ Home ID 2"
 msgstr "ICQ-ID 2 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:232
 msgid "ICQ Home ID 3"
 msgstr "ICQ-ID 3 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook-contacts/e-contact.c:233
 msgid "ICQ Work ID 1"
 msgstr "ICQ-ID 1 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook-contacts/e-contact.c:234
 msgid "ICQ Work ID 2"
 msgstr "ICQ-ID 2 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook-contacts/e-contact.c:235
 msgid "ICQ Work ID 3"
 msgstr "ICQ-ID 3 arbeid"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook-contacts/e-contact.c:238
 msgid "Last Revision"
 msgstr "Siste versjon"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * virtual field, which returns either name of the contact or the organization
 #. * name, recognized by multiple other fields, where the first filled is used.
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook-contacts/e-contact.c:242
 msgid "Name or Org"
 msgstr "Navn eller organisasjon"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook-contacts/e-contact.c:245
 msgid "Address List"
 msgstr "Adresseliste"
 
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook-contacts/e-contact.c:246
 msgid "Home Address"
 msgstr "Hjemmeadresse"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook-contacts/e-contact.c:247
 msgid "Work Address"
 msgstr "Jobbadresse"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook-contacts/e-contact.c:248
 msgid "Other Address"
 msgstr "Annen adresse"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook-contacts/e-contact.c:251
 msgid "Category List"
 msgstr "Kategoriliste"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook-contacts/e-contact.c:254
 msgid "Photo"
 msgstr "Fotografi"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook-contacts/e-contact.c:255
 msgid "Logo"
 msgstr "Logo"
 
 #. Translators: This is an EContact field description, in this case it's a name
 #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
-#: ../addressbook/libebook/e-contact.c:260
+#: ../addressbook/libebook-contacts/e-contact.c:259
 msgid "Name"
 msgstr "Navn"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook-contacts/e-contact.c:260
 msgid "Email List"
 msgstr "E-postliste"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook-contacts/e-contact.c:263
 msgid "AIM Screen Name List"
 msgstr "Liste over skjermnavn for AIM"
 
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook-contacts/e-contact.c:264
 msgid "GroupWise ID List"
 msgstr "GroupWise ID-liste"
 
-#: ../addressbook/libebook/e-contact.c:266
+#: ../addressbook/libebook-contacts/e-contact.c:265
 msgid "Jabber ID List"
 msgstr "Liste med Jabber-IDer"
 
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook-contacts/e-contact.c:266
 msgid "Yahoo! Screen Name List"
 msgstr "Liste med skjermnavn for Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook-contacts/e-contact.c:267
 msgid "MSN Screen Name List"
 msgstr "Liste med skjermnavn for MSN"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook-contacts/e-contact.c:268
 msgid "ICQ ID List"
 msgstr "Liste med ICQ-IDer"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook-contacts/e-contact.c:270
 msgid "Wants HTML Mail"
 msgstr "Vil ha meldinger som HTML"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * field describing whether it's a Contact list (list of email addresses) or a
 #. * regular contact for one person/organization/...
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook-contacts/e-contact.c:275
 msgid "List"
 msgstr "Liste"
 
@@ -684,118 +680,118 @@
 msgid "List Show Addresses"
 msgstr "Vis adresse som liste"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook-contacts/e-contact.c:282
 msgid "Birth Date"
 msgstr "Fødselsdato"
 
-#: ../addressbook/libebook/e-contact.c:284
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919
+#: ../addressbook/libebook-contacts/e-contact.c:283
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:875
 msgid "Anniversary"
 msgstr "Jubileum"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook-contacts/e-contact.c:286
 msgid "X.509 Certificate"
 msgstr "X.509-sertifikat"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook-contacts/e-contact.c:288
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu-ID 1 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:290
+#: ../addressbook/libebook-contacts/e-contact.c:289
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu-ID 2 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook-contacts/e-contact.c:290
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu-ID 3 hjemme"
 
-#: ../addressbook/libebook/e-contact.c:292
+#: ../addressbook/libebook-contacts/e-contact.c:291
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu-ID 1 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:293
+#: ../addressbook/libebook-contacts/e-contact.c:292
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu-ID 2 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:294
+#: ../addressbook/libebook-contacts/e-contact.c:293
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu-ID 3 arbeid"
 
-#: ../addressbook/libebook/e-contact.c:295
+#: ../addressbook/libebook-contacts/e-contact.c:294
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID-liste"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:298
+#: ../addressbook/libebook-contacts/e-contact.c:297
 msgid "Geographic Information"
 msgstr "Geografisk informasjon"
 
-#: ../addressbook/libebook/e-contact.c:300
+#: ../addressbook/libebook-contacts/e-contact.c:299
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../addressbook/libebook/e-contact.c:302
+#: ../addressbook/libebook-contacts/e-contact.c:301
 msgid "Skype Home Name 1"
 msgstr "Skype-navn hjemme 1"
 
-#: ../addressbook/libebook/e-contact.c:303
+#: ../addressbook/libebook-contacts/e-contact.c:302
 msgid "Skype Home Name 2"
 msgstr "Skype-navn hjemme 2"
 
-#: ../addressbook/libebook/e-contact.c:304
+#: ../addressbook/libebook-contacts/e-contact.c:303
 msgid "Skype Home Name 3"
 msgstr "Skype-navn hjemme 3"
 
-#: ../addressbook/libebook/e-contact.c:305
+#: ../addressbook/libebook-contacts/e-contact.c:304
 msgid "Skype Work Name 1"
 msgstr "Skype-navn arbeid 1"
 
-#: ../addressbook/libebook/e-contact.c:306
+#: ../addressbook/libebook-contacts/e-contact.c:305
 msgid "Skype Work Name 2"
 msgstr "Skype-navn arbeid 2"
 
-#: ../addressbook/libebook/e-contact.c:307
+#: ../addressbook/libebook-contacts/e-contact.c:306
 msgid "Skype Work Name 3"
 msgstr "Skype-navn arbeid 3"
 
-#: ../addressbook/libebook/e-contact.c:308
+#: ../addressbook/libebook-contacts/e-contact.c:307
 msgid "Skype Name List"
 msgstr "Liste med Skype-navn"
 
-#: ../addressbook/libebook/e-contact.c:310
+#: ../addressbook/libebook-contacts/e-contact.c:309
 msgid "SIP address"
 msgstr "SIP-adresse"
 
-#: ../addressbook/libebook/e-contact.c:312
+#: ../addressbook/libebook-contacts/e-contact.c:311
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk hjemme 1"
 
-#: ../addressbook/libebook/e-contact.c:313
+#: ../addressbook/libebook-contacts/e-contact.c:312
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk hjemme 2"
 
-#: ../addressbook/libebook/e-contact.c:314
+#: ../addressbook/libebook-contacts/e-contact.c:313
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk hjemme 3"
 
-#: ../addressbook/libebook/e-contact.c:315
+#: ../addressbook/libebook-contacts/e-contact.c:314
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk arbeid 1"
 
-#: ../addressbook/libebook/e-contact.c:316
+#: ../addressbook/libebook-contacts/e-contact.c:315
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk arbeid 2"
 
-#: ../addressbook/libebook/e-contact.c:317
+#: ../addressbook/libebook-contacts/e-contact.c:316
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk arbeid 3"
 
-#: ../addressbook/libebook/e-contact.c:318
+#: ../addressbook/libebook-contacts/e-contact.c:317
 msgid "Google Talk Name List"
 msgstr "Liste med Google Talk navn"
 
-#: ../addressbook/libebook/e-contact.c:1641
+#: ../addressbook/libebook-contacts/e-contact.c:1624
 #: ../addressbook/libebook/e-destination.c:884
 msgid "Unnamed List"
 msgstr "Liste uten navn"
@@ -804,144 +800,150 @@
 msgid "Cannot process, book backend is opening"
 msgstr "Kan ikke prosessere fordi bokmotoren er i ferd med å åpnes"
 
-#: ../addressbook/libedata-book/e-book-backend.c:90
+#: ../addressbook/libebook/e-book-client.c:643
+#: ../addressbook/libedata-book/e-book-backend.c:120
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "Ukjent egenskap «%s» for bok"
 
-#: ../addressbook/libedata-book/e-book-backend.c:107
+#: ../addressbook/libebook/e-book-client.c:658
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "Kan ikke endre verdi for bokegenskap «%s»"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:501
-#: ../camel/camel-db.c:503
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1289
+#: ../camel/camel-db.c:544
 #, c-format
 msgid "Insufficient memory"
 msgstr "Ikke nok minne"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:201
-#: ../addressbook/libedata-book/e-data-book.c:214
-#: ../addressbook/libedata-book/e-data-book.c:724
+#. Translators: This is a prefix to a detailed error message *
+#. 
+#: ../addressbook/libedata-book/e-data-book.c:691
+#: ../calendar/libedata-cal/e-data-cal.c:635
 msgid "Invalid query: "
 msgstr "Ugyldig spørring: "
 
-#: ../addressbook/libedata-book/e-data-book.c:302
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../addressbook/libedata-book/e-data-book.c:793
+#: ../calendar/libedata-cal/e-data-cal.c:752
 msgid "Success"
 msgstr "Suksess"
 
-#: ../addressbook/libedata-book/e-data-book.c:303
-#: ../calendar/libecal/e-cal.c:4016 ../calendar/libedata-cal/e-data-cal.c:416
-#: ../libedataserver/e-client.c:122
+#: ../addressbook/libedata-book/e-data-book.c:794
+#: ../calendar/libecal/e-cal.c:2307 ../calendar/libedata-cal/e-data-cal.c:753
+#: ../libedataserver/e-client.c:133
 msgid "Backend is busy"
 msgstr "Motoren er opptatt"
 
-#: ../addressbook/libedata-book/e-data-book.c:304
-#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
+#: ../addressbook/libedata-book/e-data-book.c:795
+#: ../calendar/libedata-cal/e-data-cal.c:754 ../libedataserver/e-client.c:143
 msgid "Repository offline"
 msgstr "Lageret er frakoblet"
 
-#: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libecal/e-cal.c:4030 ../calendar/libedata-cal/e-data-cal.c:418
-#: ../libedataserver/e-client.c:138
+#: ../addressbook/libedata-book/e-data-book.c:796
+#: ../calendar/libecal/e-cal.c:2321 ../calendar/libedata-cal/e-data-cal.c:755
+#: ../libedataserver/e-client.c:150
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: ../addressbook/libedata-book/e-data-book.c:308
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../addressbook/libedata-book/e-data-book.c:799
+#: ../calendar/libedata-cal/e-data-cal.c:760
 msgid "Authentication Failed"
 msgstr "Autentisering feilet"
 
-#: ../addressbook/libedata-book/e-data-book.c:309
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../addressbook/libedata-book/e-data-book.c:800
+#: ../calendar/libedata-cal/e-data-cal.c:761
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
 
-#: ../addressbook/libedata-book/e-data-book.c:310
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../addressbook/libedata-book/e-data-book.c:801
+#: ../calendar/libedata-cal/e-data-cal.c:762
 msgid "Unsupported field"
 msgstr "Ikke støttet felt"
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
+#: ../addressbook/libedata-book/e-data-book.c:802
+#: ../calendar/libedata-cal/e-data-cal.c:764 ../libedataserver/e-client.c:158
 msgid "Unsupported authentication method"
 msgstr "Ikke støttet autentiseringsmetode"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:803
+#: ../calendar/libedata-cal/e-data-cal.c:765 ../libedataserver/e-client.c:160
 msgid "TLS not available"
 msgstr "TLS er ikke tilgjengelig"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../addressbook/libedata-book/e-data-book.c:805
 msgid "Book removed"
 msgstr "Bok fjernet"
 
-#: ../addressbook/libedata-book/e-data-book.c:315
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../addressbook/libedata-book/e-data-book.c:806
+#: ../calendar/libedata-cal/e-data-cal.c:768
 msgid "Not available in offline mode"
 msgstr "Ikke tilgjengelig i frakoblet modus"
 
-#: ../addressbook/libedata-book/e-data-book.c:316
-#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:807
+#: ../calendar/libedata-cal/e-data-cal.c:769 ../libedataserver/e-client.c:162
 msgid "Search size limit exceeded"
 msgstr "Søkets størrelsesgrense oversteget"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
+#: ../addressbook/libedata-book/e-data-book.c:808
+#: ../calendar/libedata-cal/e-data-cal.c:770 ../libedataserver/e-client.c:164
 msgid "Search time limit exceeded"
 msgstr "Tidsbegrensning for søk oversteget"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897
+#: ../addressbook/libedata-book/e-data-book.c:669
+#: ../addressbook/libedata-book/e-data-book.c:809
+#: ../calendar/libedata-cal/e-data-cal.c:612
+#: ../calendar/libedata-cal/e-data-cal.c:771 ../libedataserver/e-client.c:166
+#, c-format
 msgid "Invalid query"
 msgstr "Ugyldig spørring"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:810
+#: ../calendar/libedata-cal/e-data-cal.c:772 ../libedataserver/e-client.c:168
 msgid "Query refused"
 msgstr "Spørring nektet"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:811
+#: ../calendar/libedata-cal/e-data-cal.c:773 ../libedataserver/e-client.c:154
 msgid "Could not cancel"
 msgstr "Kunne ikke avbryte"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:322
-#: ../calendar/libedata-cal/e-data-cal.c:438
+#: ../addressbook/libedata-book/e-data-book.c:813
+#: ../calendar/libedata-cal/e-data-cal.c:775
 msgid "Invalid server version"
 msgstr "Ugyldig versjon for tjener"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libecal/e-cal.c:4014 ../calendar/libedata-cal/e-data-cal.c:439
-#: ../libedataserver/e-client.c:120
+#: ../addressbook/libedata-book/e-data-book.c:815
+#: ../calendar/libecal/e-cal.c:2305 ../calendar/libedata-cal/e-data-cal.c:776
+#: ../libedataserver/e-client.c:131
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libecal/e-cal.c:4053 ../calendar/libedata-cal/e-data-cal.c:441
-#: ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:817
+#: ../calendar/libecal/e-cal.c:1064 ../calendar/libecal/e-cal.c:1432
+#: ../calendar/libecal/e-cal.c:1912 ../calendar/libecal/e-cal.c:2344
+#: ../calendar/libedata-cal/e-data-cal.c:778 ../libedataserver/e-client.c:156
+#, c-format
 msgid "Not supported"
 msgstr "Ikke støttet"
 
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
+#: ../addressbook/libedata-book/e-data-book.c:818
+#: ../calendar/libedata-cal/e-data-cal.c:779 ../libedataserver/e-client.c:174
 msgid "Backend is not opened yet"
 msgstr "Motoren er ikke åpnet ennå"
 
-#: ../addressbook/libedata-book/e-data-book.c:335
-#: ../calendar/libecal/e-cal-client.c:620
-#: ../calendar/libedata-cal/e-data-cal.c:450 ../libedataserver/e-client.c:160
+#: ../addressbook/libedata-book/e-data-book.c:827
+#: ../calendar/libedata-cal/e-data-cal.c:787 ../libedataserver/e-client.c:172
 msgid "Other error"
 msgstr "Annen feil"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:542
-#: ../addressbook/libedata-book/e-data-book.c:909
+#: ../addressbook/libedata-book/e-data-book.c:1298
 msgid "Cannot get contact: "
 msgstr "Kan ikke hente kontakt: "
 
@@ -952,8 +954,7 @@
 msgstr "Tom spørring: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:617
-#: ../addressbook/libedata-book/e-data-book.c:1007
+#: ../addressbook/libedata-book/e-data-book.c:1536
 msgid "Cannot add contact: "
 msgstr "Kan ikke legge til kontakt: "
 
@@ -970,7 +971,7 @@
 msgstr "Kan ikke autentisere bruker: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:796
+#: ../addressbook/libedata-book/e-data-book.c:1133
 msgid "Cannot open book: "
 msgstr "Kan ikke åpne bok: "
 
@@ -980,7 +981,7 @@
 msgstr "Kan ikke fjerne bok: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:839
+#: ../addressbook/libedata-book/e-data-book.c:1217
 msgid "Cannot refresh address book: "
 msgstr "Kan ikke oppdatere adressebok: "
 
@@ -996,17 +997,17 @@
 msgstr "Kan ikke sette egenskap for motor: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:927
+#: ../addressbook/libedata-book/e-data-book.c:1364
 msgid "Cannot get contact list: "
 msgstr "Kan ikke hente kontaktliste: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:961
+#: ../addressbook/libedata-book/e-data-book.c:1456
 msgid "Cannot get contact list uids: "
 msgstr "Kan ikke hente UIDer for kontaktliste: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1066
+#: ../addressbook/libedata-book/e-data-book.c:1640
 msgid "Cannot remove contacts: "
 msgstr "Kan ikke fjerne kontakter: "
 
@@ -1017,18 +1018,18 @@
 msgid "Empty URI"
 msgstr "Tom URI"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:572
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:560
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Tjener kan ikke nås (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:623
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:601
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "Uventet HTTP-statuskode %d mottatt (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2390
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2755
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2523
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2881
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1037,95 +1038,94 @@
 "Tjeneren kan ikke nås. Kalender åpnes i skrivebeskyttet modus.\n"
 "Feilmelding: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4640
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4869
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Kalender støtter ikke ledig/opptatt"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:877
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:913
 #, c-format
 msgid "Birthday: %s"
 msgstr "Fødselsdag: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:944
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Jubileum: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:235
+#: ../calendar/backends/file/e-cal-backend-file.c:243
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Kan ikke lagre kalenderdata: Feil i URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:242
-#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:250
+#: ../calendar/backends/file/e-cal-backend-file.c:256
 msgid "Cannot save calendar data"
 msgstr "Kan ikke lagre kalenderdata"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:544
+#: ../calendar/backends/http/e-cal-backend-http.c:568
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "Omdirigert til ugyldig URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:581
+#: ../calendar/backends/http/e-cal-backend-http.c:611
 #, c-format
 msgid "Bad file format."
 msgstr "Ugyldig filformat."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:591
+#: ../calendar/backends/http/e-cal-backend-http.c:621
 #, c-format
 msgid "Not a calendar."
 msgstr "Ikke en kalender."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:888
-#: ../calendar/backends/http/e-cal-backend-http.c:893
-#: ../calendar/backends/weather/e-cal-backend-weather.c:512
+#: ../calendar/backends/http/e-cal-backend-http.c:926
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
 msgid "Could not create cache file"
 msgstr "Kunne ikke opprette bufferfil"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:172
+#: ../calendar/backends/weather/e-cal-backend-weather.c:173
 msgid "Could not retrieve weather data"
 msgstr "Kunne ikke hente værdata"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:277
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Fog"
 msgstr "Vær: Tåke"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:278
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Cloudy Night"
 msgstr "Vær: Overskyet natt"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Cloudy"
 msgstr "Vær: Overskyet"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Overcast"
 msgstr "Vær: Overskyet"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Showers"
 msgstr "Vær: Regnbyger"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Snow"
 msgstr "Vær: Snø"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Clear Night"
 msgstr "Vær: Klar natt"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Sunny"
 msgstr "Vær: Solskinn"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Thunderstorms"
 msgstr "Vær: Tordenvær"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:409
+#: ../calendar/backends/weather/e-cal-backend-weather.c:416
 msgid "Forecast"
 msgstr "Værmelding"
 
@@ -1144,78 +1144,78 @@
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Oppgi passord for %s for å aktivere proxy for bruker %s"
 
-#: ../calendar/libecal/e-cal.c:4018
+#: ../calendar/libecal/e-cal.c:2309
 msgid "Repository is offline"
 msgstr "Lageret er frakoblet"
 
-#: ../calendar/libecal/e-cal.c:4020 ../calendar/libecal/e-cal-client.c:135
+#: ../calendar/libecal/e-cal.c:2311 ../calendar/libecal/e-cal-client.c:262
 msgid "No such calendar"
 msgstr "Ingen slik kalender"
 
-#: ../calendar/libecal/e-cal.c:4022 ../calendar/libecal/e-cal-client.c:137
-#: ../calendar/libedata-cal/e-data-cal.c:420
+#: ../calendar/libecal/e-cal.c:2313 ../calendar/libecal/e-cal-client.c:264
+#: ../calendar/libedata-cal/e-data-cal.c:757
 msgid "Object not found"
 msgstr "Objektet ble ikke funnet"
 
-#: ../calendar/libecal/e-cal.c:4024 ../calendar/libecal/e-cal-client.c:139
-#: ../calendar/libedata-cal/e-data-cal.c:421
+#: ../calendar/libecal/e-cal.c:2315 ../calendar/libecal/e-cal-client.c:266
+#: ../calendar/libedata-cal/e-data-cal.c:758
 msgid "Invalid object"
 msgstr "Ugyldig objekt"
 
-#: ../calendar/libecal/e-cal.c:4026
+#: ../calendar/libecal/e-cal.c:2317
 msgid "URI not loaded"
 msgstr "URI ble ikke lastet"
 
-#: ../calendar/libecal/e-cal.c:4028
+#: ../calendar/libecal/e-cal.c:2319
 msgid "URI already loaded"
 msgstr "URI allerede lastet"
 
-#: ../calendar/libecal/e-cal.c:4032
+#: ../calendar/libecal/e-cal.c:2323
 msgid "Unknown User"
 msgstr "Ukjent bruker"
 
-#: ../calendar/libecal/e-cal.c:4034 ../calendar/libecal/e-cal-client.c:143
-#: ../calendar/libedata-cal/e-data-cal.c:422
+#: ../calendar/libecal/e-cal.c:2325 ../calendar/libecal/e-cal-client.c:270
+#: ../calendar/libedata-cal/e-data-cal.c:759
 msgid "Object ID already exists"
 msgstr "Objekt-ID eksisterer allerede"
 
-#: ../calendar/libecal/e-cal.c:4036
+#: ../calendar/libecal/e-cal.c:2327
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke støttet"
 
-#: ../calendar/libecal/e-cal.c:4038
+#: ../calendar/libecal/e-cal.c:2329
 msgid "Operation has been canceled"
 msgstr "Operasjonen ble avbrutt"
 
-#: ../calendar/libecal/e-cal.c:4040
+#: ../calendar/libecal/e-cal.c:2331
 msgid "Could not cancel operation"
 msgstr "Kunne ikke avbryte operasjon"
 
-#: ../calendar/libecal/e-cal.c:4042 ../libedataserver/e-client.c:128
+#: ../calendar/libecal/e-cal.c:2333 ../libedataserver/e-client.c:139
 msgid "Authentication failed"
 msgstr "Autentisering feilet"
 
-#: ../calendar/libecal/e-cal.c:4044
-#: ../camel/providers/smtp/camel-smtp-transport.c:857
-#: ../libedataserver/e-client.c:130
+#: ../calendar/libecal/e-cal.c:2335
+#: ../camel/providers/smtp/camel-smtp-transport.c:911
+#: ../libedataserver/e-client.c:141
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
-#: ../calendar/libecal/e-cal.c:4046
+#: ../calendar/libecal/e-cal.c:2337
 msgid "A D-Bus exception has occurred"
 msgstr "Et D-Bus-unntak har oppstått"
 
-#: ../calendar/libecal/e-cal.c:4050
+#: ../calendar/libecal/e-cal.c:2341
 msgid "No error"
 msgstr "Ingen feil"
 
-#: ../calendar/libecal/e-cal-client.c:141
-#: ../calendar/libedata-cal/e-data-cal.c:430
+#: ../calendar/libecal/e-cal-client.c:268
+#: ../calendar/libedata-cal/e-data-cal.c:767
 msgid "Unknown user"
 msgstr "Ukjent bruker"
 
-#: ../calendar/libecal/e-cal-client.c:145
-#: ../calendar/libedata-cal/e-data-cal.c:419
+#: ../calendar/libecal/e-cal-client.c:272
+#: ../calendar/libedata-cal/e-data-cal.c:756
 msgid "Invalid range"
 msgstr "Ugyldig område"
 
@@ -1227,7 +1227,7 @@
 msgid "Failed to find system calendar"
 msgstr "Klarte ikke å finne kalender for systemet"
 
-#: ../calendar/libedata-cal/e-data-cal.c:429
+#: ../calendar/libedata-cal/e-data-cal.c:766
 msgid "Calendar does not exist"
 msgstr "Kalender eksisterer ikke."
 
@@ -1363,23 +1363,23 @@
 msgid "31st"
 msgstr "31"
 
-#: ../calendar/libecal/e-cal-util.c:697 ../calendar/libecal/e-cal-util.c:724
+#: ../calendar/libecal/e-cal-util.c:707 ../calendar/libecal/e-cal-util.c:734
 msgctxt "Priority"
 msgid "High"
 msgstr "Høy"
 
-#: ../calendar/libecal/e-cal-util.c:699 ../calendar/libecal/e-cal-util.c:726
+#: ../calendar/libecal/e-cal-util.c:709 ../calendar/libecal/e-cal-util.c:736
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../calendar/libecal/e-cal-util.c:701 ../calendar/libecal/e-cal-util.c:728
+#: ../calendar/libecal/e-cal-util.c:711 ../calendar/libecal/e-cal-util.c:738
 msgctxt "Priority"
 msgid "Low"
 msgstr "Lav"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:722
+#: ../calendar/libecal/e-cal-util.c:732
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "Udefinert"
@@ -1388,99 +1388,100 @@
 msgid "Cannot process, calendar backend is opening"
 msgstr "Kan ikke prosessere fordi kalendermotoren er i ferd med å åpnes"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:135
+#: ../calendar/libecal/e-cal-client.c:920
+#: ../calendar/libedata-cal/e-cal-backend.c:204
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "Ukjent kalenderegenskap «%s»"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:152
+#: ../calendar/libecal/e-cal-client.c:935
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "Kan ikke lage endre verdi for kalenderegenskap «%s»"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:847
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:990
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1022
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1229
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:596
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:619
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:742
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:774
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1014
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1326
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "«%s» forventer ingen argumenter"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:238
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:285
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:326
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1302
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1056
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1365
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1492
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1541
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "«%s» forventer ett argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:122
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:130
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:333
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:917
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1372
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1380
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "«%s» forventer at første argument er en streng"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:139
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr ""
 "«%s» forventer at første argument er en dato/tid-streng i ISO 8601 format"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:562
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:910
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1058
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:311
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:660
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:810
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1434
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "«%s» forventer to argumenter"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:189
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:245
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:292
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:417
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:506
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:569
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1065
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1309
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1441
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1499
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1548
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "«%s» forventer at første argument er av type time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:198
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1450
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "«%s» forventer at andre argument er et heltall"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:410
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
 #, c-format
 msgid "\"%s\" expects two or three arguments"
 msgstr "«%s» forventer to eller tre argumenter"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:426
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:514
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:579
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1074
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:264
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:328
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:826
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "«%s» forventer at andre argument er av type time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:436
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:186
 #, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "«%s» forventer at tredje argument er en streng"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:926
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "«%s» forventer at andre argument er en streng"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:957
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:707
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1490,12 +1491,12 @@
 "«%s» forventer at første argument er en av «any», «summary», «description», "
 "«location», «attendee», «organizer» eller «classification»"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1126
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "«%s» forventer minst ett argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1141
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:893
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1504,12 +1505,12 @@
 "«%s» forventer at alle argumenter er strenger eller ett, og kun ett, "
 "argument er den bolske verdien falsk (#f)"
 
-#: ../calendar/libedata-cal/e-data-cal.c:426
+#: ../calendar/libedata-cal/e-data-cal.c:763
 msgid "Unsupported method"
 msgstr "Ikke støttet metode"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:909
+#: ../calendar/libedata-cal/e-data-cal.c:1237
 msgid "Cannot open calendar: "
 msgstr "Kan ikke åpne kalender: "
 
@@ -1519,77 +1520,77 @@
 msgstr "Kan ikke fjerne kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:961
+#: ../calendar/libedata-cal/e-data-cal.c:1298
 msgid "Cannot refresh calendar: "
 msgstr "Kan ikke oppdatere kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:990
+#: ../calendar/libedata-cal/e-data-cal.c:1337
 msgid "Cannot retrieve backend property: "
 msgstr "Kan ikke hente egenskap for motor: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1045
+#: ../calendar/libedata-cal/e-data-cal.c:1395
 msgid "Cannot retrieve calendar object path: "
 msgstr "Kan ikke hente objektsti for kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1075
+#: ../calendar/libedata-cal/e-data-cal.c:1441
 msgid "Cannot retrieve calendar object list: "
 msgstr "Kan ikke hente objektliste for kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1104
+#: ../calendar/libedata-cal/e-data-cal.c:1494
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Kan ikke ledig/opptattliste for kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1142
+#: ../calendar/libedata-cal/e-data-cal.c:1535
 msgid "Cannot create calendar object: "
 msgstr "Kan ikke lage kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1177
+#: ../calendar/libedata-cal/e-data-cal.c:1604
 msgid "Cannot modify calendar object: "
 msgstr "Kan ikke endre kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1217
+#: ../calendar/libedata-cal/e-data-cal.c:1666
 msgid "Cannot remove calendar object: "
 msgstr "Kan ikke fjerne kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1254
+#: ../calendar/libedata-cal/e-data-cal.c:1727
 msgid "Cannot receive calendar objects: "
 msgstr "Kan ikke motta kalenderobjekter: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1285
+#: ../calendar/libedata-cal/e-data-cal.c:1768
 msgid "Cannot send calendar objects: "
 msgstr "Kan ikke sende kalenderobjekter: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1317
+#: ../calendar/libedata-cal/e-data-cal.c:1828
 msgid "Could not retrieve attachment uris: "
 msgstr "Kunne ikke hente vedleggslenker: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1345
+#: ../calendar/libedata-cal/e-data-cal.c:1878
 msgid "Could not discard reminder: "
 msgstr "Kan ikke forkaste påminnelse: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1374
+#: ../calendar/libedata-cal/e-data-cal.c:1917
 msgid "Could not get calendar view path: "
 msgstr "Kunne ikke hente sti for kalendervisning: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1404
+#: ../calendar/libedata-cal/e-data-cal.c:1963
 msgid "Could not retrieve calendar time zone: "
 msgstr "Kunne ikke hente tidssone for kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1430
+#: ../calendar/libedata-cal/e-data-cal.c:2007
 msgid "Could not add calendar time zone: "
 msgstr "Kunne ikke legge til tidssone for kalender: "
 
@@ -1613,45 +1614,45 @@
 msgid "Could not instantiate backend"
 msgstr "Kunne ikke starte motor"
 
-#: ../camel/camel-cipher-context.c:206
+#: ../camel/camel-cipher-context.c:208
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Signering er ikke støttet av dette cipheret"
 
-#: ../camel/camel-cipher-context.c:219
+#: ../camel/camel-cipher-context.c:221
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifisering er ikke støttet av dette cipheret"
 
-#: ../camel/camel-cipher-context.c:235
+#: ../camel/camel-cipher-context.c:237
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering er ikke støttet av dette cipheret"
 
-#: ../camel/camel-cipher-context.c:249
+#: ../camel/camel-cipher-context.c:251
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke støttet av dette cipheret"
 
-#: ../camel/camel-cipher-context.c:262
+#: ../camel/camel-cipher-context.c:264
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Du kan ikke importere nøkler med dette cipheret"
 
-#: ../camel/camel-cipher-context.c:276
+#: ../camel/camel-cipher-context.c:278
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Du kan ikke eksportere nøkler med dette cipheret"
 
-#: ../camel/camel-cipher-context.c:817
+#: ../camel/camel-cipher-context.c:819
 msgid "Signing message"
 msgstr "Signerer melding"
 
-#: ../camel/camel-cipher-context.c:1058
+#: ../camel/camel-cipher-context.c:1060
 msgid "Encrypting message"
 msgstr "Krypterer melding"
 
-#: ../camel/camel-cipher-context.c:1185
+#: ../camel/camel-cipher-context.c:1187
 msgid "Decrypting message"
 msgstr "Dekrypterer melding"
 
@@ -1676,8 +1677,7 @@
 "Videre operasjoner på denne tjeneren vil ikke kunne spilles av når\n"
 "du kobler til dette nettverket igjen."
 
-#: ../camel/camel-disco-diary.c:271
-#: ../camel/providers/imap/camel-imap-journal.c:312
+#: ../camel/camel-disco-diary.c:279
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1688,7 +1688,7 @@
 "%s\n"
 "Endringer i denne mappen vil ikke re-synkroniseres."
 
-#: ../camel/camel-disco-diary.c:315
+#: ../camel/camel-disco-diary.c:326
 msgid "Resynchronizing with server"
 msgstr "Re-synkroniserer med tjener"
 
@@ -1696,7 +1696,7 @@
 msgid "Downloading new messages for offline mode"
 msgstr "Laster ned nye meldinger for frakoblet modus"
 
-#: ../camel/camel-disco-folder.c:420
+#: ../camel/camel-disco-folder.c:422
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Forbereder mappe «%s» på frakobling"
@@ -1705,23 +1705,22 @@
 msgid "Copy folder content locally for offline operation"
 msgstr "Kopier mappeinnhold lokalt for frakoblet operasjon"
 
-#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:413
-#: ../camel/camel-imapx-folder.c:446 ../camel/camel-imapx-folder.c:482
-#: ../camel/camel-imapx-folder.c:538 ../camel/camel-imapx-folder.c:615
-#: ../camel/camel-imapx-folder.c:649 ../camel/camel-imapx-folder.c:689
-#: ../camel/camel-imapx-folder.c:725 ../camel/camel-imapx-store.c:276
-#: ../camel/camel-imapx-store.c:1399 ../camel/camel-imapx-store.c:1488
-#: ../camel/camel-imapx-store.c:1537
-#: ../camel/providers/imap/camel-imap-store.c:1270
-#: ../camel/providers/imap/camel-imap-store.c:2033
-#: ../camel/providers/imap/camel-imap-store.c:2509
-#: ../camel/providers/imap/camel-imap-store.c:3289
-#: ../camel/providers/pop3/camel-pop3-folder.c:534
-#: ../camel/providers/pop3/camel-pop3-folder.c:677
-#: ../camel/providers/pop3/camel-pop3-folder.c:906
-#: ../camel/providers/pop3/camel-pop3-folder.c:1106
-#: ../camel/providers/pop3/camel-pop3-store.c:424
-#: ../camel/providers/pop3/camel-pop3-store.c:849
+#: ../camel/camel-disco-store.c:479 ../camel/camel-imapx-folder.c:478
+#: ../camel/camel-imapx-folder.c:514 ../camel/camel-imapx-folder.c:553
+#: ../camel/camel-imapx-folder.c:613 ../camel/camel-imapx-folder.c:748
+#: ../camel/camel-imapx-folder.c:933 ../camel/camel-imapx-folder.c:993
+#: ../camel/camel-imapx-folder.c:1032 ../camel/camel-imapx-store.c:368
+#: ../camel/camel-imapx-store.c:1592 ../camel/camel-imapx-store.c:1681
+#: ../camel/camel-imapx-store.c:1730
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
+#: ../camel/providers/pop3/camel-pop3-folder.c:746
+#: ../camel/providers/pop3/camel-pop3-folder.c:987
+#: ../camel/providers/pop3/camel-pop3-folder.c:1216
+#: ../camel/providers/pop3/camel-pop3-store.c:291
+#: ../camel/providers/pop3/camel-pop3-store.c:519
+#: ../camel/providers/pop3/camel-pop3-store.c:567
+#: ../camel/providers/pop3/camel-pop3-store.c:659
+#: ../camel/providers/pop3/camel-pop3-store.c:1059
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Du må arbeide tilknyttet for å fullføre denne operasjonen"
@@ -1731,7 +1730,7 @@
 msgid "Canceled"
 msgstr "Avbrutt"
 
-#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:772
+#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Kunne ikke opprette underprosess «%s»: %s"
@@ -1741,54 +1740,54 @@
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ugyldig meldingsstrøm mottatt fra %s: %s"
 
-#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
+#: ../camel/camel-filter-driver.c:1171 ../camel/camel-filter-driver.c:1180
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: ../camel/camel-filter-driver.c:1276 ../camel/camel-filter-driver.c:1761
+#: ../camel/camel-filter-driver.c:1278
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1774
+#: ../camel/camel-filter-driver.c:1289
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under kjøring av filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1383
+#: ../camel/camel-filter-driver.c:1385
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke åpne spool-mappen"
 
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1397
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Kan ikke prosessere spool-mappen"
 
-#: ../camel/camel-filter-driver.c:1415
+#: ../camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter melding %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1424 ../camel/camel-filter-driver.c:1446
+#: ../camel/camel-filter-driver.c:1429 ../camel/camel-filter-driver.c:1451
 #, c-format
 msgid "Failed on message %d"
 msgstr "Feilet på melding %d"
 
-#: ../camel/camel-filter-driver.c:1463 ../camel/camel-filter-driver.c:1573
+#: ../camel/camel-filter-driver.c:1470 ../camel/camel-filter-driver.c:1584
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1581
+#: ../camel/camel-filter-driver.c:1475 ../camel/camel-filter-driver.c:1592
 msgid "Complete"
 msgstr "Fullført"
 
-#: ../camel/camel-filter-driver.c:1529
+#: ../camel/camel-filter-driver.c:1538
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter melding %d av %d"
 
-#: ../camel/camel-filter-driver.c:1547
+#: ../camel/camel-filter-driver.c:1556
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Feilet på melding %d av %d"
@@ -1797,65 +1796,65 @@
 msgid "Failed to retrieve message"
 msgstr "Feil under henting av melding"
 
-#: ../camel/camel-filter-search.c:512
+#: ../camel/camel-filter-search.c:537
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ugyldige argumenter til (system-flag)"
 
-#: ../camel/camel-filter-search.c:530
+#: ../camel/camel-filter-search.c:555
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ugyldige argumenter til (user-tag)"
 
-#: ../camel/camel-filter-search.c:949 ../camel/camel-filter-search.c:958
+#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under lagring av filtersøk: %s: %s"
 
-#: ../camel/camel-folder.c:270
+#: ../camel/camel-folder.c:310
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "Lærer ny uønsket melding i «%s»"
 msgstr[1] "Lærer nye uønskede meldinger i «%s»"
 
-#: ../camel/camel-folder.c:310
+#: ../camel/camel-folder.c:350
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "Lærer ny ønsket melding i «%s»"
 msgstr[1] "Lærer nye ønskede meldinger i «%s»"
 
-#: ../camel/camel-folder.c:358
+#: ../camel/camel-folder.c:398
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "Filtrerer ny melding i «%s»"
 msgstr[1] "Filtrerer nye meldinger i «%s»"
 
-#: ../camel/camel-folder.c:930
+#: ../camel/camel-folder.c:972
 #: ../camel/providers/local/camel-maildir-folder.c:321
 msgid "Moving messages"
 msgstr "Flytter meldinger"
 
-#: ../camel/camel-folder.c:933
+#: ../camel/camel-folder.c:975
 msgid "Copying messages"
 msgstr "Kopierer meldinger"
 
-#: ../camel/camel-folder.c:1253
+#: ../camel/camel-folder.c:1295
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "Kvoteinformasjon er ikke støttet for mappe «%s»"
 
-#: ../camel/camel-folder.c:3604
+#: ../camel/camel-folder.c:3760
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "Henter melding «%s» i %s"
 
-#: ../camel/camel-folder.c:3755
+#: ../camel/camel-folder.c:3911
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "Henter kvoteinformasjon for «%s»"
 
-#: ../camel/camel-folder-search.c:420 ../camel/camel-folder-search.c:587
+#: ../camel/camel-folder-search.c:1930 ../camel/camel-folder-search.c:2096
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1864,7 +1863,7 @@
 "Kan ikke tolke uttrykket: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:432 ../camel/camel-folder-search.c:599
+#: ../camel/camel-folder-search.c:1942 ../camel/camel-folder-search.c:2108
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1874,47 +1873,47 @@
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865
+#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) krever et enkelt bolsk resultat"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:932
+#: ../camel/camel-folder-search.c:964
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) tillates ikke inne i %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947
+#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) krever en streng for trefftype"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:1007
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) forventer resultat på tabellform"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:985
+#: ../camel/camel-folder-search.c:1017
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) krever et mappesett"
 
-#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
-#: ../camel/camel-gpg-context.c:1331
+#: ../camel/camel-gpg-context.c:730 ../camel/camel-gpg-context.c:735
+#: ../camel/camel-gpg-context.c:1398
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Feil ved kjøring av gpg: %s"
 
-#: ../camel/camel-gpg-context.c:668
-#: ../camel/providers/smtp/camel-smtp-transport.c:860
+#: ../camel/camel-gpg-context.c:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:914
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../camel/camel-gpg-context.c:733
+#: ../camel/camel-gpg-context.c:800
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1925,17 +1924,17 @@
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:769
+#: ../camel/camel-gpg-context.c:836
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Feil under tolking av hint for gpg brukerid."
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
+#: ../camel/camel-gpg-context.c:861 ../camel/camel-gpg-context.c:876
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Kunne ikke tolke forespørsel på gpg-passordfrase."
 
-#: ../camel/camel-gpg-context.c:830
+#: ../camel/camel-gpg-context.c:897
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1944,7 +1943,7 @@
 "Du trenger en PIN for å låse opp nøkkelen for\n"
 "ditt SmartCard: «%s»"
 
-#: ../camel/camel-gpg-context.c:834
+#: ../camel/camel-gpg-context.c:901
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1953,76 +1952,76 @@
 "Du trenger et passord for å låse opp nøkkelen for\n"
 "bruker «%s»"
 
-#: ../camel/camel-gpg-context.c:840
+#: ../camel/camel-gpg-context.c:907
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Uventet forespørsel fra GnuPG for «%s»"
 
-#: ../camel/camel-gpg-context.c:883 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:950 ../camel/camel-net-utils.c:524
 #: ../camel/camel-tcp-stream-raw.c:268
-#: ../camel/providers/nntp/camel-nntp-summary.c:388
-#: ../libedataserver/e-client.c:140
+#: ../camel/providers/nntp/camel-nntp-summary.c:402
+#: ../libedataserver/e-client.c:152
 #, c-format
 msgid "Cancelled"
 msgstr "Avbrutt"
 
-#: ../camel/camel-gpg-context.c:904
+#: ../camel/camel-gpg-context.c:971
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Feil ved åpning av hemmelig nøkkel: 3 ugyldige passord oppgitt."
 
-#: ../camel/camel-gpg-context.c:917
+#: ../camel/camel-gpg-context.c:984
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventet svar fra GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:1048
+#: ../camel/camel-gpg-context.c:1115
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan ikke kryptere: Ingen gyldige mottakere spesifisert."
 
-#: ../camel/camel-gpg-context.c:1595 ../camel/camel-smime-context.c:832
+#: ../camel/camel-gpg-context.c:1665 ../camel/camel-smime-context.c:846
 msgid "Could not generate signing data: "
 msgstr "Kan ikke generere signeringsdata: "
 
-#: ../camel/camel-gpg-context.c:1644 ../camel/camel-gpg-context.c:1848
-#: ../camel/camel-gpg-context.c:1958 ../camel/camel-gpg-context.c:2105
-#: ../camel/camel-gpg-context.c:2205 ../camel/camel-gpg-context.c:2253
+#: ../camel/camel-gpg-context.c:1714 ../camel/camel-gpg-context.c:1918
+#: ../camel/camel-gpg-context.c:2028 ../camel/camel-gpg-context.c:2179
+#: ../camel/camel-gpg-context.c:2279 ../camel/camel-gpg-context.c:2327
 msgid "Failed to execute gpg."
 msgstr "Feil ved kjøring av gpg."
 
-#: ../camel/camel-gpg-context.c:1723 ../camel/camel-gpg-context.c:1731
-#: ../camel/camel-gpg-context.c:1739 ../camel/camel-gpg-context.c:1759
-#: ../camel/camel-smime-context.c:959 ../camel/camel-smime-context.c:973
-#: ../camel/camel-smime-context.c:982
+#: ../camel/camel-gpg-context.c:1793 ../camel/camel-gpg-context.c:1801
+#: ../camel/camel-gpg-context.c:1809 ../camel/camel-gpg-context.c:1829
+#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987
+#: ../camel/camel-smime-context.c:996
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Kunne ikke verifisere meldingens signatur: Ugyldig meldingsformat"
 
-#: ../camel/camel-gpg-context.c:1801
+#: ../camel/camel-gpg-context.c:1871
 msgid "Cannot verify message signature: "
 msgstr "Kunne ikke verifisere meldingens signatur: "
 
-#: ../camel/camel-gpg-context.c:1924
+#: ../camel/camel-gpg-context.c:1994
 msgid "Could not generate encrypting data: "
 msgstr "Kunne ikke generere krypteringsdata: "
 
-#: ../camel/camel-gpg-context.c:1977
+#: ../camel/camel-gpg-context.c:2047
 msgid "This is a digitally encrypted message part"
 msgstr "Dette er en digitalt kryptert meldingsdel"
 
-#: ../camel/camel-gpg-context.c:2035 ../camel/camel-gpg-context.c:2044
-#: ../camel/camel-gpg-context.c:2067
+#: ../camel/camel-gpg-context.c:2105 ../camel/camel-gpg-context.c:2114
+#: ../camel/camel-gpg-context.c:2137
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Kan ikke dekryptere e-post: Ikke korrekt e-postformat"
 
-#: ../camel/camel-gpg-context.c:2055
+#: ../camel/camel-gpg-context.c:2125
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Feil under dekryptering av MIME-del: protokollfeil"
 
-#: ../camel/camel-gpg-context.c:2146 ../camel/camel-smime-context.c:1273
+#: ../camel/camel-gpg-context.c:2220 ../camel/camel-smime-context.c:1287
 msgid "Encrypted content"
 msgstr "Kryptert innhold"
 
@@ -2153,12 +2152,12 @@
 msgid "Could not connect to %s: "
 msgstr "Kunne ikke koble til %s: "
 
-#: ../camel/camel-net-utils.c:703
+#: ../camel/camel-net-utils.c:704
 #, c-format
 msgid "Resolving: %s"
 msgstr "Finner: «%s»"
 
-#: ../camel/camel-net-utils.c:726
+#: ../camel/camel-net-utils.c:727
 msgid "Host lookup failed"
 msgstr "Vertsoppslag feilet"
 
@@ -2167,20 +2166,20 @@
 msgid "Host lookup failed: %s: %s"
 msgstr "Navneoppslag feilet: %s: %s"
 
-#: ../camel/camel-net-utils.c:853
+#: ../camel/camel-net-utils.c:858
 msgid "Resolving address"
 msgstr "Finner adresse"
 
-#: ../camel/camel-net-utils.c:874
+#: ../camel/camel-net-utils.c:879
 msgid "Name lookup failed"
 msgstr "Navneoppslag feilet"
 
-#: ../camel/camel-net-utils.c:880
+#: ../camel/camel-net-utils.c:890
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Navneoppslag feilet: %s"
 
-#: ../camel/camel-offline-folder.c:210
+#: ../camel/camel-offline-folder.c:212
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Synkroniserer meldinger i mappe «%s» til disk"
@@ -2198,27 +2197,28 @@
 msgid "For reading mail as a query of another set of folders"
 msgstr "For lesing av e-post som en spørring på et annet sett med mapper"
 
-#: ../camel/camel-provider.c:258
+#: ../camel/camel-provider.c:263
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Kunne ikke laste %s: Modullasting er ikke støttet på dette systemet."
 
-#: ../camel/camel-provider.c:267
+#: ../camel/camel-provider.c:272
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikke laste %s: %s"
 
-#: ../camel/camel-provider.c:276
+#: ../camel/camel-provider.c:281
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke laste %s: Ingen initieringskode i modulen."
 
-#: ../camel/camel-provider.c:424 ../camel/camel-session.c:406
+#: ../camel/camel-provider.c:429 ../camel/camel-session.c:407
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Ingen tilbyder tilgjengelig for protokoll «%s»"
 
 #: ../camel/camel-sasl-anonymous.c:35
+#: ../camel/providers/nntp/camel-nntp-provider.c:85
 msgid "Anonymous"
 msgstr "Anonym"
 
@@ -2384,7 +2384,7 @@
 
 #: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
 #: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405
-#: ../camel/providers/smtp/camel-smtp-transport.c:575
+#: ../camel/providers/smtp/camel-smtp-transport.c:612
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar på autentisering fra tjener."
@@ -2407,11 +2407,11 @@
 msgid "Unknown authentication state."
 msgstr "Ukjent autentiseringstilstand."
 
-#: ../camel/camel-sasl-ntlm.c:47
+#: ../camel/camel-sasl-ntlm.c:48
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:49
+#: ../camel/camel-sasl-ntlm.c:50
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2436,17 +2436,17 @@
 msgid "POP Source UID"
 msgstr "Kilde-UID for POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:96
+#: ../camel/camel-sasl-popb4smtp.c:98
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "POP før SMTP autentisering via en ukjent transport"
 
-#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
+#: ../camel/camel-sasl-popb4smtp.c:110 ../camel/camel-sasl-popb4smtp.c:119
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "POP før SMTP autentisering forsøkt med en %s-tjeneste"
 
-#: ../camel/camel-search-private.c:112
+#: ../camel/camel-search-private.c:116
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Kompilering av regulært uttrykk feilet: %s: %s"
@@ -2466,17 +2466,20 @@
 msgid "URL '%s' needs a path component"
 msgstr "URL «%s» må inneholde en sti"
 
-#: ../camel/camel-session.c:415
+#: ../camel/camel-session.c:416
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "Ugyldig GType registrert for protokoll «%s»"
 
-#: ../camel/camel-session.c:1362
+#. Translators: The first argument is the account type
+#. * (e.g. "IMAP"), the second is the user name, and the
+#. * third is the host name.
+#: ../camel/camel-session.c:1423
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Vennligst oppgi %s-passord for %s på vert %s"
 
-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1060
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1074
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Kan ikke finne sertifikat for «%s»"
@@ -2612,107 +2615,105 @@
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signeringspart: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:844 ../camel/camel-smime-context.c:1134
+#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1148
 msgid "Cannot create encoder context"
 msgstr "Kan ikke opprette kontekst for koding"
 
-#: ../camel/camel-smime-context.c:850
+#: ../camel/camel-smime-context.c:864
 msgid "Failed to add data to CMS encoder"
 msgstr "Kunne ikke legge til data i CMS-koder"
 
-#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1151
+#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1165
 msgid "Failed to encode data"
 msgstr "Kunne ikke kode data"
 
-#: ../camel/camel-smime-context.c:999 ../camel/camel-smime-context.c:1248
+#: ../camel/camel-smime-context.c:1013 ../camel/camel-smime-context.c:1262
 msgid "Decoder failed"
 msgstr "Dekoder feilet"
 
-#: ../camel/camel-smime-context.c:1068
+#: ../camel/camel-smime-context.c:1082
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Kan ikke finne felles krypteringsalgoritme"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1090
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Kan ikke allokere plass for krypteringsnøkkel"
 
-#: ../camel/camel-smime-context.c:1087
+#: ../camel/camel-smime-context.c:1101
 msgid "Cannot create CMS Message"
 msgstr "Kan ikke opprette CMS-melding"
 
-#: ../camel/camel-smime-context.c:1093
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot create CMS Enveloped data"
 msgstr "Kan ikke opprette CMS-innpakkede data"
 
-#: ../camel/camel-smime-context.c:1099
+#: ../camel/camel-smime-context.c:1113
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Kan ikke legge ved CMS-innpakkede data"
 
-#: ../camel/camel-smime-context.c:1105
+#: ../camel/camel-smime-context.c:1119
 msgid "Cannot attach CMS data object"
 msgstr "Kan ikke legge ved dataobjekt for CMS"
 
-#: ../camel/camel-smime-context.c:1114
+#: ../camel/camel-smime-context.c:1128
 msgid "Cannot create CMS Recipient information"
 msgstr "Kan ikke opprette mottakerinformasjon for CMS"
 
-#: ../camel/camel-smime-context.c:1119
+#: ../camel/camel-smime-context.c:1133
 msgid "Cannot add CMS Recipient information"
 msgstr "Kan ikke legge til mottakerinformasjon for CMS"
 
-#: ../camel/camel-smime-context.c:1145
+#: ../camel/camel-smime-context.c:1159
 msgid "Failed to add data to encoder"
 msgstr "Klarte ikke å legge til data for koder"
 
-#: ../camel/camel-smime-context.c:1255
+#: ../camel/camel-smime-context.c:1269
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME dekryptering: Fant ikke kryptert innhold"
 
-#: ../camel/camel-store.c:1838
+#: ../camel/camel-store.c:1871
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Kan ikke opprette mappe «%s»: mappen eksisterer"
 
-#: ../camel/camel-store.c:1881
+#: ../camel/camel-store.c:1914
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Åpner mappe «%s»"
 
-#: ../camel/camel-store.c:2066
+#: ../camel/camel-store.c:2099
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Søker etter mapper i «%s»"
 
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088
+#: ../camel/camel-store.c:2115 ../camel/camel-store.c:2146
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Papirkurv"
 
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092
+#: ../camel/camel-store.c:2127 ../camel/camel-store.c:2162
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Søppel"
 
-#: ../camel/camel-store.c:2540
+#: ../camel/camel-store.c:2615
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kan ikke opprette mappe: «%s»: mappen eksisterer"
 
-#: ../camel/camel-store.c:2554
+#: ../camel/camel-store.c:2629
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Lager mappe «%s»"
 
-#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410
-#: ../camel/providers/local/camel-maildir-store.c:306
+#: ../camel/camel-store.c:2747 ../camel/camel-vee-store.c:416
+#: ../camel/providers/local/camel-maildir-store.c:315
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
 
-#: ../camel/camel-store.c:2815 ../camel/camel-vee-store.c:460
-#: ../camel/providers/local/camel-maildir-store.c:788
+#: ../camel/camel-store.c:2890 ../camel/camel-vee-store.c:466
+#: ../camel/providers/local/camel-maildir-store.c:839
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
@@ -2904,16 +2905,16 @@
 
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
 #. * all messages not belonging into any other configured search folder
-#: ../camel/camel-vee-store.c:38
+#: ../camel/camel-vee-store.c:42
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: ../camel/camel-vee-store.c:436
+#: ../camel/camel-vee-store.c:442
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
 
-#: ../camel/camel-vee-store.c:470
+#: ../camel/camel-vee-store.c:476
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe"
@@ -3000,20 +3001,16 @@
 msgid "Unable to retrieve message: "
 msgstr "Kan ikke hente melding: "
 
-#: ../camel/camel-imapx-server.c:6618
-#: ../camel/providers/imap/camel-imap-folder.c:3531
+#: ../camel/camel-imapx-server.c:7385
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Kan ikke hente melding med meldings-ID %s: %s"
 
-#: ../camel/camel-imapx-server.c:6619
-#: ../camel/providers/imap/camel-imap-folder.c:3532
+#: ../camel/camel-imapx-server.c:7386
 msgid "No such message available."
 msgstr "Ingen slik melding tilgjengelig."
 
-#: ../camel/providers/imap/camel-imap-folder.c:3620
-#: ../camel/providers/imap/camel-imap-folder.c:4512
-#: ../camel/providers/nntp/camel-nntp-folder.c:493
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 #, c-format
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
@@ -3059,17 +3056,14 @@
 msgid "Failed to cache %s: "
 msgstr "Feil ved mellomlagring av %s: "
 
-#: ../camel/providers/imap/camel-imap-provider.c:40
 #: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../camel/providers/imap/camel-imap-provider.c:42
 #: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "_Se etter nye meldinger i alle mapper"
 
-#: ../camel/providers/imap/camel-imap-provider.c:44
 #: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "S_e etter nye meldinger i abonnerte mapper"
@@ -3088,18 +3082,15 @@
 msgid "Co_mmand:"
 msgstr "Ko_mmando:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:47
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "Mapper"
 
-#: ../camel/providers/imap/camel-imap-provider.c:49
 #: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "_Show only subscribed folders"
 msgstr "Vi_s kun abonnerte mapper"
 
-#: ../camel/providers/imap/camel-imap-provider.c:51
 #: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "O_verride server-supplied folder namespace"
 msgstr "O_verstyr tjeners navneområde for mapper"
@@ -3108,16 +3099,14 @@
 msgid "Names_pace:"
 msgstr "_Navneområde:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:55
 #: ../camel/providers/imapx/camel-imapx-provider.c:59
 #: ../camel/providers/local/camel-local-provider.c:41
-#: ../camel/providers/local/camel-local-provider.c:77
-#: ../camel/providers/local/camel-local-provider.c:97
+#: ../camel/providers/local/camel-local-provider.c:81
+#: ../camel/providers/local/camel-local-provider.c:101
 #: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Options"
 msgstr "Alternativer"
 
-#: ../camel/providers/imap/camel-imap-provider.c:59
 #: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "_Bruk filtre for nye meldinger i Innboks på denne tjeneren"
@@ -3127,12 +3116,10 @@
 msgid "Check new messages for Jun_k contents"
 msgstr "Se etter søppelinn_hold i nye meldinger"
 
-#: ../camel/providers/imap/camel-imap-provider.c:63
 #: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Se kun etter søppelinnhold i nye meldinger i inn_boksen"
 
-#: ../camel/providers/imap/camel-imap-provider.c:65
 #: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "S_ynkroniser eksterne meldinger med lokale meldinger automatisk"
@@ -3141,7 +3128,6 @@
 msgid "IMAP default port"
 msgstr "Forvalgt port for IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "IMAP over SSL"
 msgstr "IMAP over SSL"
@@ -3150,20 +3136,17 @@
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:80
 #: ../camel/providers/imapx/camel-imapx-provider.c:85
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post på IMAP-tjenere."
 
-#: ../camel/camel-imapx-store.c:251
-#: ../camel/providers/imap/camel-imap-provider.c:98
-#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/camel-imapx-store.c:343
+#: ../camel/providers/nntp/camel-nntp-provider.c:95
 #: ../camel/providers/pop3/camel-pop3-provider.c:83
 msgid "Password"
 msgstr "Passord"
 
-#: ../camel/camel-imapx-store.c:253
-#: ../camel/providers/imap/camel-imap-provider.c:100
+#: ../camel/camel-imapx-store.c:345
 msgid ""
 "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -3171,33 +3154,27 @@
 "passord."
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/camel-imapx-store.c:377 ../camel/camel-imapx-store.c:867
-#: ../camel/providers/imap/camel-imap-store.c:275
-#: ../camel/providers/imap/camel-imap-store.c:2684
+#: ../camel/camel-imapx-store.c:478 ../camel/camel-imapx-store.c:968
 #: ../camel/providers/local/camel-maildir-folder.c:473
-#: ../camel/providers/local/camel-maildir-store.c:307
-#: ../camel/providers/local/camel-maildir-store.c:699
-#: ../camel/providers/local/camel-maildir-store.c:705
-#: ../camel/providers/local/camel-maildir-store.c:789
+#: ../camel/providers/local/camel-maildir-store.c:316
+#: ../camel/providers/local/camel-maildir-store.c:750
+#: ../camel/providers/local/camel-maildir-store.c:756
+#: ../camel/providers/local/camel-maildir-store.c:840
 #: ../camel/providers/local/camel-spool-store.c:393
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../camel/camel-imapx-server.c:3622
-#: ../camel/providers/imap/camel-imap-store.c:414
-#: ../camel/providers/imap/camel-imap-store.c:468
+#: ../camel/camel-imapx-server.c:3994
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
 
-#: ../camel/camel-imapx-server.c:3623
-#: ../camel/providers/imap/camel-imap-store.c:415
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/camel-imapx-server.c:3995
+#: ../camel/providers/smtp/camel-smtp-transport.c:203
 msgid "STARTTLS not supported"
 msgstr "STARTTLS er ikke støttet"
 
-#: ../camel/camel-imapx-server.c:3662
-#: ../camel/providers/imap/camel-imap-store.c:440
+#: ../camel/camel-imapx-server.c:4034
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "Klarte ikke å koble til IMAP-tjener %s i sikker modus: "
@@ -3244,69 +3221,59 @@
 "%s\n"
 "\n"
 
-#: ../camel/camel-imapx-store.c:157
-#: ../camel/providers/imap/camel-imap-store.c:827
+#: ../camel/camel-imapx-store.c:249
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-tjener %s"
 
-#: ../camel/camel-imapx-store.c:160
-#: ../camel/providers/imap/camel-imap-store.c:830
+#: ../camel/camel-imapx-store.c:252
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjeneste for %s på %s"
 
-#: ../camel/camel-imapx-store.c:352
-#: ../camel/providers/imap/camel-imap-store.c:2064
-#: ../camel/providers/imap/camel-imap-store.c:2262
+#: ../camel/camel-imapx-store.c:453
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: ../camel/camel-imapx-store.c:1421
-#: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imap/camel-imap-store.c:2524
+#: ../camel/camel-imapx-store.c:1614
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
 
-#: ../camel/camel-imapx-store.c:1442
-#: ../camel/providers/imap/camel-imap-store.c:2140
-#: ../camel/providers/imap/camel-imap-store.c:2589
+#: ../camel/camel-imapx-store.c:1635
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Opphavsmappen tillates ikke å ha undermapper"
 
-#: ../camel/providers/imap/camel-imap-store.c:2191
-#: ../camel/providers/local/camel-maildir-store.c:274
+#: ../camel/providers/local/camel-maildir-store.c:283
 #: ../camel/providers/local/camel-mbox-store.c:442
-#: ../camel/providers/local/camel-mh-store.c:564
+#: ../camel/providers/local/camel-mh-store.c:556
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Kan ikke opprette mappe «%s»: mappen eksisterer."
 
-#: ../camel/camel-imapx-store.c:1432
-#: ../camel/providers/imap/camel-imap-store.c:2537
+#: ../camel/camel-imapx-store.c:1625
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjent opphavsmappe: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3334
+#: ../camel/providers/imap/camel-imap-store.c:3344
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "Tjener koblet fra uventet"
 
-#: ../camel/providers/imap/camel-imap-store.c:3338
+#: ../camel/providers/imap/camel-imap-store.c:3348
 msgid "Server unexpectedly disconnected: "
 msgstr "Tjener koblet fra uventet: "
 
-#: ../camel/camel-imapx-folder.c:104
+#: ../camel/camel-imapx-folder.c:1228
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "Kunne ikke lage sammendrag for mappe %s"
 
-#: ../camel/camel-imapx-folder.c:112
+#: ../camel/camel-imapx-folder.c:1236
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "Kunne ikke lage mellomlager for %s: "
@@ -3343,7 +3310,7 @@
 msgid "Error writing to cache stream: "
 msgstr "Feil under skriving til mellomlagerstrøm: "
 
-#: ../camel/camel-imapx-server.c:2644
+#: ../camel/camel-imapx-server.c:3029
 #, c-format
 msgid "Not authenticated"
 msgstr "Ikke autentisert"
@@ -3352,12 +3319,11 @@
 msgid "Closing tmp stream failed: "
 msgstr "Feil ved lukking av midlertidig strøm: "
 
-#: ../camel/camel-imapx-server.c:6774 ../camel/camel-imapx-server.c:6789
+#: ../camel/camel-imapx-server.c:7547 ../camel/camel-imapx-server.c:7562
 msgid "Cannot create spool file: "
 msgstr "Kan ikke spool-fil: "
 
-#: ../camel/camel-imapx-store.c:1204
-#: ../camel/providers/nntp/camel-nntp-store.c:1771
+#: ../camel/providers/nntp/camel-nntp-store.c:2284
 #, c-format
 msgid "No such folder: %s"
 msgstr "Ingen slik mappe: %s"
@@ -3413,11 +3379,11 @@
 msgid "For storing local mail in MH-like mail directories."
 msgstr "For lagring av lokal e-post i MH-lignende meldingskataloger."
 
-#: ../camel/providers/local/camel-local-provider.c:64
+#: ../camel/providers/local/camel-local-provider.c:68
 msgid "Local delivery"
 msgstr "Lokal levering"
 
-#: ../camel/providers/local/camel-local-provider.c:65
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3430,24 +3396,24 @@
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_Bruk filtre for nye meldinger i INNBOKS"
 
-#: ../camel/providers/local/camel-local-provider.c:86
+#: ../camel/providers/local/camel-local-provider.c:90
 msgid "Maildir-format mail directories"
 msgstr "E-postkataloger i maildir-format"
 
-#: ../camel/providers/local/camel-local-provider.c:87
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "For storing local mail in maildir directories."
 msgstr "For lagring av lokal e-post i maildir-kataloger."
 
-#: ../camel/providers/local/camel-local-provider.c:100
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_Lagre statushoder i Elm/Mutt/Pine-format"
 
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
 msgstr "Standard Unix mbox «spool»-fil"
 
-#: ../camel/providers/local/camel-local-provider.c:108
-#: ../camel/providers/local/camel-local-provider.c:120
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:126
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3455,7 +3421,7 @@
 "For lesing og lagring av lokal e-post i standard eksterne mbox-filer.\n"
 "Kan også  brukes til å lagre et tre av mapper i Elm, Pine eller Mutt-stil."
 
-#: ../camel/providers/local/camel-local-provider.c:119
+#: ../camel/providers/local/camel-local-provider.c:125
 msgid "Standard Unix mbox spool directory"
 msgstr "Standard Unix mbox «spool»-katalog"
 
@@ -3471,7 +3437,7 @@
 
 #: ../camel/providers/local/camel-local-store.c:223
 #: ../camel/providers/local/camel-local-store.c:383
-#: ../camel/providers/local/camel-maildir-store.c:104
+#: ../camel/providers/local/camel-maildir-store.c:117
 #: ../camel/providers/local/camel-mbox-store.c:581
 #: ../camel/providers/local/camel-spool-store.c:89
 #, c-format
@@ -3486,7 +3452,7 @@
 #: ../camel/providers/local/camel-local-store.c:244
 #: ../camel/providers/local/camel-local-store.c:254
 #: ../camel/providers/local/camel-local-store.c:396
-#: ../camel/providers/local/camel-maildir-store.c:137
+#: ../camel/providers/local/camel-maildir-store.c:145
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finner ikke mappe: %s: %s"
@@ -3513,7 +3479,7 @@
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikke endre navn på «%s»: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:543
+#: ../camel/providers/local/camel-local-summary.c:567
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke legge til melding i sammendraget: ukjent grunn"
@@ -3550,52 +3516,52 @@
 msgid "Cannot create folder: %s : Folder name cannot contain a dot"
 msgstr "Kan ikke opprette mappe: %s: mappenavn kan ikke inneholde punktum"
 
-#: ../camel/providers/local/camel-maildir-store.c:122
-#: ../camel/providers/local/camel-maildir-store.c:806
+#: ../camel/providers/local/camel-maildir-store.c:125
+#: ../camel/providers/local/camel-maildir-store.c:848
 #, c-format
 msgid "Folder %s already exists"
 msgstr "Mappen %s eksisterer allerede"
 
-#: ../camel/providers/local/camel-maildir-store.c:221
-#: ../camel/providers/local/camel-maildir-store.c:252
+#: ../camel/providers/local/camel-maildir-store.c:230
+#: ../camel/providers/local/camel-maildir-store.c:261
 #: ../camel/providers/local/camel-mbox-store.c:403
 #: ../camel/providers/local/camel-mbox-store.c:424
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Kan ikke opprette mappe «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:245
 #: ../camel/providers/local/camel-mbox-store.c:369
-#: ../camel/providers/local/camel-mh-store.c:522
+#: ../camel/providers/local/camel-mh-store.c:514
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Finner ikke mappe «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:251
 #: ../camel/providers/local/camel-mbox-store.c:379
-#: ../camel/providers/local/camel-mh-store.c:531
+#: ../camel/providers/local/camel-mh-store.c:523
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Finner ikke mappe «%s»: mappen eksisterer ikke."
 
-#: ../camel/providers/local/camel-maildir-store.c:269
+#: ../camel/providers/local/camel-maildir-store.c:278
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "Kan ikke hente mappe «%s»: ikke en maildir katalog."
 
-#: ../camel/providers/local/camel-maildir-store.c:338
-#: ../camel/providers/local/camel-maildir-store.c:378
-#: ../camel/providers/local/camel-mh-store.c:682
+#: ../camel/providers/local/camel-maildir-store.c:347
+#: ../camel/providers/local/camel-maildir-store.c:387
+#: ../camel/providers/local/camel-mh-store.c:674
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Kunne ikke slette mappe «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:340
+#: ../camel/providers/local/camel-maildir-store.c:349
 msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
-#: ../camel/providers/local/camel-maildir-store.c:589
-#: ../camel/providers/local/camel-maildir-store.c:1003
+#: ../camel/providers/local/camel-maildir-store.c:628
+#: ../camel/providers/local/camel-maildir-store.c:1063
 #: ../camel/providers/local/camel-spool-store.c:212
 #: ../camel/providers/local/camel-spool-store.c:231
 #, c-format
@@ -3608,25 +3574,25 @@
 msgstr ""
 "Kan ikke endre navn på mappe: %s: mappenavn kan ikke inneholde punktum"
 
-#: ../camel/providers/local/camel-maildir-summary.c:434
-#: ../camel/providers/local/camel-maildir-summary.c:567
+#: ../camel/providers/local/camel-maildir-summary.c:458
+#: ../camel/providers/local/camel-maildir-summary.c:591
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan ikke åpne maildir katalogsti: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:582
 msgid "Checking folder consistency"
 msgstr "Sjekker om mappen er konsistent"
 
-#: ../camel/providers/local/camel-maildir-summary.c:651
+#: ../camel/providers/local/camel-maildir-summary.c:675
 msgid "Checking for new messages"
 msgstr "Ser etter nye meldinger"
 
-#: ../camel/providers/local/camel-maildir-summary.c:746
-#: ../camel/providers/local/camel-mbox-summary.c:418
-#: ../camel/providers/local/camel-mbox-summary.c:650
-#: ../camel/providers/local/camel-mbox-summary.c:794
-#: ../camel/providers/local/camel-spool-summary.c:132
+#: ../camel/providers/local/camel-maildir-summary.c:770
+#: ../camel/providers/local/camel-mbox-summary.c:450
+#: ../camel/providers/local/camel-mbox-summary.c:682
+#: ../camel/providers/local/camel-mbox-summary.c:830
+#: ../camel/providers/local/camel-spool-summary.c:141
 msgid "Storing folder"
 msgstr "Lagrer mappe"
 
@@ -3717,58 +3683,58 @@
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kunne ikke endre navn på «%s» til %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:428
+#: ../camel/providers/local/camel-mbox-summary.c:460
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunne ikke åpne mappe %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:490
+#: ../camel/providers/local/camel-mbox-summary.c:522
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "Fatal feil i lesing av e-post nær posisjon %s i mappe %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:575
+#: ../camel/providers/local/camel-mbox-summary.c:607
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikke sjekke mappe: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:663
-#: ../camel/providers/local/camel-mbox-summary.c:803
-#: ../camel/providers/local/camel-spool-summary.c:139
+#: ../camel/providers/local/camel-mbox-summary.c:695
+#: ../camel/providers/local/camel-mbox-summary.c:839
+#: ../camel/providers/local/camel-spool-summary.c:148
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunne ikke åpne fil %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:677
-#: ../camel/providers/local/camel-spool-summary.c:154
+#: ../camel/providers/local/camel-mbox-summary.c:709
+#: ../camel/providers/local/camel-spool-summary.c:163
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke åpne midlertidig postboks: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:694
-#: ../camel/providers/local/camel-mbox-summary.c:920
+#: ../camel/providers/local/camel-mbox-summary.c:726
+#: ../camel/providers/local/camel-mbox-summary.c:956
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:705
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:758
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn på mappe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:817
-#: ../camel/providers/local/camel-mbox-summary.c:1086
+#: ../camel/providers/local/camel-mbox-summary.c:853
+#: ../camel/providers/local/camel-mbox-summary.c:1122
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunne ikke lagre mappe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:856
-#: ../camel/providers/local/camel-mbox-summary.c:1123
+#: ../camel/providers/local/camel-mbox-summary.c:892
+#: ../camel/providers/local/camel-mbox-summary.c:1162
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3777,25 +3743,25 @@
 "MBOX-filen er korrupt. Vennligst korriger den. (Forventet en From: linje, "
 "men fant den ikke.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:866
-#: ../camel/providers/local/camel-mbox-summary.c:1136
+#: ../camel/providers/local/camel-mbox-summary.c:902
+#: ../camel/providers/local/camel-mbox-summary.c:1174
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Sammendrag og mappe stemmer ikke overens selv etter synkronisering"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1031
-#: ../camel/providers/local/camel-spool-summary.c:347
+#: ../camel/providers/local/camel-mbox-summary.c:1067
+#: ../camel/providers/local/camel-spool-summary.c:356
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1194
-#: ../camel/providers/local/camel-mbox-summary.c:1224
+#: ../camel/providers/local/camel-mbox-summary.c:1232
+#: ../camel/providers/local/camel-mbox-summary.c:1262
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Skriving til midlertidig postboks feilet: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1213
+#: ../camel/providers/local/camel-mbox-summary.c:1251
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks feilet: %s: %s"
@@ -3805,12 +3771,12 @@
 msgid "Cannot append message to mh folder: %s: "
 msgstr "Kan ikke legge til melding i mh-mappe: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:541
+#: ../camel/providers/local/camel-mh-store.c:533
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Kunne ikke opprette mappe «%s»: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:557
+#: ../camel/providers/local/camel-mh-store.c:549
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Kan ikke hente mappe «%s»: ikke en katalog."
@@ -3888,21 +3854,21 @@
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Spool «%s» er ikke en vanlig fil eller katalog"
 
-#: ../camel/providers/local/camel-spool-summary.c:170
-#: ../camel/providers/local/camel-spool-summary.c:182
-#: ../camel/providers/local/camel-spool-summary.c:194
+#: ../camel/providers/local/camel-spool-summary.c:179
+#: ../camel/providers/local/camel-spool-summary.c:191
+#: ../camel/providers/local/camel-spool-summary.c:203
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "Kunne ikke synkronisere midlertidig mappe %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:212
+#: ../camel/providers/local/camel-spool-summary.c:221
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "Kunne ikke synkronisere spool-mappe %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:244
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:276
+#: ../camel/providers/local/camel-spool-summary.c:253
+#: ../camel/providers/local/camel-spool-summary.c:272
+#: ../camel/providers/local/camel-spool-summary.c:285
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
@@ -3911,47 +3877,46 @@
 "Kunne ikke synkronisere spool-mappe %s: %s\n"
 "Mappen kan være korrupt, kopi lagret i «%s»"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:278
-#: ../camel/providers/nntp/camel-nntp-folder.c:360
-#: ../camel/providers/nntp/camel-nntp-folder.c:481
+#: ../camel/providers/nntp/camel-nntp-folder.c:285
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
+#: ../camel/providers/nntp/camel-nntp-folder.c:510
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Intern feil: UID har ugyldig format: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:328
-#: ../camel/providers/nntp/camel-nntp-folder.c:332
-#: ../camel/providers/pop3/camel-pop3-folder.c:633
-#: ../camel/providers/pop3/camel-pop3-folder.c:1065
+#: ../camel/providers/nntp/camel-nntp-folder.c:349
+#: ../camel/providers/nntp/camel-nntp-folder.c:354
+#: ../camel/providers/pop3/camel-pop3-folder.c:698
+#: ../camel/providers/pop3/camel-pop3-folder.c:1173
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Kan ikke hente melding %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:339
-#: ../camel/providers/nntp/camel-nntp-folder.c:504
-#: ../camel/providers/pop3/camel-pop3-folder.c:558
+#: ../camel/providers/nntp/camel-nntp-folder.c:361
+#: ../camel/providers/nntp/camel-nntp-folder.c:536
 #: ../camel/providers/pop3/camel-pop3-folder.c:623
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
+#: ../camel/providers/pop3/camel-pop3-folder.c:688
+#: ../camel/providers/pop3/camel-pop3-folder.c:707
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Kan ikke hente melding %s: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:559
-#: ../camel/providers/nntp/camel-nntp-folder.c:565
-#: ../camel/providers/nntp/camel-nntp-folder.c:611
+#: ../camel/providers/nntp/camel-nntp-folder.c:593
+#: ../camel/providers/nntp/camel-nntp-folder.c:599
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Posting feilet: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:606
+#: ../camel/providers/nntp/camel-nntp-folder.c:664
 msgid "Posting failed: "
 msgstr "Posting feilet: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:633
+#: ../camel/providers/nntp/camel-nntp-folder.c:689
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Du kan ikke poste NNTP-meldinger mens du arbeider frakoblet!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:653
+#: ../camel/providers/nntp/camel-nntp-folder.c:709
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Du kan ikke kopiere meldinger fra en NNTP-mappe!"
@@ -3984,7 +3949,7 @@
 "Dette er en tilbyder for lesing og posting av innlegg til USENET "
 "nyhetsgrupper."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:87
+#: ../camel/providers/nntp/camel-nntp-provider.c:97
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4002,22 +3967,22 @@
 msgid "Cannot authenticate to server: %s"
 msgstr "Kan ikke autentisere mot tjener: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:286
+#: ../camel/providers/nntp/camel-nntp-store.c:386
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Kan ikke lese hilsen fra %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:298
+#: ../camel/providers/nntp/camel-nntp-store.c:394
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-tjener %s returnerte feilkode %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:463
+#: ../camel/providers/nntp/camel-nntp-store.c:555
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1058
+#: ../camel/providers/nntp/camel-nntp-store.c:1219
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4028,23 +3993,23 @@
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1152
+#: ../camel/providers/nntp/camel-nntp-store.c:1331
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "Du kan ikke opprette mapper i et News-lager: abonner i stedet."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1168
+#: ../camel/providers/nntp/camel-nntp-store.c:1347
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Du kan ikke endre navn på en mappe på en nyhetstjener."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1191
+#: ../camel/providers/nntp/camel-nntp-store.c:1370
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Du kan ikke fjerne en mappe i et News-lager: slett abonnement i stedet."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1390
+#: ../camel/providers/nntp/camel-nntp-store.c:1589
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4055,7 +4020,7 @@
 "\n"
 "Nyhetsgruppen finnes ikke. Valgt oppføring er sannsynligvis en opphavsmappe."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1438
+#: ../camel/providers/nntp/camel-nntp-store.c:1656
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4066,68 +4031,68 @@
 "\n"
 "nyhetsgruppen eksisterer ikke!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1628
+#: ../camel/providers/nntp/camel-nntp-store.c:2093
 msgid "NNTP Command failed: "
 msgstr "NNTP-kommando feilet: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1713
+#: ../camel/providers/nntp/camel-nntp-store.c:2190
 #, c-format
 msgid "Not connected."
 msgstr "Ingen tilkoblet."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:198
-#: ../camel/providers/nntp/camel-nntp-summary.c:328
+#: ../camel/providers/nntp/camel-nntp-summary.c:200
+#: ../camel/providers/nntp/camel-nntp-summary.c:339
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Søker etter nye meldinger"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:216
+#: ../camel/providers/nntp/camel-nntp-summary.c:222
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Uventet svar fra xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:346
+#: ../camel/providers/nntp/camel-nntp-summary.c:360
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Uventet svar fra head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:393
+#: ../camel/providers/nntp/camel-nntp-summary.c:407
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operasjonen feilet: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:453
-#: ../camel/providers/pop3/camel-pop3-folder.c:526
+#: ../camel/providers/pop3/camel-pop3-folder.c:509
+#: ../camel/providers/pop3/camel-pop3-folder.c:588
 #, c-format
 msgid "No message with UID %s"
 msgstr "Ingen melding med UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:542
+#: ../camel/providers/pop3/camel-pop3-folder.c:604
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-melding %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:634
+#: ../camel/providers/pop3/camel-pop3-folder.c:699
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:682
+#: ../camel/providers/pop3/camel-pop3-folder.c:751
 msgid "Retrieving POP summary"
 msgstr "Henter POP-sammendrag"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:741
-#: ../camel/providers/pop3/camel-pop3-folder.c:744
-#: ../camel/providers/pop3/camel-pop3-folder.c:757
-#: ../camel/providers/pop3/camel-pop3-folder.c:770
-#: ../camel/providers/pop3/camel-pop3-folder.c:784
+#: ../camel/providers/pop3/camel-pop3-folder.c:812
+#: ../camel/providers/pop3/camel-pop3-folder.c:815
+#: ../camel/providers/pop3/camel-pop3-folder.c:828
+#: ../camel/providers/pop3/camel-pop3-folder.c:841
+#: ../camel/providers/pop3/camel-pop3-folder.c:855
 msgid "Cannot get POP summary: "
 msgstr "Kan ikke hente POP-sammendrag: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:891
+#: ../camel/providers/pop3/camel-pop3-folder.c:966
 msgid "Expunging old messages"
 msgstr "Fjerner gamle meldinger"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:911
+#: ../camel/providers/pop3/camel-pop3-folder.c:992
 msgid "Expunging deleted messages"
 msgstr "Fjerner slettede meldinger"
 
@@ -4190,32 +4155,32 @@
 "selv på tjenere som hevder å støtte det."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:83
+#: ../camel/providers/pop3/camel-pop3-store.c:99
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:144
+#: ../camel/providers/pop3/camel-pop3-store.c:161
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Klarte ikke å lese en gyldig hilsen fra POP-tjener %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:159
+#: ../camel/providers/pop3/camel-pop3-store.c:176
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Klarte ikke å koble til POP-tjener %s i sikker modus: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:160
+#: ../camel/providers/pop3/camel-pop3-store.c:177
 msgid "STLS not supported by server"
 msgstr "STLS er ikke støttet av tjeneren"
 
 #. Translators: Last %s is an optional
 #. * explanation beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "Klarte ikke å koble til POP-tjener %s i sikker modus%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:194
+#: ../camel/providers/pop3/camel-pop3-store.c:211
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Klarte ikke å koble til POP-tjener %s i sikker modus: "
@@ -4240,17 +4205,17 @@
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "SASL «%s»-login feilet for POP-tjener %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:305
+#: ../camel/providers/pop3/camel-pop3-store.c:351
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Kan ikke logge inn til POP-tjener %s: SASL-protokollfeil"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:327
+#: ../camel/providers/pop3/camel-pop3-store.c:373
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Klarte ikke å autentisere mot POP-tjener %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:563
+#: ../camel/providers/pop3/camel-pop3-store.c:703
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4259,7 +4224,7 @@
 "Kan ikke koble til POP-tjener %s:\\tUgyldig APOP-ID mottatt. Mulig "
 "identitetstyveri. Kontakt din administrator."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:615
+#: ../camel/providers/pop3/camel-pop3-store.c:755
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4270,7 +4235,7 @@
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:630
+#: ../camel/providers/pop3/camel-pop3-store.c:770
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4289,12 +4254,12 @@
 "Kunne ikke koble til POP-tjener %s.\n"
 "Feil ved oversending av passord%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:387
+#: ../camel/providers/pop3/camel-pop3-store.c:481
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3-tjener %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:390
+#: ../camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "POP3-tjener for %s på %s"
@@ -4304,18 +4269,18 @@
 msgid "Could not connect to POP server %s"
 msgstr "Kunne ikke koble til POP-tjener %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:718
+#: ../camel/providers/pop3/camel-pop3-store.c:852
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Ingen slik mappe «%s»."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:735
+#: ../camel/providers/pop3/camel-pop3-store.c:869
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3-lagre har ingen mappehierarki"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:36
-#: ../data/sources/sendmail.source.in.h:1
+#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4327,15 +4292,15 @@
 "For levering av e-post ved å videresende den til «sendmail»-programmet på "
 "det lokale systemet."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:52
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering av e-post via sendmail programmet"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:93
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "Kunne ikke tolke mottakerliste"
@@ -4350,7 +4315,7 @@
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kunne ikke kjøre fork på sendmail: %s: melding ikke sendt"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:287
 msgid "Could not send message: "
 msgstr "Kunne ikke sende meldingen: "
 
@@ -4389,33 +4354,33 @@
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "For levering av e-post via en ekstern e-posttjener med SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:154
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Welcome response error: "
 msgstr "Feil i velkommen-svar: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:202
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Klarte ikke å koble til SMTP-tjener %s i sikker modus: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
-#: ../camel/providers/smtp/camel-smtp-transport.c:223
-#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:226
+#: ../camel/providers/smtp/camel-smtp-transport.c:234
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:241
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "Klarte ikke å koble til SMTP-tjener %s i sikker modus: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:301
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:304
+#: ../camel/providers/smtp/camel-smtp-transport.c:341
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
@@ -4436,133 +4401,133 @@
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:691
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Kan ikke sende melding: tjenesten er ikke tilkoblet."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:661
+#: ../camel/providers/smtp/camel-smtp-transport.c:698
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:665
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:690
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende melding: ingen mottakere definert."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:740
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan ikke sende melding: en eller flere ugyldige mottakere"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:807
+#: ../camel/providers/smtp/camel-smtp-transport.c:861
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfeil, kommando ikke gjenkjent"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:809
+#: ../camel/providers/smtp/camel-smtp-transport.c:863
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfeil i parametere eller argumenter"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:811
+#: ../camel/providers/smtp/camel-smtp-transport.c:865
 msgid "Command not implemented"
 msgstr "Kommando ikke implementert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:813
+#: ../camel/providers/smtp/camel-smtp-transport.c:867
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:815
+#: ../camel/providers/smtp/camel-smtp-transport.c:869
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar på systemhjelp"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:817
+#: ../camel/providers/smtp/camel-smtp-transport.c:871
 msgid "Help message"
 msgstr "Hjelp-melding"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:819
+#: ../camel/providers/smtp/camel-smtp-transport.c:873
 msgid "Service ready"
 msgstr "Tjeneste klar"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:821
+#: ../camel/providers/smtp/camel-smtp-transport.c:875
 msgid "Service closing transmission channel"
 msgstr "Tjenesten lukker sendekanalen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:823
+#: ../camel/providers/smtp/camel-smtp-transport.c:877
 msgid "Service not available, closing transmission channel"
 msgstr "Tjenesten er ikke tilgjengelig, lukker sendekanalen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:825
+#: ../camel/providers/smtp/camel-smtp-transport.c:879
 msgid "Requested mail action okay, completed"
 msgstr "Forespurt e-post handling er ok, fullført"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:827
+#: ../camel/providers/smtp/camel-smtp-transport.c:881
 msgid "User not local; will forward to <forward-path>"
 msgstr "Ikke lokal bruker; videresender til <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:829
+#: ../camel/providers/smtp/camel-smtp-transport.c:883
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Forespurt e-post handling er ikke utført: postboks ikke tilgjengelig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:831
+#: ../camel/providers/smtp/camel-smtp-transport.c:885
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurt handling ikke utført: postboks ikke tilgjengelig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:833
+#: ../camel/providers/smtp/camel-smtp-transport.c:887
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurt handling avbrutt: feil i prosessering"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:835
+#: ../camel/providers/smtp/camel-smtp-transport.c:889
 msgid "User not local; please try <forward-path>"
 msgstr "Ikke lokal bruker; vennligst prøv <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:837
+#: ../camel/providers/smtp/camel-smtp-transport.c:891
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Forespurt handling ikke utført: utilstrekkelig lagringsplass"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:839
+#: ../camel/providers/smtp/camel-smtp-transport.c:893
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Forespurt e-post handling avbrutt: lagringsallokering oversteget"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:841
+#: ../camel/providers/smtp/camel-smtp-transport.c:895
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Forespurt handling ikke utført: postboksnavn ikke tillatt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:843
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start e-post input; slutt med <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:845
+#: ../camel/providers/smtp/camel-smtp-transport.c:899
 msgid "Transaction failed"
 msgstr "Transaksjonen feilet"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:849
+#: ../camel/providers/smtp/camel-smtp-transport.c:903
 msgid "A password transition is needed"
 msgstr "Passordoverføring kreves"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:851
+#: ../camel/providers/smtp/camel-smtp-transport.c:905
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen er for svak"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:853
+#: ../camel/providers/smtp/camel-smtp-transport.c:907
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kreves for forespurt autentiseringsmekanisme."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:855
+#: ../camel/providers/smtp/camel-smtp-transport.c:909
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autentiseringsfeil"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1112
+#: ../camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1139
-#: ../camel/providers/smtp/camel-smtp-transport.c:1157
-#: ../camel/providers/smtp/camel-smtp-transport.c:1165
+#: ../camel/providers/smtp/camel-smtp-transport.c:1193
+#: ../camel/providers/smtp/camel-smtp-transport.c:1207
+#: ../camel/providers/smtp/camel-smtp-transport.c:1215
 msgid "HELO command failed: "
 msgstr "HELO-kommando feilet: "
 
@@ -4570,47 +4535,47 @@
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:488
-#: ../camel/providers/smtp/camel-smtp-transport.c:499
-#: ../camel/providers/smtp/camel-smtp-transport.c:512
+#: ../camel/providers/smtp/camel-smtp-transport.c:526
+#: ../camel/providers/smtp/camel-smtp-transport.c:537
+#: ../camel/providers/smtp/camel-smtp-transport.c:550
 msgid "AUTH command failed: "
 msgstr "AUTH-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1255
-#: ../camel/providers/smtp/camel-smtp-transport.c:1265
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#: ../camel/providers/smtp/camel-smtp-transport.c:1305
+#: ../camel/providers/smtp/camel-smtp-transport.c:1315
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1292
+#: ../camel/providers/smtp/camel-smtp-transport.c:1342
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1309
-#: ../camel/providers/smtp/camel-smtp-transport.c:1319
+#: ../camel/providers/smtp/camel-smtp-transport.c:1359
+#: ../camel/providers/smtp/camel-smtp-transport.c:1369
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1362
-#: ../camel/providers/smtp/camel-smtp-transport.c:1373
-#: ../camel/providers/smtp/camel-smtp-transport.c:1384
-#: ../camel/providers/smtp/camel-smtp-transport.c:1443
-#: ../camel/providers/smtp/camel-smtp-transport.c:1463
-#: ../camel/providers/smtp/camel-smtp-transport.c:1477
-#: ../camel/providers/smtp/camel-smtp-transport.c:1486
+#: ../camel/providers/smtp/camel-smtp-transport.c:1412
+#: ../camel/providers/smtp/camel-smtp-transport.c:1423
+#: ../camel/providers/smtp/camel-smtp-transport.c:1434
+#: ../camel/providers/smtp/camel-smtp-transport.c:1493
+#: ../camel/providers/smtp/camel-smtp-transport.c:1513
+#: ../camel/providers/smtp/camel-smtp-transport.c:1527
+#: ../camel/providers/smtp/camel-smtp-transport.c:1536
 msgid "DATA command failed: "
 msgstr "DATA-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-#: ../camel/providers/smtp/camel-smtp-transport.c:1526
-#: ../camel/providers/smtp/camel-smtp-transport.c:1535
+#: ../camel/providers/smtp/camel-smtp-transport.c:1561
+#: ../camel/providers/smtp/camel-smtp-transport.c:1576
+#: ../camel/providers/smtp/camel-smtp-transport.c:1585
 msgid "RSET command failed: "
 msgstr "RSET-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1560
-#: ../camel/providers/smtp/camel-smtp-transport.c:1574
-#: ../camel/providers/smtp/camel-smtp-transport.c:1581
+#: ../camel/providers/smtp/camel-smtp-transport.c:1610
+#: ../camel/providers/smtp/camel-smtp-transport.c:1624
+#: ../camel/providers/smtp/camel-smtp-transport.c:1631
 msgid "QUIT command failed: "
 msgstr "QUIT-kommando feilet: "
 
@@ -4726,21 +4691,22 @@
 msgid "Waiting"
 msgstr "Venter"
 
-#: ../libedataserver/e-client.c:124
+#: ../libedataserver/e-client.c:135
 msgid "Source not loaded"
 msgstr "Kilde ble ikke lastet"
 
-#: ../libedataserver/e-client.c:126
+#: ../libedataserver/e-client.c:137
 msgid "Source already loaded"
 msgstr "Kilden er allerede lastet"
 
-#. Translators: This means that the EClient does not support offline mode, or
-#. * it's not set to by a user, thus it is unavailable while user is not connected.
-#: ../libedataserver/e-client.c:136
+#. Translators: This means that the EClient does not
+#. * support offline mode, or it's not set to by a user,
+#. * thus it is unavailable while user is not connected.
+#: ../libedataserver/e-client.c:148
 msgid "Offline unavailable"
 msgstr "Frakoblet modus er ikke tilgjengelig"
 
-#: ../libedataserver/e-client.c:158
+#: ../libedataserver/e-client.c:170
 msgid "D-Bus error"
 msgstr "D-Bus-feil"
 
@@ -4748,7 +4714,7 @@
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1647 ../libedataserver/e-time-utils.c:1946
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1962
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
@@ -4756,7 +4722,7 @@
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1652 ../libedataserver/e-time-utils.c:1937
+#: ../libedataserver/e-time-utils.c:1668 ../libedataserver/e-time-utils.c:1953
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
@@ -4764,7 +4730,7 @@
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1657 ../libedataserver/e-time-utils.c:1942
+#: ../libedataserver/e-time-utils.c:1673 ../libedataserver/e-time-utils.c:1958
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d.%m.%Y %H.%M"
 
@@ -4772,78 +4738,78 @@
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1933
+#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1949
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d.%m.%Y %H.%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1667
+#: ../libedataserver/e-time-utils.c:1683
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d.%m.%Y %H"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1672
+#: ../libedataserver/e-time-utils.c:1688
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d.%m.%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1675 ../libedataserver/e-time-utils.c:1795
-#: ../libedataserver/e-time-utils.c:1928
+#: ../libedataserver/e-time-utils.c:1691 ../libedataserver/e-time-utils.c:1811
+#: ../libedataserver/e-time-utils.c:1944
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1682
+#: ../libedataserver/e-time-utils.c:1698
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %H.%M.%S"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1686
+#: ../libedataserver/e-time-utils.c:1702
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H.%M.%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1691
+#: ../libedataserver/e-time-utils.c:1707
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y %H.%S"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1696
+#: ../libedataserver/e-time-utils.c:1712
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H.%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1701
+#: ../libedataserver/e-time-utils.c:1717
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1706
+#: ../libedataserver/e-time-utils.c:1722
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1709 ../libedataserver/e-time-utils.c:1798
+#: ../libedataserver/e-time-utils.c:1725 ../libedataserver/e-time-utils.c:1814
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1869 ../libedataserver/e-time-utils.c:1990
+#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:2006
 msgid "%I:%M:%S %p"
 msgstr "%H.%M.%s"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1873 ../libedataserver/e-time-utils.c:1982
+#: ../libedataserver/e-time-utils.c:1889 ../libedataserver/e-time-utils.c:1998
 msgid "%H:%M:%S"
 msgstr "%H.%M.%s"
 
@@ -4851,25 +4817,25 @@
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1878 ../libedataserver/e-time-utils.c:1987
+#: ../libedataserver/e-time-utils.c:1894 ../libedataserver/e-time-utils.c:2003
 msgid "%I:%M %p"
 msgstr "%H.%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1882 ../libedataserver/e-time-utils.c:1979
+#: ../libedataserver/e-time-utils.c:1898 ../libedataserver/e-time-utils.c:1995
 msgid "%H:%M"
 msgstr "%H.%M"
 
 #. strptime format for time of day, without seconds 24-hour format,
 #. * and no colon.
-#: ../libedataserver/e-time-utils.c:1886
+#: ../libedataserver/e-time-utils.c:1902
 msgid "%H%M"
 msgstr "%H.%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1890
+#: ../libedataserver/e-time-utils.c:1906
 msgid "%I %p"
 msgstr "%H"
 
@@ -5014,7 +4980,7 @@
 msgstr "_Søk:"
 
 #: ../libedataserverui/e-name-selector-dialog.c:357
-#: ../libedataserverui/e-name-selector-dialog.c:1182
+#: ../libedataserverui/e-name-selector-dialog.c:1184
 msgid "Any Category"
 msgstr "Hvilken som helst kategori"
 
@@ -5030,49 +4996,49 @@
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../data/sources/contacts-stub.source.in.h:1
-#: ../libedataserverui/e-name-selector-dialog.c:427
-#: ../modules/google-backend/module-google-backend.c:183
+#: ../modules/google-backend/module-google-backend.c:261
+#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
+#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: ../libedataserverui/e-name-selector-dialog.c:545
+#: ../libedataserverui/e-name-selector-dialog.c:547
 msgid "Select Contacts from Address Book"
 msgstr "Velg kontakter fra adresseboken"
 
-#: ../libedataserverui/e-name-selector-dialog.c:917
+#: ../libedataserverui/e-name-selector-dialog.c:919
 msgid "_Add"
 msgstr "_Legg til"
 
-#: ../libedataserverui/e-name-selector-dialog.c:921
+#: ../libedataserverui/e-name-selector-dialog.c:923
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../libedataserverui/e-name-selector-dialog.c:1097
+#: ../libedataserverui/e-name-selector-dialog.c:1099
 #, c-format
 msgid "Error loading address book: %s"
 msgstr "Feil under lasting av adressebok: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:3043
+#: ../libedataserverui/e-name-selector-entry.c:3054
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "Ut_vid %s i oppføringen"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:3059
+#: ../libedataserverui/e-name-selector-entry.c:3070
 #, c-format
 msgid "Cop_y %s"
 msgstr "Ko_pier %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:3070
+#: ../libedataserverui/e-name-selector-entry.c:3081
 #, c-format
 msgid "C_ut %s"
 msgstr "Klipp _ut %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:3088
+#: ../libedataserverui/e-name-selector-entry.c:3099
 #, c-format
 msgid "_Edit %s"
 msgstr "_Rediger %s"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/evolution-exchange-3.2.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/evolution-exchange-3.2.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/evolution-exchange-3.2.po	2013-01-29 09:34:00.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/evolution-exchange-3.2.po	2014-01-07 06:37:21.000000000 +0000
@@ -19,8 +19,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 13:51+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:17+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../addressbook/apps_exchange_addressbook.schemas.in.in.h:1
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/evolution-indicator.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/evolution-indicator.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/evolution-indicator.po	2013-01-29 09:34:00.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/evolution-indicator.po	2014-01-07 06:37:34.000000000 +0000
@@ -9,14 +9,14 @@
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-13 12:59+0000\n"
 "PO-Revision-Date: 2011-09-19 14:31+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
+"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:53+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:42+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../data/evolution-indicator.schemas.in.h:1
 msgid "Only create notifications for new mail in an Inbox."
@@ -34,52 +34,52 @@
 msgid "Show new message count in the message indicator applet."
 msgstr "Vis antall nye meldinger i meldingsvarsleren i panelet."
 
-#: ../src/evolution-indicator.c:303
+#: ../src/evolution-indicator.c:235
 #, c-format
 msgid "%d New Message"
 msgid_plural "%d New Messages"
 msgstr[0] "%d ny melding"
 msgstr[1] "%d nye meldinger"
 
-#: ../src/evolution-indicator.c:653 ../src/evolution-indicator.c:936
-#: ../src/evolution-indicator.c:941
+#: ../src/evolution-indicator.c:467 ../src/evolution-indicator.c:744
+#: ../src/evolution-indicator.c:749
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../src/evolution-indicator.c:769
+#: ../src/evolution-indicator.c:582
 msgid "Compose New Message"
 msgstr "Skriv en ny melding"
 
-#: ../src/evolution-indicator.c:774
+#: ../src/evolution-indicator.c:587
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: ../src/evolution-indicator.c:927
+#: ../src/evolution-indicator.c:735
 msgid "When new mail arri_ves in"
 msgstr "Når ny e-post m_ottas i"
 
-#: ../src/evolution-indicator.c:936 ../src/evolution-indicator.c:941
+#: ../src/evolution-indicator.c:744 ../src/evolution-indicator.c:749
 msgid "any Inbox"
 msgstr "hvilken som helst e-postinnboks"
 
-#: ../src/evolution-indicator.c:937 ../src/evolution-indicator.c:942
+#: ../src/evolution-indicator.c:745 ../src/evolution-indicator.c:750
 msgid "any Folder"
 msgstr "hvilken som helst mappe"
 
 #. i18n: ':' is used in the end of the above line (When New Mail Arrives:)
-#: ../src/evolution-indicator.c:950
+#: ../src/evolution-indicator.c:758
 msgid ":"
 msgstr ":"
 
-#: ../src/evolution-indicator.c:979
+#: ../src/evolution-indicator.c:787
 msgid "Pla_y a sound"
 msgstr "S_pill av en lyd"
 
-#: ../src/evolution-indicator.c:984
+#: ../src/evolution-indicator.c:792
 msgid "_Display a notification"
 msgstr "_Vis et varsel"
 
-#: ../src/evolution-indicator.c:989
+#: ../src/evolution-indicator.c:797
 msgid "_Indicate new messages in the panel"
 msgstr "_Varsle nye meldinger i panelet"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/evolution-webcal.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/evolution-webcal.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/evolution-webcal.po	2013-01-29 09:33:59.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/evolution-webcal.po	2014-01-07 06:37:01.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:05+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:07+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../evolution-webcal.schemas.in.in.h:1
 msgid "How to handle webcal URLs"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/file-roller.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/file-roller.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/file-roller.po	2013-01-29 09:33:54.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/file-roller.po	2014-01-07 06:37:01.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:07+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:08+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../copy-n-paste/eggdesktopfile.c:165
@@ -30,27 +30,27 @@
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Kjenner ikke igjen versjon «%s» i desktop-fil"
 
-#: ../copy-n-paste/eggdesktopfile.c:970
+#: ../copy-n-paste/eggdesktopfile.c:973
 #, c-format
 msgid "Starting %s"
 msgstr "Starter %s"
 
-#: ../copy-n-paste/eggdesktopfile.c:1112
+#: ../copy-n-paste/eggdesktopfile.c:1115
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "Programmet tar ikke dokumenter på kommandolinjen"
 
-#: ../copy-n-paste/eggdesktopfile.c:1180
+#: ../copy-n-paste/eggdesktopfile.c:1183
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Kjenner ikke igjen oppstartsalternativ: %d"
 
-#: ../copy-n-paste/eggdesktopfile.c:1385
+#: ../copy-n-paste/eggdesktopfile.c:1388
 #, c-format
 msgid "Can't pass documents to this desktop element"
 msgstr "Kan ikke gi dokumenter til dette skrivebordselementet"
 
-#: ../copy-n-paste/eggdesktopfile.c:1406
+#: ../copy-n-paste/eggdesktopfile.c:1409
 #, c-format
 msgid "Not a launchable item"
 msgstr "Ikke en startbar oppføring"
@@ -83,8 +83,8 @@
 msgid "Show session management options"
 msgstr "Vis alternativer for økthåndtering"
 
-#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:2005
-#: ../src/fr-window.c:5415
+#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:2052
+#: ../src/fr-window.c:5428
 msgid "Archive Manager"
 msgstr "Arkivhåndtering"
 
@@ -116,7 +116,7 @@
 "Hvorvidt sortering skal være stigende eller synkende. Mulige verdier: "
 "ascending, descending."
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:5
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:5 ../src/ui/app-menu.ui.h:2
 msgid "List Mode"
 msgstr "Listemodus"
 
@@ -196,27 +196,27 @@
 msgid "Whether to display the toolbar."
 msgstr "Hvorvidt verktøylinjen skal vises."
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:21
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:19
 msgid "View statusbar"
 msgstr "Vis statuslinjen"
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:22
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:20
 msgid "Whether to display the statusbar."
 msgstr "Hvorvidt statuslinjen skal vises."
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:23 ../src/ui.h:212
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:21 ../src/ui.h:198
 msgid "View the folders pane"
 msgstr "Vis mappelinjen"
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:24
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:22
 msgid "Whether to display the folders pane."
 msgstr "Hvorvidt mappelinjen skal vises."
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:25
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:23
 msgid "Editors"
 msgstr "Redigeringsprogram"
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:26
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:24
 msgid ""
 "List of applications entered in the 'Open File' dialog and not associated "
 "with the file type."
@@ -224,11 +224,11 @@
 "Liste med programmer oppgitt i «Åpne fil»-dialogen som ikke er assosiert med "
 "filtypen."
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:27
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:25
 msgid "Compression level"
 msgstr "Komprimeringsrate"
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:28
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:26
 msgid ""
 "Compression level used when adding files to an archive. Possible values: "
 "very-fast, fast, normal, maximum."
@@ -236,11 +236,11 @@
 "Komprimeringsrate som brukes når filer blir lagt til i et arkiv. Mulige "
 "verdier: very-fast, fast, normal, maximum."
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:29
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:27
 msgid "Encrypt the archive header"
 msgstr "Krypter header for arkiv"
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:30
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:28
 msgid ""
 "Whether to encrypt the archive header. If the header is encrypted the "
 "password will be required to list the archive content as well."
@@ -252,19 +252,19 @@
 msgid "Overwrite existing files"
 msgstr "Overskriv eksisterende filer"
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:31
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:29
 msgid "Do not overwrite newer files"
 msgstr "Ikke overskriv nyere filer"
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:32
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:30
 msgid "Recreate the folders stored in the archive"
 msgstr "Gjenskap mappene som er lagret i arkivet"
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:33
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:31
 msgid "Default volume size"
 msgstr "Forvalgt størrelse på volum"
 
-#: ../data/org.gnome.FileRoller.gschema.xml.in.h:34
+#: ../data/org.gnome.FileRoller.gschema.xml.in.h:32
 msgid "The default size for volumes."
 msgstr "Forvalgt størrelse på volum."
 
@@ -273,7 +273,8 @@
 msgid "Load Options"
 msgstr "Alternativer for lasting"
 
-#: ../src/dlg-batch-add.c:87 ../src/main.c:417 ../src/main.c:793
+#: ../src/dlg-batch-add.c:87 ../src/fr-application.c:329
+#: ../src/fr-application.c:683
 msgid "Compress"
 msgstr "Komprimer"
 
@@ -282,7 +283,7 @@
 msgstr "_Filnavn:"
 
 #. Translators: after the colon there is a folder name.
-#: ../src/fr-window.c:5783 ../src/ui/file-selector.ui.h:1
+#: ../src/fr-window.c:5804 ../src/ui/file-selector.ui.h:4
 #: ../src/ui/new-archive-dialog.ui.h:2
 msgid "_Location:"
 msgstr "P_lassering:"
@@ -291,29 +292,24 @@
 msgid "Location"
 msgstr "Plassering"
 
-#: ../src/ui/ask-password.ui.h:1 ../src/ui/new-archive-dialog-options.ui.h:1
-#: ../src/ui/new-archive-dialog.ui.h:4
+#: ../src/ui/ask-password.ui.h:1 ../src/ui/new-archive-dialog.ui.h:4
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../src/ui/new-archive-dialog-options.ui.h:2
 #: ../src/ui/new-archive-dialog.ui.h:5
 msgid "_Encrypt the file list too"
 msgstr "Krypt_er fillisten også"
 
 #. this is part of a sentence, for example "split into volumes of 10.0 MB", where MB stands for megabyte.
-#: ../src/ui/new-archive-dialog-options.ui.h:3
 #: ../src/ui/new-archive-dialog.ui.h:7
 msgid "Split into _volumes of"
 msgstr "Del opp i _volumer på"
 
 #. MB means megabytes
-#: ../src/ui/new-archive-dialog-options.ui.h:5
 #: ../src/ui/new-archive-dialog.ui.h:9
 msgid "MB"
 msgstr "MB"
 
-#: ../src/ui/new-archive-dialog-options.ui.h:6
 #: ../src/ui/new-archive-dialog.ui.h:10
 msgid "_Other Options"
 msgstr "A_ndre alternativer"
@@ -409,36 +405,36 @@
 msgid "Create a compressed archive with the selected objects"
 msgstr "Opprett et komprimert arkiv med de valgte objektene"
 
-#: ../src/fr-new-archive-dialog.c:335 ../src/fr-new-archive-dialog.c:354
-#: ../src/fr-new-archive-dialog.c:370 ../src/fr-new-archive-dialog.c:418
-#: ../src/fr-window.c:2868
+#: ../src/fr-new-archive-dialog.c:344 ../src/fr-new-archive-dialog.c:363
+#: ../src/fr-new-archive-dialog.c:379 ../src/fr-new-archive-dialog.c:427
+#: ../src/fr-new-archive-dialog.c:445 ../src/fr-window.c:2915
 msgid "Could not create the archive"
 msgstr "Kunne ikke opprette arkivet"
 
-#: ../src/fr-new-archive-dialog.c:337 ../src/fr-new-archive-dialog.c:356
+#: ../src/fr-new-archive-dialog.c:346 ../src/fr-new-archive-dialog.c:365
 msgid "You have to specify an archive name."
 msgstr "Du må oppgi et navn for arkivet."
 
-#: ../src/fr-new-archive-dialog.c:420
+#: ../src/fr-new-archive-dialog.c:429
 msgid "You don't have permission to create an archive in this folder"
 msgstr "Du har ikke adgang til å opprette et arkiv i denne mappen"
 
 #: ../src/dlg-package-installer.c:294 ../src/dlg-package-installer.c:303
-#: ../src/dlg-package-installer.c:331 ../src/fr-archive.c:743
-#: ../src/fr-window.c:3927 ../src/fr-window.c:7408 ../src/fr-window.c:7764
-#: ../src/fr-window.c:9311
+#: ../src/dlg-package-installer.c:331 ../src/fr-archive.c:744
+#: ../src/fr-window.c:3970 ../src/fr-window.c:7429 ../src/fr-window.c:7786
+#: ../src/fr-window.c:9318
 msgid "Archive type not supported."
 msgstr "Type arkiv ikke støttet."
 
-#: ../src/fr-new-archive-dialog.c:462
+#: ../src/fr-new-archive-dialog.c:489
 msgid "Could not delete the old archive."
 msgstr "Kunne ikke slette gammelt arkiv."
 
-#: ../src/actions.c:112 ../src/fr-window.c:5710 ../src/fr-window.c:6255
+#: ../src/actions.c:112 ../src/fr-window.c:5722 ../src/fr-window.c:6238
 msgid "Open"
 msgstr "Åpne"
 
-#: ../src/actions.c:125 ../src/fr-window.c:5254
+#: ../src/actions.c:125 ../src/fr-window.c:5279
 msgid "All archives"
 msgstr "Alle arkiv"
 
@@ -446,15 +442,15 @@
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/actions.c:499
+#: ../src/actions.c:487
 msgid "Copyright © 2001–2010 Free Software Foundation, Inc."
 msgstr "Opphavsrett © 2001-2010 Free Software Foundation, Inc."
 
-#: ../src/actions.c:500
+#: ../src/actions.c:488
 msgid "An archive manager for GNOME."
 msgstr "En arkiverer for GNOME."
 
-#: ../src/actions.c:503
+#: ../src/actions.c:491
 msgid "translator-credits"
 msgstr ""
 "Lars Alvik <lalvik@hotmail.com>\n"
@@ -473,7 +469,7 @@
 msgid "You don't have the right permissions to read files from folder \"%s\""
 msgstr "Du har ikke adgang til å lese filer fra mappen «%s»"
 
-#: ../src/dlg-add.c:182 ../src/ui.h:46
+#: ../src/dlg-add.c:182 ../src/ui.h:42
 msgid "Add Files"
 msgstr "Legg til filer"
 
@@ -546,7 +542,7 @@
 "\n"
 "%s"
 
-#: ../src/fr-window.c:8118 ../src/fr-window.c:8120
+#: ../src/fr-window.c:8140 ../src/fr-window.c:8142
 msgid "Please use a different name."
 msgstr "Vennligst bruk et annet navn."
 
@@ -556,7 +552,7 @@
 "folder."
 msgstr "Du har ikke rettigheter til å opprette et arkiv i målmappen."
 
-#: ../src/dlg-extract.c:96 ../src/fr-window.c:6802
+#: ../src/dlg-extract.c:96 ../src/fr-window.c:6796
 #, c-format
 msgid ""
 "Destination folder \"%s\" does not exist.\n"
@@ -567,11 +563,11 @@
 "\n"
 "Vil du opprette den?"
 
-#: ../src/dlg-extract.c:105 ../src/fr-window.c:6811
+#: ../src/dlg-extract.c:105 ../src/fr-window.c:6805
 msgid "Create _Folder"
 msgstr "Opprett _mappe"
 
-#: ../src/dlg-extract.c:125 ../src/fr-window.c:6828
+#: ../src/dlg-extract.c:125 ../src/fr-window.c:6822
 #, c-format
 msgid "Could not create the destination folder: %s."
 msgstr "Kunne ikke opprette målmappen: %s."
@@ -589,19 +585,19 @@
 msgstr "_Overskriv"
 
 #: ../src/dlg-extract.c:124 ../src/dlg-extract.c:142 ../src/dlg-extract.c:169
-#: ../src/fr-window.c:4197 ../src/fr-window.c:6706 ../src/fr-window.c:6711
-#: ../src/fr-window.c:6832 ../src/fr-window.c:6851 ../src/fr-window.c:6856
+#: ../src/fr-window.c:4241 ../src/fr-window.c:6700 ../src/fr-window.c:6705
+#: ../src/fr-window.c:6826 ../src/fr-window.c:6845 ../src/fr-window.c:6850
 msgid "Extraction not performed"
 msgstr "Utpakking ble ikke utført"
 
-#: ../src/dlg-extract.c:170 ../src/fr-window.c:4366 ../src/fr-window.c:4450
+#: ../src/dlg-extract.c:170 ../src/fr-window.c:4410 ../src/fr-window.c:4494
 #, c-format
 msgid ""
 "You don't have the right permissions to extract archives in the folder \"%s\""
 msgstr "Du har ikke adgang til å pakke ut arkiver i mappen «%s»"
 
 #: ../src/dlg-extract.c:283 ../src/ui/extract-dialog-options.ui.h:1
-#: ../src/ui.h:113
+#: ../src/ui.h:109
 msgid "Extract"
 msgstr "Pakk ut"
 
@@ -746,15 +742,15 @@
 msgid "Archive not found"
 msgstr "Arkivet ble ikke funnet"
 
-#: ../src/fr-archive.c:1844
+#: ../src/fr-archive.c:1845
 msgid "You don't have the right permissions."
 msgstr "Du har ikke korrekte rettigheter."
 
-#: ../src/fr-archive.c:1844
+#: ../src/fr-archive.c:1845
 msgid "This archive type cannot be modified"
 msgstr "Denne typen arkiv kan ikke endres"
 
-#: ../src/fr-archive.c:1858
+#: ../src/fr-archive.c:1859
 msgid "You can't add an archive to itself."
 msgstr "Du kan ikke legge arkivet inni arkivet."
 
@@ -775,20 +771,20 @@
 msgid "Removing file: "
 msgstr "Fjerner fil: "
 
-#: ../src/fr-command-rar.c:586
+#: ../src/fr-command-rar.c:685
 #, c-format
 msgid "Could not find the volume: %s"
 msgstr "Kunne ikke finne volum: %s"
 
-#: ../src/fr-command-tar.c:381
+#: ../src/fr-command-tar.c:380
 msgid "Deleting files from archive"
 msgstr "Sletter filer fra arkiv"
 
-#: ../src/fr-command-tar.c:486
+#: ../src/fr-command-tar.c:485
 msgid "Recompressing archive"
 msgstr "Komprimerer arkiv på nytt"
 
-#: ../src/fr-command-tar.c:726
+#: ../src/fr-command-tar.c:744
 msgid "Decompressing archive"
 msgstr "Dekomprimerer arkiv"
 
@@ -920,29 +916,29 @@
 msgid "_Extract"
 msgstr "_Pakk ut"
 
-#: ../src/fr-window.c:1242
+#: ../src/fr-window.c:1290
 #, c-format
 msgid "%d object (%s)"
 msgid_plural "%d objects (%s)"
 msgstr[0] "%d objekt (%s)"
 msgstr[1] "%d objekter (%s)"
 
-#: ../src/fr-window.c:1247
+#: ../src/fr-window.c:1295
 #, c-format
 msgid "%d object selected (%s)"
 msgid_plural "%d objects selected (%s)"
 msgstr[0] "%d objekt valgt (%s)"
 msgstr[1] "%d objekter valgt (%s)"
 
-#: ../src/fr-window.c:1632
+#: ../src/fr-window.c:1680
 msgid "Folder"
 msgstr "Mappe"
 
-#: ../src/fr-window.c:2013
+#: ../src/fr-window.c:2060
 msgid "[read only]"
 msgstr "[kun lesbar]"
 
-#: ../src/fr-window.c:2132
+#: ../src/fr-window.c:2179
 #, c-format
 msgid "Could not display the folder \"%s\""
 msgstr "Kunne ikke vise mappe «%s»"
@@ -963,7 +959,7 @@
 msgid "Testing archive"
 msgstr "Tester arkiv"
 
-#: ../src/fr-window.c:2242
+#: ../src/fr-window.c:2289
 msgid "Getting the file list"
 msgstr "Henter fillisten"
 
@@ -983,11 +979,11 @@
 msgid "Saving archive"
 msgstr "Lagrer arkiv"
 
-#: ../src/fr-window.c:2452
+#: ../src/fr-window.c:2499
 msgid "_Open the Archive"
 msgstr "_Åpne arkivet"
 
-#: ../src/fr-window.c:2453
+#: ../src/fr-window.c:2500
 msgid "_Show the Files"
 msgstr "Vi_s filene"
 
@@ -995,7 +991,7 @@
 msgid "Archive:"
 msgstr "Arkiv:"
 
-#: ../src/fr-window.c:2630
+#: ../src/fr-window.c:2677
 msgid "Extraction completed successfully"
 msgstr "Utpakking fullført"
 
@@ -1007,57 +1003,57 @@
 msgid "please wait…"
 msgstr "vennligst vent …"
 
-#: ../src/fr-window.c:2752 ../src/fr-window.c:2924
+#: ../src/fr-window.c:2799 ../src/fr-window.c:2971
 msgid "Command exited abnormally."
 msgstr "Unormal avsluttning av kommando."
 
-#: ../src/fr-window.c:2873
+#: ../src/fr-window.c:2920
 msgid "An error occurred while extracting files."
 msgstr "Det skjedde en feil under utpakking."
 
-#: ../src/fr-window.c:2879
+#: ../src/fr-window.c:2926
 #, c-format
 msgid "Could not open \"%s\""
 msgstr "Kunne ikke åpne «%s»"
 
-#: ../src/fr-window.c:2884
+#: ../src/fr-window.c:2931
 msgid "An error occurred while loading the archive."
 msgstr "Det skjedde en feil under lasting av arkivet."
 
-#: ../src/fr-window.c:2888
+#: ../src/fr-window.c:2935
 msgid "An error occurred while deleting files from the archive."
 msgstr "Det skjedde en feil under sletting av filer fra arkivet."
 
-#: ../src/fr-window.c:2894
+#: ../src/fr-window.c:2941
 msgid "An error occurred while adding files to the archive."
 msgstr "Det skjedde en feil under sletting av filer fra arkivet."
 
-#: ../src/fr-window.c:2898
+#: ../src/fr-window.c:2945
 msgid "An error occurred while testing archive."
 msgstr "Det skjedde en feil under testing av arkivet."
 
-#: ../src/fr-window.c:2903
+#: ../src/fr-window.c:2950
 msgid "An error occurred while saving the archive."
 msgstr "Det skjedde en feil under lagring av arkivet."
 
-#: ../src/fr-window.c:2915
+#: ../src/fr-window.c:2962
 msgid "An error occurred."
 msgstr "En feil oppsto."
 
-#: ../src/fr-window.c:2921
+#: ../src/fr-window.c:2968
 msgid "Command not found."
 msgstr "Kommando ikke funnet."
 
-#: ../src/fr-window.c:3081
+#: ../src/fr-window.c:3124
 msgid "Test Result"
 msgstr "Testresultat"
 
-#: ../src/fr-window.c:4045 ../src/fr-window.c:8757 ../src/fr-window.c:8791
-#: ../src/fr-window.c:9070
+#: ../src/fr-window.c:4088 ../src/fr-window.c:8779 ../src/fr-window.c:8813
+#: ../src/fr-window.c:9092
 msgid "Could not perform the operation"
 msgstr "Kunne ikke utføre operasjonen"
 
-#: ../src/fr-window.c:4071
+#: ../src/fr-window.c:4114
 msgid ""
 "Do you want to add this file to the current archive or open it as a new "
 "archive?"
@@ -1065,24 +1061,24 @@
 "Vil du legge til denne filen i dette arkivet eller åpne den som et nytt "
 "arkiv?"
 
-#: ../src/fr-window.c:4101
+#: ../src/fr-window.c:4144
 msgid "Do you want to create a new archive with these files?"
 msgstr "Vil du lage et nytt arkiv med disse filene?"
 
-#: ../src/fr-window.c:4104
+#: ../src/fr-window.c:4147
 msgid "Create _Archive"
 msgstr "Opprett _arkiv"
 
-#: ../src/fr-window.c:4724
+#: ../src/fr-window.c:4750
 msgid "Folders"
 msgstr "Mapper"
 
-#: ../src/fr-window.c:4762 ../src/ui/file-selector.ui.h:5
+#: ../src/fr-window.c:4788 ../src/ui/file-selector.ui.h:7
 msgctxt "File"
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../src/fr-window.c:4763
+#: ../src/fr-window.c:4789
 msgctxt "File"
 msgid "Type"
 msgstr "Filtype"
@@ -1092,12 +1088,12 @@
 msgid "Date Modified"
 msgstr "Endringsdato"
 
-#: ../src/fr-window.c:4765
+#: ../src/fr-window.c:4791
 msgctxt "File"
 msgid "Location"
 msgstr "Plassering"
 
-#: ../src/fr-window.c:4774 ../src/ui/file-selector.ui.h:4
+#: ../src/fr-window.c:4800 ../src/ui/file-selector.ui.h:6
 msgctxt "File"
 msgid "Name"
 msgstr "Navn"
@@ -1111,57 +1107,57 @@
 msgstr "Lukk mappelinjen"
 
 #. Translators: this is the label for the "open recent file" sub-menu.
-#: ../src/fr-window.c:5698
+#: ../src/fr-window.c:5710
 msgid "Open _Recent"
 msgstr "Åpne _siste"
 
-#: ../src/fr-window.c:5699 ../src/fr-window.c:5711
+#: ../src/fr-window.c:5711 ../src/fr-window.c:5723
 msgid "Open a recently used archive"
 msgstr "Åpne et av de sist brukte arkivene"
 
-#: ../src/fr-window.c:7400 ../src/fr-window.c:7756
+#: ../src/fr-window.c:7421 ../src/fr-window.c:7778
 #, c-format
 msgid "Could not save the archive \"%s\""
 msgstr "Kunne ikke lagre arkivet «%s»"
 
-#: ../src/fr-window.c:6632
+#: ../src/fr-window.c:6616
 #, c-format
 msgid "Replace file \"%s\"?"
 msgstr "Erstatt fil «%s»?"
 
-#: ../src/fr-window.c:6635
+#: ../src/fr-window.c:6619
 #, c-format
 msgid "Another file with the same name already exists in \"%s\"."
 msgstr "En fil med samme navn eksisterer allerede i «%s»."
 
-#: ../src/fr-window.c:6642
+#: ../src/fr-window.c:6626
 msgid "Replace _All"
 msgstr "Erstatt _alle"
 
-#: ../src/fr-window.c:6643
+#: ../src/fr-window.c:6627
 msgid "_Skip"
 msgstr "_Hopp over"
 
-#: ../src/fr-new-archive-dialog.c:447 ../src/fr-window.c:6644
+#: ../src/fr-new-archive-dialog.c:474 ../src/fr-window.c:6628
 msgid "_Replace"
 msgstr "E_rstatt"
 
-#: ../src/fr-window.c:7850
+#: ../src/fr-window.c:7872
 msgid "Last Output"
 msgstr "Skrevet ut sist"
 
 #. Translators: the name references to a filename.  This message can appear when renaming a file.
-#: ../src/fr-window.c:8072
+#: ../src/fr-window.c:8094
 msgid "New name is void, please type a name."
 msgstr "Nytt navn er tomt. Vennligst oppgi et navn."
 
 #. Translators: the name references to a filename.  This message can appear when renaming a file.
-#: ../src/fr-window.c:8077
+#: ../src/fr-new-archive-dialog.c:447 ../src/fr-window.c:8099
 msgid "New name is the same as old one, please type other name."
 msgstr "Nytt navn er det samme som det gamle. Vennligst oppgi et annet navn."
 
 #. Translators: the %s references to a filename.  This message can appear when renaming a file.
-#: ../src/fr-window.c:8082
+#: ../src/fr-window.c:8104
 #, c-format
 msgid ""
 "Name \"%s\" is not valid because it contains at least one of the following "
@@ -1170,7 +1166,7 @@
 "Navnet «%s» er ugyldig fordi det inneholder minst et av følgende tegn: %s. "
 "Vennligst oppgi et annet navn."
 
-#: ../src/fr-window.c:8118
+#: ../src/fr-window.c:8140
 #, c-format
 msgid ""
 "A folder named \"%s\" already exists.\n"
@@ -1181,7 +1177,7 @@
 "\n"
 "%s"
 
-#: ../src/fr-window.c:8120
+#: ../src/fr-window.c:8142
 #, c-format
 msgid ""
 "A file named \"%s\" already exists.\n"
@@ -1192,51 +1188,52 @@
 "\n"
 "%s"
 
-#: ../src/fr-window.c:8190
+#: ../src/fr-window.c:8212
 msgid "Rename"
 msgstr "Endre navn"
 
-#: ../src/fr-window.c:8191
+#: ../src/fr-window.c:8213
 msgid "_New folder name:"
 msgstr "_Navn på ny mappe:"
 
-#: ../src/fr-window.c:8191
+#: ../src/fr-window.c:8213
 msgid "_New file name:"
 msgstr "_Navn på ny fil:"
 
-#: ../src/fr-window.c:8195
+#: ../src/fr-window.c:8217
 msgid "_Rename"
 msgstr "End_re navn"
 
-#: ../src/fr-window.c:8212 ../src/fr-window.c:8231
+#: ../src/fr-window.c:8234 ../src/fr-window.c:8253
 msgid "Could not rename the folder"
 msgstr "Kunne ikke endre navn på mappen"
 
-#: ../src/fr-window.c:8212 ../src/fr-window.c:8231
+#: ../src/fr-window.c:8234 ../src/fr-window.c:8253
 msgid "Could not rename the file"
 msgstr "Kunne ikke endre navn på filen"
 
-#: ../src/fr-window.c:8718
+#: ../src/fr-window.c:8740
 msgid "Paste Selection"
 msgstr "Lim inn utvalget"
 
-#: ../src/fr-window.c:8719
+#: ../src/fr-window.c:8741
 msgid "_Destination folder:"
 msgstr "_Målmappe:"
 
-#: ../src/fr-window.c:9329
+#: ../src/fr-window.c:9336
 msgid "Add files to an archive"
 msgstr "Legg til filer i et arkiv"
 
-#: ../src/fr-window.c:9374 ../src/main.c:453 ../src/main.c:489
-#: ../src/main.c:515 ../src/main.c:817
+#: ../src/fr-application.c:365 ../src/fr-application.c:401
+#: ../src/fr-application.c:427 ../src/fr-application.c:707
+#: ../src/fr-window.c:9381
 msgid "Extract archive"
 msgstr "Pakk ut arkiv"
 
 #. This is the time format used in the "Date Modified" column and
 #. * in the Properties dialog.  See the man page of strftime for an
 #. * explanation of the values.
-#: ../src/glib-utils.c:733
+#: ../src/glib-utils.c:769
 msgid "%d %B %Y, %H:%M"
 msgstr "%d %B %Y, %H:%M"
 
@@ -1249,51 +1246,51 @@
 msgid "Could not display help"
 msgstr "Kunne ikke vise hjelp"
 
-#: ../src/main.c:66
+#: ../src/fr-application.c:65
 msgid "Add files to the specified archive and quit the program"
 msgstr "Legg til filer til spesifisert arkiv og avslutt programmet"
 
-#: ../src/main.c:67
+#: ../src/fr-application.c:66
 msgid "ARCHIVE"
 msgstr "ARKIV"
 
-#: ../src/main.c:70
+#: ../src/fr-application.c:69
 msgid "Add files asking the name of the archive and quit the program"
 msgstr "Legg til filer ved å spørre etter arkivnavn og så lukke programmet"
 
-#: ../src/main.c:74
+#: ../src/fr-application.c:73
 msgid "Extract archives to the specified folder and quit the program"
 msgstr "Pakk ut filer til spesifisert mappe og avslutt programmet"
 
-#: ../src/main.c:75 ../src/main.c:87
+#: ../src/fr-application.c:74 ../src/fr-application.c:86
 msgid "FOLDER"
 msgstr "MAPPE"
 
-#: ../src/main.c:78
+#: ../src/fr-application.c:77
 msgid "Extract archives asking the destination folder and quit the program"
 msgstr "Pakk ut arkiv ved å spørre etter målmappe og avslutte programmet"
 
-#: ../src/main.c:82
+#: ../src/fr-application.c:81
 msgid ""
 "Extract the contents of the archives in the archive folder and quit the "
 "program"
 msgstr "Pakk ut innhold i arkivene i arkivmappen og avslutt programmet"
 
-#: ../src/main.c:86
+#: ../src/fr-application.c:85
 msgid "Default folder to use for the '--add' and '--extract' commands"
 msgstr ""
 "Forvalgt mappe som skal brukes for kommandoene «--add» og «--extract»"
 
-#: ../src/main.c:90
+#: ../src/fr-application.c:89
 msgid "Create destination folder without asking confirmation"
 msgstr "Opprett målmappe uten å spørre etter bekreftelse"
 
-#: ../src/main.c:675
+#: ../src/fr-application.c:565
 msgid "- Create and modify an archive"
 msgstr "- Opprett eller endre et arkiv"
 
 #. manually set name and icon
-#: ../src/main.c:644
+#: ../src/fr-application.c:833
 msgid "File Roller"
 msgstr "Arkivhåndtering"
 
@@ -1309,7 +1306,7 @@
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/ui/app-menu.ui.h:2 ../src/ui.h:34
+#: ../src/ui/app-menu.ui.h:6
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -1317,15 +1314,15 @@
 msgid "_Arrange Files"
 msgstr "_Plasser filer"
 
-#: ../src/ui.h:39
+#: ../src/ui.h:35
 msgid "Information about the program"
 msgstr "Informasjon om programet"
 
-#: ../src/ui.h:42
+#: ../src/ui.h:38
 msgid "_Add Files…"
 msgstr "L_egg til filer …"
 
-#: ../src/ui.h:43 ../src/ui.h:47
+#: ../src/ui.h:39 ../src/ui.h:43
 msgid "Add files to the archive"
 msgstr "Legg til filer til arkivet"
 
@@ -1341,111 +1338,111 @@
 msgid "Add Folder"
 msgstr "Legg til mappe"
 
-#: ../src/ui.h:51
+#: ../src/ui.h:47
 msgid "Close the current archive"
 msgstr "Lukk dette arkivet"
 
-#: ../src/ui.h:54
+#: ../src/ui.h:50
 msgid "Contents"
 msgstr "Innhold"
 
-#: ../src/ui.h:55
+#: ../src/ui.h:51
 msgid "Display the File Roller Manual"
 msgstr "Vis håndboken for Filknuser"
 
-#: ../src/ui.h:60 ../src/ui.h:81
+#: ../src/ui.h:56 ../src/ui.h:77
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: ../src/ui.h:64 ../src/ui.h:85
+#: ../src/ui.h:60 ../src/ui.h:81
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ../src/ui.h:68 ../src/ui.h:89
+#: ../src/ui.h:64 ../src/ui.h:85
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ../src/ui.h:71 ../src/ui.h:92
+#: ../src/ui.h:67 ../src/ui.h:88
 msgid "_Rename…"
 msgstr "End_re navn …"
 
-#: ../src/ui.h:72 ../src/ui.h:93
+#: ../src/ui.h:68 ../src/ui.h:89
 msgid "Rename the selection"
 msgstr "Endre navn på utvalget"
 
-#: ../src/ui.h:76 ../src/ui.h:97
+#: ../src/ui.h:72 ../src/ui.h:93
 msgid "Delete the selection from the archive"
 msgstr "Slett utvalget fra arkivet"
 
-#: ../src/ui/file-selector.ui.h:8 ../src/ui.h:101
+#: ../src/ui/file-selector.ui.h:2 ../src/ui.h:97
 msgid "Dese_lect All"
 msgstr "Ve_lg bort alle"
 
-#: ../src/ui.h:102
+#: ../src/ui.h:98
 msgid "Deselect all files"
 msgstr "Velg bort alle filer"
 
-#: ../src/ui.h:105 ../src/ui.h:109
+#: ../src/ui.h:101 ../src/ui.h:105
 msgid "_Extract…"
 msgstr "_Pakk ut …"
 
-#: ../src/ui.h:106 ../src/ui.h:110 ../src/ui.h:114
+#: ../src/ui.h:102 ../src/ui.h:106 ../src/ui.h:110
 msgid "Extract files from the archive"
 msgstr "Pakk ut filer fra arkivet"
 
-#: ../src/ui.h:117
+#: ../src/ui.h:202
 msgid "Find…"
 msgstr "Finn …"
 
-#: ../src/ui.h:122
+#: ../src/ui.h:113
 msgid "New…"
 msgstr "Nytt …"
 
-#: ../src/ui.h:123
+#: ../src/ui.h:114
 msgid "Create a new archive"
 msgstr "Lag et nytt arkiv"
 
-#: ../src/ui.h:126
+#: ../src/ui.h:117
 msgid "Open…"
 msgstr "Åpne …"
 
-#: ../src/ui.h:127 ../src/ui.h:131
+#: ../src/ui.h:118 ../src/ui.h:122
 msgid "Open archive"
 msgstr "Åpne arkiv"
 
-#: ../src/ui.h:134
+#: ../src/ui.h:125
 msgid "_Open With…"
 msgstr "_Åpne med …"
 
-#: ../src/ui.h:135
+#: ../src/ui.h:126
 msgid "Open selected files with an application"
 msgstr "Åpne valgte filer i et program"
 
-#: ../src/ui.h:138
+#: ../src/ui.h:129
 msgid "Pass_word…"
 msgstr "Pass_ord …"
 
-#: ../src/ui.h:139
+#: ../src/ui.h:130
 msgid "Specify a password for this archive"
 msgstr "Oppgi et passord for dette arkivet"
 
-#: ../src/ui.h:143
+#: ../src/ui.h:134
 msgid "Show archive properties"
 msgstr "Vis egenskaper for arkiv"
 
-#: ../src/ui.h:147
+#: ../src/ui.h:138
 msgid "Reload current archive"
 msgstr "Gjenles dette arkivet"
 
-#: ../src/ui.h:150
+#: ../src/ui.h:141
 msgid "Save As…"
 msgstr "Lagre som …"
 
-#: ../src/ui.h:151
+#: ../src/ui.h:142
 msgid "Save the current archive with a different name"
 msgstr "Lagre dette arkivet med et nytt navn"
 
-#: ../src/ui.h:155
+#: ../src/ui.h:146
 msgid "Select all files"
 msgstr "velg alle filene"
 
@@ -1453,36 +1450,36 @@
 msgid "Stop current operation"
 msgstr "Stop denne handlingen"
 
-#: ../src/ui.h:158
+#: ../src/ui.h:149
 msgid "_Test Integrity"
 msgstr "_Test integritet"
 
-#: ../src/ui.h:159
+#: ../src/ui.h:150
 msgid "Test whether the archive contains errors"
 msgstr "Test om dette arkivet inneholder feil"
 
-#: ../src/ui.h:163 ../src/ui.h:167
+#: ../src/ui.h:154 ../src/ui.h:158
 msgid "Open the selected file"
 msgstr "Åpne valgt fil"
 
-#: ../src/ui.h:171 ../src/ui.h:175
+#: ../src/ui.h:162 ../src/ui.h:166
 msgid "Open the selected folder"
 msgstr "Åpne valgt mappe"
 
-#: ../src/ui.h:180
+#: ../src/ui.h:171
 msgid "Go to the previous visited location"
 msgstr "Gå til tidligere besøkt adresse"
 
-#: ../src/ui.h:184
+#: ../src/ui.h:175
 msgid "Go to the next visited location"
 msgstr "Gå til neste besøkte adresse"
 
-#: ../src/ui/file-selector.ui.h:2 ../src/ui.h:188
+#: ../src/ui/file-selector.ui.h:5 ../src/ui.h:179
 msgid "Go up one level"
 msgstr "Gå opp et nivå"
 
 #. Translators: the home location is the home folder.
-#: ../src/ui.h:193
+#: ../src/ui.h:184
 msgid "Go to the home location"
 msgstr "Gå til startadressen"
 
@@ -1494,11 +1491,11 @@
 msgid "View the main toolbar"
 msgstr "Vis hovedverktøylinjen"
 
-#: ../src/ui.h:206
+#: ../src/ui.h:192
 msgid "Stat_usbar"
 msgstr "Stat_uslinje"
 
-#: ../src/ui.h:207
+#: ../src/ui.h:193
 msgid "View the statusbar"
 msgstr "Vis statuslinjen"
 
@@ -1510,15 +1507,15 @@
 msgid "Reverse the list order"
 msgstr "Reverser listen"
 
-#: ../src/ui.h:211
+#: ../src/ui/app-menu.ui.h:5 ../src/ui.h:197
 msgid "_Folders"
 msgstr "_Mapper"
 
-#: ../src/ui.h:221
+#: ../src/ui/app-menu.ui.h:3 ../src/ui.h:213
 msgid "View All _Files"
 msgstr "Vis alle _filer"
 
-#: ../src/ui.h:224
+#: ../src/ui/app-menu.ui.h:4 ../src/ui.h:216
 msgid "View as a F_older"
 msgstr "Vis som en _mappe"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gcalctool.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gcalctool.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gcalctool.po	2013-01-29 09:33:53.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gcalctool.po	2014-01-07 06:37:01.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:13+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:16+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #. Accessible name for the inverse button
@@ -113,6 +113,9 @@
 "investment of present value to a future value, at a fixed interest rate per "
 "compounding period."
 msgstr ""
+"Beregner antall renteberegningsperioder som er nødvendig for å øke en "
+"investering av gjeldende verdi til en fremtidig verdi, med en fast "
+"styringsrente per beregningsperiode."
 
 #. Periodic Interest Rate Dialog: Label before future value input
 #: ../data/buttons-financial.ui.h:12
@@ -130,6 +133,8 @@
 "Calculates the depreciation allowance on an asset for a specified period of "
 "time, using the double-declining balance method."
 msgstr ""
+"Beregner avskrivningsbeløpet på et anleggsmiddel for en bestemt tidsperiode, "
+"med halvert levetid."
 
 #. Gross Profit Margin Dialog: Label before cost input
 #: ../data/buttons-financial.ui.h:18
@@ -159,6 +164,8 @@
 "payments at a periodic interest rate over the number of payment periods in "
 "the term."
 msgstr ""
+"Beregner fremtidig verdi av en investering, basert på en rekke med like "
+"nedbetalinger og en gitt rentesats per betalingstermin."
 
 #. Payment Period Dialog: Label before periodic payment input
 #: ../data/buttons-financial.ui.h:28
@@ -174,7 +181,7 @@
 #. Tooltip for the gross profit margin button
 #: ../data/buttons-financial.ui.h:32 ../src/math-buttons.c:273
 msgid "Gross Profit Margin"
-msgstr ""
+msgstr "Bruttofortjeneste"
 
 #. Gross Profit Margin Dialog: Description of calculation
 #: ../data/buttons-financial.ui.h:34
@@ -182,6 +189,8 @@
 "Calculates the resale price of a product, based on the product cost and the "
 "wanted gross profit margin."
 msgstr ""
+"Beregner salgsprisen for et produkt, basert på kostpris og ønsket "
+"bruttofortjeneste."
 
 #. Gross Profit Margin Dialog: Label before margin input
 #: ../data/buttons-financial.ui.h:36
@@ -226,6 +235,8 @@
 "payments discounted at a periodic interest rate over the number of payment "
 "periods in the term. "
 msgstr ""
+"Beregner nåverdi av en investering, basert på en rekke like betalinger, "
+"diskontert med en periodisk rente over antall betalingsperioder i terminen. "
 
 #. Title of Periodic Interest Rate dialog
 #. Tooltip for the periodic interest rate button
@@ -239,6 +250,8 @@
 "Calculates the periodic interest necessary to increase an investment to a "
 "future value, over the number of compounding periods. "
 msgstr ""
+"Beregner hvor høy rente som er nødvendig for å øke verdien av en investering "
+"over et gitt antall perioder. "
 
 #. Title of Straight-Line Depreciation dialog
 #: ../data/buttons-financial.ui.h:54
@@ -263,6 +276,9 @@
 "over the useful life of an asset. The useful life is the number of periods, "
 "typically years, over which an asset is depreciated. "
 msgstr ""
+"Beregner lineær avskrivning på et anleggsmiddel for én periode. Lineær "
+"avskrivning deler opp kostnadsføringen månedsvis i henhold til "
+"anleggsmiddelets forventede levetid, som typisk oppgis i antall år. "
 
 #. Title of Sum-of-the-Years'-Digits Depreciation dialog
 #: ../data/buttons-financial.ui.h:62
@@ -278,6 +294,10 @@
 "occurs in earlier periods than in later ones. The useful life is the number "
 "of periods, typically years, over which an asset is depreciated. "
 msgstr ""
+"Beregner avskrivningsbeløpet på et anleggsmiddel over en gitt tidsperiode, "
+"med degressiv avskrivningsmetode. Denne metoden avskriver større andeler i "
+"tidligere perioder enn i senere perioder. Levetiden er lik antall perioder, "
+"som typisk oppgis i antall år. "
 
 #. Title of Payment Period dialog
 #: ../data/buttons-financial.ui.h:66
@@ -296,6 +316,8 @@
 "of an ordinary annuity, to accumulate a future value, at a periodic interest "
 "rate."
 msgstr ""
+"Beregner hvor mange betalingsperioder som må til for å betale ned et "
+"annuitetslån, med dagens rente."
 
 #. Calculates the number of compounding periods necessary to increase an investment of present value pv to a future value of fv, at a fixed interest rate of int per compounding period. See also: http://en.wikipedia.org/wiki/Compound_interest
 #: ../data/buttons-financial.ui.h:78
@@ -828,6 +850,15 @@
 "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 "  --g-fatal-warnings              Make all warnings fatal"
 msgstr ""
+"Valg for GTK+:\n"
+"  --class=KLASSE                   programklasse som brukes av "
+"vindusbehandleren\n"
+"  --name=NAVN                     programnavn som brukes av "
+"vindusbehandleren\n"
+"  --screen=SKJERM                 X-skjerm som skal brukes\n"
+"  --sync                          Gjør synkrone kall på X\n"
+"  --gtk-module=MODULER            Last inn tilleggsmoduler for GTK+\n"
+"  --g-fatal-warnings              Regn alle advarsler som kritiske feil"
 
 #. Description on gcalctool application options displayed on command-line
 #: ../src/gcalctool.c:112
@@ -1301,7 +1332,8 @@
 "  Espen Stefansen https://launchpad.net/~espenas\n"
 "  Håkon Malmedal https://launchpad.net/~hmalmedal\n"
 "  Kjartan Maraas https://launchpad.net/~kmaraas\n"
-"  Smart Viking https://launchpad.net/~smart-viking"
+"  Smart Viking https://launchpad.net/~smart-viking\n"
+"  Åka Sikrom https://launchpad.net/~akrosikam"
 
 #. The license this software is under (GPL2+)
 #: ../src/gcalctool.c:393
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gdata.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gdata.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gdata.po	2013-01-29 09:33:59.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gdata.po	2014-01-07 06:37:36.000000000 +0000
@@ -14,28 +14,28 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:12+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:03+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../gdata/gdata-client-login-authorizer.c:597
-#: ../gdata/gdata-oauth1-authorizer.c:804
-#: ../gdata/gdata-oauth1-authorizer.c:1076
+#: ../gdata/gdata-oauth1-authorizer.c:809
+#: ../gdata/gdata-oauth1-authorizer.c:1085
 msgid "The server returned a malformed response."
 msgstr "Tjeneren returnerte et feilutformet svar."
 
-#: ../gdata/gdata-client-login-authorizer.c:617 ../gdata/gdata-service.c:321
+#: ../gdata/gdata-client-login-authorizer.c:617 ../gdata/gdata-service.c:320
 #, c-format
 msgid "Cannot connect to the service's server."
 msgstr "Kan ikke koble til tjenestens tjener."
 
-#: ../gdata/gdata-client-login-authorizer.c:622 ../gdata/gdata-service.c:326
+#: ../gdata/gdata-client-login-authorizer.c:622 ../gdata/gdata-service.c:325
 #, c-format
 msgid "Cannot connect to the proxy server."
 msgstr "Kan ikke koble til proxy-tjener."
 
 #. Translators: the parameter is an error message returned by the server.
-#: ../gdata/gdata-client-login-authorizer.c:628 ../gdata/gdata-service.c:332
+#: ../gdata/gdata-client-login-authorizer.c:628 ../gdata/gdata-service.c:331
 #, c-format
 msgid ""
 "Invalid request URI or header, or unsupported nonstandard parameter: %s"
@@ -44,58 +44,58 @@
 "standardisert parameter: %s"
 
 #. Translators: the parameter is an error message returned by the server.
-#: ../gdata/gdata-client-login-authorizer.c:634 ../gdata/gdata-service.c:338
+#: ../gdata/gdata-client-login-authorizer.c:634 ../gdata/gdata-service.c:337
 #, c-format
 msgid "Authentication required: %s"
 msgstr "Autentisering kreves: %s"
 
 #. Translators: the parameter is an error message returned by the server.
-#: ../gdata/gdata-client-login-authorizer.c:639 ../gdata/gdata-service.c:343
+#: ../gdata/gdata-client-login-authorizer.c:639 ../gdata/gdata-service.c:342
 #, c-format
 msgid "The requested resource was not found: %s"
 msgstr "Forespurt ressurs ble ikke funnet: %s"
 
 #. Translators: the parameter is an error message returned by the server.
-#: ../gdata/gdata-client-login-authorizer.c:645 ../gdata/gdata-service.c:349
+#: ../gdata/gdata-client-login-authorizer.c:645 ../gdata/gdata-service.c:348
 #, c-format
 msgid "The entry has been modified since it was downloaded: %s"
 msgstr "Oppføringen er endret siden den ble lastet ned: %s"
 
 #. Translators: the first parameter is an HTTP status,
 #. * and the second is an error message returned by the server.
-#: ../gdata/gdata-client-login-authorizer.c:657 ../gdata/gdata-service.c:363
+#: ../gdata/gdata-client-login-authorizer.c:657 ../gdata/gdata-service.c:362
 #, c-format
 msgid "Error code %u when authenticating: %s"
 msgstr "Feilkode %u under autentisering: %s"
 
-#: ../gdata/gdata-client-login-authorizer.c:752
+#: ../gdata/gdata-client-login-authorizer.c:756
 msgid "A CAPTCHA must be filled out to log in."
 msgstr "En CAPTCHA må fylles ut for å logge inn."
 
 #. Translators: the parameter is a URI for further information.
-#: ../gdata/gdata-client-login-authorizer.c:790
+#: ../gdata/gdata-client-login-authorizer.c:794
 #, c-format
 msgid "This account requires an application-specific password. (%s)"
 msgstr "Denne kontoen krever et programspesifikt passord. (%s)"
 
-#: ../gdata/gdata-client-login-authorizer.c:797
+#: ../gdata/gdata-client-login-authorizer.c:801
 msgid "Your username or password were incorrect."
 msgstr "Feil brukernavn eller passord."
 
 #. Translators: the parameter is a URI for further information.
-#: ../gdata/gdata-client-login-authorizer.c:818
+#: ../gdata/gdata-client-login-authorizer.c:822
 #, c-format
 msgid "Your account's e-mail address has not been verified. (%s)"
 msgstr "E-postadressen for din konto er ikke verifisert. (%s)"
 
 #. Translators: the parameter is a URI for further information.
-#: ../gdata/gdata-client-login-authorizer.c:823
+#: ../gdata/gdata-client-login-authorizer.c:827
 #, c-format
 msgid "You have not agreed to the service's terms and conditions. (%s)"
 msgstr "Du har ikke godtatt betingelsene for tjenesten. (%s)"
 
 #. Translators: the parameter is a URI for further information.
-#: ../gdata/gdata-client-login-authorizer.c:829
+#: ../gdata/gdata-client-login-authorizer.c:833
 #, c-format
 msgid ""
 "This account has been migrated. Please log in online to receive your new "
@@ -105,25 +105,25 @@
 "ditt nye brukernavn og passord. (%s)"
 
 #. Translators: the parameter is a URI for further information.
-#: ../gdata/gdata-client-login-authorizer.c:834
+#: ../gdata/gdata-client-login-authorizer.c:838
 #, c-format
 msgid "This account has been deleted. (%s)"
 msgstr "Denne kontoen er slettet. (%s)"
 
 #. Translators: the parameter is a URI for further information.
-#: ../gdata/gdata-client-login-authorizer.c:839
+#: ../gdata/gdata-client-login-authorizer.c:843
 #, c-format
 msgid "This account has been disabled. (%s)"
 msgstr "Denne kontoen er deaktivert. (%s)"
 
 #. Translators: the parameter is a URI for further information.
-#: ../gdata/gdata-client-login-authorizer.c:844
+#: ../gdata/gdata-client-login-authorizer.c:848
 #, c-format
 msgid "This account's access to this service has been disabled. (%s)"
 msgstr "Denne kontoens tilgang til denne tjenesten er slått av. (%s)"
 
 #. Translators: the parameter is a URI for further information.
-#: ../gdata/gdata-client-login-authorizer.c:849
+#: ../gdata/gdata-client-login-authorizer.c:853
 #, c-format
 msgid "This service is not available at the moment. (%s)"
 msgstr "Denne tjenesten er ikke tilgjengelig nå. (%s)"
@@ -146,17 +146,17 @@
 msgstr "Denne kommentaren kan ikke slettes."
 
 #. Tried to seek too far
-#: ../gdata/gdata-download-stream.c:752
+#: ../gdata/gdata-download-stream.c:754
 msgid "Invalid seek request"
 msgstr "Ugyldig søkeforespørsel"
 
-#: ../gdata/gdata-oauth1-authorizer.c:779
+#: ../gdata/gdata-oauth1-authorizer.c:784
 msgid "The server rejected the temporary credentials request."
 msgstr "Tjener avviste midlertidig forespørsel om påloggingsinformasjon."
 
 #. Server returned an error. This either means that there was a server error or, more likely, the server doesn't trust the client
 #. * or the user denied authorization to the token on the authorization web page.
-#: ../gdata/gdata-oauth1-authorizer.c:1050
+#: ../gdata/gdata-oauth1-authorizer.c:1059
 msgid "Access was denied by the user or server."
 msgstr "Tilgang ble nektet av bruker eller tjener."
 
@@ -255,66 +255,66 @@
 
 #. Translators: the first parameter is an HTTP status,
 #. * and the second is an error message returned by the server.
-#: ../gdata/gdata-service.c:369
+#: ../gdata/gdata-service.c:368
 #, c-format
 msgid "Error code %u when querying: %s"
 msgstr "Feilkode %u under spørring: %s"
 
 #. Translators: the first parameter is an HTTP status,
 #. * and the second is an error message returned by the server.
-#: ../gdata/gdata-service.c:375
+#: ../gdata/gdata-service.c:374
 #, c-format
 msgid "Error code %u when inserting an entry: %s"
 msgstr "Feilkode %u under innsetting av en oppføring: %s"
 
 #. Translators: the first parameter is an HTTP status,
 #. * and the second is an error message returned by the server.
-#: ../gdata/gdata-service.c:381
+#: ../gdata/gdata-service.c:380
 #, c-format
 msgid "Error code %u when updating an entry: %s"
 msgstr "Feilkode %u under oppdatering av en oppføring: %s"
 
 #. Translators: the first parameter is an HTTP status,
 #. * and the second is an error message returned by the server.
-#: ../gdata/gdata-service.c:387
+#: ../gdata/gdata-service.c:386
 #, c-format
 msgid "Error code %u when deleting an entry: %s"
 msgstr "Feilkode %u under sletting av en oppføring: %s"
 
 #. Translators: the first parameter is an HTTP status,
 #. * and the second is an error message returned by the server.
-#: ../gdata/gdata-service.c:393
+#: ../gdata/gdata-service.c:392
 #, c-format
 msgid "Error code %u when downloading: %s"
 msgstr "Feilkode %u under nedlasting: %s"
 
 #. Translators: the first parameter is an HTTP status,
 #. * and the second is an error message returned by the server.
-#: ../gdata/gdata-service.c:399
+#: ../gdata/gdata-service.c:398
 #, c-format
 msgid "Error code %u when uploading: %s"
 msgstr "Feilkode %u under opplasting: %s"
 
 #. Translators: the first parameter is a HTTP status,
 #. * and the second is an error message returned by the server.
-#: ../gdata/gdata-service.c:405
+#: ../gdata/gdata-service.c:404
 #, c-format
 msgid "Error code %u when running a batch operation: %s"
 msgstr "Feilkode %u under kjøring av en batch-operasjon: %s"
 
 #. Translators: the parameter is the URI which is invalid.
-#: ../gdata/gdata-service.c:686
+#: ../gdata/gdata-service.c:691
 #, c-format
 msgid "Invalid redirect URI: %s"
 msgstr "Ugyldig URI for omdirigering: %s"
 
-#: ../gdata/gdata-service.c:1338
+#: ../gdata/gdata-service.c:1345
 #: ../gdata/services/picasaweb/gdata-picasaweb-service.c:624
-#: ../gdata/services/youtube/gdata-youtube-service.c:875
+#: ../gdata/services/youtube/gdata-youtube-service.c:888
 msgid "The entry has already been inserted."
 msgstr "Oppføringen er allerede satt inn."
 
-#: ../gdata/gdata-upload-stream.c:892
+#: ../gdata/gdata-upload-stream.c:896
 msgid "Stream is already closed"
 msgstr "Strømmen er allerede lukket"
 
@@ -369,31 +369,31 @@
 msgid "You must be authenticated to download documents."
 msgstr "Du må være autentisert for å laste ned dokumenter."
 
-#: ../gdata/services/documents/gdata-documents-service.c:460
-#: ../gdata/services/documents/gdata-documents-service.c:510
+#: ../gdata/services/documents/gdata-documents-service.c:461
+#: ../gdata/services/documents/gdata-documents-service.c:511
 msgid "You must be authenticated to query documents."
 msgstr "Du må være autentisert for å spørre på dokumenter."
 
-#: ../gdata/services/documents/gdata-documents-service.c:555
+#: ../gdata/services/documents/gdata-documents-service.c:556
 msgid "You must be authenticated to upload documents."
 msgstr "Du må være autentisert for å laste opp dokumenter."
 
-#: ../gdata/services/documents/gdata-documents-service.c:561
+#: ../gdata/services/documents/gdata-documents-service.c:562
 msgid "The document has already been uploaded."
 msgstr "Dokumentet er allerede lastet opp."
 
-#: ../gdata/services/documents/gdata-documents-service.c:705
+#: ../gdata/services/documents/gdata-documents-service.c:706
 msgid "You must be authenticated to update documents."
 msgstr "Du må være autentisert for å oppdatere dokumenter."
 
-#: ../gdata/services/documents/gdata-documents-service.c:885
+#: ../gdata/services/documents/gdata-documents-service.c:888
 #, c-format
 msgid ""
 "The content type of the supplied document ('%s') could not be recognized."
 msgstr "Innholdstype av oppgitt dokument («%s») ble ikke gjenkjent."
 
-#: ../gdata/services/documents/gdata-documents-service.c:1087
-#: ../gdata/services/documents/gdata-documents-service.c:1270
+#: ../gdata/services/documents/gdata-documents-service.c:1090
+#: ../gdata/services/documents/gdata-documents-service.c:1273
 msgid "You must be authenticated to move documents and folders."
 msgstr "Du må være autentisert for å flytte dokumenter og mapper."
 
@@ -429,17 +429,17 @@
 msgid "You must be authenticated to insert an album."
 msgstr "Du må være autentisert for å sette inn et album."
 
-#: ../gdata/services/youtube/gdata-youtube-service.c:456
+#: ../gdata/services/youtube/gdata-youtube-service.c:457
 #, c-format
 msgid "This service is not available at the moment."
 msgstr "Denne tjenesten er ikke tilgjengelig nå."
 
-#: ../gdata/services/youtube/gdata-youtube-service.c:460
+#: ../gdata/services/youtube/gdata-youtube-service.c:473
 #, c-format
 msgid "You must be authenticated to do this."
 msgstr "Du må være autentisert for å gjøre dette."
 
-#: ../gdata/services/youtube/gdata-youtube-service.c:465
+#: ../gdata/services/youtube/gdata-youtube-service.c:478
 #, c-format
 msgid ""
 "You have made too many API calls recently. Please wait a few minutes and try "
@@ -448,7 +448,7 @@
 "Du har gjort for mange API-kall. Vennligst vent et par minutter og prøv "
 "igjen."
 
-#: ../gdata/services/youtube/gdata-youtube-service.c:468
+#: ../gdata/services/youtube/gdata-youtube-service.c:481
 #, c-format
 msgid ""
 "You have exceeded your entry quota. Please delete some entries and try again."
@@ -459,23 +459,24 @@
 #. Translators: the first parameter is an error code, which is a coded string.
 #. * The second parameter is an error domain, which is another coded string.
 #. * The third parameter is the location of the error, which is either a URI or an XPath.
-#: ../gdata/services/youtube/gdata-youtube-service.c:475
-#: ../gdata/services/youtube/gdata-youtube-service.c:481
+#: ../gdata/services/youtube/gdata-youtube-service.c:467
+#: ../gdata/services/youtube/gdata-youtube-service.c:488
+#: ../gdata/services/youtube/gdata-youtube-service.c:494
 #, c-format
 msgid ""
 "Unknown error code \"%s\" in domain \"%s\" received with location \"%s\"."
 msgstr "Ukjent feilkode «%s» i domene «%s» mottatt med lokasjon «%s»."
 
-#: ../gdata/services/youtube/gdata-youtube-service.c:499
+#: ../gdata/services/youtube/gdata-youtube-service.c:512
 #, c-format
 msgid "Unknown and unparsable error received."
 msgstr "Ukjent og ulesbar feil mottatt."
 
-#: ../gdata/services/youtube/gdata-youtube-service.c:763
-#: ../gdata/services/youtube/gdata-youtube-service.c:820
+#: ../gdata/services/youtube/gdata-youtube-service.c:776
+#: ../gdata/services/youtube/gdata-youtube-service.c:833
 msgid "The video did not have a related videos <link>."
 msgstr "Videoen har ikke en <link> for relaterte videoer."
 
-#: ../gdata/services/youtube/gdata-youtube-service.c:882
+#: ../gdata/services/youtube/gdata-youtube-service.c:895
 msgid "You must be authenticated to upload a video."
 msgstr "Du må være autentisert for å laste opp en video."
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gdk-pixbuf.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gdk-pixbuf.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gdk-pixbuf.po	2013-01-29 09:33:56.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gdk-pixbuf.po	2014-01-07 06:37:05.000000000 +0000
@@ -16,23 +16,23 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:48+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:58+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
-#: gdk-pixbuf/gdk-pixbuf-animation.c:147 gdk-pixbuf/gdk-pixbuf-io.c:1092
-#: gdk-pixbuf/gdk-pixbuf-io.c:1358
+#: gdk-pixbuf/gdk-pixbuf-animation.c:160 gdk-pixbuf/gdk-pixbuf-io.c:1064
+#: gdk-pixbuf/gdk-pixbuf-io.c:1330
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Klarte ikke å åpne fil «%s»: %s"
 
-#: gdk-pixbuf/gdk-pixbuf-animation.c:160 gdk-pixbuf/gdk-pixbuf-io.c:1104
+#: gdk-pixbuf/gdk-pixbuf-animation.c:173 gdk-pixbuf/gdk-pixbuf-io.c:1076
 #, c-format
 msgid "Image file '%s' contains no data"
 msgstr "Bildefil «%s» inneholder ikke data"
 
-#: gdk-pixbuf/gdk-pixbuf-animation.c:202 gdk-pixbuf/gdk-pixbuf-io.c:1140
-#: gdk-pixbuf/gdk-pixbuf-io.c:1410
+#: gdk-pixbuf/gdk-pixbuf-animation.c:280 gdk-pixbuf/gdk-pixbuf-io.c:1112
+#: gdk-pixbuf/gdk-pixbuf-io.c:1382
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -40,7 +40,7 @@
 "Feil under lasting av bilde «%s»: årsak ikke kjent, sannsynligvis korrupt "
 "bildefil"
 
-#: gdk-pixbuf/gdk-pixbuf-animation.c:235
+#: gdk-pixbuf/gdk-pixbuf-animation.c:212
 #, c-format
 msgid ""
 "Failed to load animation '%s': reason not known, probably a corrupt "
@@ -49,12 +49,12 @@
 "Feil under lasting av animasjon «%s»: årsak ikke kjent, sannsynligvis "
 "korrupt animasjonsfil"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:813
+#: gdk-pixbuf/gdk-pixbuf-io.c:790
 #, c-format
 msgid "Unable to load image-loading module: %s: %s"
 msgstr "Kan ikke laste modul for innlesing av bilder: %s: %s"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:828
+#: gdk-pixbuf/gdk-pixbuf-io.c:805
 #, c-format
 msgid ""
 "Image-loading module %s does not export the proper interface; perhaps it's "
@@ -63,54 +63,54 @@
 "Modul %s for bildelasting eksporterer ikke riktig grensesnitt; kanskje den "
 "er fra en annen versjon av gdk-pixbuf?"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:837 gdk-pixbuf/gdk-pixbuf-io.c:888
+#: gdk-pixbuf/gdk-pixbuf-io.c:814 gdk-pixbuf/gdk-pixbuf-io.c:865
 #, c-format
 msgid "Image type '%s' is not supported"
 msgstr "Bildetype «%s» er ikke støttet"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:973
+#: gdk-pixbuf/gdk-pixbuf-io.c:950
 #, c-format
 msgid "Couldn't recognize the image file format for file '%s'"
 msgstr "Kunne ikke gjenkjenne bildeformatet for fil «%s»"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:981
+#: gdk-pixbuf/gdk-pixbuf-io.c:958
 msgid "Unrecognized image file format"
 msgstr "Ikke-gjenkjent bildeformat"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:1149
+#: gdk-pixbuf/gdk-pixbuf-io.c:1121
 #, c-format
 msgid "Failed to load image '%s': %s"
 msgstr "Feil under lasting av bilde «%s»: %s"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:2037 gdk-pixbuf/io-gdip-utils.c:887
+#: gdk-pixbuf/gdk-pixbuf-io.c:2015 gdk-pixbuf/io-gdip-utils.c:837
 #, c-format
 msgid "Error writing to image file: %s"
 msgstr "Feil under skriving til bildefil: %s"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:2082 gdk-pixbuf/gdk-pixbuf-io.c:2212
+#: gdk-pixbuf/gdk-pixbuf-io.c:2057 gdk-pixbuf/gdk-pixbuf-io.c:2178
 #, c-format
 msgid "This build of gdk-pixbuf does not support saving the image format: %s"
 msgstr ""
 "Dette versjonen av gdk-pixbuf støtter ikke lagring av bildeformatet: %s"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:2116
+#: gdk-pixbuf/gdk-pixbuf-io.c:2088
 msgid "Insufficient memory to save image to callback"
 msgstr "Ikke nok minne til å lagre bilde til callback"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:2129
+#: gdk-pixbuf/gdk-pixbuf-io.c:2101
 msgid "Failed to open temporary file"
 msgstr "Kunne ikke åpne midlertidig fil"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:2155
+#: gdk-pixbuf/gdk-pixbuf-io.c:2124
 msgid "Failed to read from temporary file"
 msgstr "Kunne ikke lese fra midlertidig fil"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:2408
+#: gdk-pixbuf/gdk-pixbuf-io.c:2372
 #, c-format
 msgid "Failed to open '%s' for writing: %s"
 msgstr "Feil under åpning av «%s» for skriving: %s"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:2434
+#: gdk-pixbuf/gdk-pixbuf-io.c:2398
 #, c-format
 msgid ""
 "Failed to close '%s' while writing image, all data may not have been saved: "
@@ -119,15 +119,15 @@
 "Feil under lukking av «%s» under skriving av bilde. Det er ikke sikkert at "
 "alle data er lagret: %s"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:2655 gdk-pixbuf/gdk-pixbuf-io.c:2707
+#: gdk-pixbuf/gdk-pixbuf-io.c:2619 gdk-pixbuf/gdk-pixbuf-io.c:2671
 msgid "Insufficient memory to save image into a buffer"
 msgstr "Ikke nok minne til å lagre bilde til buffer"
 
-#: gdk-pixbuf/gdk-pixbuf-io.c:2753
+#: gdk-pixbuf/gdk-pixbuf-io.c:2717
 msgid "Error writing to image stream"
 msgstr "Feil under skriving til bildestrøm"
 
-#: gdk-pixbuf/gdk-pixbuf-loader.c:397
+#: gdk-pixbuf/gdk-pixbuf-loader.c:393
 #, c-format
 msgid ""
 "Internal error: Image loader module '%s' failed to complete an operation, "
@@ -136,7 +136,7 @@
 "Intern feil: Modul for lasting av bilder «%s» klarte ikke å fullføre en "
 "operasjon, men ga ingen årsak for feilen"
 
-#: gdk-pixbuf/gdk-pixbuf-loader.c:439
+#: gdk-pixbuf/gdk-pixbuf-loader.c:435
 #, c-format
 msgid "Incremental loading of image type '%s' is not supported"
 msgstr "Stegvis lasting av bildetype «%s» er ikke støttet"
@@ -178,7 +178,7 @@
 msgid "Malformed chunk in animation"
 msgstr "Feil i en del av animasjonen"
 
-#: gdk-pixbuf/io-ani.c:705
+#: gdk-pixbuf/io-ani.c:671
 msgid "The ANI image format"
 msgstr "ANI bildeformat"
 
@@ -219,7 +219,7 @@
 msgid "The EMF image format"
 msgstr "EMF bildeformat"
 
-#: gdk-pixbuf/io-gdip-gif.c:80 gdk-pixbuf/io-gif.c:1719
+#: gdk-pixbuf/io-gdip-gif.c:80 gdk-pixbuf/io-gif.c:1720
 msgid "The GIF image format"
 msgstr "GIF bildeformat"
 
@@ -276,11 +276,11 @@
 msgid "Couldn't load metafile"
 msgstr "Kunne ikke laste metafil"
 
-#: gdk-pixbuf/io-gdip-utils.c:932
+#: gdk-pixbuf/io-gdip-utils.c:878
 msgid "Unsupported image format for GDI+"
 msgstr "Bildeformat ikke støttet for GDI+"
 
-#: gdk-pixbuf/io-gdip-utils.c:939
+#: gdk-pixbuf/io-gdip-utils.c:885
 msgid "Couldn't save"
 msgstr "Kunne ikke lagre"
 
@@ -293,7 +293,7 @@
 msgid "Failure reading GIF: %s"
 msgstr "Feil under lesing av GIF: %s"
 
-#: gdk-pixbuf/io-gif.c:496 gdk-pixbuf/io-gif.c:1501 gdk-pixbuf/io-gif.c:1668
+#: gdk-pixbuf/io-gif.c:496 gdk-pixbuf/io-gif.c:1502 gdk-pixbuf/io-gif.c:1669
 msgid "GIF file was missing some data (perhaps it was truncated somehow?)"
 msgstr "GIF-fil mangler data (kanskje den har blitt avkuttet på en måte?)"
 
@@ -318,8 +318,8 @@
 msgid "Circular table entry in GIF file"
 msgstr "Sirkulær tabelloppføring i GIF-fil"
 
-#: gdk-pixbuf/io-gif.c:866 gdk-pixbuf/io-gif.c:1487 gdk-pixbuf/io-gif.c:1540
-#: gdk-pixbuf/io-gif.c:1656
+#: gdk-pixbuf/io-gif.c:866 gdk-pixbuf/io-gif.c:1488 gdk-pixbuf/io-gif.c:1541
+#: gdk-pixbuf/io-gif.c:1657
 msgid "Not enough memory to load GIF file"
 msgstr "Ikke nok minne til å laste GIF-bilde"
 
@@ -348,7 +348,7 @@
 "GIF-bildet har ikke globalt fargekart, og et delbilde i det har ikke lokalt "
 "fargekart."
 
-#: gdk-pixbuf/io-gif.c:1563
+#: gdk-pixbuf/io-gif.c:1564
 msgid "GIF image was truncated or incomplete."
 msgstr "GIF-bildet er avkuttet eller ukomplett."
 
@@ -445,7 +445,7 @@
 msgid "Error interpreting JPEG image file (%s)"
 msgstr "Feil under tolking av JPEG-bildefil (%s)"
 
-#: gdk-pixbuf/io-jpeg.c:606
+#: gdk-pixbuf/io-jpeg.c:599
 msgid ""
 "Insufficient memory to load image, try exiting some applications to free "
 "memory"
@@ -453,17 +453,17 @@
 "Ikke nok minne til å laste bildet. Prøv å avslutte noen applikasjoner for å "
 "frigjøre minne"
 
-#: gdk-pixbuf/io-jpeg.c:653 gdk-pixbuf/io-jpeg.c:867
+#: gdk-pixbuf/io-jpeg.c:647 gdk-pixbuf/io-jpeg.c:860
 #, c-format
 msgid "Unsupported JPEG color space (%s)"
 msgstr "JPEG-fargeområde ikke støttet (%s)"
 
-#: gdk-pixbuf/io-jpeg.c:766 gdk-pixbuf/io-jpeg.c:1046
+#: gdk-pixbuf/io-jpeg.c:759 gdk-pixbuf/io-jpeg.c:1039
 #: gdk-pixbuf/io-jpeg.c:1310 gdk-pixbuf/io-jpeg.c:1320
 msgid "Couldn't allocate memory for loading JPEG file"
 msgstr "Kunne ikke allokere minne for lasting av JPEG-fil"
 
-#: gdk-pixbuf/io-jpeg.c:1020
+#: gdk-pixbuf/io-jpeg.c:1013
 msgid "Transformed JPEG has zero width or height."
 msgstr "Transformert JPEG har bredde eller høyde lik null."
 
@@ -520,33 +520,33 @@
 msgid "The GdkPixdata format"
 msgstr "GdkPixdata-format"
 
-#: gdk-pixbuf/io-png.c:54
+#: gdk-pixbuf/io-png.c:55
 msgid "Bits per channel of PNG image is invalid."
 msgstr "Ugyldig antall biter per kanal i PNG-bilde."
 
-#: gdk-pixbuf/io-png.c:135 gdk-pixbuf/io-png.c:641
+#: gdk-pixbuf/io-png.c:136 gdk-pixbuf/io-png.c:642
 msgid "Transformed PNG has zero width or height."
 msgstr "Transformert PNG har bredde eller høyde lik null."
 
-#: gdk-pixbuf/io-png.c:143
+#: gdk-pixbuf/io-png.c:144
 msgid "Bits per channel of transformed PNG is not 8."
 msgstr "Antall biter per kanal i transformert PNG er forskjellig fra 8."
 
-#: gdk-pixbuf/io-png.c:152
+#: gdk-pixbuf/io-png.c:153
 msgid "Transformed PNG not RGB or RGBA."
 msgstr "Transformert PNG er ikke RGB eller RGBA."
 
-#: gdk-pixbuf/io-png.c:161
+#: gdk-pixbuf/io-png.c:162
 msgid "Transformed PNG has unsupported number of channels, must be 3 or 4."
 msgstr ""
 "Transformert PNG har et ikke-støttet antall kanaler, må være 3 eller 4."
 
-#: gdk-pixbuf/io-png.c:182
+#: gdk-pixbuf/io-png.c:183
 #, c-format
 msgid "Fatal error in PNG image file: %s"
 msgstr "Fatal feil i PNG-bildefil: %s"
 
-#: gdk-pixbuf/io-png.c:315
+#: gdk-pixbuf/io-png.c:316
 msgid "Insufficient memory to load PNG file"
 msgstr "Ikke nok minne til å laste PNG-fil"
 
@@ -559,30 +559,30 @@
 "Ikke nok minne til å lagre et %ld ganger %ld bilde; prøv å avslutte noen "
 "applikasjoner for å redusere minnebruken"
 
-#: gdk-pixbuf/io-png.c:719
+#: gdk-pixbuf/io-png.c:720
 msgid "Fatal error reading PNG image file"
 msgstr "Fatal feil under lesing av PNG-bildefil"
 
-#: gdk-pixbuf/io-png.c:768
+#: gdk-pixbuf/io-png.c:769
 #, c-format
 msgid "Fatal error reading PNG image file: %s"
 msgstr "Fatal feil under lesing av PNG-bildefil: %s"
 
-#: gdk-pixbuf/io-png.c:858
+#: gdk-pixbuf/io-png.c:859
 msgid ""
 "Keys for PNG text chunks must have at least 1 and at most 79 characters."
 msgstr "Nøkler for PNG tekstbiter må minst ha mellom 1 og 79 tegn."
 
-#: gdk-pixbuf/io-png.c:867
+#: gdk-pixbuf/io-png.c:868
 msgid "Keys for PNG text chunks must be ASCII characters."
 msgstr "Nøkler for PNG tekstbiter må bestå av ASCII-tegn."
 
-#: gdk-pixbuf/io-png.c:881 gdk-pixbuf/io-tiff.c:667
+#: gdk-pixbuf/io-png.c:882 gdk-pixbuf/io-tiff.c:667
 #, c-format
 msgid "Color profile has invalid length %d."
 msgstr "Fargeprofilen har ugyldig lengde %d."
 
-#: gdk-pixbuf/io-png.c:894
+#: gdk-pixbuf/io-png.c:895
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%s' could not "
@@ -591,7 +591,7 @@
 "Nivået til PNG-komprimeringen må være en verdi mello 0 og 9; verdi «%s» kan "
 "ikke brukes."
 
-#: gdk-pixbuf/io-png.c:907
+#: gdk-pixbuf/io-png.c:908
 #, c-format
 msgid ""
 "PNG compression level must be a value between 0 and 9; value '%d' is not "
@@ -600,14 +600,14 @@
 "Nivået på PNG-komprimering må være en verdi mellom 0 og 9; verdien «%d» er "
 "ikke tillat."
 
-#: gdk-pixbuf/io-png.c:955
+#: gdk-pixbuf/io-png.c:956
 #, c-format
 msgid ""
 "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding."
 msgstr ""
 "Verdi for PNG-tekstbit %s kan ikke konverteres til ISO-8859-1-koding."
 
-#: gdk-pixbuf/io-png.c:1118
+#: gdk-pixbuf/io-png.c:1119
 msgid "The PNG image format"
 msgstr "PNG-bildeformat"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gedit.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gedit.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gedit.po	2013-01-29 09:33:59.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gedit.po	2014-01-07 06:37:02.000000000 +0000
@@ -17,15 +17,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:17+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:21+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../data/gedit.desktop.in.in.h:1
 msgid "gedit"
 msgstr "gedit"
 
-#: ../data/gedit.desktop.in.in.h:2 ../gedit/gedit-print-job.c:791
+#: ../data/gedit.desktop.in.in.h:2 ../gedit/gedit-print-job.c:784
 msgid "Text Editor"
 msgstr "Tekstredigering"
 
@@ -45,11 +45,11 @@
 msgid "Open a New Document"
 msgstr "Åpne et nytt dokument"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:1
+#: ../data/org.gnome.gedit.gschema.xml.in.h:1
 msgid "Use Default Font"
 msgstr "Bruk forvalgt skrift"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:2
+#: ../data/org.gnome.gedit.gschema.xml.in.h:2
 msgid ""
 "Whether to use the system's default fixed width font for editing text "
 "instead of a font specific to gedit. If this option is turned off, then the "
@@ -60,11 +60,11 @@
 "tekst i stedet for en spesifikk skrift for gedit. Hvis dette alternativet er "
 "slått av vil skriften som er satt i «Skrift for redigering» brukes i stedet."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:3
+#: ../data/org.gnome.gedit.gschema.xml.in.h:4
 msgid "Editor Font"
 msgstr "Skrift for redigering"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:4
+#: ../data/org.gnome.gedit.gschema.xml.in.h:5
 msgid ""
 "A custom font that will be used for the editing area. This will only take "
 "effect if the \"Use Default Font\" option is turned off."
@@ -72,19 +72,19 @@
 "En egendefinert skrift som vil brukes i redigeringsområdet. Denne vil kun "
 "brukes hvis «Bruk forvalgt skrift» er slått av."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:5
+#: ../data/org.gnome.gedit.gschema.xml.in.h:6
 msgid "Style Scheme"
 msgstr "Stilskjema"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:6
+#: ../data/org.gnome.gedit.gschema.xml.in.h:7
 msgid "The ID of a GtkSourceView Style Scheme used to color the text."
 msgstr "ID for en GtkSourceView stilschema som brukes til å farge teksten."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:7
+#: ../data/org.gnome.gedit.gschema.xml.in.h:8
 msgid "Create Backup Copies"
 msgstr "Lag sikkerhetskopier"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:8
+#: ../data/org.gnome.gedit.gschema.xml.in.h:9
 msgid ""
 "Whether gedit should create backup copies for the files it saves. You can "
 "set the backup file extension with the \"Backup Copy Extension\" option."
@@ -93,11 +93,11 @@
 "filtypen for sikkerhetskopiene med alternativet «Filtype for "
 "sikkerhetskopier»."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:9
+#: ../data/org.gnome.gedit.gschema.xml.in.h:10
 msgid "Autosave"
 msgstr "Automatisk lagring"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:10
+#: ../data/org.gnome.gedit.gschema.xml.in.h:11
 msgid ""
 "Whether gedit should automatically save modified files after a time "
 "interval. You can set the time interval with the \"Autosave Interval\" "
@@ -106,11 +106,11 @@
 "Om gedit skal lagre endrede filer automatisk etter et tidsintervall. Du kan "
 "sette tidsintervallet med alternativet «Intervall for automatisk lagring»."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:11
+#: ../data/org.gnome.gedit.gschema.xml.in.h:12
 msgid "Autosave Interval"
 msgstr "Intervall for automatisk lagring"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:12
+#: ../data/org.gnome.gedit.gschema.xml.in.h:13
 msgid ""
 "Number of minutes after which gedit will automatically save modified files. "
 "This will only take effect if the \"Autosave\" option is turned on."
@@ -118,11 +118,11 @@
 "Antall minutter før gedit lagrer endrede filer automatisk. Dette vil kun "
 "brukes hvis «Automatisk lagring» er slått på."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:13
+#: ../data/org.gnome.gedit.gschema.xml.in.h:14
 msgid "Undo Actions Limit (DEPRECATED)"
 msgstr "Grense for angring av handlinger (UTFASES)"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:14
+#: ../data/org.gnome.gedit.gschema.xml.in.h:15
 msgid ""
 "Maximum number of actions that gedit will be able to undo or redo. Use \"-"
 "1\" for unlimited number of actions. Deprecated since 2.12.0"
@@ -130,11 +130,11 @@
 "Maksimalt antall handlinger som gedit vil kunne angre eller gjenopprette. "
 "Bruk «-1» for ubegrenset antall handlinger. Fases ut etter 2.12.0"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:15
+#: ../data/org.gnome.gedit.gschema.xml.in.h:16
 msgid "Maximum Number of Undo Actions"
 msgstr "Maksimalt antall angrehandlinger"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:16
+#: ../data/org.gnome.gedit.gschema.xml.in.h:17
 msgid ""
 "Maximum number of actions that gedit will be able to undo or redo. Use \"-"
 "1\" for unlimited number of actions."
@@ -142,11 +142,11 @@
 "Maksimalt antall handlinger som gedit vil kunne angre eller gjenopprette. "
 "Bruk «-1» for ubegrenset antall handlinger."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:17
+#: ../data/org.gnome.gedit.gschema.xml.in.h:18
 msgid "Line Wrapping Mode"
 msgstr "Modus for linjebryting"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:18
+#: ../data/org.gnome.gedit.gschema.xml.in.h:19
 msgid ""
 "Specifies how to wrap long lines in the editing area. Use \"none\" for no "
 "wrapping, \"word\" for wrapping at word boundaries, and \"char\" for "
@@ -159,77 +159,77 @@
 "mellom store og små bokstaver så sørg for at de oppgis eksakt som de "
 "beskrives her."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:19
+#: ../data/org.gnome.gedit.gschema.xml.in.h:20
 msgid "Tab Size"
 msgstr "Fanestørrelse"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:20
+#: ../data/org.gnome.gedit.gschema.xml.in.h:21
 msgid ""
 "Specifies the number of spaces that should be displayed instead of Tab "
 "characters."
 msgstr "Spesifiserer antall mellomrom som vises i stedet for tabulatorer."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:21
+#: ../data/org.gnome.gedit.gschema.xml.in.h:22
 msgid "Insert spaces"
 msgstr "Sett inn mellomrom"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:22
+#: ../data/org.gnome.gedit.gschema.xml.in.h:23
 msgid "Whether gedit should insert spaces instead of tabs."
 msgstr "Om gedit skal sette inn mellomrom i stedet for tabulator."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:23
+#: ../data/org.gnome.gedit.gschema.xml.in.h:24
 msgid "Automatic indent"
 msgstr "Automatisk innrykk"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:24
+#: ../data/org.gnome.gedit.gschema.xml.in.h:25
 msgid "Whether gedit should enable automatic indentation."
 msgstr "Om gedit skal aktivere automatisk innrykk."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:25
+#: ../data/org.gnome.gedit.gschema.xml.in.h:26
 msgid "Display Line Numbers"
 msgstr "Vis linjenummer"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:26
+#: ../data/org.gnome.gedit.gschema.xml.in.h:27
 msgid "Whether gedit should display line numbers in the editing area."
 msgstr "Om gedit skal vise linjenummer i redigeringsområdet."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:27
+#: ../data/org.gnome.gedit.gschema.xml.in.h:28
 msgid "Highlight Current Line"
 msgstr "Uthev aktiv linje"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:28
+#: ../data/org.gnome.gedit.gschema.xml.in.h:29
 msgid "Whether gedit should highlight the current line."
 msgstr "Om gedit skal utheve aktiv linje."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:29
+#: ../data/org.gnome.gedit.gschema.xml.in.h:30
 msgid "Highlight Matching Brackets"
 msgstr "Uthev tilhørende hakeparantes"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:30
+#: ../data/org.gnome.gedit.gschema.xml.in.h:31
 msgid "Whether gedit should highlight matching brackets."
 msgstr "Om gedit skal utheve hakeparanteser som hører sammen."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:31
+#: ../data/org.gnome.gedit.gschema.xml.in.h:32
 msgid "Display Right Margin"
 msgstr "Vis høyre marg"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:32
+#: ../data/org.gnome.gedit.gschema.xml.in.h:33
 msgid "Whether gedit should display the right margin in the editing area."
 msgstr "Om gedit skal vise høyre marg i redigeringsområdet."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:33
+#: ../data/org.gnome.gedit.gschema.xml.in.h:34
 msgid "Right Margin Position"
 msgstr "Plassering av høyre marg"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:34
+#: ../data/org.gnome.gedit.gschema.xml.in.h:35
 msgid "Specifies the position of the right margin."
 msgstr "Spesifiserer posisjonen for høyre marg."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:35
+#: ../data/org.gnome.gedit.gschema.xml.in.h:36
 msgid "Smart Home End"
 msgstr "Smart home/end"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:36
+#: ../data/org.gnome.gedit.gschema.xml.in.h:37
 msgid ""
 "Specifies how the cursor moves when the HOME and END keys are pressed. Use "
 "\"disabled\" to always move at the start/end of the line, \"after\" to move "
@@ -246,57 +246,57 @@
 "start/slutt av teksten før start/slutt av linjen, og «always» for alltid å "
 "gå til start/slutt av teksten i stedet for start/alutt av linjen."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:37
+#: ../data/org.gnome.gedit.gschema.xml.in.h:38
 msgid "Restore Previous Cursor Position"
 msgstr "Gjenopprett forrige markørposisjon"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:38
+#: ../data/org.gnome.gedit.gschema.xml.in.h:39
 msgid ""
 "Whether gedit should restore the previous cursor position when a file is "
 "loaded."
 msgstr ""
 "Om gedit skal gjenopprette tidligere markørposisjon når et dokument lastes."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:39
+#: ../data/org.gnome.gedit.gschema.xml.in.h:40
 msgid "Enable Syntax Highlighting"
 msgstr "Aktiver syntaksutheving"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:40
+#: ../data/org.gnome.gedit.gschema.xml.in.h:41
 msgid "Whether gedit should enable syntax highlighting."
 msgstr "Om gedit skal aktivere automatisk syntaksutheving."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:41
+#: ../data/org.gnome.gedit.gschema.xml.in.h:42
 msgid "Enable Search Highlighting"
 msgstr "Aktiver utheving ved søk"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:42
+#: ../data/org.gnome.gedit.gschema.xml.in.h:43
 msgid ""
 "Whether gedit should highlight all the occurrences of the searched text."
 msgstr "Om gedit skal utheve tekst i søket."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:43
+#: ../data/org.gnome.gedit.gschema.xml.in.h:44
 msgid "Ensure Trailing Newline"
 msgstr "Sikre slutt med linjeskift"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:44
+#: ../data/org.gnome.gedit.gschema.xml.in.h:45
 msgid ""
 "Whether gedit will ensure that documents always end with a trailing newline."
 msgstr ""
 "Hvorvidt gedit skal sikre at dokumenter alltid slutter med linjeskift."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:45
+#: ../data/org.gnome.gedit.gschema.xml.in.h:46
 msgid "Toolbar is Visible"
 msgstr "Verktøylinjen er synlig"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:46
+#: ../data/org.gnome.gedit.gschema.xml.in.h:47
 msgid "Whether the toolbar should be visible in editing windows."
 msgstr "Om verktøylinjen i redigeringsvinduet skal være synlig."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:47
+#: ../data/org.gnome.gedit.gschema.xml.in.h:48
 msgid "Notebook Show Tabs Mode"
 msgstr "Vis faner i notisblokk"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:48
+#: ../data/org.gnome.gedit.gschema.xml.in.h:49
 msgid ""
 "Specifies when to show the notebook tabs. Use \"never\" to never show the "
 "tabs, \"always\" to always show the tabs, and \"auto\" to show the tabs only "
@@ -309,29 +309,29 @@
 "mellom store og små bokstaver, så sørg for at de oppgis eksakt som de "
 "beskrives her."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:49
+#: ../data/org.gnome.gedit.gschema.xml.in.h:50
 msgid "Status Bar is Visible"
 msgstr "Statuslinjen er synlig"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:50
+#: ../data/org.gnome.gedit.gschema.xml.in.h:51
 msgid ""
 "Whether the status bar at the bottom of editing windows should be visible."
 msgstr "Om statuslinjen nederst i redigeringsvinduet skal være synlig."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:51
+#: ../data/org.gnome.gedit.gschema.xml.in.h:52
 msgid "Side panel is Visible"
 msgstr "Sidelinjen er synlig"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:52
+#: ../data/org.gnome.gedit.gschema.xml.in.h:53
 msgid ""
 "Whether the side panel at the left of editing windows should be visible."
 msgstr "Om sidelinjen til venstre i redigeringsvinduet skal være synlig."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:53
+#: ../data/org.gnome.gedit.gschema.xml.in.h:54
 msgid "Maximum Recent Files"
 msgstr "Maksimalt antall nylig åpnede filer"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:54
+#: ../data/org.gnome.gedit.gschema.xml.in.h:55
 msgid ""
 "Specifies the maximum number of recently opened files that will be displayed "
 "in the \"Recent Files\" submenu."
@@ -339,29 +339,29 @@
 "Spesifiserer maksimalt antall nylig åpnede filer som vil vises i «Nylig "
 "åpnede filer» undermenyen."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:55
+#: ../data/org.gnome.gedit.gschema.xml.in.h:56
 msgid "Print Syntax Highlighting"
 msgstr "Skriv ut syntaksutheving"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:56
+#: ../data/org.gnome.gedit.gschema.xml.in.h:57
 msgid ""
 "Whether gedit should print syntax highlighting when printing documents."
 msgstr "Om gedit skal ta med en syntaksutheving ved utskrift av dokumenter."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:57
+#: ../data/org.gnome.gedit.gschema.xml.in.h:58
 msgid "Print Header"
 msgstr "Skriv ut topptekst"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:58
+#: ../data/org.gnome.gedit.gschema.xml.in.h:59
 msgid ""
 "Whether gedit should include a document header when printing documents."
 msgstr "Om gedig skal ta med en topptekst ved utskrift av dokumenter."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:59
+#: ../data/org.gnome.gedit.gschema.xml.in.h:60
 msgid "Printing Line Wrapping Mode"
 msgstr "Linjebrytingsmodus ved utskrift"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:60
+#: ../data/org.gnome.gedit.gschema.xml.in.h:61
 msgid ""
 "Specifies how to wrap long lines for printing. Use \"none\" for no wrapping, "
 "\"word\" for wrapping at word boundaries, and \"char\" for wrapping at "
@@ -373,11 +373,11 @@
 "hvis du ønsker bryting på tegnnivå. Merk at det skilles mellom store og små "
 "bokstaver så sørg for at de oppgis eksakt som de beskrives her."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:61
+#: ../data/org.gnome.gedit.gschema.xml.in.h:62
 msgid "Print Line Numbers"
 msgstr "Skriv ut linjenummer"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:62
+#: ../data/org.gnome.gedit.gschema.xml.in.h:63
 msgid ""
 "If this value is 0, then no line numbers will be inserted when printing a "
 "document. Otherwise, gedit will print line numbers every such number of "
@@ -386,21 +386,21 @@
 "Hvis verdien er 0 vil ikke linjenummer settes inn ved utskrift av et "
 "dokument. Ellers vil gedit skrive ut linjenummer ved verdiens antall linjer."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:63
+#: ../data/org.gnome.gedit.gschema.xml.in.h:65
 msgid "Body Font for Printing"
 msgstr "Skrift for kropp ved utskrift"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:64
+#: ../data/org.gnome.gedit.gschema.xml.in.h:66
 msgid ""
 "Specifies the font to use for a document's body when printing documents."
 msgstr ""
 "Spesifiserer skriften som skal brukes for et dokuments kropp ved utskrift."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:65
+#: ../data/org.gnome.gedit.gschema.xml.in.h:68
 msgid "Header Font for Printing"
 msgstr "Skrift for topptekst ved utskrift"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:66
+#: ../data/org.gnome.gedit.gschema.xml.in.h:69
 msgid ""
 "Specifies the font to use for page headers when printing a document. This "
 "will only take effect if the \"Print Header\" option is turned on."
@@ -408,11 +408,11 @@
 "Spesifiserer skriften som skal brukes for topptekst ved utskrift av et "
 "dokument. Denne vil kun brukes hvis «Skriv ut topptekst» er slått på."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:67
+#: ../data/org.gnome.gedit.gschema.xml.in.h:71
 msgid "Line Number Font for Printing"
 msgstr "Skrift for linjenummer ved utskrift"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:68
+#: ../data/org.gnome.gedit.gschema.xml.in.h:72
 msgid ""
 "Specifies the font to use for line numbers when printing. This will only "
 "take effect if the \"Print Line Numbers\" option is non-zero."
@@ -420,11 +420,11 @@
 "Spesifiserer skriften som skal brukes for linjenummer ved utskrift. Denne "
 "vil kun brukes hvis «Skriv ut linjenummer» er ulik null."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:81
+#: ../data/org.gnome.gedit.gschema.xml.in.h:85
 msgid "Automatically Detected Encodings"
 msgstr "Automatisk gjenkjente kodinger"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:82
+#: ../data/org.gnome.gedit.gschema.xml.in.h:86
 msgid ""
 "Sorted list of encodings used by gedit for automatically detecting the "
 "encoding of a file. \"CURRENT\" represents the current locale encoding. Only "
@@ -434,11 +434,11 @@
 "av kodinger for en fil. «CURRENT» er aktivt locale's koding. Kun gjenkjente "
 "kodinger vil brukes."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:86
+#: ../data/org.gnome.gedit.gschema.xml.in.h:90
 msgid "Encodings shown in menu"
 msgstr "Tegnkodinger som vises i menyen"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:87
+#: ../data/org.gnome.gedit.gschema.xml.in.h:91
 msgid ""
 "List of encodings shown in the Character Encoding menu in open/save file "
 "selector. Only recognized encodings are used."
@@ -446,11 +446,11 @@
 "Liste med kodinger som vises i menyen Tegnkoding i filvelger for "
 "åpning/lagring. Kun gjenkjente kodinger brukes."
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:88
+#: ../data/org.gnome.gedit.gschema.xml.in.h:92
 msgid "Active plugins"
 msgstr "Aktive tillegg"
 
-#: ../data/org.gnome.gedit.gschema.xml.in.in.h:89
+#: ../data/org.gnome.gedit.gschema.xml.in.h:93
 msgid ""
 "List of active plugins. It contains the \"Location\" of the active plugins. "
 "See the .gedit-plugin file for obtaining the \"Location\" of a given plugin."
@@ -458,11 +458,11 @@
 "Liste over aktive tillegg. Denne inneholder «adresse» for de aktive "
 "tilleggene. Se filen .gedit-plugin for å finne «adresse» for et gitt tillegg."
 
-#: ../gedit/gedit-app.c:222
+#: ../gedit/gedit-app.c:281
 msgid "There was an error displaying the help."
 msgstr "Det oppsto en feil under visning av hjelp."
 
-#: ../gedit/gedit-app-osx.c:274
+#: ../gedit/gedit-app-osx.c:260
 msgid "About gedit"
 msgstr "Om gedit"
 
@@ -474,15 +474,15 @@
 msgid "_Cancel Logout"
 msgstr "A_vbryt utlogging"
 
-#: ../gedit/gedit-close-confirmation-dialog.c:152
+#: ../gedit/gedit-close-confirmation-dialog.c:318
 msgid "Close _without Saving"
 msgstr "Lukk _uten å lagre"
 
-#: ../gedit/gedit-close-confirmation-dialog.c:214
+#: ../gedit/gedit-close-confirmation-dialog.c:147
 msgid "Question"
 msgstr "Spørsmål"
 
-#: ../gedit/gedit-close-confirmation-dialog.c:414
+#: ../gedit/gedit-close-confirmation-dialog.c:366
 #, c-format
 msgid ""
 "If you don't save, changes from the last %ld second will be permanently lost."
@@ -494,12 +494,12 @@
 msgstr[1] ""
 "Hvis du ikke lagrer vil endringene fra de siste %ld sekundene gå tapt."
 
-#: ../gedit/gedit-close-confirmation-dialog.c:423
+#: ../gedit/gedit-close-confirmation-dialog.c:375
 msgid ""
 "If you don't save, changes from the last minute will be permanently lost."
 msgstr "Hvis du ikke lagrer vil endringene fra det siste minuttet gå tapt."
 
-#: ../gedit/gedit-close-confirmation-dialog.c:429
+#: ../gedit/gedit-close-confirmation-dialog.c:381
 #, c-format
 msgid ""
 "If you don't save, changes from the last minute and %ld second will be "
@@ -514,7 +514,7 @@
 "Hvis du ikke lagrer vil endringene fra det siste minuttet og %ld sekundene "
 "gå tapt."
 
-#: ../gedit/gedit-close-confirmation-dialog.c:439
+#: ../gedit/gedit-close-confirmation-dialog.c:391
 #, c-format
 msgid ""
 "If you don't save, changes from the last %ld minute will be permanently lost."
@@ -526,12 +526,12 @@
 msgstr[1] ""
 "Hvis du ikke lagrer vil endringene fra de siste %ld minuttene gå tapt."
 
-#: ../gedit/gedit-close-confirmation-dialog.c:454
+#: ../gedit/gedit-close-confirmation-dialog.c:406
 msgid ""
 "If you don't save, changes from the last hour will be permanently lost."
 msgstr "Hvis du ikke lagrer vil endringene fra den siste timen gå tapt."
 
-#: ../gedit/gedit-close-confirmation-dialog.c:460
+#: ../gedit/gedit-close-confirmation-dialog.c:412
 #, c-format
 msgid ""
 "If you don't save, changes from the last hour and %d minute will be "
@@ -546,7 +546,7 @@
 "Hvis du ikke lagrer vil endringene fra den siste timen og %d minuttene gå "
 "tapt."
 
-#: ../gedit/gedit-close-confirmation-dialog.c:475
+#: ../gedit/gedit-close-confirmation-dialog.c:427
 #, c-format
 msgid ""
 "If you don't save, changes from the last %d hour will be permanently lost."
@@ -557,29 +557,29 @@
 msgstr[1] ""
 "Hvis du ikke lagrer vil endringene fra de siste %d timene gå tapt."
 
-#: ../gedit/gedit-close-confirmation-dialog.c:519
+#: ../gedit/gedit-close-confirmation-dialog.c:479
 #, c-format
 msgid "Changes to document \"%s\" will be permanently lost."
 msgstr "Endringer gjort i dokument «%s» vil gå tapt."
 
-#: ../gedit/gedit-close-confirmation-dialog.c:524
+#: ../gedit/gedit-close-confirmation-dialog.c:484
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr "Lagre endringene i dokument «%s» før programmet lukkes?"
 
-#: ../gedit/gedit-close-confirmation-dialog.c:538
-#: ../gedit/gedit-close-confirmation-dialog.c:755
+#: ../gedit/gedit-close-confirmation-dialog.c:495
+#: ../gedit/gedit-close-confirmation-dialog.c:719
 msgid "Saving has been disabled by the system administrator."
 msgstr "Lagring er deaktivert av systemadministrator."
 
-#: ../gedit/gedit-close-confirmation-dialog.c:706
+#: ../gedit/gedit-close-confirmation-dialog.c:666
 #, c-format
 msgid "Changes to %d document will be permanently lost."
 msgid_plural "Changes to %d documents will be permanently lost."
 msgstr[0] "Endringer gjort i %d dokument vil gå tapt."
 msgstr[1] "Endringer gjort i %d dokumenter vil gå tapt."
 
-#: ../gedit/gedit-close-confirmation-dialog.c:714
+#: ../gedit/gedit-close-confirmation-dialog.c:674
 #, c-format
 msgid ""
 "There is %d document with unsaved changes. Save changes before closing?"
@@ -592,15 +592,15 @@
 "Det finnes %d dokumenter med endringer som ikke er lagret. Lagre endringene "
 "før du lukker?"
 
-#: ../gedit/gedit-close-confirmation-dialog.c:733
+#: ../gedit/gedit-close-confirmation-dialog.c:694
 msgid "Docum_ents with unsaved changes:"
 msgstr "Dokum_enter med endringer som ikke er lagret:"
 
-#: ../gedit/gedit-close-confirmation-dialog.c:735
+#: ../gedit/gedit-close-confirmation-dialog.c:698
 msgid "S_elect the documents you want to save:"
 msgstr "V_elg dokumentene du vil lagre:"
 
-#: ../gedit/gedit-close-confirmation-dialog.c:759
+#: ../gedit/gedit-close-confirmation-dialog.c:723
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "Hvis du ikke lagrer vil alle endringene gå tapt."
 
@@ -609,42 +609,42 @@
 msgid "%s: invalid encoding.\n"
 msgstr "%s: ugyldig koding.\n"
 
-#: ../gedit/gedit-command-line.c:256
+#: ../gedit/gedit-app.c:119
 msgid "Show the application's version"
 msgstr "Vis programmets versjon"
 
-#: ../gedit/gedit-command-line.c:262
+#: ../gedit/gedit-app.c:125
 msgid "Display list of possible values for the encoding option"
 msgstr "Vis liste med mulige verdier for kodingsalternativet"
 
-#: ../gedit/gedit-command-line.c:270
+#: ../gedit/gedit-app.c:133
 msgid ""
 "Set the character encoding to be used to open the files listed on the "
 "command line"
 msgstr ""
 "Sett tegnkoding som skal brukes for å åpne filer gitt via kommandolinjen"
 
-#: ../gedit/gedit-command-line.c:271
+#: ../gedit/gedit-app.c:134
 msgid "ENCODING"
 msgstr "KODING"
 
-#: ../gedit/gedit-command-line.c:278
+#: ../gedit/gedit-app.c:141
 msgid "Create a new top-level window in an existing instance of gedit"
 msgstr "Opprett et nytt toppvindu i en eksisterende instans av gedit"
 
-#: ../gedit/gedit-command-line.c:286
+#: ../gedit/gedit-app.c:149
 msgid "Create a new document in an existing instance of gedit"
 msgstr "Opprett et nytt dokument i en eksisterende instans av gedit"
 
-#: ../gedit/gedit-command-line.c:294
+#: ../gedit/gedit-app.c:157
 msgid "Set the size and position of the window (WIDTHxHEIGHT+X+Y)"
 msgstr "Sett størrelse og posisjon for vinduet (BREDDExHØYDE+X+Y)"
 
-#: ../gedit/gedit-command-line.c:295
+#: ../gedit/gedit-app.c:158
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: ../gedit/gedit-command-line.c:302
+#: ../gedit/gedit-app.c:165
 msgid "Open files and block process until files are closed"
 msgstr "Åpne filer og blokker prosessen til filene er lukket"
 
@@ -652,20 +652,19 @@
 msgid "Run gedit in the background"
 msgstr "Kjør gedit i bakgrunnen"
 
-#: ../gedit/gedit-command-line.c:318
+#: ../gedit/gedit-app.c:173
 msgid "Run gedit in standalone mode"
 msgstr "Kjør gedit i frittstående modus"
 
-#: ../gedit/gedit-command-line.c:327
+#: ../gedit/gedit-app.c:182
 msgid "[FILE...] [+LINE[:COLUMN]]"
 msgstr "[FIL …] [+LINJE[:KOLONNE]]"
 
-#. Setup command line options
-#: ../gedit/gedit-command-line.c:334
+#: ../gedit/gedit-app.c:702
 msgid "- Edit text files"
 msgstr "- Rediger tekstfiler"
 
-#: ../gedit/gedit-command-line.c:345
+#: ../gedit/gedit-app.c:811 ../gedit/gedit-app.c:901
 #, c-format
 msgid ""
 "%s\n"
@@ -674,12 +673,12 @@
 "%s\n"
 "Kjør «%s --help» for å se en liste med tilgjengelige kommandolinjeflagg.\n"
 
-#: ../gedit/gedit-commands-file.c:266
+#: ../gedit/gedit-commands-file.c:268
 #, c-format
 msgid "Loading file '%s'…"
 msgstr "Laster fil «%s» …"
 
-#: ../gedit/gedit-commands-file.c:275
+#: ../gedit/gedit-commands-file.c:277
 #, c-format
 msgid "Loading %d file…"
 msgid_plural "Loading %d files…"
@@ -687,28 +686,28 @@
 msgstr[1] "Laster %d filer …"
 
 #. Translators: "Open Files" is the title of the file chooser window
-#: ../gedit/gedit-commands-file.c:440
+#: ../gedit/gedit-commands-file.c:442
 msgid "Open Files"
 msgstr "Åpne filer"
 
-#: ../gedit/gedit-commands-file.c:551
+#: ../gedit/gedit-commands-file.c:553
 #, c-format
 msgid "The file \"%s\" is read-only."
 msgstr "Filen «%s» er skrivebeskyttet."
 
-#: ../gedit/gedit-commands-file.c:556
+#: ../gedit/gedit-commands-file.c:558
 msgid "Do you want to try to replace it with the one you are saving?"
 msgstr "Vil du prøve å erstatte den med filen du lagrer?"
 
-#: ../gedit/gedit-commands-file.c:564 ../gedit/gedit-replace-dialog.c:283
+#: ../gedit/gedit-commands-file.c:566 ../gedit/gedit-replace-dialog.ui.h:3
 msgid "_Replace"
 msgstr "E_rstatt"
 
-#: ../gedit/gedit-commands-file.c:606
+#: ../gedit/gedit-commands-file.c:608
 msgid "Save the file using compression?"
 msgstr "Lagre filen med komprimering?"
 
-#: ../gedit/gedit-commands-file.c:607
+#: ../gedit/gedit-commands-file.c:609
 #, c-format
 msgid ""
 "The file \"%s\" was previously saved as plain text and will now be saved "
@@ -716,15 +715,15 @@
 msgstr ""
 "Filen «%s» var lagret som ren tekst og vil nå bli lagret med komprimering."
 
-#: ../gedit/gedit-commands-file.c:609
+#: ../gedit/gedit-commands-file.c:611
 msgid "_Save Using Compression"
 msgstr "_Lagre med komprimering"
 
-#: ../gedit/gedit-commands-file.c:613
+#: ../gedit/gedit-commands-file.c:615
 msgid "Save the file as plain text?"
 msgstr "Lagre filen som ren tekst?"
 
-#: ../gedit/gedit-commands-file.c:614
+#: ../gedit/gedit-commands-file.c:616
 #, c-format
 msgid ""
 "The file \"%s\" was previously saved using compression and will now be saved "
@@ -732,30 +731,30 @@
 msgstr ""
 "Filen «%s» var lagret med komprimering og vil nå bli lagret som ren tekst."
 
-#: ../gedit/gedit-commands-file.c:616
+#: ../gedit/gedit-commands-file.c:618
 msgid "_Save As Plain Text"
 msgstr "_Lagre som vanlig tekst"
 
-#: ../gedit/gedit-commands-file.c:736 ../gedit/gedit-commands-file.c:953
+#: ../gedit/gedit-commands-file.c:738 ../gedit/gedit-commands-file.c:955
 #, c-format
 msgid "Saving file '%s'…"
 msgstr "Lagrer fil «%s» …"
 
-#: ../gedit/gedit-commands-file.c:840
+#: ../gedit/gedit-commands-file.c:842
 msgid "Save As"
 msgstr "Lagre som"
 
-#: ../gedit/gedit-commands-file.c:1167
+#: ../gedit/gedit-commands-file.c:1168
 #, c-format
 msgid "Reverting the document '%s'…"
 msgstr "Forkaster endringer i dokument «%s» …"
 
-#: ../gedit/gedit-commands-file.c:1212
+#: ../gedit/gedit-commands-file.c:1213
 #, c-format
 msgid "Revert unsaved changes to document '%s'?"
 msgstr "Forkast ikke-lagrede endringer i dokumentet «%s»?"
 
-#: ../gedit/gedit-commands-file.c:1221
+#: ../gedit/gedit-commands-file.c:1222
 #, c-format
 msgid ""
 "Changes made to the document in the last %ld second will be permanently lost."
@@ -765,12 +764,12 @@
 msgstr[0] "Endringer gjort i dokumentet det siste %ld sekundet vil å tapt."
 msgstr[1] "Endringer gjort i dokumentet de siste %ld sekundene vil gå tapt."
 
-#: ../gedit/gedit-commands-file.c:1230
+#: ../gedit/gedit-commands-file.c:1231
 msgid ""
 "Changes made to the document in the last minute will be permanently lost."
 msgstr "Endringer gjort i dokumentet det siste minuttet vil gå tapt."
 
-#: ../gedit/gedit-commands-file.c:1236
+#: ../gedit/gedit-commands-file.c:1237
 #, c-format
 msgid ""
 "Changes made to the document in the last minute and %ld second will be "
@@ -783,7 +782,7 @@
 msgstr[1] ""
 "Endringer gjort i dokumentet det siste minuttet og %ld sekundene vil gå tapt."
 
-#: ../gedit/gedit-commands-file.c:1246
+#: ../gedit/gedit-commands-file.c:1247
 #, c-format
 msgid ""
 "Changes made to the document in the last %ld minute will be permanently lost."
@@ -793,12 +792,12 @@
 msgstr[0] "Endringer gjort i dokumentet det siste %ld minuttet vil gå tapt."
 msgstr[1] "Endringer gjort i dokumentet de siste %ld minuttene vil gå tapt."
 
-#: ../gedit/gedit-commands-file.c:1261
+#: ../gedit/gedit-commands-file.c:1262
 msgid ""
 "Changes made to the document in the last hour will be permanently lost."
 msgstr "Endringer gjort i dokumentet den siste timen vil gå tapt."
 
-#: ../gedit/gedit-commands-file.c:1267
+#: ../gedit/gedit-commands-file.c:1268
 #, c-format
 msgid ""
 "Changes made to the document in the last hour and %d minute will be "
@@ -811,7 +810,7 @@
 msgstr[1] ""
 "Endringer gjort i dokumentet den siste timen og %d minuttene vil gå tapt."
 
-#: ../gedit/gedit-commands-file.c:1282
+#: ../gedit/gedit-commands-file.c:1283
 #, c-format
 msgid ""
 "Changes made to the document in the last %d hour will be permanently lost."
@@ -820,15 +819,15 @@
 msgstr[0] "Endringer gjort i dokumentet den siste %d timen vil gå tapt."
 msgstr[1] "Endringer gjort i dokumentet de siste %d timene vil gå tapt."
 
-#: ../gedit/gedit-commands-file.c:1308
+#: ../gedit/gedit-commands-file.c:1309
 msgid "_Revert"
 msgstr "Fo_rkast"
 
-#: ../gedit/gedit-commands-help.c:88
+#: ../gedit/gedit-commands-help.c:89
 msgid "gedit is a small and lightweight text editor for the GNOME Desktop"
 msgstr "gedit er en liten og lett tekst editor for GNOME skrivebordet"
 
-#: ../gedit/gedit-commands-help.c:113
+#: ../gedit/gedit-commands-help.c:114
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -842,35 +841,35 @@
 "  TH https://launchpad.net/~thaugseth\n"
 "  Øivind Hoel https://launchpad.net/~eruin"
 
-#: ../gedit/gedit-commands-search.c:112
+#: ../gedit/gedit-commands-search.c:113
 #, c-format
 msgid "Found and replaced %d occurrence"
 msgid_plural "Found and replaced %d occurrences"
 msgstr[0] "Fant og erstattet %d oppføring"
 msgstr[1] "Fant og erstattet %d oppføringer"
 
-#: ../gedit/gedit-commands-search.c:121
+#: ../gedit/gedit-commands-search.c:122
 msgid "Found and replaced one occurrence"
 msgstr "Fant og erstattet én oppføring"
 
 #. Translators: %s is replaced by the text
 #. entered by the user in the search box
-#: ../gedit/gedit-commands-search.c:144
+#: ../gedit/gedit-commands-search.c:148
 #, c-format
 msgid "\"%s\" not found"
 msgstr "«%s» ikke funnet"
 
-#: ../gedit/gedit-document.c:1222 ../gedit/gedit-document.c:1248
+#: ../gedit/gedit-document.c:1266 ../gedit/gedit-document.c:1292
 #, c-format
 msgid "Untitled Document %d"
 msgstr "Uten navn %d"
 
-#: ../gedit/gedit-documents-panel.c:123 ../gedit/gedit-documents-panel.c:137
-#: ../gedit/gedit-window.c:2397 ../gedit/gedit-window.c:2404
+#: ../gedit/gedit-documents-panel.c:119 ../gedit/gedit-documents-panel.c:133
+#: ../gedit/gedit-window.c:2080 ../gedit/gedit-window.c:2087
 msgid "Read-Only"
 msgstr "Skrivebeskyttet"
 
-#: ../gedit/gedit-documents-panel.c:1146 ../gedit/gedit-window.c:3846
+#: ../gedit/gedit-documents-panel.c:1140 ../gedit/gedit-window.c:3458
 msgid "Documents"
 msgstr "Dokumenter"
 
@@ -990,17 +989,17 @@
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../gedit/gedit-encodings-combo-box.c:301
+#: ../gedit/gedit-encodings-combo-box.c:293
 msgid "Automatically Detected"
 msgstr "Automatisk gjenkjent"
 
-#: ../gedit/gedit-encodings-combo-box.c:320
-#: ../gedit/gedit-encodings-combo-box.c:336
+#: ../gedit/gedit-encodings-combo-box.c:312
+#: ../gedit/gedit-encodings-combo-box.c:328
 #, c-format
 msgid "Current Locale (%s)"
 msgstr "Aktivt locale (%s)"
 
-#: ../gedit/gedit-encodings-combo-box.c:388
+#: ../gedit/gedit-encodings-combo-box.c:380
 msgid "Add or Remove..."
 msgstr "Legg til eller fjern …"
 
@@ -1008,11 +1007,11 @@
 msgid "Character Encodings"
 msgstr "Tegnkodinger"
 
-#: ../gedit/gedit-encodings-dialog.c:395 ../gedit/gedit-encodings-dialog.c:456
+#: ../gedit/gedit-encodings-dialog.ui.h:3
 msgid "_Description"
 msgstr "_Beskrivelse"
 
-#: ../gedit/gedit-encodings-dialog.c:404 ../gedit/gedit-encodings-dialog.c:465
+#: ../gedit/gedit-encodings-dialog.ui.h:4
 msgid "_Encoding"
 msgstr "_Koding"
 
@@ -1025,41 +1024,41 @@
 msgid "A_vailable encodings:"
 msgstr "Til_gjengelige kodinger:"
 
-#: ../gedit/gedit-encodings-dialog.ui.h:3
+#: ../gedit/gedit-encodings-dialog.ui.h:5
 msgid "E_ncodings shown in menu:"
 msgstr "Kodi_nger som vises i menyen:"
 
-#: ../gedit/gedit-file-chooser-dialog.c:52
-#: ../gedit/gedit-preferences-dialog.c:909
+#: ../gedit/gedit-file-chooser-dialog.c:50
+#: ../gedit/gedit-preferences-dialog.c:874
 msgid "All Files"
 msgstr "Alle filer"
 
-#: ../gedit/gedit-file-chooser-dialog.c:53
+#: ../gedit/gedit-file-chooser-dialog.c:51
 msgid "All Text Files"
 msgstr "Alle tekstfiler"
 
-#: ../gedit/gedit-file-chooser-dialog.c:95
+#: ../gedit/gedit-file-chooser-dialog.c:91
 msgid "C_haracter Encoding:"
 msgstr "Te_gnkoding:"
 
-#: ../gedit/gedit-file-chooser-dialog.c:154
+#: ../gedit/gedit-file-chooser-dialog.c:150
 msgid "L_ine Ending:"
 msgstr "Koding av l_inje:"
 
-#: ../gedit/gedit-file-chooser-dialog.c:173
+#: ../gedit/gedit-file-chooser-dialog.c:169
 msgid "Unix/Linux"
 msgstr "Unix/Linux"
 
-#: ../gedit/gedit-file-chooser-dialog.c:179
+#: ../gedit/gedit-file-chooser-dialog.c:175
 msgid "Mac OS Classic"
 msgstr "Mac OS Classic"
 
-#: ../gedit/gedit-file-chooser-dialog.c:185
+#: ../gedit/gedit-file-chooser-dialog.c:181
 msgid "Windows"
 msgstr "Windows"
 
-#: ../gedit/gedit-io-error-info-bar.c:182
-#: ../gedit/gedit-io-error-info-bar.c:497
+#: ../gedit/gedit-io-error-info-bar.c:161
+#: ../gedit/gedit-io-error-info-bar.c:471
 msgid "_Retry"
 msgstr "P_røv igjen"
 
@@ -1068,9 +1067,9 @@
 msgid "Could not find the file %s."
 msgstr "Kunne ikke finne filen %s."
 
-#: ../gedit/gedit-io-error-info-bar.c:205
-#: ../gedit/gedit-io-error-info-bar.c:248
-#: ../gedit/gedit-io-error-info-bar.c:255
+#: ../gedit/gedit-io-error-info-bar.c:183
+#: ../gedit/gedit-io-error-info-bar.c:223
+#: ../gedit/gedit-io-error-info-bar.c:230
 msgid "Please check that you typed the location correctly and try again."
 msgstr "Vennligst sjekk at du skrev inn adressen korrekt og prøv igjen."
 
@@ -1112,7 +1111,7 @@
 "Vert %s ble ikke funnet. Vennligst sjekk at dine proxy-innstillinger er "
 "riktige og prøv igjen."
 
-#: ../gedit/gedit-io-error-info-bar.c:304
+#: ../gedit/gedit-io-error-info-bar.c:279
 #, c-format
 msgid ""
 "Hostname was invalid. Please check that you typed the location correctly and "
@@ -1126,15 +1125,15 @@
 msgid "%s is not a regular file."
 msgstr "%s er ikke en vanlig fil."
 
-#: ../gedit/gedit-io-error-info-bar.c:317
+#: ../gedit/gedit-io-error-info-bar.c:292
 msgid "Connection timed out. Please try again."
 msgstr "Tidsavbrudd for tilkobling. Vennligst prøv igjen."
 
-#: ../gedit/gedit-io-error-info-bar.c:340
+#: ../gedit/gedit-io-error-info-bar.c:315
 msgid "The file is too big."
 msgstr "Filen er for stor."
 
-#: ../gedit/gedit-io-error-info-bar.c:381
+#: ../gedit/gedit-io-error-info-bar.c:356
 #, c-format
 msgid "Unexpected error: %s"
 msgstr "Uventet feil: %s"
@@ -1148,18 +1147,18 @@
 msgid "Could not revert the file %s."
 msgstr "Kunne ikke forkaste endringer i fil %s."
 
-#: ../gedit/gedit-io-error-info-bar.c:454
+#: ../gedit/gedit-io-error-info-bar.c:429
 msgid "Ch_aracter Encoding:"
 msgstr "Te_gnkoding:"
 
 #. Translators: the access key chosen for this string should be
 #. different from other main menu access keys (Open, Edit, View...)
-#: ../gedit/gedit-io-error-info-bar.c:506
-#: ../gedit/gedit-io-error-info-bar.c:782
+#: ../gedit/gedit-io-error-info-bar.c:479
+#: ../gedit/gedit-io-error-info-bar.c:751
 msgid "Edit Any_way"
 msgstr "Redi_ger likevel"
 
-#: ../gedit/gedit-io-error-info-bar.c:608
+#: ../gedit/gedit-io-error-info-bar.c:577
 msgid ""
 "The number of followed links is limited and the actual file could not be "
 "found within this limit."
@@ -1167,7 +1166,7 @@
 "Antall lenker som kan følges er begrenset og filen ble ikke funnet innenfor "
 "denne grensen."
 
-#: ../gedit/gedit-io-error-info-bar.c:612
+#: ../gedit/gedit-io-error-info-bar.c:581
 msgid "You do not have the permissions necessary to open the file."
 msgstr "Du har ikke tilstrekkelige rettigheter til å åpne filen."
 
@@ -1175,12 +1174,12 @@
 msgid "gedit has not been able to detect the character encoding."
 msgstr "gedit har ikke klart å gjenkjenne tegnkodingen."
 
-#: ../gedit/gedit-io-error-info-bar.c:620
-#: ../gedit/gedit-io-error-info-bar.c:642
+#: ../gedit/gedit-io-error-info-bar.c:588
+#: ../gedit/gedit-io-error-info-bar.c:610
 msgid "Please check that you are not trying to open a binary file."
 msgstr "Vennligst sjekk om du prøver å åpne en binær fil."
 
-#: ../gedit/gedit-io-error-info-bar.c:621
+#: ../gedit/gedit-io-error-info-bar.c:589
 msgid "Select a character encoding from the menu and try again."
 msgstr "Velg tegnkoding fra menyen og prøv igjen."
 
@@ -1189,7 +1188,7 @@
 msgid "There was a problem opening the file %s."
 msgstr "Det oppsto en feil under åpning av fil %s."
 
-#: ../gedit/gedit-io-error-info-bar.c:629
+#: ../gedit/gedit-io-error-info-bar.c:597
 msgid ""
 "The file you opened has some invalid characters. If you continue editing "
 "this file you could corrupt this document."
@@ -1197,7 +1196,7 @@
 "Filen du åpnet har noen ugyldige tegn. Hvis du fortsetter redigering av "
 "denne filen kan den bli ødelagt."
 
-#: ../gedit/gedit-io-error-info-bar.c:632
+#: ../gedit/gedit-io-error-info-bar.c:600
 msgid "You can also choose another character encoding and try again."
 msgstr "Du kan også velge en annen tegnkoding og prøve igjen."
 
@@ -1206,8 +1205,8 @@
 msgid "Could not open the file %s using the %s character encoding."
 msgstr "Kunne ikke åpne fil %s som bruker tegnkoding %s."
 
-#: ../gedit/gedit-io-error-info-bar.c:643
-#: ../gedit/gedit-io-error-info-bar.c:717
+#: ../gedit/gedit-io-error-info-bar.c:611
+#: ../gedit/gedit-io-error-info-bar.c:685
 msgid "Select a different character encoding from the menu and try again."
 msgstr "Velg en annen tegnkoding fra menyen og prøv igjen."
 
@@ -1221,7 +1220,7 @@
 msgid "Could not save the file %s using the %s character encoding."
 msgstr "Kunne ikke lagre fil %s med tegnkoding %s."
 
-#: ../gedit/gedit-io-error-info-bar.c:715
+#: ../gedit/gedit-io-error-info-bar.c:683
 msgid ""
 "The document contains one or more characters that cannot be encoded using "
 "the specified character encoding."
@@ -1231,16 +1230,16 @@
 
 #. Translators: the access key chosen for this string should be
 #. different from other main menu access keys (Open, Edit, View...)
-#: ../gedit/gedit-io-error-info-bar.c:787
+#: ../gedit/gedit-io-error-info-bar.c:756
 msgid "D_on't Edit"
 msgstr "_Ikke rediger"
 
-#: ../gedit/gedit-io-error-info-bar.c:801
+#: ../gedit/gedit-io-error-info-bar.c:803
 #, c-format
 msgid "This file (%s) is already open in another gedit window."
 msgstr "Denne filen (%s) er allerede åpen i et annet gedit vindu."
 
-#: ../gedit/gedit-io-error-info-bar.c:815
+#: ../gedit/gedit-io-error-info-bar.c:817
 msgid ""
 "gedit opened this instance of the file in a non-editable way. Do you want to "
 "edit it anyway?"
@@ -1248,15 +1247,15 @@
 "gedit åpnet denne instansen av filen uten mulighet for redigering. Vil du "
 "redigere den likevel?"
 
-#: ../gedit/gedit-io-error-info-bar.c:873
-#: ../gedit/gedit-io-error-info-bar.c:971
-#: ../gedit/gedit-io-error-info-bar.c:1260
+#: ../gedit/gedit-io-error-info-bar.c:836
+#: ../gedit/gedit-io-error-info-bar.c:928
+#: ../gedit/gedit-io-error-info-bar.c:1219
 msgid "S_ave Anyway"
 msgstr "L_agre likevel"
 
-#: ../gedit/gedit-io-error-info-bar.c:877
-#: ../gedit/gedit-io-error-info-bar.c:975
-#: ../gedit/gedit-io-error-info-bar.c:1264
+#: ../gedit/gedit-io-error-info-bar.c:839
+#: ../gedit/gedit-io-error-info-bar.c:931
+#: ../gedit/gedit-io-error-info-bar.c:1222
 msgid "D_on't Save"
 msgstr "_Ikke lagre"
 
@@ -1264,28 +1263,28 @@
 #. * could be interpreted as the changes he made in the document. beside "reading" is
 #. * not accurate (since last load/save)
 #. 
-#: ../gedit/gedit-io-error-info-bar.c:895
+#: ../gedit/gedit-io-error-info-bar.c:897
 #, c-format
 msgid "The file %s has been modified since reading it."
 msgstr "Fil %s er endret siden den ble lest."
 
-#: ../gedit/gedit-io-error-info-bar.c:910
+#: ../gedit/gedit-io-error-info-bar.c:868
 msgid ""
 "If you save it, all the external changes could be lost. Save it anyway?"
 msgstr ""
 "Hvis du lagrer den kan alle eksterne endringer gå tapt. Lagre den likevel?"
 
-#: ../gedit/gedit-io-error-info-bar.c:998
+#: ../gedit/gedit-io-error-info-bar.c:1000
 #, c-format
 msgid "Could not create a backup file while saving %s"
 msgstr "Kunne ikke opprette sikkerhetskopi ved lagring av %s"
 
-#: ../gedit/gedit-io-error-info-bar.c:1003
+#: ../gedit/gedit-io-error-info-bar.c:1005
 #, c-format
 msgid "Could not create a temporary backup file while saving %s"
 msgstr "Kunne ikke opprette en midlertidig sikkerhetskopi ved lagring av %s"
 
-#: ../gedit/gedit-io-error-info-bar.c:1020
+#: ../gedit/gedit-io-error-info-bar.c:1022
 msgid ""
 "gedit could not back up the old copy of the file before saving the new one. "
 "You can ignore this warning and save the file anyway, but if an error occurs "
@@ -1297,7 +1296,7 @@
 "likevel?"
 
 #. Translators: %s is a URI scheme (like for example http:, ftp:, etc.)
-#: ../gedit/gedit-io-error-info-bar.c:1080
+#: ../gedit/gedit-io-error-info-bar.c:1082
 #, c-format
 msgid ""
 "gedit cannot handle %s locations in write mode. Please check that you typed "
@@ -1306,7 +1305,7 @@
 "gedit kan ikke håndtere %s-adresser i skrivemodus. Vennligst sjekk at du "
 "skrev inn adressen korrekt og prøv igjen."
 
-#: ../gedit/gedit-io-error-info-bar.c:1088
+#: ../gedit/gedit-io-error-info-bar.c:1090
 msgid ""
 "gedit cannot handle this location in write mode. Please check that you typed "
 "the location correctly and try again."
@@ -1314,7 +1313,7 @@
 "gedit kan ikke håndtere denne adressen i skrivemodus. Vennligst sjekk at du "
 "skrev inn adressen korrekt og prøv igjen."
 
-#: ../gedit/gedit-io-error-info-bar.c:1097
+#: ../gedit/gedit-io-error-info-bar.c:1099
 #, c-format
 msgid ""
 "%s is not a valid location. Please check that you typed the location "
@@ -1323,7 +1322,7 @@
 "%s er ikke en gyldig adresse. Vennligst sjekk at du skrev inn adressen "
 "korrekt og prøv igjen."
 
-#: ../gedit/gedit-io-error-info-bar.c:1104
+#: ../gedit/gedit-io-error-info-bar.c:1056
 msgid ""
 "You do not have the permissions necessary to save the file. Please check "
 "that you typed the location correctly and try again."
@@ -1331,7 +1330,7 @@
 "Du har ikke nødvendige rettigheter til å lagre filen. Vennligst sjekk at du "
 "skrev inn adressen korrekt og prøv igjen."
 
-#: ../gedit/gedit-io-error-info-bar.c:1110
+#: ../gedit/gedit-io-error-info-bar.c:1062
 msgid ""
 "There is not enough disk space to save the file. Please free some disk space "
 "and try again."
@@ -1339,7 +1338,7 @@
 "Det er ikke nok plass på disken til å lagre filen. Vennligst frigjør plass "
 "og prøv igjen."
 
-#: ../gedit/gedit-io-error-info-bar.c:1115
+#: ../gedit/gedit-io-error-info-bar.c:1067
 msgid ""
 "You are trying to save the file on a read-only disk. Please check that you "
 "typed the location correctly and try again."
@@ -1347,14 +1346,14 @@
 "Du prøver å lagre filen på en skrivebeskyttet disk. Vennligst sjekk at du "
 "skrev inn adressen korrekt og prøv igjen."
 
-#: ../gedit/gedit-io-error-info-bar.c:1121
+#: ../gedit/gedit-io-error-info-bar.c:1073
 msgid ""
 "A file with the same name already exists. Please use a different name."
 msgstr ""
 "En fil med det samme navnet eksisterer allerede. Vennligst bruk et annet "
 "navn."
 
-#: ../gedit/gedit-io-error-info-bar.c:1126
+#: ../gedit/gedit-io-error-info-bar.c:1078
 msgid ""
 "The disk where you are trying to save the file has a limitation on length of "
 "the file names. Please use a shorter name."
@@ -1362,7 +1361,7 @@
 "Disken du prøver å lagre filen på har en begrensning på lengde på filnavn. "
 "Vennligst bruk et kortere navn."
 
-#: ../gedit/gedit-io-error-info-bar.c:1133
+#: ../gedit/gedit-io-error-info-bar.c:1085
 msgid ""
 "The disk where you are trying to save the file has a limitation on file "
 "sizes. Please try saving a smaller file or saving it to a disk that does not "
@@ -1372,7 +1371,7 @@
 "Vennligst prøv å lagre en mindre fil eller lagre den på en disk som ikke har "
 "denne begrensningen."
 
-#: ../gedit/gedit-io-error-info-bar.c:1149
+#: ../gedit/gedit-io-error-info-bar.c:1151
 #, c-format
 msgid "Could not save the file %s."
 msgstr "Kunne ikke lagre filen %s."
@@ -1381,29 +1380,29 @@
 #. * could be interpreted as the changes he made in the document. beside "reading" is
 #. * not accurate (since last load/save)
 #. 
-#: ../gedit/gedit-io-error-info-bar.c:1194
+#: ../gedit/gedit-io-error-info-bar.c:1196
 #, c-format
 msgid "The file %s changed on disk."
 msgstr "Fil %s er endret på disk."
 
-#: ../gedit/gedit-io-error-info-bar.c:1199
+#: ../gedit/gedit-io-error-info-bar.c:1201
 msgid "Do you want to drop your changes and reload the file?"
 msgstr "Vil du forkaste dine endringer og laste filen på nytt?"
 
-#: ../gedit/gedit-io-error-info-bar.c:1201
+#: ../gedit/gedit-io-error-info-bar.c:1203
 msgid "Do you want to reload the file?"
 msgstr "Vil du laste filen på nytt?"
 
-#: ../gedit/gedit-io-error-info-bar.c:1206
+#: ../gedit/gedit-io-error-info-bar.c:1166
 msgid "_Reload"
 msgstr "_Last på nytt"
 
-#: ../gedit/gedit-io-error-info-bar.c:1278
+#: ../gedit/gedit-io-error-info-bar.c:1280
 #, c-format
 msgid "Some invalid chars have been detected while saving %s"
 msgstr "Noen ugyldige tegn ble funnet under lagring av %s"
 
-#: ../gedit/gedit-io-error-info-bar.c:1294
+#: ../gedit/gedit-io-error-info-bar.c:1248
 msgid ""
 "If you continue saving this file you can corrupt the document.  Save anyway?"
 msgstr ""
@@ -1411,65 +1410,66 @@
 "likevel?"
 
 #. Keep in sync with the respective GtkActions
-#: ../gedit/gedit-notebook-popup-menu.c:172 ../gedit/gedit-ui.h:140
+#: ../gedit/gedit-notebook-popup-menu.c:167 ../gedit/gedit-ui.h:142
 msgid "_Move to New Window"
 msgstr "_Flytt til nytt vindu"
 
-#: ../gedit/gedit-notebook-popup-menu.c:190 ../gedit/gedit-ui.h:78
+#: ../gedit/gedit-notebook-popup-menu.c:185 ../gedit/gedit-ui.h:78
 msgid "Save _As..."
 msgstr "L_agre som …"
 
-#: ../gedit/gedit-notebook-popup-menu.c:203 ../gedit/gedit-ui.h:84
+#: ../gedit/gedit-notebook-popup-menu.c:196 ../gedit/gedit-ui.h:84
 msgid "_Print..."
 msgstr "S_kriv ut …"
 
-#: ../gedit/gedit-panel.c:409 ../gedit/gedit-panel.c:587
+#: ../gedit/gedit-panel.c:407 ../gedit/gedit-panel.c:588
 msgid "Empty"
 msgstr "Tom"
 
-#: ../gedit/gedit-panel.c:475
+#: ../gedit/gedit-panel.c:473
 msgid "Hide panel"
 msgstr "Skjul panel"
 
-#: ../gedit/gedit-preferences-dialog.c:423
+#: ../gedit/gedit-preferences-dialog.c:396
 msgid "Click on this button to select the font to be used by the editor"
 msgstr ""
 "Trykk på denne knappen for å velge skriften som skal brukes av "
 "redigeringsprogrammet"
 
-#: ../gedit/gedit-preferences-dialog.c:438
+#: ../gedit/gedit-preferences-dialog.c:409
 #, c-format
 msgid "_Use the system fixed width font (%s)"
 msgstr "Br_uk systemets skrift for fast bredde (%s)"
 
-#: ../gedit/gedit-preferences-dialog.c:676
+#: ../gedit/gedit-preferences-dialog.c:641
 #, c-format
 msgid ""
 "Directory '%s' could not be created: g_mkdir_with_parents() failed: %s"
 msgstr "Kunne ikke opprette katalog «%s»: g_mkdir_with_parents() feilet: %s"
 
-#: ../gedit/gedit-preferences-dialog.c:860
+#: ../gedit/gedit-preferences-dialog.c:825
 msgid "The selected color scheme cannot be installed."
 msgstr "Valgt fargeschema kan ikke installeres."
 
-#: ../gedit/gedit-preferences-dialog.c:887
+#: ../gedit/gedit-preferences-dialog.c:852
 msgid "Add Scheme"
 msgstr "Legg til schema"
 
-#: ../gedit/gedit-preferences-dialog.c:894
+#: ../gedit/gedit-preferences-dialog.c:859
 msgid "A_dd Scheme"
 msgstr "_Legg til schema"
 
-#: ../gedit/gedit-preferences-dialog.c:902
+#: ../gedit/gedit-preferences-dialog.c:867
 msgid "Color Scheme Files"
 msgstr "Filer for fargeschema"
 
-#: ../gedit/gedit-preferences-dialog.c:954
+#: ../gedit/gedit-preferences-dialog.c:919
 #, c-format
 msgid "Could not remove color scheme \"%s\"."
 msgstr "Kunne ikke fjerne fargeschema «%s»"
 
-#: ../gedit/gedit-preferences-dialog.c:1177
+#. ex:set ts=8 noet:
+#: ../gedit/gedit-preferences-dialog.ui.h:1
 msgid "gedit Preferences"
 msgstr "Brukervalg for gedit"
 
@@ -1478,7 +1478,7 @@
 msgid "Preferences"
 msgstr "Brukervalg"
 
-#: ../gedit/gedit-preferences-dialog.ui.h:2 ../gedit/gedit-view.c:552
+#: ../gedit/gedit-preferences-dialog.ui.h:2 ../gedit/gedit-view.c:466
 msgid "_Display line numbers"
 msgstr "Vis _linjenummer"
 
@@ -1571,40 +1571,40 @@
 msgid "Color Scheme"
 msgstr "Fargepalett"
 
-#: ../gedit/gedit-preferences-dialog.ui.h:24
+#: ../gedit/gedit-preferences-dialog.ui.h:25
 msgid "Install scheme"
 msgstr "Installer skjema"
 
-#: ../gedit/gedit-preferences-dialog.ui.h:25
+#: ../gedit/gedit-preferences-dialog.ui.h:26
 msgid "Install Scheme"
 msgstr "Installer skjema"
 
-#: ../gedit/gedit-preferences-dialog.ui.h:26
+#: ../gedit/gedit-preferences-dialog.ui.h:27
 msgid "Uninstall scheme"
 msgstr "Avinstaller skjema"
 
-#: ../gedit/gedit-preferences-dialog.ui.h:27
+#: ../gedit/gedit-preferences-dialog.ui.h:28
 msgid "Uninstall Scheme"
 msgstr "Avinstaller skjema"
 
-#: ../gedit/gedit-preferences-dialog.ui.h:28
+#: ../gedit/gedit-preferences-dialog.ui.h:29
 msgid "Font & Colors"
 msgstr "Skrifter og farger"
 
-#: ../gedit/gedit-preferences-dialog.ui.h:29
+#: ../gedit/gedit-preferences-dialog.ui.h:30
 msgid "Plugins"
 msgstr "Tillegg"
 
-#: ../gedit/gedit-print-job.c:572
+#: ../gedit/gedit-print-job.c:565
 #, c-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../gedit/gedit-print-job.c:581
+#: ../gedit/gedit-print-job.c:574
 msgid "Page %N of %Q"
 msgstr "Side %N av %Q"
 
-#: ../gedit/gedit-print-job.c:843
+#: ../gedit/gedit-print-job.c:836
 msgid "Preparing..."
 msgstr "Forbereder …"
 
@@ -1663,79 +1663,79 @@
 msgid "_Restore Default Fonts"
 msgstr "Gjenopp_rett forvalgte skrifter"
 
-#: ../gedit/gedit-print-preview.c:562
+#. ex:set ts=8 noet:
+#: ../gedit/gedit-print-preview.ui.h:1
 msgid "Show the previous page"
 msgstr "Vis forrige side"
 
-#: ../gedit/gedit-print-preview.c:574
+#: ../gedit/gedit-print-preview.ui.h:3
 msgid "Show the next page"
 msgstr "Vis neste side"
 
-#: ../gedit/gedit-print-preview.c:590
+#: ../gedit/gedit-print-preview.ui.h:5
 msgid "Current page (Alt+P)"
 msgstr "Denne siden (Alt+P)"
 
-#. Translators: the "of" from "1 of 19" in print preview.
-#: ../gedit/gedit-print-preview.c:613
+#. the "of" from "1 of 19" in print preview
+#: ../gedit/gedit-print-preview.ui.h:7
 msgid "of"
 msgstr "av"
 
-#: ../gedit/gedit-print-preview.c:621
+#: ../gedit/gedit-print-preview.ui.h:8
 msgid "Page total"
 msgstr "Sider totalt"
 
-#: ../gedit/gedit-print-preview.c:622
+#: ../gedit/gedit-print-preview.ui.h:9
 msgid "The total number of pages in the document"
 msgstr "Totalt antall sider i dokumentet"
 
-#: ../gedit/gedit-print-preview.c:639
+#: ../gedit/gedit-print-preview.ui.h:10
 msgid "Show multiple pages"
 msgstr "Vis flere sider"
 
-#: ../gedit/gedit-print-preview.c:652
+#: ../gedit/gedit-print-preview.ui.h:11
 msgid "Zoom 1:1"
 msgstr "Zoom 1:1"
 
-#: ../gedit/gedit-print-preview.c:661
+#: ../gedit/gedit-print-preview.ui.h:12
 msgid "Zoom to fit the whole page"
 msgstr "Zoom tilpasset hele siden"
 
-#: ../gedit/gedit-print-preview.c:670
+#: ../gedit/gedit-print-preview.ui.h:13
 msgid "Zoom the page in"
 msgstr "Sett inn på siden"
 
-#: ../gedit/gedit-print-preview.c:679
+#: ../gedit/gedit-print-preview.ui.h:14
 msgid "Zoom the page out"
 msgstr "Zoom ut på siden"
 
-#: ../gedit/gedit-print-preview.c:691
+#: ../gedit/gedit-print-preview.ui.h:16
 msgid "_Close Preview"
 msgstr "_Lukk forhåndsvisning"
 
-#: ../gedit/gedit-print-preview.c:694
+#: ../gedit/gedit-print-preview.ui.h:15
 msgid "Close print preview"
 msgstr "Lukk forhåndsvisning av utskrift"
 
-#: ../gedit/gedit-print-preview.c:763
+#: ../gedit/gedit-print-preview.c:614
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../gedit/gedit-print-preview.c:947
+#: ../gedit/gedit-print-preview.ui.h:17
 msgid "Page Preview"
 msgstr "Forhåndsvisning av side"
 
-#: ../gedit/gedit-print-preview.c:948
+#: ../gedit/gedit-print-preview.ui.h:18
 msgid "The preview of a page in the document to be printed"
 msgstr "Forhåndsvisning av en side i dokumentet som skal skrives ut"
 
 #. ex:set ts=8 noet:
-#: ../gedit/gedit-replace-dialog.c:220 ../gedit/gedit-replace-dialog.ui.h:1
-#: ../gedit/gedit-window.c:1557
+#: ../gedit/gedit-replace-dialog.ui.h:1 ../gedit/gedit-window.c:1236
 msgid "Replace"
 msgstr "Erstatt"
 
-#: ../gedit/gedit-replace-dialog.c:282
+#: ../gedit/gedit-replace-dialog.ui.h:2
 msgid "Replace _All"
 msgstr "Erstatt _alle"
 
@@ -1743,36 +1743,36 @@
 msgid "Replace All"
 msgstr "Erstatt alle"
 
-#: ../gedit/gedit-replace-dialog.ui.h:3
+#: ../gedit/gedit-replace-dialog.ui.h:4
 msgid "_Search for: "
 msgstr "_Søk etter: "
 
-#: ../gedit/gedit-replace-dialog.ui.h:4
+#: ../gedit/gedit-replace-dialog.ui.h:5
 msgid "Replace _with: "
 msgstr "Erstatt _med: "
 
-#: ../gedit/gedit-replace-dialog.ui.h:5
+#: ../gedit/gedit-replace-dialog.ui.h:6
 msgid "_Match case"
 msgstr "_Skill mellom små/store bokstaver"
 
-#: ../gedit/gedit-replace-dialog.ui.h:6
+#: ../gedit/gedit-replace-dialog.ui.h:7
 msgid "Match _entire word only"
 msgstr "Kun treff på _hele ord"
 
-#: ../gedit/gedit-replace-dialog.ui.h:7
+#: ../gedit/gedit-replace-dialog.ui.h:9
 msgid "Search _backwards"
 msgstr "Søk _bakover"
 
-#: ../gedit/gedit-replace-dialog.ui.h:8
+#: ../gedit/gedit-replace-dialog.ui.h:10
 msgid "_Wrap around"
 msgstr "_Brytningsmodus"
 
 #. Use spaces to leave padding proportional to the font size
-#: ../gedit/gedit-statusbar.c:70 ../gedit/gedit-statusbar.c:76
+#: ../gedit/gedit-statusbar.c:66 ../gedit/gedit-statusbar.c:72
 msgid "OVR"
 msgstr "OVR"
 
-#: ../gedit/gedit-statusbar.c:70 ../gedit/gedit-statusbar.c:76
+#: ../gedit/gedit-statusbar.c:66 ../gedit/gedit-statusbar.c:72
 msgid "INS"
 msgstr "SET"
 
@@ -1792,77 +1792,77 @@
 
 #. Translators: the first %s is a file name (e.g. test.txt) the second one
 #. is a directory (e.g. ssh://master.gnome.org/home/users/paolo)
-#: ../gedit/gedit-tab.c:734
+#: ../gedit/gedit-tab.c:766
 #, c-format
 msgid "Reverting %s from %s"
 msgstr "Forkaster endringer fra %s til %s"
 
-#: ../gedit/gedit-tab.c:741
+#: ../gedit/gedit-tab.c:773
 #, c-format
 msgid "Reverting %s"
 msgstr "Forkaster %s"
 
 #. Translators: the first %s is a file name (e.g. test.txt) the second one
 #. is a directory (e.g. ssh://master.gnome.org/home/users/paolo)
-#: ../gedit/gedit-tab.c:757
+#: ../gedit/gedit-tab.c:789
 #, c-format
 msgid "Loading %s from %s"
 msgstr "Laster %s fra %s"
 
-#: ../gedit/gedit-tab.c:764
+#: ../gedit/gedit-tab.c:796
 #, c-format
 msgid "Loading %s"
 msgstr "Laster %s"
 
 #. Translators: the first %s is a file name (e.g. test.txt) the second one
 #. is a directory (e.g. ssh://master.gnome.org/home/users/paolo)
-#: ../gedit/gedit-tab.c:845
+#: ../gedit/gedit-tab.c:877
 #, c-format
 msgid "Saving %s to %s"
 msgstr "Lagrer %s til %s"
 
-#: ../gedit/gedit-tab.c:852
+#: ../gedit/gedit-tab.c:884
 #, c-format
 msgid "Saving %s"
 msgstr "Lagrer %s"
 
 #. Read only
-#: ../gedit/gedit-tab.c:1835
+#: ../gedit/gedit-tab.c:1869
 msgid "RO"
 msgstr "Skrivebeskyttet"
 
-#: ../gedit/gedit-tab.c:1882
+#: ../gedit/gedit-tab.c:1916
 #, c-format
 msgid "Error opening file %s"
 msgstr "Feil ved åpning av fil %s"
 
-#: ../gedit/gedit-tab.c:1887
+#: ../gedit/gedit-tab.c:1921
 #, c-format
 msgid "Error reverting file %s"
 msgstr "Feil under forkasting av endringer i fil %s"
 
-#: ../gedit/gedit-tab.c:1892
+#: ../gedit/gedit-tab.c:1926
 #, c-format
 msgid "Error saving file %s"
 msgstr "Feil ved lagring av fil %s"
 
-#: ../gedit/gedit-tab.c:1913
+#: ../gedit/gedit-tab.c:1947
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../gedit/gedit-tab.c:1920
+#: ../gedit/gedit-tab.c:1954
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../gedit/gedit-tab.c:1921
+#: ../gedit/gedit-tab.c:1955
 msgid "MIME Type:"
 msgstr "MIME-type:"
 
-#: ../gedit/gedit-tab.c:1922
+#: ../gedit/gedit-tab.c:1956
 msgid "Encoding:"
 msgstr "Koding:"
 
-#: ../gedit/gedit-tab-label.c:283
+#: ../gedit/gedit-tab-label.c:279
 msgid "Close document"
 msgstr "Lukk dokument"
 
@@ -1891,7 +1891,7 @@
 msgid "_Documents"
 msgstr "_Dokumenter"
 
-#: ../gedit/gedit-ui.h:49
+#: ../gedit/gedit-menu.ui.h:3 ../gedit/gedit-ui.h:49
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -1903,7 +1903,7 @@
 msgid "_Open..."
 msgstr "_Åpne …"
 
-#: ../gedit/gedit-ui.h:55 ../gedit/gedit-window.c:1486
+#: ../gedit/gedit-open-tool-button.c:122 ../gedit/gedit-ui.h:55
 msgid "Open a file"
 msgstr "Åpne en fil"
 
@@ -1995,271 +1995,269 @@
 msgstr "_Uthevingsmodus"
 
 #. Search menu
-#: ../gedit/gedit-ui.h:107
+#: ../gedit/gedit-ui.h:109
 msgid "_Find..."
 msgstr "_Finn …"
 
-#: ../gedit/gedit-ui.h:108
+#: ../gedit/gedit-ui.h:110
 msgid "Search for text"
 msgstr "Søk etter tekst"
 
-#: ../gedit/gedit-ui.h:109
+#: ../gedit/gedit-ui.h:111
 msgid "Find Ne_xt"
 msgstr "Finn ne_ste"
 
-#: ../gedit/gedit-ui.h:110
+#: ../gedit/gedit-ui.h:112
 msgid "Search forwards for the same text"
 msgstr "Søk framover etter samme tekst"
 
-#: ../gedit/gedit-ui.h:111
+#: ../gedit/gedit-ui.h:113
 msgid "Find Pre_vious"
 msgstr "Finn forri_ge"
 
-#: ../gedit/gedit-ui.h:112
+#: ../gedit/gedit-ui.h:114
 msgid "Search backwards for the same text"
 msgstr "Søk bakover etter samme tekst"
 
-#: ../gedit/gedit-ui.h:114 ../gedit/gedit-ui.h:117
+#: ../gedit/gedit-ui.h:116 ../gedit/gedit-ui.h:119
 msgid "_Replace..."
 msgstr "E_rstatt …"
 
-#: ../gedit/gedit-ui.h:115 ../gedit/gedit-ui.h:118
+#: ../gedit/gedit-ui.h:117 ../gedit/gedit-ui.h:120
 msgid "Search for and replace text"
 msgstr "Søk etter og erstatt tekst"
 
-#: ../gedit/gedit-ui.h:120
+#: ../gedit/gedit-ui.h:122
 msgid "_Clear Highlight"
 msgstr "_Fjern utheving"
 
-#: ../gedit/gedit-ui.h:121
+#: ../gedit/gedit-ui.h:123
 msgid "Clear highlighting of search matches"
 msgstr "Fjern utheving av treff på søk"
 
-#: ../gedit/gedit-ui.h:122
+#: ../gedit/gedit-ui.h:124
 msgid "Go to _Line..."
 msgstr "Gå til _linje ……"
 
-#: ../gedit/gedit-ui.h:123
+#: ../gedit/gedit-ui.h:125
 msgid "Go to a specific line"
 msgstr "Gå til en spesifikk linje"
 
 #. Documents menu
-#: ../gedit/gedit-ui.h:126
+#: ../gedit/gedit-ui.h:128
 msgid "_Save All"
 msgstr "L_agre alle"
 
-#: ../gedit/gedit-ui.h:127
+#: ../gedit/gedit-ui.h:129
 msgid "Save all open files"
 msgstr "Lagre alle åpne filer"
 
-#: ../gedit/gedit-ui.h:128
+#: ../gedit/gedit-ui.h:130
 msgid "_Close All"
 msgstr "_Lukk alle"
 
-#: ../gedit/gedit-ui.h:129
+#: ../gedit/gedit-ui.h:131
 msgid "Close all open files"
 msgstr "Lukk alle åpne filer"
 
-#: ../gedit/gedit-ui.h:130
+#: ../gedit/gedit-ui.h:132
 msgid "_New Tab Group"
 msgstr "_Ny fanegruppe"
 
-#: ../gedit/gedit-ui.h:131
+#: ../gedit/gedit-ui.h:133
 msgid "Create a new tab group"
 msgstr "Opprett en ny gruppe med faner"
 
-#: ../gedit/gedit-ui.h:132
+#: ../gedit/gedit-ui.h:134
 msgid "P_revious Tab Group"
 msgstr "Fo_rrige fanegruppe"
 
-#: ../gedit/gedit-ui.h:133
+#: ../gedit/gedit-ui.h:135
 msgid "Switch to the previous tab group"
 msgstr "Bytt til forrige fanegruppe"
 
-#: ../gedit/gedit-ui.h:134
+#: ../gedit/gedit-ui.h:136
 msgid "Nex_t Tab Group"
 msgstr "Nes_te fanegruppe"
 
-#: ../gedit/gedit-ui.h:135
+#: ../gedit/gedit-ui.h:137
 msgid "Switch to the next tab group"
 msgstr "Bytt til neste fanegruppe"
 
-#: ../gedit/gedit-ui.h:136
+#: ../gedit/gedit-ui.h:138
 msgid "_Previous Document"
 msgstr "_Forrige dokument"
 
-#: ../gedit/gedit-ui.h:137
+#: ../gedit/gedit-ui.h:139
 msgid "Activate previous document"
 msgstr "Aktiver forrige dokument"
 
-#: ../gedit/gedit-ui.h:138
+#: ../gedit/gedit-ui.h:140
 msgid "N_ext Document"
 msgstr "N_este dokument"
 
-#: ../gedit/gedit-ui.h:139
+#: ../gedit/gedit-ui.h:141
 msgid "Activate next document"
 msgstr "Aktiver forrige dokument"
 
-#: ../gedit/gedit-ui.h:141
+#: ../gedit/gedit-ui.h:143
 msgid "Move the current document to a new window"
 msgstr "Flytt aktivt dokument til et nytt vindu"
 
-#: ../gedit/gedit-ui.h:148
+#: ../gedit/gedit-ui.h:150
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ../gedit/gedit-ui.h:155
+#: ../gedit/gedit-ui.h:157
 msgid "Quit the program"
 msgstr "Avslutt programmet"
 
-#: ../gedit/gedit-ui.h:160
+#: ../gedit/gedit-ui.h:162
 msgid "_Toolbar"
 msgstr "Verk_tøylinje"
 
-#: ../gedit/gedit-ui.h:161
+#: ../gedit/gedit-ui.h:163
 msgid "Show or hide the toolbar in the current window"
 msgstr "Vis eller skjul verktøylinjen i aktivt vindu"
 
-#: ../gedit/gedit-ui.h:163
+#: ../gedit/gedit-ui.h:165
 msgid "_Statusbar"
 msgstr "_Statuslinje"
 
-#: ../gedit/gedit-ui.h:164
+#: ../gedit/gedit-ui.h:166
 msgid "Show or hide the statusbar in the current window"
 msgstr "Vis eller skjul statuslinjen i aktivt vindu"
 
-#: ../gedit/gedit-ui.h:167
+#: ../gedit/gedit-ui.h:169
 msgid "Edit text in fullscreen"
 msgstr "Rediger tekst i fullskjerm"
 
-#: ../gedit/gedit-ui.h:174
+#: ../gedit/gedit-ui.h:176
 msgid "Side _Panel"
 msgstr "Side_panel"
 
-#: ../gedit/gedit-ui.h:175
+#: ../gedit/gedit-ui.h:177
 msgid "Show or hide the side panel in the current window"
 msgstr "Vis eller skjul sidepanelet i dette vinduet"
 
-#: ../gedit/gedit-ui.h:177
+#: ../gedit/gedit-ui.h:179
 msgid "_Bottom Panel"
 msgstr "_Bunnpanel"
 
-#: ../gedit/gedit-ui.h:178
+#: ../gedit/gedit-ui.h:180
 msgid "Show or hide the bottom panel in the current window"
 msgstr "Vis eller skjul bunnpanelet i dette vinduet"
 
-#: ../gedit/gedit-utils.c:1033
+#: ../gedit/gedit-utils.c:931
 msgid "Please check your installation."
 msgstr "Vennligst sjekk din installasjon."
 
-#: ../gedit/gedit-utils.c:1091
+#: ../gedit/gedit-utils.c:989
 #, c-format
 msgid "Unable to open UI file %s. Error: %s"
 msgstr "Kunne ikke åpne fil for brukergrensesnitt %s. Feil: %s"
 
-#: ../gedit/gedit-utils.c:1110
+#: ../gedit/gedit-utils.c:1008
 #, c-format
 msgid "Unable to find the object '%s' inside file %s."
 msgstr "Kunne ikke finne objekt «%s» i fil %s."
 
 #. Translators: '/ on <remote-share>'
-#: ../gedit/gedit-utils.c:1332
+#: ../gedit/gedit-utils.c:1231
 #, c-format
 msgid "/ on %s"
 msgstr "/ på %s"
 
 #. create "Wrap Around" menu item.
-#: ../gedit/gedit-view-frame.c:542
+#: ../gedit/gedit-view-frame.c:795
 msgid "_Wrap Around"
 msgstr "_Bryting"
 
 #. create "Match Entire Word Only" menu item.
-#: ../gedit/gedit-view-frame.c:552
+#: ../gedit/gedit-view-frame.c:819
 msgid "Match _Entire Word Only"
 msgstr "Kun treff på _hele ord"
 
 #. create "Match Case" menu item.
-#: ../gedit/gedit-view-frame.c:562
+#: ../gedit/gedit-view-frame.c:833
 msgid "_Match Case"
 msgstr "_Skill mellom små/store bokstaver"
 
-#: ../gedit/gedit-view-frame.c:759
+#: ../gedit/gedit-view-frame.c:1007
 msgid "String you want to search for"
 msgstr "Streng du vil søke etter"
 
-#: ../gedit/gedit-view-frame.c:769
+#: ../gedit/gedit-view-frame.c:1019
 msgid "Line you want to move the cursor to"
 msgstr "Linje du vil flytte markøren til"
 
-#: ../gedit/gedit-window.c:941
+#: ../gedit/gedit-window.c:942
 #, c-format
 msgid "Use %s highlight mode"
 msgstr "Bruk uthevingsmodus %s"
 
-#. add the "Plain Text" item before all the others
-#. Translators: "Plain Text" means that no highlight mode is selected in the
-#. * "View->Highlight Mode" submenu and so syntax highlighting is disabled
-#: ../gedit/gedit-window.c:1046 ../gedit/gedit-window.c:2091
-#: ../plugins/externaltools/tools/manager.py:146
-#: ../plugins/externaltools/tools/manager.py:455
-#: ../plugins/externaltools/tools/manager.py:566
-#: ../plugins/externaltools/tools/manager.py:885
+#: ../gedit/gedit-highlight-mode-dialog.c:295 ../gedit/gedit-window.c:1791
+#: ../gedit/gedit-window.c:2179 ../plugins/externaltools/tools/manager.py:146
+#: ../plugins/externaltools/tools/manager.py:463
+#: ../plugins/externaltools/tools/manager.py:579
+#: ../plugins/externaltools/tools/manager.py:915
 msgid "Plain Text"
 msgstr "Vanlig tekst"
 
-#: ../gedit/gedit-window.c:1047
+#: ../gedit/gedit-window.c:1052
 msgid "Disable syntax highlighting"
 msgstr "Deaktiver syntaksutheving"
 
 #. Translators: %s is a URI
-#: ../gedit/gedit-window.c:1364
+#: ../gedit/gedit-window.c:1068
 #, c-format
 msgid "Open '%s'"
 msgstr "Åpne «%s»"
 
-#: ../gedit/gedit-window.c:1488
+#: ../gedit/gedit-open-tool-button.c:124
 msgid "Open a recently used file"
 msgstr "Åpne nylig brukt fil"
 
-#: ../gedit/gedit-window.c:1494
+#. Translators: "Open" is the title of the file chooser window
+#: ../gedit/gedit-commands-file.c:442 ../gedit/gedit-window.c:1175
 msgid "Open"
 msgstr "Åpne"
 
-#: ../gedit/gedit-window.c:1551
+#: ../gedit/gedit-window.c:1230
 msgid "Save"
 msgstr "Lagre"
 
-#: ../gedit/gedit-window.c:1553
+#: ../gedit/gedit-window.c:1232
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../gedit/gedit-window.c:1555
+#: ../gedit/gedit-window.c:1234
 msgid "Find"
 msgstr "Finn"
 
 #. Translators: %s is a URI
-#: ../gedit/gedit-window.c:1715
+#: ../gedit/gedit-window.c:1398
 #, c-format
 msgid "Activate '%s'"
 msgstr "Aktiver «%s»"
 
-#: ../gedit/gedit-window.c:2072
+#: ../gedit/gedit-window.c:1744
 msgid "Use Spaces"
 msgstr "Bruk mellomrom"
 
-#: ../gedit/gedit-window.c:2145
+#: ../gedit/gedit-window.c:2135
 msgid "Tab Width"
 msgstr "Tabulatorbredde"
 
-#: ../gedit/gedit-window.c:2254
+#: ../gedit/gedit-window.c:1937
 msgid "Bracket match is out of range"
 msgstr "Søk etter sammenhørende hakeparantes utenfor gyldig område"
 
-#: ../gedit/gedit-window.c:2259
+#: ../gedit/gedit-window.c:1942
 msgid "Bracket match not found"
 msgstr "Fant ingen sammenhørende hakeparanteser"
 
-#: ../gedit/gedit-window.c:2264
+#: ../gedit/gedit-window.c:1947
 #, c-format
 msgid "Bracket match found on line: %d"
 msgstr "Sammenhørende hakeparantes funnet på linje: %d"
@@ -2383,7 +2381,7 @@
 msgstr "Filnavn"
 
 #: ../plugins/docinfo/gedit-docinfo-plugin.ui.h:4
-#: ../plugins/externaltools/tools/tools.ui.h:27
+#: ../plugins/externaltools/tools/tools.ui.h:28
 #: ../plugins/snippets/snippets/snippets.ui.h:13
 msgid "    "
 msgstr "    "
@@ -2478,24 +2476,24 @@
 msgstr ""
 "Et pango skriftnavn. For eksempel «Sans 12» eller «Monospace Bold 14»."
 
-#: ../plugins/externaltools/tools/capture.py:92
+#: ../plugins/externaltools/tools/capture.py:95
 #, python-format
 msgid "Could not execute command: %s"
 msgstr "Kunne ikke kjøre kommando: %s"
 
-#: ../plugins/externaltools/tools/functions.py:157
+#: ../plugins/externaltools/tools/functions.py:175
 msgid "You must be inside a word to run this command"
 msgstr "Du må være inne i et ord for å kjøre denne kommandoen"
 
-#: ../plugins/externaltools/tools/functions.py:263
+#: ../plugins/externaltools/tools/functions.py:310
 msgid "Running tool:"
 msgstr "Kjører verktøy:"
 
-#: ../plugins/externaltools/tools/functions.py:292
+#: ../plugins/externaltools/tools/functions.py:339
 msgid "Done."
 msgstr "Ferdig."
 
-#: ../plugins/externaltools/tools/functions.py:294
+#: ../plugins/externaltools/tools/functions.py:341
 msgid "Exited"
 msgstr "Avsluttet"
 
@@ -2503,27 +2501,27 @@
 msgid "All languages"
 msgstr "Alle språk"
 
-#: ../plugins/externaltools/tools/manager.py:555
-#: ../plugins/externaltools/tools/manager.py:559
-#: ../plugins/externaltools/tools/manager.py:883
-#: ../plugins/externaltools/tools/tools.ui.h:28
+#: ../plugins/externaltools/tools/manager.py:568
+#: ../plugins/externaltools/tools/manager.py:572
+#: ../plugins/externaltools/tools/manager.py:913
+#: ../plugins/externaltools/tools/tools.ui.h:29
 msgid "All Languages"
 msgstr "Alle språk"
 
-#: ../plugins/externaltools/tools/manager.py:672
+#: ../plugins/externaltools/tools/manager.py:685
 msgid "New tool"
 msgstr "Nytt verktøy"
 
-#: ../plugins/externaltools/tools/manager.py:803
+#: ../plugins/externaltools/tools/manager.py:816
 #, python-format
 msgid "This accelerator is already bound to %s"
 msgstr "Denne snarveien er allerede satt til %s"
 
-#: ../plugins/externaltools/tools/manager.py:847
+#: ../plugins/externaltools/tools/manager.py:860
 msgid "Type a new accelerator, or press Backspace to clear"
 msgstr "Skriv inn en ny snarvei eller trykk slett for å tømme"
 
-#: ../plugins/externaltools/tools/manager.py:849
+#: ../plugins/externaltools/tools/manager.py:862
 msgid "Type a new accelerator"
 msgstr "Skriv inn en ny snarvei"
 
@@ -2531,125 +2529,124 @@
 msgid "Stopped."
 msgstr "Stoppet."
 
-#. ex:ts=4:et:
-#: ../plugins/externaltools/tools/tools.ui.h:1
+#: ../plugins/externaltools/tools/tools.ui.h:2
 msgid "All documents"
 msgstr "Alle dokumenter"
 
-#: ../plugins/externaltools/tools/tools.ui.h:2
+#: ../plugins/externaltools/tools/tools.ui.h:3
 msgid "All documents except untitled ones"
 msgstr "Alle dokumenter med navn"
 
-#: ../plugins/externaltools/tools/tools.ui.h:3
+#: ../plugins/externaltools/tools/tools.ui.h:4
 msgid "Local files only"
 msgstr "Kun lokale filer"
 
-#: ../plugins/externaltools/tools/tools.ui.h:4
+#: ../plugins/externaltools/tools/tools.ui.h:5
 msgid "Remote files only"
 msgstr "Kun eksterne filer"
 
-#: ../plugins/externaltools/tools/tools.ui.h:5
+#: ../plugins/externaltools/tools/tools.ui.h:6
 msgid "Untitled documents only"
 msgstr "Kun dokumenter uten navn"
 
-#: ../plugins/externaltools/tools/tools.ui.h:6
+#: ../plugins/externaltools/tools/tools.ui.h:7
 msgid "Nothing"
 msgstr "Ingenting"
 
-#: ../plugins/externaltools/tools/tools.ui.h:7
+#: ../plugins/externaltools/tools/tools.ui.h:8
 msgid "Current document"
 msgstr "Aktivt dokument"
 
-#: ../plugins/externaltools/tools/tools.ui.h:8
+#: ../plugins/externaltools/tools/tools.ui.h:9
 msgid "Current selection"
 msgstr "Aktivt utvalg"
 
-#: ../plugins/externaltools/tools/tools.ui.h:9
+#: ../plugins/externaltools/tools/tools.ui.h:10
 msgid "Current selection (default to document)"
 msgstr "Aktivt utvalg (dokument er forvalg)"
 
-#: ../plugins/externaltools/tools/tools.ui.h:10
+#: ../plugins/externaltools/tools/tools.ui.h:11
 msgid "Current line"
 msgstr "Denne linjen"
 
-#: ../plugins/externaltools/tools/tools.ui.h:11
+#: ../plugins/externaltools/tools/tools.ui.h:12
 msgid "Current word"
 msgstr "Dette ordet"
 
-#: ../plugins/externaltools/tools/tools.ui.h:12
+#: ../plugins/externaltools/tools/tools.ui.h:13
 msgid "Display in bottom pane"
 msgstr "Vis i det nederste feltet"
 
-#: ../plugins/externaltools/tools/tools.ui.h:13
+#: ../plugins/externaltools/tools/tools.ui.h:14
 msgid "Create new document"
 msgstr "Opprett nytt dokument"
 
-#: ../plugins/externaltools/tools/tools.ui.h:14
+#: ../plugins/externaltools/tools/tools.ui.h:15
 msgid "Append to current document"
 msgstr "Legg til i dette dokumentet"
 
-#: ../plugins/externaltools/tools/tools.ui.h:15
+#: ../plugins/externaltools/tools/tools.ui.h:16
 msgid "Replace current document"
 msgstr "Erstatt dette dokumentet"
 
-#: ../plugins/externaltools/tools/tools.ui.h:16
+#: ../plugins/externaltools/tools/tools.ui.h:17
 msgid "Replace current selection"
 msgstr "Erstatt dette utvalget"
 
-#: ../plugins/externaltools/tools/tools.ui.h:17
+#: ../plugins/externaltools/tools/tools.ui.h:18
 msgid "Insert at cursor position"
 msgstr "Set inn i markørposisjonen"
 
-#: ../plugins/externaltools/tools/tools.ui.h:18
+#: ../plugins/externaltools/tools/tools.ui.h:19
 msgid "Manage External Tools"
 msgstr "Håndter eksterne verktøy"
 
-#: ../plugins/externaltools/tools/tools.ui.h:19
+#: ../plugins/externaltools/tools/tools.ui.h:20
 msgid "_Tools:"
 msgstr "Verk_tøy:"
 
-#: ../plugins/externaltools/tools/tools.ui.h:20
+#: ../plugins/externaltools/tools/tools.ui.h:21
 msgid "Add a new tool"
 msgstr "Legg til et nytt verktøy"
 
-#: ../plugins/externaltools/tools/tools.ui.h:21
+#: ../plugins/externaltools/tools/tools.ui.h:22
 msgid "Add Tool"
 msgstr "Legg til verktøy"
 
-#: ../plugins/externaltools/tools/tools.ui.h:22
+#: ../plugins/externaltools/tools/tools.ui.h:23
 msgid "Remove selected tool"
 msgstr "Fjern valgt verktøy"
 
-#: ../plugins/externaltools/tools/tools.ui.h:23
+#: ../plugins/externaltools/tools/tools.ui.h:24
 msgid "Remove Tool"
 msgstr "Fjern verktøy"
 
-#: ../plugins/externaltools/tools/tools.ui.h:24
+#: ../plugins/externaltools/tools/tools.ui.h:25
 msgid "Revert tool"
 msgstr "Forkast verktøy"
 
-#: ../plugins/externaltools/tools/tools.ui.h:25
+#: ../plugins/externaltools/tools/tools.ui.h:26
 msgid "Revert Tool"
 msgstr "Forkast verktøy"
 
-#: ../plugins/externaltools/tools/tools.ui.h:26
+#: ../plugins/externaltools/tools/tools.ui.h:27
 #: ../plugins/snippets/snippets/snippets.ui.h:11
 msgid "_Edit:"
 msgstr "R_ediger:"
 
-#: ../plugins/externaltools/tools/tools.ui.h:29
+#: ../plugins/externaltools/tools/tools.ui.h:30
 msgid "_Applicability:"
 msgstr "_Anvendbarhet"
 
-#: ../plugins/externaltools/tools/tools.ui.h:30
+#: ../plugins/externaltools/tools/tools.ui.h:31
 msgid "_Output:"
 msgstr "_Utdata:"
 
-#: ../plugins/externaltools/tools/tools.ui.h:31
+#: ../plugins/externaltools/tools/tools.ui.h:32
 msgid "_Input:"
 msgstr "_Inndata:"
 
-#: ../plugins/externaltools/tools/tools.ui.h:32
+#: ../plugins/externaltools/tools/tools.ui.h:33
 msgid "_Save:"
 msgstr "_Lagre:"
 
@@ -2657,19 +2654,19 @@
 msgid "Shortcut _Key:"
 msgstr "_Snarveitast:"
 
-#: ../plugins/externaltools/tools/windowactivatable.py:173
+#: ../plugins/externaltools/tools/windowactivatable.py:175
 msgid "Manage _External Tools..."
 msgstr "Håndter _eksterne verktøy …"
 
-#: ../plugins/externaltools/tools/windowactivatable.py:174
+#: ../plugins/externaltools/tools/windowactivatable.py:176
 msgid "Opens the External Tools Manager"
 msgstr "Åpner håndtering av eksterne verktøy"
 
-#: ../plugins/externaltools/tools/windowactivatable.py:177
+#: ../plugins/externaltools/tools/windowactivatable.py:179
 msgid "External _Tools"
 msgstr "Eksterne verk_tøy"
 
-#: ../plugins/externaltools/tools/windowactivatable.py:178
+#: ../plugins/externaltools/tools/windowactivatable.py:180
 msgid "External tools"
 msgstr "Eksterne verktøy"
 
@@ -2686,7 +2683,7 @@
 msgid "Easy file access from the side panel"
 msgstr "Enkel filtilgang fra sidepanelet"
 
-#: ../plugins/filebrowser/gedit-file-bookmarks-store.c:241
+#: ../plugins/filebrowser/gedit-file-bookmarks-store.c:232
 msgid "File System"
 msgstr "Filsystem"
 
@@ -2706,43 +2703,43 @@
 msgid "Open a terminal at the currently opened directory"
 msgstr "Åpne en terminal i katalogen som er åpen"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:705
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:538
 msgid "File Browser"
 msgstr "Filhåndterer"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:848
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:681
 msgid "An error occurred while creating a new directory"
 msgstr "En feil oppsto ved oppretting av ny katalog"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:851
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:684
 msgid "An error occurred while creating a new file"
 msgstr "En feil oppsto ved oppretting av en ny fil"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:854
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:687
 msgid "An error occurred while renaming a file or directory"
 msgstr "En feil oppsto ved endring av navn på en fil eller katalog"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:857
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:690
 msgid "An error occurred while deleting a file or directory"
 msgstr "En feil oppsto ved sletting av en fil eller katalog"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:860
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:693
 msgid "An error occurred while opening a directory in the file manager"
 msgstr "En feil oppsto ved åpning av en katalog i filhåndtereren"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:863
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:696
 msgid "An error occurred while setting a root directory"
 msgstr "En feil oppsto ved forsøk på å sette rotkatalogen"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:866
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:699
 msgid "An error occurred while loading a directory"
 msgstr "En feil oppsto ved lasting av en katalog"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:869
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:702
 msgid "An error occurred"
 msgstr "En feil oppsto"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1085
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:916
 msgid ""
 "Cannot move file to trash, do you\n"
 "want to delete permanently?"
@@ -2750,33 +2747,33 @@
 "Kan ikke flytte filen til papirkurven.\n"
 "Vil du slette den permanent?"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1090
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:921
 #, c-format
 msgid "The file \"%s\" cannot be moved to the trash."
 msgstr "Filen «%s» kan ikke flyttes til papirkurven."
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1095
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:926
 msgid "The selected files cannot be moved to the trash."
 msgstr "Valgte filer kan ikke flyttes til papirkurven."
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1127
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:958
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Er du sikker på at du vil slette «%s» permanent?"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1132
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:963
 msgid "Are you sure you want to permanently delete the selected files?"
 msgstr "Er du sikker på at du vil slette valgte filer permanent?"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1135
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:966
 msgid "If you delete an item, it is permanently lost."
 msgstr "Hvis du sletter en oppføring vil denne gå tapt."
 
-#: ../plugins/filebrowser/gedit-file-browser-store.c:1722
+#: ../plugins/filebrowser/gedit-file-browser-store.c:1776
 msgid "(Empty)"
 msgstr "(Tom)"
 
-#: ../plugins/filebrowser/gedit-file-browser-store.c:3467
+#: ../plugins/filebrowser/gedit-file-browser-store.c:3498
 msgid ""
 "The renamed file is currently filtered out. You need to adjust your filter "
 "settings to make the file visible"
@@ -2785,11 +2782,11 @@
 "for å gjøre den synlig"
 
 #. Translators: This is the default name of new files created by the file browser pane.
-#: ../plugins/filebrowser/gedit-file-browser-store.c:3711
+#: ../plugins/filebrowser/gedit-file-browser-store.c:3709
 msgid "file"
 msgstr "fil"
 
-#: ../plugins/filebrowser/gedit-file-browser-store.c:3739
+#: ../plugins/filebrowser/gedit-file-browser-store.c:3783
 msgid ""
 "The new file is currently filtered out. You need to adjust your filter "
 "settings to make the file visible"
@@ -2798,11 +2795,11 @@
 "den synlig"
 
 #. Translators: This is the default name of new directories created by the file browser pane.
-#: ../plugins/filebrowser/gedit-file-browser-store.c:3770
+#: ../plugins/filebrowser/gedit-file-browser-store.c:3768
 msgid "directory"
 msgstr "katalog"
 
-#: ../plugins/filebrowser/gedit-file-browser-store.c:3795
+#: ../plugins/filebrowser/gedit-file-browser-store.c:3839
 msgid ""
 "The new directory is currently filtered out. You need to adjust your filter "
 "settings to make the directory visible"
@@ -2810,15 +2807,15 @@
 "Den nye katalogen er filtrert ut. Du må justere filterinnstillingene for å "
 "gjøre den synlig"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:733
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:785
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:821
+#: ../plugins/filebrowser/gedit-file-browser-menus.ui.h:11
 msgid "_Filter"
 msgstr "_Filter"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:826
+#: ../plugins/filebrowser/gedit-file-browser-menus.ui.h:6
 msgid "_Move to Trash"
 msgstr "_Flytt til papirkurven"
 
@@ -2826,7 +2823,7 @@
 msgid "Move selected file or folder to trash"
 msgstr "Flytt valgt fil eller mappe til papirkurven"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:829
+#: ../plugins/filebrowser/gedit-file-browser-menus.ui.h:7
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -2846,7 +2843,7 @@
 msgid "Open the parent folder"
 msgstr "Lagre opphavsmappe"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:849
+#: ../plugins/filebrowser/gedit-file-browser-menus.ui.h:3
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
@@ -2854,7 +2851,7 @@
 msgid "Add new empty folder"
 msgstr "Legg til en ny tom mappe"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:852
+#: ../plugins/filebrowser/gedit-file-browser-menus.ui.h:4
 msgid "New F_ile"
 msgstr "Ny f_il"
 
@@ -2886,7 +2883,7 @@
 msgid "Go to the next visited location"
 msgstr "Gå til neste adresse"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:871
+#: ../plugins/filebrowser/gedit-file-browser-menus.ui.h:8
 msgid "Re_fresh View"
 msgstr "Opp_dater visningen"
 
@@ -2894,8 +2891,7 @@
 msgid "Refresh the view"
 msgstr "Oppdater visningen"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:873
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:891
+#: ../plugins/filebrowser/gedit-file-browser-menus.ui.h:9
 msgid "_View Folder"
 msgstr "_Vis mappe"
 
@@ -2904,7 +2900,7 @@
 msgid "View folder in file manager"
 msgstr "Vis mappe i filhåndterer"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:881
+#: ../plugins/filebrowser/gedit-file-browser-menus.ui.h:12
 msgid "Show _Hidden"
 msgstr "Vis s_kjulte"
 
@@ -2912,7 +2908,7 @@
 msgid "Show hidden files and folders"
 msgstr "Vis skjulte filer og mapper"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:884
+#: ../plugins/filebrowser/gedit-file-browser-menus.ui.h:13
 msgid "Show _Binary"
 msgstr "Vis _binære filer"
 
@@ -2924,17 +2920,17 @@
 msgid "Match Filename"
 msgstr "Treff på filnavn"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:2004
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:1979
 #, c-format
 msgid "No mount object for mounted volume: %s"
 msgstr "Ingen monteringsobjekt for montert volum: %s"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:2081
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:2056
 #, c-format
 msgid "Could not open media: %s"
 msgstr "Kunne ikke åpne medie: %s"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:2128
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:2103
 #, c-format
 msgid "Could not mount volume: %s"
 msgstr "Kunne ikke montere volum: %s"
@@ -3089,7 +3085,7 @@
 
 #. ex:ts=4:et:
 #: ../plugins/quickopen/quickopen.plugin.desktop.in.h:1
-#: ../plugins/quickopen/quickopen/popup.py:31
+#: ../plugins/quickopen/quickopen/popup.py:33
 msgid "Quick Open"
 msgstr "Hurtigåpning"
 
@@ -3097,12 +3093,12 @@
 msgid "Quickly open files"
 msgstr "Åpne filer raskt"
 
-#: ../plugins/quickopen/quickopen/popup.py:72
+#: ../plugins/quickopen/quickopen/popup.py:78
 msgid "Type to search..."
 msgstr "Skriv for å søke …"
 
 #. ex:ts=8:et:
-#: ../plugins/snippets/snippets/document.py:57
+#: ../plugins/snippets/snippets/document.py:56
 #: ../plugins/snippets/snippets.plugin.desktop.in.h:1
 msgid "Snippets"
 msgstr "Tekstblokker"
@@ -3158,19 +3154,19 @@
 msgid "Snippets archive"
 msgstr "Arkiv med tekstblokker"
 
-#: ../plugins/snippets/snippets/manager.py:63
+#: ../plugins/snippets/snippets/manager.py:67
 msgid "Add a new snippet..."
 msgstr "Legg til en ny tekstblokk …"
 
-#: ../plugins/snippets/snippets/manager.py:116
+#: ../plugins/snippets/snippets/manager.py:119
 msgid "Global"
 msgstr "Global"
 
-#: ../plugins/snippets/snippets/manager.py:400
+#: ../plugins/snippets/snippets/manager.py:410
 msgid "Revert selected snippet"
 msgstr "Forkast valgt tekstblokk"
 
-#: ../plugins/snippets/snippets/manager.py:403
+#: ../plugins/snippets/snippets/manager.py:413
 #: ../plugins/snippets/snippets/snippets.ui.h:5
 msgid "Delete selected snippet"
 msgstr "Slett valgt tekstblokk"
@@ -3185,88 +3181,88 @@
 "bokstaver eller et enkelt, ikke alfanumerisk, tegn som {, [, etc."
 
 #. self['hbox_tab_trigger'].set_spacing(0)
-#: ../plugins/snippets/snippets/manager.py:670
+#: ../plugins/snippets/snippets/manager.py:679
 #: ../plugins/snippets/snippets/snippets.ui.h:16
 msgid "Single word the snippet is activated with after pressing Tab"
 msgstr "Enkelt ord som aktiverer tekstblokker etter å trykke tabulator"
 
-#: ../plugins/snippets/snippets/manager.py:759
+#: ../plugins/snippets/snippets/manager.py:768
 #, python-format
 msgid "The following error occurred while importing: %s"
 msgstr "Følgende feil oppsto ved import: %s"
 
-#: ../plugins/snippets/snippets/manager.py:766
+#: ../plugins/snippets/snippets/manager.py:775
 msgid "Import successfully completed"
 msgstr "Import fullført uten feil"
 
-#: ../plugins/snippets/snippets/manager.py:780
+#: ../plugins/snippets/snippets/manager.py:789
 #: ../plugins/snippets/snippets/snippets.ui.h:7
 msgid "Import snippets"
 msgstr "Importer tekstblokk"
 
-#: ../plugins/snippets/snippets/manager.py:785
-#: ../plugins/snippets/snippets/manager.py:871
-#: ../plugins/snippets/snippets/manager.py:934
+#: ../plugins/snippets/snippets/manager.py:794
+#: ../plugins/snippets/snippets/manager.py:880
+#: ../plugins/snippets/snippets/manager.py:943
 msgid "All supported archives"
 msgstr "Alle støttede arkiver"
 
-#: ../plugins/snippets/snippets/manager.py:786
-#: ../plugins/snippets/snippets/manager.py:872
-#: ../plugins/snippets/snippets/manager.py:935
+#: ../plugins/snippets/snippets/manager.py:795
+#: ../plugins/snippets/snippets/manager.py:881
+#: ../plugins/snippets/snippets/manager.py:944
 msgid "Gzip compressed archive"
 msgstr "Gzip-komprimert arkiv"
 
-#: ../plugins/snippets/snippets/manager.py:787
-#: ../plugins/snippets/snippets/manager.py:873
-#: ../plugins/snippets/snippets/manager.py:936
+#: ../plugins/snippets/snippets/manager.py:796
+#: ../plugins/snippets/snippets/manager.py:882
+#: ../plugins/snippets/snippets/manager.py:945
 msgid "Bzip2 compressed archive"
 msgstr "Bzip2-komprimert arkiv"
 
-#: ../plugins/snippets/snippets/manager.py:788
+#: ../plugins/snippets/snippets/manager.py:797
 msgid "Single snippets file"
 msgstr "Enkel tekstblokkfil"
 
-#: ../plugins/snippets/snippets/manager.py:789
-#: ../plugins/snippets/snippets/manager.py:875
-#: ../plugins/snippets/snippets/manager.py:938
+#: ../plugins/snippets/snippets/manager.py:798
+#: ../plugins/snippets/snippets/manager.py:884
+#: ../plugins/snippets/snippets/manager.py:947
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../plugins/snippets/snippets/manager.py:801
+#: ../plugins/snippets/snippets/manager.py:810
 #, python-format
 msgid "The following error occurred while exporting: %s"
 msgstr "Følgende feil oppsto ved eksport: %s"
 
-#: ../plugins/snippets/snippets/manager.py:805
+#: ../plugins/snippets/snippets/manager.py:814
 msgid "Export successfully completed"
 msgstr "Eksport fullført uten feil"
 
 #. Ask if system snippets should also be exported
-#: ../plugins/snippets/snippets/manager.py:845
-#: ../plugins/snippets/snippets/manager.py:912
+#: ../plugins/snippets/snippets/manager.py:854
+#: ../plugins/snippets/snippets/manager.py:921
 msgid ""
 "Do you want to include selected <b>system</b> snippets in your export?"
 msgstr "Vil du ta med valgte <b>system</b>-tekstblokker i eksporten?"
 
-#: ../plugins/snippets/snippets/manager.py:860
-#: ../plugins/snippets/snippets/manager.py:930
+#: ../plugins/snippets/snippets/manager.py:869
+#: ../plugins/snippets/snippets/manager.py:939
 msgid "There are no snippets selected to be exported"
 msgstr "Ingen tekstblokker valgt for eksport"
 
-#: ../plugins/snippets/snippets/manager.py:865
-#: ../plugins/snippets/snippets/manager.py:903
+#: ../plugins/snippets/snippets/manager.py:874
+#: ../plugins/snippets/snippets/manager.py:912
 msgid "Export snippets"
 msgstr "Eksporter tekstblokker"
 
-#: ../plugins/snippets/snippets/manager.py:1044
+#: ../plugins/snippets/snippets/manager.py:1053
 msgid "Type a new shortcut, or press Backspace to clear"
 msgstr "Skriv inn en ny snarvei eller trykk slett for å tømme"
 
-#: ../plugins/snippets/snippets/manager.py:1046
+#: ../plugins/snippets/snippets/manager.py:1055
 msgid "Type a new shortcut"
 msgstr "Skriv inn en ny snarvei"
 
-#: ../plugins/snippets/snippets/placeholder.py:602
+#: ../plugins/snippets/snippets/placeholder.py:601
 #, python-format
 msgid ""
 "Execution of the Python command (%s) exceeds the maximum time, execution "
@@ -3274,7 +3270,7 @@
 msgstr ""
 "Kjøring av Python-kommando (%s) overstiger maksimal tid. Kjøring avbrutt."
 
-#: ../plugins/snippets/snippets/placeholder.py:610
+#: ../plugins/snippets/snippets/placeholder.py:609
 #, python-format
 msgid "Execution of the Python command (%s) failed: %s"
 msgstr "Kjøring av Python-kommando (%s) feilet: %s"
@@ -3457,9 +3453,7 @@
 msgid "Default"
 msgstr "Forvalgt"
 
-#. ex:ts=8:noet:
 #: ../plugins/spell/gedit-spell-language-dialog.c:140
-#: ../plugins/spell/languages-dialog.ui.h:1
 msgid "Set language"
 msgstr "Sett språk"
 
@@ -3467,35 +3461,35 @@
 msgid "Languages"
 msgstr "Språk"
 
-#: ../plugins/spell/gedit-spell-plugin.c:107
+#: ../plugins/spell/gedit-spell-plugin.c:108
 msgid "_Check Spelling..."
 msgstr "_Sjekk staving …"
 
-#: ../plugins/spell/gedit-spell-plugin.c:109
+#: ../plugins/spell/gedit-spell-plugin.c:110
 msgid "Check the current document for incorrect spelling"
 msgstr "Sjekk aktivt dokument for ukorrekt staving"
 
-#: ../plugins/spell/gedit-spell-plugin.c:115
+#: ../plugins/spell/gedit-spell-plugin.c:116
 msgid "Set _Language..."
 msgstr "Sett _språk …"
 
-#: ../plugins/spell/gedit-spell-plugin.c:117
+#: ../plugins/spell/gedit-spell-plugin.c:118
 msgid "Set the language of the current document"
 msgstr "Sett språk for aktivt dokument"
 
-#: ../plugins/spell/gedit-spell-plugin.c:126
+#: ../plugins/spell/gedit-spell-plugin.c:127
 msgid "_Highlight Misspelled Words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../plugins/spell/gedit-spell-plugin.c:128
+#: ../plugins/spell/gedit-spell-plugin.c:129
 msgid "Automatically spell-check the current document"
 msgstr "Automatisk stavekontroll av aktivt dokument"
 
-#: ../plugins/spell/gedit-spell-plugin.c:810
+#: ../plugins/spell/gedit-spell-plugin.c:821
 msgid "The document is empty."
 msgstr "Dokumentet er tomt."
 
-#: ../plugins/spell/gedit-spell-plugin.c:835
+#: ../plugins/spell/gedit-spell-plugin.c:846
 msgid "No misspelled words"
 msgstr "Ingen feilstavede ord"
 
@@ -3598,15 +3592,15 @@
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../plugins/time/gedit-time-plugin.c:188
+#: ../plugins/time/gedit-time-plugin.c:184
 msgid "In_sert Date and Time..."
 msgstr "_Sett inn dato/klokkeslett …"
 
-#: ../plugins/time/gedit-time-plugin.c:190
+#: ../plugins/time/gedit-time-plugin.c:186
 msgid "Insert current date and time at the cursor position"
 msgstr "Sett inn dagens dato og klokkeslett i markørposisjonen"
 
-#: ../plugins/time/gedit-time-plugin.c:537
+#: ../plugins/time/gedit-time-plugin.c:504
 msgid "Available formats"
 msgstr "Tilgjengelige formater"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gftp.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gftp.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gftp.po	2013-01-29 09:34:05.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gftp.po	2014-01-07 06:37:02.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:18+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:23+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: lib/bookmark.c:38
 #, c-format
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gimp20-libgimp.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gimp20-libgimp.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gimp20-libgimp.po	2013-01-29 09:34:05.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gimp20-libgimp.po	2014-01-07 06:37:02.000000000 +0000
@@ -8,34 +8,34 @@
 msgstr ""
 "Project-Id-Version: GIMP HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-23 08:06+0000\n"
-"PO-Revision-Date: 2010-12-27 16:58+0000\n"
+"POT-Creation-Date: 2013-12-06 20:50+0000\n"
+"PO-Revision-Date: 2013-12-10 04:01+0000\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-no@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:23+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:28+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. procedure executed successfully
-#: ../libgimp/gimp.c:1077
+#: ../libgimp/gimp.c:1097
 msgid "success"
 msgstr "suksess"
 
 #. procedure execution failed
-#: ../libgimp/gimp.c:1081
+#: ../libgimp/gimp.c:1101
 msgid "execution error"
 msgstr "feil ved kjøring"
 
 #. procedure called incorrectly
-#: ../libgimp/gimp.c:1085
+#: ../libgimp/gimp.c:1105
 msgid "calling error"
 msgstr "feil ved kall"
 
 #. procedure execution cancelled
-#: ../libgimp/gimp.c:1089
+#: ../libgimp/gimp.c:1109
 msgid "cancelled"
 msgstr "avbrutt"
 
@@ -236,7 +236,7 @@
 #. This string appears in an empty menu as in
 #. * "nothing selected and nothing to select"
 #. 
-#: ../libgimp/gimpmenu.c:461 ../libgimpwidgets/gimpintstore.c:241
+#: ../libgimp/gimpmenu.c:461 ../libgimpwidgets/gimpintstore.c:259
 msgid "(Empty)"
 msgstr "(Tomt)"
 
@@ -648,7 +648,7 @@
 msgid "Incremental"
 msgstr "Økende"
 
-#: ../modules/display-filter-lcms.c:186
+#: ../modules/display-filter-lcms.c:218
 msgid "None"
 msgstr "Ingen"
 
@@ -757,9 +757,9 @@
 msgstr "Fylt"
 
 #: ../libgimpbase/gimputils.c:178 ../libgimpbase/gimputils.c:183
-#: ../modules/color-selector-cmyk-lcms.c:424
-#: ../modules/color-selector-cmyk-lcms.c:430
-#: ../modules/display-filter-lcms.c:178
+#: ../modules/color-selector-cmyk-lcms.c:434
+#: ../modules/color-selector-cmyk-lcms.c:449
+#: ../modules/display-filter-lcms.c:200
 msgid "(invalid UTF-8 string)"
 msgstr "(ugyldig UTF-8)"
 
@@ -851,28 +851,28 @@
 msgid "Absolute colorimetric"
 msgstr "Absolutt fargetilpasning"
 
-#: ../libgimpconfig/gimpconfig-deserialize.c:106
+#: ../libgimpconfig/gimpconfig-deserialize.c:109
 #, c-format
 msgid "value for token %s is not a valid UTF-8 string"
 msgstr "verdi for tegn %s er ikke gyldig UTF-8"
 
 #. please don't translate 'yes' and 'no'
-#: ../libgimpconfig/gimpconfig-deserialize.c:444
+#: ../libgimpconfig/gimpconfig-deserialize.c:451
 #, c-format
 msgid "expected 'yes' or 'no' for boolean token %s, got '%s'"
 msgstr "forventet «yes» eller «no» for boolesk tegn %s, fikk «%s»"
 
-#: ../libgimpconfig/gimpconfig-deserialize.c:518
+#: ../libgimpconfig/gimpconfig-deserialize.c:525
 #, c-format
 msgid "invalid value '%s' for token %s"
 msgstr "ugyldig verdi «%s» for tegn %s"
 
-#: ../libgimpconfig/gimpconfig-deserialize.c:533
+#: ../libgimpconfig/gimpconfig-deserialize.c:540
 #, c-format
 msgid "invalid value '%ld' for token %s"
 msgstr "ugyldig verdi «%ld» for tegn %s"
 
-#: ../libgimpconfig/gimpconfig-deserialize.c:602
+#: ../libgimpconfig/gimpconfig-deserialize.c:609
 #, c-format
 msgid "while parsing token '%s': %s"
 msgstr "under lesing av «%s»: %s"
@@ -1074,20 +1074,20 @@
 msgstr "Gigabyte"
 
 #. Count label
-#: ../libgimpwidgets/gimppageselector.c:282
-#: ../libgimpwidgets/gimppageselector.c:1178
+#: ../libgimpwidgets/gimppageselector.c:269
+#: ../libgimpwidgets/gimppageselector.c:1067
 msgid "Nothing selected"
 msgstr "Ingenting valgt"
 
-#: ../libgimpwidgets/gimppageselector.c:300
+#: ../libgimpwidgets/gimppageselector.c:287
 msgid "Select _All"
 msgstr "Velg _alt"
 
-#: ../libgimpwidgets/gimppageselector.c:320
+#: ../libgimpwidgets/gimppageselector.c:307
 msgid "Select _range:"
 msgstr "Velg _område:"
 
-#: ../libgimpwidgets/gimppageselector.c:332
+#: ../libgimpwidgets/gimppageselector.c:319
 msgid "Open _pages as"
 msgstr "Åpne _sider som"
 
@@ -1095,18 +1095,18 @@
 msgid "Page 000"
 msgstr "Side 000"
 
-#: ../libgimpwidgets/gimppageselector.c:521
-#: ../libgimpwidgets/gimppageselector.c:758
+#: ../libgimpwidgets/gimppageselector.c:449
+#: ../libgimpwidgets/gimppageselector.c:647
 #, c-format
 msgid "Page %d"
 msgstr "Side %d"
 
-#: ../libgimpwidgets/gimppageselector.c:1183
+#: ../libgimpwidgets/gimppageselector.c:1072
 msgid "One page selected"
 msgstr "En side valgt"
 
-#: ../libgimpwidgets/gimppageselector.c:1190
-#: ../libgimpwidgets/gimppageselector.c:1194
+#: ../libgimpwidgets/gimppageselector.c:1079
+#: ../libgimpwidgets/gimppageselector.c:1083
 #, c-format
 msgid "%d page selected"
 msgid_plural "All %d pages selected"
@@ -1371,15 +1371,15 @@
 msgid "Contrast c_ycles:"
 msgstr "_Kontrastsykluser:"
 
-#: ../modules/display-filter-lcms.c:97
+#: ../modules/display-filter-lcms.c:98
 msgid "Color management display filter using ICC color profiles"
 msgstr "Fargeprøvefilter for ICC-fargeprofiler"
 
-#: ../modules/display-filter-lcms.c:129
+#: ../modules/display-filter-lcms.c:130
 msgid "Color Management"
 msgstr "Fargebehandling"
 
-#: ../modules/display-filter-lcms.c:207
+#: ../modules/display-filter-lcms.c:239
 msgid ""
 "This filter takes its configuration from the Color Management section in the "
 "Preferences dialog."
@@ -1387,19 +1387,19 @@
 "Dette fileteret henter innstillinger fra fargebehandlingsdelen i "
 "programinnstillingene."
 
-#: ../modules/display-filter-lcms.c:221
+#: ../modules/display-filter-lcms.c:253
 msgid "Mode of operation:"
 msgstr "Operasjonsmodus:"
 
-#: ../modules/display-filter-lcms.c:228
+#: ../modules/display-filter-lcms.c:260
 msgid "Image profile:"
 msgstr "Bildeprofil:"
 
-#: ../modules/display-filter-lcms.c:236
+#: ../modules/display-filter-lcms.c:268
 msgid "Monitor profile:"
 msgstr "Skjermprofil:"
 
-#: ../modules/display-filter-lcms.c:244
+#: ../modules/display-filter-lcms.c:276
 msgid "Print simulation profile:"
 msgstr "Utskriftsimuleringsprofil:"
 
@@ -1411,27 +1411,27 @@
 msgid "Color Proof"
 msgstr "Fargeprøve"
 
-#: ../modules/display-filter-proof.c:338
+#: ../modules/display-filter-proof.c:359
 msgid "Choose an ICC Color Profile"
 msgstr "Velg en ICC fargeprofil"
 
-#: ../modules/display-filter-proof.c:365
+#: ../modules/display-filter-proof.c:386
 msgid "All files (*.*)"
 msgstr "Alle filer (*.*)"
 
-#: ../modules/display-filter-proof.c:370
+#: ../modules/display-filter-proof.c:391
 msgid "ICC color profile (*.icc, *.icm)"
 msgstr "ICC-fargeprofiler (*.icc, *.icm)"
 
-#: ../modules/display-filter-proof.c:428
+#: ../modules/display-filter-proof.c:449
 msgid "_Profile:"
 msgstr "_Profil:"
 
-#: ../modules/display-filter-proof.c:434
+#: ../modules/display-filter-proof.c:455
 msgid "_Intent:"
 msgstr "_Hensikt:"
 
-#: ../modules/display-filter-proof.c:439
+#: ../modules/display-filter-proof.c:460
 msgid "_Black Point Compensation"
 msgstr "_Svartpunktskompensering"
 
@@ -1445,45 +1445,45 @@
 msgstr "CMYK"
 
 #. Cyan
-#: ../modules/color-selector-cmyk-lcms.c:168
+#: ../modules/color-selector-cmyk-lcms.c:166
 #: ../modules/color-selector-cmyk.c:124
 msgid "_C"
 msgstr "_C"
 
 #. Magenta
-#: ../modules/color-selector-cmyk-lcms.c:170
+#: ../modules/color-selector-cmyk-lcms.c:168
 #: ../modules/color-selector-cmyk.c:126
 msgid "_M"
 msgstr "_M"
 
 #. Yellow
-#: ../modules/color-selector-cmyk-lcms.c:172
+#: ../modules/color-selector-cmyk-lcms.c:170
 #: ../modules/color-selector-cmyk.c:128
 msgid "_Y"
 msgstr "_Y"
 
 #. Key (Black)
-#: ../modules/color-selector-cmyk-lcms.c:174
+#: ../modules/color-selector-cmyk-lcms.c:172
 #: ../modules/color-selector-cmyk.c:130
 msgid "_K"
 msgstr "_K"
 
-#: ../modules/color-selector-cmyk-lcms.c:178
+#: ../modules/color-selector-cmyk-lcms.c:176
 #: ../modules/color-selector-cmyk.c:134
 msgid "Cyan"
 msgstr "Cyan"
 
-#: ../modules/color-selector-cmyk-lcms.c:179
+#: ../modules/color-selector-cmyk-lcms.c:177
 #: ../modules/color-selector-cmyk.c:135
 msgid "Magenta"
 msgstr "Magenta"
 
-#: ../modules/color-selector-cmyk-lcms.c:180
+#: ../modules/color-selector-cmyk-lcms.c:178
 #: ../modules/color-selector-cmyk.c:136
 msgid "Yellow"
 msgstr "Yellow"
 
-#: ../modules/color-selector-cmyk-lcms.c:181
+#: ../modules/color-selector-cmyk-lcms.c:179
 #: ../modules/color-selector-cmyk.c:137
 msgid "Black"
 msgstr "Sort"
@@ -1504,7 +1504,7 @@
 msgid "Profile: (none)"
 msgstr "Profil: (ingen)"
 
-#: ../modules/color-selector-cmyk-lcms.c:433
+#: ../modules/color-selector-cmyk-lcms.c:452
 #, c-format
 msgid "Profile: %s"
 msgstr "Profil: %s"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gimp20-script-fu.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gimp20-script-fu.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gimp20-script-fu.po	2013-01-29 09:34:03.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gimp20-script-fu.po	2014-01-07 06:37:02.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: achtung 1.1.25\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-02 14:38+0200\n"
-"PO-Revision-Date: 2012-03-30 20:17+0000\n"
-"Last-Translator: Martin Thoresen <Unknown>\n"
+"POT-Creation-Date: 2013-12-06 20:50+0000\n"
+"PO-Revision-Date: 2013-12-10 07:39+0000\n"
+"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:23+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:28+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../plug-ins/script-fu/script-fu-console.c:130
 #: ../plug-ins/script-fu/script-fu-console.c:197
@@ -50,16 +50,16 @@
 msgid "Script-Fu evaluation mode only allows non-interactive invocation"
 msgstr "Script-Fu evalueringsmodus tillater bare ikke-interaktiv kjøring"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:194
+#: ../plug-ins/script-fu/script-fu-interface.c:198
 msgid "Script-Fu cannot process two scripts at the same time."
 msgstr "Script-Fu kan ikke kjøre to skript samtidig."
 
-#: ../plug-ins/script-fu/script-fu-interface.c:196
+#: ../plug-ins/script-fu/script-fu-interface.c:200
 #, c-format
 msgid "You are already running the \"%s\" script."
 msgstr "Du kjører allerede skriptet «%s»."
 
-#: ../plug-ins/script-fu/script-fu-interface.c:222
+#: ../plug-ins/script-fu/script-fu-interface.c:226
 #, c-format
 msgid "Script-Fu: %s"
 msgstr "Script-Fu: %s"
@@ -67,44 +67,44 @@
 #. we add a colon after the label;
 #. *  some languages want an extra space here
 #. 
-#: ../plug-ins/script-fu/script-fu-interface.c:286
+#: ../plug-ins/script-fu/script-fu-interface.c:290
 #, c-format
 msgid "%s:"
 msgstr "%s"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:333
+#: ../plug-ins/script-fu/script-fu-interface.c:337
 msgid "Script-Fu Color Selection"
 msgstr "Script-Fu fargevalg"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:442
+#: ../plug-ins/script-fu/script-fu-interface.c:446
 msgid "Script-Fu File Selection"
 msgstr "Script-Fu filvalg"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:445
+#: ../plug-ins/script-fu/script-fu-interface.c:449
 msgid "Script-Fu Folder Selection"
 msgstr "Script-Fu mappevalg"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:458
+#: ../plug-ins/script-fu/script-fu-interface.c:462
 msgid "Script-Fu Font Selection"
 msgstr "Script-Fu skrifttypevalg"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:466
+#: ../plug-ins/script-fu/script-fu-interface.c:470
 msgid "Script-Fu Palette Selection"
 msgstr "Script-Fu palettvalg"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:475
+#: ../plug-ins/script-fu/script-fu-interface.c:479
 msgid "Script-Fu Pattern Selection"
 msgstr "Script-Fu mønstervalg"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:484
+#: ../plug-ins/script-fu/script-fu-interface.c:488
 msgid "Script-Fu Gradient Selection"
 msgstr "Script-Fu gradientvalg"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:493
+#: ../plug-ins/script-fu/script-fu-interface.c:497
 msgid "Script-Fu Brush Selection"
 msgstr "Script-Fu børstevalg"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:824
+#: ../plug-ins/script-fu/script-fu-interface.c:840
 #, c-format
 msgid "Error while executing %s:"
 msgstr "Feil under kjøring av %s:"
@@ -118,19 +118,19 @@
 msgid "Error while loading %s:"
 msgstr "Feil under lasting av %s:"
 
-#: ../plug-ins/script-fu/script-fu-server.c:807
+#: ../plug-ins/script-fu/script-fu-server.c:811
 msgid "Script-Fu Server Options"
 msgstr "Script-Fu tjeneralternativer"
 
-#: ../plug-ins/script-fu/script-fu-server.c:812
+#: ../plug-ins/script-fu/script-fu-server.c:816
 msgid "_Start Server"
 msgstr "_Start tjener"
 
-#: ../plug-ins/script-fu/script-fu-server.c:840
+#: ../plug-ins/script-fu/script-fu-server.c:844
 msgid "Server port:"
 msgstr "Tjenerport:"
 
-#: ../plug-ins/script-fu/script-fu-server.c:846
+#: ../plug-ins/script-fu/script-fu-server.c:850
 msgid "Server logfile:"
 msgstr "Loggfil på tjener:"
 
@@ -212,2519 +212,66 @@
 "Please close all Script-Fu windows and try again."
 msgstr ""
 
-#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:1
-msgid "3D _Outline..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:2
-msgid "Bumpmap (alpha layer) blur radius"
-msgstr "Bumpmap (alpha-lag) blur radius"
-
-#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:3
-msgid "Create a logo with outlined text and a drop shadow"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:4
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:6
-msgid "Default bumpmap settings"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:5
-#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:5
-#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:4
-#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:4
-#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:5
-#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:3
-#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:3
-#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:2
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:11
-#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:5
-#: ../plug-ins/script-fu/scripts/chalk.scm.h:5
-#: ../plug-ins/script-fu/scripts/chip-away.scm.h:8
-#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:5
-#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:5
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:5
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:6
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:7
-#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:5
-#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:2
-#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/news-text.scm.h:7
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:3
-#: ../plug-ins/script-fu/scripts/slide.scm.h:2
-#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/speed-text.scm.h:5
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:2
-#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:8
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:4
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/title-header.scm.h:2
-msgid "Font"
-msgstr "Skrifttype"
-
-#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:6
-#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:6
-#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:5
-#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:5
-#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:4
-#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:4
-#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:3
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:12
-#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/chalk.scm.h:6
-#: ../plug-ins/script-fu/scripts/chip-away.scm.h:9
-#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:6
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:7
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:8
-#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:8
-#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:3
-#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/news-text.scm.h:8
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:4
-#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:8
-#: ../plug-ins/script-fu/scripts/speed-text.scm.h:6
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:3
-#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:9
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:5
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/title-header.scm.h:3
-msgid "Font size (pixels)"
-msgstr "Skriftstørrelse (piksler)"
-
-#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:7
-msgid "Outline blur radius"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:8
-msgid ""
-"Outline the selected region (or alpha) with a pattern and add a drop shadow"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:9
-#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:5
-#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:3
-#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:5
-#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:5
-#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:3
-#: ../plug-ins/script-fu/scripts/chip-away.scm.h:13
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:11
-msgid "Pattern"
-msgstr "Mønster"
-
-#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:10
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:16
-#: ../plug-ins/script-fu/scripts/round-corners.scm.h:6
-msgid "Shadow X offset"
-msgstr "X-avstand for skygge"
-
-#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:11
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:17
-#: ../plug-ins/script-fu/scripts/round-corners.scm.h:7
-msgid "Shadow Y offset"
-msgstr "Y-avstand for skygge"
-
-#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:12
-msgid "Shadow blur radius"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:13
-#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:10
-#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:8
-#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:10
-#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:9
-#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:7
-#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:6
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:17
-#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:10
-#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:8
-#: ../plug-ins/script-fu/scripts/chalk.scm.h:7
-#: ../plug-ins/script-fu/scripts/chip-away.scm.h:14
-#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:9
-#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:11
-#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:10
-#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:8
-#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:13
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:17
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:18
-#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:8
-#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:10
-#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:7
-#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:10
-#: ../plug-ins/script-fu/scripts/news-text.scm.h:10
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:13
-#: ../plug-ins/script-fu/scripts/slide.scm.h:5
-#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:11
-#: ../plug-ins/script-fu/scripts/speed-text.scm.h:8
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:11
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:8
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:14
-#: ../plug-ins/script-fu/scripts/title-header.scm.h:5
-msgid "Text"
-msgstr "Tekst"
-
-#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:1
-msgid "3_D Truchet..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:2
-#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:1
-#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:1
-#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:1
-#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:2
-#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:3
-#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:2
-#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:3
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:2
-#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:3
-#: ../plug-ins/script-fu/scripts/chalk.scm.h:1
-#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:3
-#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:2
-#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:2
-#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:2
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:1
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:2
-#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:2
-#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:2
-#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:1
-#: ../plug-ins/script-fu/scripts/news-text.scm.h:1
-#: ../plug-ins/script-fu/scripts/speed-text.scm.h:1
-#: ../plug-ins/script-fu/scripts/swirltile.scm.h:2
-#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:2
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:1
-#: ../plug-ins/script-fu/scripts/truchet.scm.h:1
-msgid "Background color"
-msgstr "Bakgrunnsfarge"
-
-#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:3
-#: ../plug-ins/script-fu/scripts/truchet.scm.h:2
-msgid "Block size"
-msgstr "Blokkstørrelse"
-
-#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:4
-msgid "Create an image filled with a 3D Truchet pattern"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:5
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:7
-msgid "End blend"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:6
-#: ../plug-ins/script-fu/scripts/truchet.scm.h:5
-msgid "Number of X tiles"
-msgstr "Antall X-fliser"
-
-#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:7
-#: ../plug-ins/script-fu/scripts/truchet.scm.h:6
-msgid "Number of Y tiles"
-msgstr "Antall Y-fliser"
-
-#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:8
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:16
-msgid "Start blend"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:9
-msgid "Supersample"
-msgstr "Supersample"
-
-#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:10
-#: ../plug-ins/script-fu/scripts/add-bevel.scm.h:4
-#: ../plug-ins/script-fu/scripts/truchet.scm.h:8
-msgid "Thickness"
-msgstr "Tykkhet"
-
-#: ../plug-ins/script-fu/scripts/add-bevel.scm.h:1
-msgid "Add B_evel..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/add-bevel.scm.h:2
-msgid "Add a beveled border to an image"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/add-bevel.scm.h:3
-#: ../plug-ins/script-fu/scripts/chip-away.scm.h:12
-msgid "Keep bump layer"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/add-bevel.scm.h:5
-#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:10
-#: ../plug-ins/script-fu/scripts/old-photo.scm.h:6
-#: ../plug-ins/script-fu/scripts/round-corners.scm.h:8
-#: ../plug-ins/script-fu/scripts/slide.scm.h:6
-#: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:6
-msgid "Work on copy"
-msgstr "Jobb med kopi"
-
-#: ../plug-ins/script-fu/scripts/addborder.scm.h:1
-msgid "Add _Border..."
-msgstr "Legg til _kant..."
-
-#: ../plug-ins/script-fu/scripts/addborder.scm.h:2
-msgid "Add a border around an image"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/addborder.scm.h:3
-msgid "Border X size"
-msgstr "Rammens X-størrelse"
-
-#: ../plug-ins/script-fu/scripts/addborder.scm.h:4
-msgid "Border Y size"
-msgstr "Rammens Y-størrelse"
-
-#: ../plug-ins/script-fu/scripts/addborder.scm.h:5
-msgid "Border color"
-msgstr "Kantfarge"
-
-#: ../plug-ins/script-fu/scripts/addborder.scm.h:6
-msgid "Delta value on color"
-msgstr "Deltaverdi for farge"
-
-#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:2
-msgid "Create an arrow graphic with an eerie glow for web pages"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:3
-#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:2
-msgid "Down"
-msgstr "Ned"
-
-#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:4
-#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:5
-#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:3
-#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:4
-#: ../plug-ins/script-fu/scripts/camo.scm.h:5
-#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:6
-msgid "Flatten image"
-msgstr "Flat ut bilde"
-
-#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:5
-#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:6
-#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:4
-#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:7
-#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:8
-#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:8
-#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:8
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:4
-msgid "Glow color"
-msgstr "Farge for glød"
-
-#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:6
-#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:3
-msgid "Left"
-msgstr "Venstre"
-
-#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:7
-#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:4
-msgid "Orientation"
-msgstr "Orientering"
-
-#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182
-#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156
-msgid "Right"
-msgstr "Høyre"
-
-#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:9
-#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:7
-#: ../plug-ins/script-fu/scripts/lava.scm.h:7
-msgid "Size"
-msgstr "Størrelse"
-
-#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:10
-#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:8
-msgid "Up"
-msgstr "Opp"
-
-#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:11
-#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:9
-msgid "_Arrow..."
-msgstr "_Pil..."
-
-#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:2
-msgid "Bar height"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:3
-msgid "Bar length"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:4
-msgid "Create an Hrule graphic with an eerie glow for web pages"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:7
-#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:5
-msgid "_Hrule..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:2
-msgid "Create a bullet graphic with an eerie glow for web pages"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:5
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:6
-#: ../plug-ins/script-fu/scripts/tileblur.scm.h:7
-msgid "Radius"
-msgstr "Radius"
-
-#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:6
-#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:5
-msgid "_Bullet..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:1
-#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:1
-msgid "B_utton..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:3
-msgid "Create a button graphic with an eerie glow for web pages"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:8
-msgid "Glow radius"
-msgstr "Radius for glød"
-
-#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:9
-#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:6
-msgid "Padding"
-msgstr "Fyll"
-
-#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:11
-#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:8
-#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:10
-#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:8
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:18
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:14
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:18
-#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:8
-#: ../plug-ins/script-fu/scripts/news-text.scm.h:11
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:14
-#: ../plug-ins/script-fu/scripts/speed-text.scm.h:9
-msgid "Text color"
-msgstr "Tekstfarge"
-
-#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:1
-msgid "Add an eerie glow around the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:2
-msgid "Alien _Glow..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:3
-msgid "Create a logo with an alien glow around the text"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:7
-msgid "Glow size (pixels * 4)"
-msgstr "Størrelse på glød (piksler * 4)"
-
-#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:1
-msgid "Add psychedelic outlines to the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:2
-msgid "Alien _Neon..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:4
-msgid "Create a logo with psychedelic outlines around the text"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:5
-msgid "Fade away"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:9
-msgid "Number of bands"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:11
-msgid "Width of bands"
-msgstr "Bredde for bånd"
-
-#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:12
-msgid "Width of gaps"
-msgstr "Bredde for mellomrom"
-
-#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:1
-msgid ""
-"Add a gradient effect, a drop shadow, and a background to the selected "
-"region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:3
-msgid ""
-"Create a plain text logo with a gradient effect, a drop shadow, and a "
-"background"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:8
-msgid "_Basic I..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:1
-msgid "Add a shadow and a highlight to the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:2
-msgid "B_asic II..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:4
-msgid "Create a simple logo with a shadow and a highlight"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:1
-#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:4
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:1
-msgid "Bevel width"
-msgstr "Kantbredde"
-
-#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:2
-msgid "Create a simple, beveled button graphic for webpages"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:5
-msgid "Lower-right color"
-msgstr "Farge nede til høyre"
-
-#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:7
-#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:6
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:11
-msgid "Pressed"
-msgstr "Presset"
-
-#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:8
-msgid "Simple _Beveled Button..."
-msgstr "Enkel o_pphevet knapp..."
-
-#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:11
-msgid "Upper-left color"
-msgstr "Farge oppe til venstre"
-
-#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:1
-msgid "Create a beveled pattern arrow for webpages"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:1
-msgid "Create a beveled pattern bullet for webpages"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:2
-msgid "Diameter"
-msgstr "Diameter"
-
-#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:4
-#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:7
-#: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:4
-msgid "Transparent background"
-msgstr "Gjennomsiktig bakgrunn"
-
-#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:2
-msgid "Create a beveled pattern button for webpages"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:1
-msgid "Create a beveled pattern heading for webpages"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:4
-msgid "H_eading..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:1
-msgid "Create a beveled pattern hrule for webpages"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:2
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:8
-#: ../plug-ins/script-fu/scripts/gradient-example.scm.h:4
-#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:7
-#: ../plug-ins/script-fu/scripts/swirltile.scm.h:7
-msgid "Height"
-msgstr "Høyde"
-
-#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:4
-#: ../plug-ins/script-fu/scripts/gradient-example.scm.h:5
-#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:11
-#: ../plug-ins/script-fu/scripts/swirltile.scm.h:11
-msgid "Width"
-msgstr "Bredde"
-
-#: ../plug-ins/script-fu/scripts/blend-anim.scm.h:1
-msgid "Blend Animation needs at least three source layers"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/blend-anim.scm.h:2
-msgid ""
-"Create intermediate layers to blend two or more layers over a background as "
-"an animation"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/blend-anim.scm.h:3
-msgid "Intermediate frames"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/blend-anim.scm.h:4
-msgid "Looped"
-msgstr "Løkke"
-
-#: ../plug-ins/script-fu/scripts/blend-anim.scm.h:5
-msgid "Max. blur radius"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/blend-anim.scm.h:6
-msgid "_Blend..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:1
-msgid ""
-"Add blended backgrounds, highlights, and shadows to the selected region (or "
-"alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:3
-msgid "Blen_ded..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:4
-msgid "Blend mode"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:5
-msgid "Create a logo with blended backgrounds, highlights, and shadows"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:6
-msgid "Custom Gradient"
-msgstr "Egendefinert gradient"
-
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:8
-msgid "FG-BG-HSV"
-msgstr "FG-BG-HSV"
-
-#: ../plug-ins/script-fu/scripts/blended-logo.scm:136
-#: ../plug-ins/script-fu/scripts/blended-logo.scm:195
-msgid "FG-BG-RGB"
-msgstr "FG-BG-RGB"
-
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:10
-msgid "FG-Transparent"
-msgstr "FG-gjennomsiktig"
-
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:13
-#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:8
-#: ../plug-ins/script-fu/scripts/land.scm.h:3
-#: ../plug-ins/script-fu/scripts/lava.scm.h:2
-#: ../plug-ins/script-fu/scripts/rendermap.scm.h:4
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:9
-msgid "Gradient"
-msgstr "Gradient"
-
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:14
-#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:8
-#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:9
-#: ../plug-ins/script-fu/scripts/gradient-example.scm.h:3
-#: ../plug-ins/script-fu/scripts/rendermap.scm.h:5
-#: ../plug-ins/script-fu/scripts/title-header.scm.h:4
-msgid "Gradient reverse"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:15
-msgid "Offset (pixels)"
-msgstr "Avstand (piksler)"
-
-#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:1
-msgid "Add 'cow spots' to the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:2
-#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:2
-msgid "Background Color"
-msgstr "Bakgrunnsfarge"
-
-#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:4
-msgid "Bo_vination..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:5
-msgid "Create a logo with text in the style of 'cow spots'"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:8
-msgid "Spots density X"
-msgstr "Punkttetthet X"
-
-#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:9
-msgid "Spots density Y"
-msgstr "Punkttetthet Y"
-
-#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:1
-msgid "Add glowing"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:2
-msgid "After glow"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:3
-msgid "B_urn-In..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:4
-msgid "Corona width"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:5
-msgid ""
-"Create intermediate layers to produce an animated 'burn-in' transition "
-"between two layers"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:6
-msgid "Fadeout"
-msgstr "Fadeut"
-
-#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:7
-msgid "Fadeout width"
-msgstr "Bredde på fade"
-
-#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:9
-msgid "Prepare for GIF"
-msgstr "Forbered for GIF"
-
-#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:10
-msgid "Speed (pixels/frame)"
-msgstr "Hastighet (piksler/ramme)"
-
-#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:11
-msgid ""
-"The Burn-In script needs two layers in total. A foreground layer with "
-"transparency and a background layer."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/camo.scm.h:1
-msgid "Color 1"
-msgstr "Farge 1"
-
-#: ../plug-ins/script-fu/scripts/camo.scm.h:2
-msgid "Color 2"
-msgstr "Farge 2"
-
-#: ../plug-ins/script-fu/scripts/camo.scm.h:3
-msgid "Color 3"
-msgstr "Farge 3"
-
-#: ../plug-ins/script-fu/scripts/camo.scm.h:4
-msgid "Create an image filled with a camouflage pattern"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/camo.scm.h:6
-#: ../plug-ins/script-fu/scripts/rendermap.scm.h:6
-msgid "Granularity"
-msgstr "Granularitet"
-
-#: ../plug-ins/script-fu/scripts/camo.scm.h:7
-#: ../plug-ins/script-fu/scripts/rendermap.scm.h:7
-msgid "Image size"
-msgstr "Bildestørrelse"
-
-#: ../plug-ins/script-fu/scripts/camo.scm.h:8
-#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:3
-msgid "Smooth"
-msgstr "Myk"
-
-#: ../plug-ins/script-fu/scripts/camo.scm.h:9
-msgid "_Camouflage..."
-msgstr "_Kamuflasje..."
-
-#: ../plug-ins/script-fu/scripts/carve-it.scm.h:1
-msgid "Carve white areas"
-msgstr "Skjær ut hvite områder"
-
-#: ../plug-ins/script-fu/scripts/carve-it.scm.h:2
-msgid "Image to carve"
-msgstr "Bilde som skal skjæres ut"
-
-#: ../plug-ins/script-fu/scripts/carve-it.scm.h:3
-msgid "Stencil C_arve..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:1
-msgid "Background Image"
-msgstr "Bakgrunnsbilde"
-
-#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:2
-msgid "Carve raised text"
-msgstr "Skjær ut hevet tekst"
-
-#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:3
-msgid "Carved..."
-msgstr "Utskjært..."
-
-#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:4
-msgid ""
-"Create a logo with text raised above or carved in to the specified "
-"background image"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:7
-msgid "Padding around text"
-msgstr "Fyll rundt tekst"
-
-#: ../plug-ins/script-fu/scripts/chalk.scm.h:2
-msgid "Chalk color"
-msgstr "Krittfarge"
-
-#: ../plug-ins/script-fu/scripts/chalk.scm.h:3
-msgid "Create a chalk drawing effect for the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chalk.scm.h:4
-msgid "Create a logo resembling chalk scribbled on a blackboard"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chalk.scm.h:8
-msgid "_Chalk..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chip-away.scm.h:1
-msgid "Add a chipped woodcarving effect to the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chip-away.scm.h:2
-msgid "Blur amount"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chip-away.scm.h:3
-msgid "Chip Awa_y..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chip-away.scm.h:4
-msgid "Chip amount"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chip-away.scm.h:5
-msgid "Create a logo resembling a chipped wood carving"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chip-away.scm.h:6
-msgid "Drop shadow"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chip-away.scm.h:7
-msgid "Fill BG with pattern"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chip-away.scm.h:10
-msgid "Invert"
-msgstr "Inverter"
-
-#: ../plug-ins/script-fu/scripts/chip-away.scm.h:11
-msgid "Keep background"
-msgstr "Behold bakgrunn"
-
-#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:1
-msgid ""
-"Add a chrome effect to the selected region (or alpha) using a specified "
-"(grayscale) stencil"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:2
-#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:1
-msgid "Chrome balance"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:3
-#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:2
-#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:2
-msgid "Chrome factor"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:4
-#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:3
-msgid "Chrome lightness"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:5
-#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:4
-msgid "Chrome saturation"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:6
-msgid "Chrome white areas"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:7
-#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:5
-#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:6
-msgid "Environment map"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:8
-#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:9
-msgid "Highlight balance"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:9
-msgid "Stencil C_hrome..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:1
-msgid "Add a simple chrome effect to the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:4
-msgid "C_hrome..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:5
-msgid "Create a simplistic, but cool, chromed logo"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:8
-msgid "Offsets (pixels * 2)"
-msgstr "Avstander (piksler * 2)"
-
-#: ../plug-ins/script-fu/scripts/circuit.scm.h:1
-msgid "Circuit seed"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/circuit.scm.h:2
-msgid ""
-"Fill the selected region (or alpha) with traces like those on a circuit board"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/circuit.scm.h:3
-#: ../plug-ins/script-fu/scripts/lava.scm.h:3
-#: ../plug-ins/script-fu/scripts/predator.scm.h:3
-#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:11
-msgid "Keep selection"
-msgstr "Behold utvalg"
-
-#: ../plug-ins/script-fu/scripts/circuit.scm.h:4
-msgid "No background (only for separate layer)"
-msgstr "Ingen bakgrunn (kun for separat lag)"
-
-#: ../plug-ins/script-fu/scripts/circuit.scm.h:5
-msgid "Oilify mask size"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/circuit.scm.h:6
-#: ../plug-ins/script-fu/scripts/lava.scm.h:6
-#: ../plug-ins/script-fu/scripts/predator.scm.h:6
-msgid "Separate layer"
-msgstr "Separat lag"
-
-#: ../plug-ins/script-fu/scripts/circuit.scm.h:7
-msgid "_Circuit..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/clothify.scm.h:1
-msgid "Add a cloth-like texture to the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/clothify.scm.h:2
-#: ../plug-ins/script-fu/scripts/swirltile.scm.h:1
-msgid "Azimuth"
-msgstr "Azimuth"
-
-#: ../plug-ins/script-fu/scripts/clothify.scm.h:3
-msgid "Blur X"
-msgstr "Blur X"
-
-#: ../plug-ins/script-fu/scripts/clothify.scm.h:4
-msgid "Blur Y"
-msgstr "Blur Y"
-
-#: ../plug-ins/script-fu/scripts/clothify.scm.h:5
-#: ../plug-ins/script-fu/scripts/swirltile.scm.h:5
-msgid "Depth"
-msgstr "Dybde"
-
-#: ../plug-ins/script-fu/scripts/clothify.scm.h:6
-#: ../plug-ins/script-fu/scripts/swirltile.scm.h:6
-msgid "Elevation"
-msgstr "Forhøyning"
-
-#: ../plug-ins/script-fu/scripts/clothify.scm.h:7
-msgid "_Clothify..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/coffee.scm.h:1
-msgid "Add realistic looking coffee stains to the image"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/coffee.scm.h:2
-msgid "Darken only"
-msgstr "Gjør kun mørkere"
-
-#: ../plug-ins/script-fu/scripts/coffee.scm.h:3
-msgid "Stains"
-msgstr "Flekker"
-
-#: ../plug-ins/script-fu/scripts/coffee.scm.h:4
-msgid "_Coffee Stain..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:1
-msgid ""
-"Add a comic-book effect to the selected region (or alpha) by outlining and "
-"filling with a gradient"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:3
-msgid "Comic Boo_k..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:4
-msgid ""
-"Create a comic-book style logo by outlining and filling with a gradient"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:9
-msgid "Outline color"
-msgstr "Farge for omriss"
-
-#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:10
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:11
-msgid "Outline size"
-msgstr "Størrelse for omriss"
-
-#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:1
-msgid ""
-"Add a metallic effect to the selected region (or alpha) with reflections and "
-"perspective shadows"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:3
-msgid "Cool _Metal..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:4
-msgid "Create a metallic logo with reflections and perspective shadows"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:5
-#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:4
-#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:4
-#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:5
-msgid "Effect size (pixels)"
-msgstr "Effektstørrelse (piksler)"
-
-#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:1
-msgid "Background image"
-msgstr "Bakgrunnsbilde"
-
-#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:3
-msgid ""
-"Create a logo with a crystal/gel effect displacing the image underneath"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:4
-msgid "Crystal..."
-msgstr "Krystall..."
-
-#: ../plug-ins/script-fu/scripts/difference-clouds.scm.h:1
-msgid "Difference Clouds..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/difference-clouds.scm.h:2
-msgid "Solid noise applied with Difference layer mode"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:1
-msgid "Distress the selection"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:2
-msgid "Granularity (1 is low)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:4
-msgid "Smooth horizontally"
-msgstr "Jevn ut horisontalt"
-
-#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:5
-msgid "Smooth vertically"
-msgstr "Jevn ut vertikalt"
-
-#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:6
-msgid "Spread"
-msgstr "Spredning"
-
-#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:7
-msgid "Threshold (bigger 1<-->255 smaller)"
-msgstr "Terskel (Større 1<-->255 mindre)"
-
-#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:8
-msgid "_Distort..."
-msgstr "_Forvreng..."
-
-#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:1
-msgid "Add a drop shadow to the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:2
-#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:2
-msgid "Allow resizing"
-msgstr "Tillat endring av størrelse"
-
-#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:3
-#: ../plug-ins/script-fu/scripts/news-text.scm.h:2
-#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:4
-#: ../plug-ins/script-fu/scripts/round-corners.scm.h:3
-#: ../plug-ins/script-fu/scripts/swirltile.scm.h:3
-msgid "Blur radius"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:4
-#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:5
-#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:5
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:5
-msgid "Color"
-msgstr "Farge"
-
-#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:5
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:11
-msgid "Offset X"
-msgstr "Avstand X"
-
-#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:6
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:12
-msgid "Offset Y"
-msgstr "Avstand Y"
-
-#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:7
-#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:7
-msgid "Opacity"
-msgstr "Ugjennomsiktighet"
-
-#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:8
-msgid "_Drop Shadow..."
-msgstr "_Fallskygge..."
-
-#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:1
-msgid "Columns"
-msgstr "Kolonner"
-
-#: ../plug-ins/script-fu/scripts/erase-rows.scm:49
-msgid "Erase"
-msgstr "Slett"
-
-#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:3
-msgid "Erase every other row or column"
-msgstr "Slett annenhver rad eller kolonne"
-
-#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:4
-msgid "Erase/fill"
-msgstr "Slett/Fyll"
-
-#: ../plug-ins/script-fu/scripts/erase-rows.scm:48
-msgid "Even"
-msgstr "Lik"
-
-#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:6
-msgid "Even/odd"
-msgstr "Lik/ulik"
-
-#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:7
-msgid "Fill with BG"
-msgstr "Fyll med BG"
-
-#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:8
-msgid "Odd"
-msgstr "Odde"
-
-#: ../plug-ins/script-fu/scripts/erase-rows.scm:47
-msgid "Rows"
-msgstr "Rader"
-
-#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:10
-msgid "Rows/cols"
-msgstr "Rader/kolonner"
-
-#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:11
-msgid "_Erase Every Other Row..."
-msgstr "Sl_ett annenhver rad..."
-
-#: ../plug-ins/script-fu/scripts/flatland.scm.h:1
-msgid "Create an image filled with a Land Pattern"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/flatland.scm.h:2
-#: ../plug-ins/script-fu/scripts/land.scm.h:2
-msgid "Detail level"
-msgstr "Detaljnivå"
-
-#: ../plug-ins/script-fu/scripts/flatland.scm.h:3
-#: ../plug-ins/script-fu/scripts/land.scm.h:4
-msgid "Image height"
-msgstr "Bildehøyde"
-
-#: ../plug-ins/script-fu/scripts/flatland.scm.h:4
-#: ../plug-ins/script-fu/scripts/land.scm.h:5
-msgid "Image width"
-msgstr "Bildebredde"
-
-#: ../plug-ins/script-fu/scripts/flatland.scm.h:5
-#: ../plug-ins/script-fu/scripts/land.scm.h:7
-msgid "Random seed"
-msgstr "Tilfeldig utgangsverdi"
-
-#: ../plug-ins/script-fu/scripts/flatland.scm.h:6
-#: ../plug-ins/script-fu/scripts/land.scm.h:8
-msgid "Scale X"
-msgstr "Skala X"
-
-#: ../plug-ins/script-fu/scripts/flatland.scm.h:7
-#: ../plug-ins/script-fu/scripts/land.scm.h:9
-msgid "Scale Y"
-msgstr "Skala Y"
-
-#: ../plug-ins/script-fu/scripts/flatland.scm.h:8
-msgid "_Flatland..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/font-map.scm.h:1
-msgid "Active colors"
-msgstr "Aktive farger"
-
-#: ../plug-ins/script-fu/scripts/font-map.scm:164
-msgid "Black on white"
-msgstr "Sort på hvitt"
-
-#: ../plug-ins/script-fu/scripts/font-map.scm.h:3
-msgid ""
-"Create an image filled with previews of fonts matching a fontname filter"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/font-map.scm.h:4
-msgid "Font _size (pixels)"
-msgstr "Skrift_størrelse (piksler)"
-
-#: ../plug-ins/script-fu/scripts/font-map.scm.h:5
-msgid "Render _Font Map..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/font-map.scm.h:6
-msgid "Use font _name as text"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/font-map.scm.h:7
-msgid "_Border (pixels)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/font-map.scm.h:8
-msgid "_Color scheme"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/font-map.scm.h:9
-msgid "_Filter (regexp)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/font-map.scm.h:10
-msgid "_Labels"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/font-map.scm.h:11
-msgid "_Text"
-msgstr "_Tekst"
-
-#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:1
-msgid ""
-"Add a frost effect to the selected region (or alpha) with an added drop "
-"shadow"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:3
-msgid "Create frozen logo with an added drop shadow"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:8
-msgid "_Frosty..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:1
-msgid "Add a jagged, fuzzy border to an image"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:2
-msgid "Add shadow"
-msgstr "Legg til skygge"
-
-#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:3
-msgid "Blur border"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:4
-#: ../plug-ins/script-fu/scripts/old-photo.scm.h:1
-msgid "Border size"
-msgstr "Kantstørrelse"
-
-#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:7
-msgid "Granularity (1 is Low)"
-msgstr "Granularitet (1 er lav)"
-
-#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:9
-#, no-c-format
-msgid "Shadow weight (%)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:11
-msgid "_Fuzzy Border..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:1
-msgid "Autocrop"
-msgstr "Automatisk beskjæring"
-
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:2
-msgid "Create an image of a large header using the gimp.org webpage theme"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:3
-msgid "Create an image of a small header using the gimp.org webpage theme"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:4
-msgid "Dark color"
-msgstr "Mørk farge"
-
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:7
-#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:9
-msgid "Highlight color"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:8
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:9
-msgid "Index image"
-msgstr "Indeksbilde"
-
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:9
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:10
-msgid "Number of colors"
-msgstr "Antall farger"
-
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:10
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:13
-msgid "Remove background"
-msgstr "Fjern bakgrunn"
-
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:11
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:14
-msgid "Select-by-color threshold"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:12
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:15
-msgid "Shadow color"
-msgstr "Skyggefarge"
-
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:15
-msgid "_Big Header..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:16
-msgid "_Small Header..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:2
-msgid ""
-"Create an image of a Tube Button Label Header using the gimp.org webpage "
-"theme"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:3
-msgid ""
-"Create an image of a Tube Button Label using the gimp.org webpage theme"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:4
-msgid ""
-"Create an image of a second level Tube Button Label using the gimp.org "
-"webpage theme"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:5
-msgid ""
-"Create an image of a third level Tube Button Label using the gimp.org "
-"webpage theme"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:16
-msgid "T_ube Sub-Button Label..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:19
-msgid "Tub_e Sub-Sub-Button Label..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:20
-msgid "_General Tube Labels..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:21
-msgid "_Tube Button Label..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:1
-msgid ""
-"Add gradients, patterns, shadows, and bump maps to the selected region (or "
-"alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:3
-msgid "Blend gradient (outline)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:4
-msgid "Blend gradient (text)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:5
-msgid "Create a logo with gradients, patterns, shadows, and bump maps"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:9
-msgid "Glo_ssy..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:10
-msgid "Outline gradient reverse"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:12
-msgid "Pattern (outline)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:13
-msgid "Pattern (overlay)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:14
-msgid "Pattern (text)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:15
-msgid "Shadow"
-msgstr "Skygge"
-
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:19
-msgid "Text gradient reverse"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:20
-msgid "Use pattern for outline instead of gradient"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:21
-msgid "Use pattern for text instead of gradient"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glossy.scm.h:22
-msgid "Use pattern overlay"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:1
-msgid "Add a glowing hot metal effect to the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:3
-msgid "Create a logo that looks like glowing hot metal"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:7
-msgid "Glo_wing Hot..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:1
-msgid "Add a shiny look and bevel effect to the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:3
-msgid "Bevel height (sharpness)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:5
-#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:4
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:2
-msgid "Border size (pixels)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:6
-msgid "Create a logo with a shiny look and beveled edges"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:9
-msgid "Gradient Beve_l..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gradient-example.scm.h:1
-msgid "Create an image filled with an example of the current gradient"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/gradient-example.scm.h:2
-msgid "Custom _Gradient..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/grid-system.scm.h:1
-#: ../plug-ins/script-fu/scripts/guides-from-selection.scm.h:1
-msgid ""
-"Draw a grid as specified by the lists of X and Y locations using the current "
-"brush"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/grid-system.scm.h:2
-msgid "X divisions"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/grid-system.scm.h:3
-msgid "Y divisions"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/grid-system.scm.h:4
-msgid "_Grid..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/guides-from-selection.scm.h:2
-msgid "New Guides from _Selection"
-msgstr "Nye hjelpelinjer fra _utvalg"
-
-#: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:1
-msgid ""
-"Add a guide at the position specified as a percentage of the image size"
-msgstr "Legg til en hjelpelinje spesifisert som prosent av bildestørrelsen"
-
-#: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:2
-#: ../plug-ins/script-fu/scripts/guides-new.scm.h:2
-msgid "Direction"
-msgstr "Retning"
-
-#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:35
-#: ../plug-ins/script-fu/scripts/guides-new.scm:35
-msgid "Horizontal"
-msgstr "Horisontal"
-
-#: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:4
-msgid "New Guide (by _Percent)..."
-msgstr "Ny hjelpelinje (med _prosent)..."
-
-#: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:6
-#, no-c-format
-msgid "Position (in %)"
-msgstr "Posisjon (i %)"
-
-#: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:7
-#: ../plug-ins/script-fu/scripts/guides-new.scm.h:6
-msgid "Vertical"
-msgstr "Vertikal"
-
-#: ../plug-ins/script-fu/scripts/guides-new.scm.h:1
-msgid "Add a guide at the orientation and position specified (in pixels)"
-msgstr ""
-"Legg til en hjelpelinje etter spesifisert orientering og posisjon (i piksler)"
-
-#: ../plug-ins/script-fu/scripts/guides-new.scm.h:4
-msgid "New _Guide..."
-msgstr "Ny _hjelpelinje..."
-
-#: ../plug-ins/script-fu/scripts/guides-new.scm.h:5
-msgid "Position"
-msgstr "Posisjon"
-
-#: ../plug-ins/script-fu/scripts/guides-remove-all.scm.h:1
-msgid "Remove all horizontal and vertical guides"
-msgstr "Fjern alle horisontale og vertikale hjelpelinjer"
-
-#: ../plug-ins/script-fu/scripts/guides-remove-all.scm.h:2
-msgid "_Remove all Guides"
-msgstr "_Fjern alle hjelpelinjer"
-
-#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:1
-msgid "Create a logo in a two-color, scribbled text style"
-msgstr "Lag en logo i tofarget, skriblet tekststil"
-
-#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:4
-msgid "Frame color"
-msgstr "Rammefarge"
-
-#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:5
-msgid "Frame size"
-msgstr "Rammestørrelse"
-
-#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:6
-msgid "Imigre-_26..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/land.scm.h:1
-msgid "Create an image filled with a topographic map pattern"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/land.scm.h:6
-msgid "Land height"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/land.scm.h:10
-msgid "Sea depth"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/land.scm.h:11
-msgid "_Land..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/lava.scm.h:1
-msgid "Fill the current selection with lava"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/lava.scm.h:4
-#: ../plug-ins/script-fu/scripts/swirltile.scm.h:8
-msgid "Roughness"
-msgstr "Røffhet"
-
-#: ../plug-ins/script-fu/scripts/lava.scm.h:5
-msgid "Seed"
-msgstr "Utgangsverdi"
-
-#: ../plug-ins/script-fu/scripts/lava.scm.h:8
-msgid "Use current gradient"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/lava.scm.h:9
-msgid "_Lava..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/line-nova.scm.h:1
-msgid ""
-"Fill a layer with rays emanating outward from its center using the FG color"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/line-nova.scm.h:2
-msgid "Line _Nova..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/line-nova.scm.h:3
-msgid "Number of lines"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/line-nova.scm.h:4
-msgid "Offset radius"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/line-nova.scm.h:5
-msgid "Randomness"
-msgstr "Tilfeldighet"
-
-#: ../plug-ins/script-fu/scripts/line-nova.scm.h:6
-msgid "Sharpness (degrees)"
-msgstr "Skarphet (grader)"
-
-#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:1
-msgid "Create a rectangular brush"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:2
-msgid "Create a rectangular brush with feathered edges"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:3
-msgid "Create an elliptical brush"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:4
-msgid "Create an elliptical brush with feathered edges"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:5
-msgid "Elli_ptical, Feathered..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:6
-msgid "Feathering"
-msgstr "Fjær"
-
-#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:8
-msgid "Name"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:9
-msgid "Re_ctangular, Feathered..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:10
-#: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:5
-#: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:4
-msgid "Spacing"
-msgstr "Mellomrom"
-
-#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:12
-msgid "_Elliptical..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:13
-msgid "_Rectangular..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:2
-msgid "Convert the selected region (or alpha) into a neon-sign like object"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:3
-msgid "Create a logo in the style of a neon sign"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:4
-msgid "Create shadow"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:9
-msgid "N_eon..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/news-text.scm.h:3
-msgid "Cell size (pixels)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/news-text.scm.h:4
-msgid "Create a logo in the style of newspaper printing"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/news-text.scm.h:6
-#: ../plug-ins/script-fu/scripts/speed-text.scm.h:4
-#, no-c-format
-msgid "Density (%)"
-msgstr "Tetthet (%)"
-
-#: ../plug-ins/script-fu/scripts/news-text.scm.h:9
-msgid "Newsprint Te_xt..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/old-photo.scm.h:2
-msgid "Defocus"
-msgstr "Fjern fokus"
-
-#: ../plug-ins/script-fu/scripts/old-photo.scm.h:3
-msgid "Make an image look like an old photo"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/old-photo.scm.h:4
-msgid "Mottle"
-msgstr "Flekklegg"
-
-#: ../plug-ins/script-fu/scripts/old-photo.scm.h:5
-msgid "Sepia"
-msgstr "Bruntone"
-
-#: ../plug-ins/script-fu/scripts/old-photo.scm.h:7
-msgid "_Old Photo..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:1
-#: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:1
-msgid "Brush name"
-msgstr "Penselnavn"
-
-#: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:2
-#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm.h:1
-#: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:3
-#: ../plug-ins/script-fu/scripts/select-to-pattern.scm.h:2
-msgid "File name"
-msgstr "Filnavn"
-
-#: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:3
-msgid "New _Brush..."
-msgstr "Ny _pensel..."
-
-#: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:4
-msgid "Paste the clipboard contents into a new brush"
-msgstr "Lim inn utklippstavleinnhold til en ny pensel"
-
-#: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:6
-#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm.h:5
-msgid "There is no image data in the clipboard to paste."
-msgstr "Det er ikke noe bildedata i utklippstavlen som kan limes inn."
-
-#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm.h:2
-msgid "New _Pattern..."
-msgstr "Nytt _mønster..."
-
-#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm.h:3
-msgid "Paste the clipboard contents into a new pattern"
-msgstr "Lim inn innholdet i utklippstavlen som et nytt mønster"
-
-#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm.h:4
-#: ../plug-ins/script-fu/scripts/select-to-pattern.scm.h:3
-msgid "Pattern name"
-msgstr "Mønsternavn"
-
-#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:1
-msgid "Add a perspective shadow to the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:3
-msgid "Angle"
-msgstr "Vinkel"
-
-#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:6
-msgid "Interpolation"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:8
-msgid "Relative distance of horizon"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:9
-msgid "Relative length of shadow"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:10
-msgid "_Perspective..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/predator.scm.h:1
-msgid "Add a 'Predator' effect to the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/predator.scm.h:2
-msgid "Edge amount"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/predator.scm.h:4
-msgid "Pixel amount"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/predator.scm.h:5
-msgid "Pixelize"
-msgstr "Lag til piksler"
-
-#: ../plug-ins/script-fu/scripts/predator.scm.h:7
-msgid "_Predator..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:2
-msgid "Create images, each containing an oval button graphic"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:5
-msgid "Lower color"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:6
-msgid "Lower color (active)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:7
-msgid "Not pressed"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:8
-msgid "Not pressed (active)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:9
-msgid "Padding X"
-msgstr "Fyll X"
-
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:10
-msgid "Padding Y"
-msgstr "Fyll Y"
-
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:12
-msgid "Round ratio"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:15
-msgid "Text color (active)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:16
-msgid "Upper color"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:17
-msgid "Upper color (active)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:18
-msgid "_Round Button..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/rendermap.scm.h:1
-msgid "Behavior"
-msgstr "Oppførsel"
-
-#: ../plug-ins/script-fu/scripts/rendermap.scm.h:2
-msgid "Create an image filled with an Earth-like map pattern"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/rendermap.scm.h:3
-msgid "Detail in Middle"
-msgstr "Detalj i midten"
-
-#: ../plug-ins/script-fu/scripts/rendermap.scm.h:8
-msgid "Render _Map..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/rendermap.scm:90
-msgid "Tile"
-msgstr "Flis"
-
-#: ../plug-ins/script-fu/scripts/reverse-layers.scm.h:1
-msgid "Reverse Layer Order"
-msgstr "Reverser lagrekkefølge"
-
-#: ../plug-ins/script-fu/scripts/reverse-layers.scm.h:2
-msgid "Reverse the order of layers in the image"
-msgstr "Reverser lagenes rekkefølge i bildet"
-
-#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:1
-msgid "Black"
-msgstr "Sort"
-
-#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:2
-msgid ""
-"Create a multi-layer image by adding a ripple effect to the current image"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:3
-msgid "Edge behavior"
-msgstr "Kantoppførsel"
-
-#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:4
-#: ../plug-ins/script-fu/scripts/waves-anim.scm.h:4
-msgid "Number of frames"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:5
-msgid "Rippling strength"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:6
-msgid "Smear"
-msgstr "Smør"
-
-#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129
-msgid "Wrap"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:8
-msgid "_Rippling..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/round-corners.scm.h:1
-msgid "Add background"
-msgstr "Legg til bakgrunn"
-
-#: ../plug-ins/script-fu/scripts/round-corners.scm.h:2
-msgid "Add drop-shadow"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/round-corners.scm.h:4
-msgid "Edge radius"
-msgstr "Kantradius"
-
-#: ../plug-ins/script-fu/scripts/round-corners.scm.h:5
-msgid ""
-"Round the corners of an image and optionally add a drop-shadow and background"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/round-corners.scm.h:9
-msgid "_Round Corners..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm.h:1
-msgid "Change the colormap of an image to the colors in a specified palette."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm.h:2
-msgid "Palette"
-msgstr "Palett"
-
-#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm.h:3
-msgid "Se_t Colormap..."
-msgstr "Sett _fargekart..."
-
-#: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:2
-msgid "Convert a selection to a brush"
-msgstr "Konverter et utvalg til en pensel"
-
-#: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:5
-msgid "To _Brush..."
-msgstr "Til _pensel..."
-
-#: ../plug-ins/script-fu/scripts/select-to-image.scm.h:1
-msgid "Convert a selection to an image"
-msgstr "Konverter et utvalg til et bilde"
-
-#: ../plug-ins/script-fu/scripts/select-to-image.scm.h:2
-msgid "To _Image"
-msgstr "Til _bilde"
-
-#: ../plug-ins/script-fu/scripts/select-to-pattern.scm.h:1
-msgid "Convert a selection to a pattern"
-msgstr "Konverter et utvalg til et mønster"
-
-#: ../plug-ins/script-fu/scripts/select-to-pattern.scm.h:4
-msgid "To _Pattern..."
-msgstr "Til _mønster..."
-
-#: ../plug-ins/script-fu/scripts/selection-round.scm.h:1
-msgid "Concave"
-msgstr "Konkav"
-
-#: ../plug-ins/script-fu/scripts/selection-round.scm.h:3
-#, no-c-format
-msgid "Radius (%)"
-msgstr "Radius (%)"
-
-#: ../plug-ins/script-fu/scripts/selection-round.scm.h:4
-msgid "Round the corners of the current selection"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/selection-round.scm.h:5
-msgid "Rounded R_ectangle..."
-msgstr "_Avrundet rektangel..."
-
-#: ../plug-ins/script-fu/scripts/slide.scm.h:1
-msgid "Add a slide-film like frame, sprocket holes, and labels to an image"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/slide.scm.h:3
-msgid "Font color"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/slide.scm.h:4
-msgid "Number"
-msgstr "Antall"
-
-#: ../plug-ins/script-fu/scripts/slide.scm.h:7
-msgid "_Slide..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:5
-msgid "Create a State Of The Art chromed logo"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:10
-msgid "SOTA Chrome..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/speed-text.scm.h:2
-msgid "Create a logo with a speedy text effect"
-msgstr ""
+#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm:182
+#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm:156
+msgid "Right"
+msgstr "Høyre"
 
-#: ../plug-ins/script-fu/scripts/speed-text.scm.h:7
-msgid "Speed Text..."
-msgstr ""
+#: ../plug-ins/script-fu/scripts/blended-logo.scm:136
+#: ../plug-ins/script-fu/scripts/blended-logo.scm:195
+msgid "FG-BG-RGB"
+msgstr "FG-BG-RGB"
 
-#: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:1
-msgid ""
-"Create an animation by mapping the current image onto a spinning sphere"
-msgstr ""
+#: ../plug-ins/script-fu/scripts/erase-rows.scm:47
+msgid "Rows"
+msgstr "Rader"
 
-#: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:2
-msgid "Frames"
-msgstr "Rammer"
+#: ../plug-ins/script-fu/scripts/erase-rows.scm:48
+msgid "Even"
+msgstr "Lik"
 
-#: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:3
-msgid "Index to n colors (0 = remain RGB)"
-msgstr ""
+#: ../plug-ins/script-fu/scripts/erase-rows.scm:49
+msgid "Erase"
+msgstr "Slett"
 
-#: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:5
-msgid "Turn from left to right"
-msgstr ""
+#: ../plug-ins/script-fu/scripts/font-map.scm:164
+msgid "Black on white"
+msgstr "Sort på hvitt"
 
-#: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:7
-msgid "_Spinning Globe..."
-msgstr ""
+#: ../plug-ins/script-fu/scripts/guides-new-percent.scm:35
+#: ../plug-ins/script-fu/scripts/guides-new.scm:35
+msgid "Horizontal"
+msgstr "Horisontal"
 
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:1
-msgid ""
-"Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer"
-msgstr ""
+#: ../plug-ins/script-fu/scripts/rendermap.scm:90
+msgid "Tile"
+msgstr "Flis"
 
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:2
-msgid "Airbrush"
+#: ../plug-ins/script-fu/scripts/ripply-anim.scm:129
+msgid "Wrap"
 msgstr ""
 
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:3
-msgid "Brush"
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm:323
+msgid "Spyrograph"
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm:326
 msgid "Circle"
 msgstr ""
 
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:6
-msgid "Color method"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:7
-msgid "Epitrochoid"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:8
-msgid "Frame"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:10
-msgid "Gradient: Loop Sawtooth"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:11
-msgid "Gradient: Loop Triangle"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:12
-msgid "Hexagon"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:13
-msgid "Hole ratio"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:14
-msgid "Inner teeth"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:15
-msgid "Lissajous"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:16
-msgid "Margin (pixels)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:17
-msgid "Outer teeth"
-msgstr ""
-
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm:342
 msgid "Pencil"
 msgstr ""
 
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:19
-msgid "Pentagon"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:20
-msgid "Polygon: 10 sides"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:21
-msgid "Polygon: 7 sides"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:22
-msgid "Polygon: 8 sides"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:23
-msgid "Polygon: 9 sides"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:24
-msgid "Rendering Spyro"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:25
-msgid "Shape"
-msgstr ""
-
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm:347
 msgid "Solid Color"
 msgstr ""
 
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm:323
-msgid "Spyrograph"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:28
-msgid "Square"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:29
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:7
-msgid "Start angle"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:30
-msgid "Tool"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:31
-msgid "Triangle"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:32
-msgid "Type"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:33
-msgid "_Spyrogimp..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:1
-msgid "Create a logo using a rock-like texture, a nova glow, and shadow"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:5
-msgid "Sta_rscape..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/swirltile.scm.h:4
-msgid "Create an image filled with a swirled tile effect"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/swirltile.scm.h:9
-msgid "Swirl-_Tile..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/swirltile.scm.h:10
-msgid "Whirl amount"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:1
-msgid "Create an image filled with a swirly pattern"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:2
-msgid "Number of times to whirl"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:3
-msgid "Quarter size"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:4
-msgid "Whirl angle"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:5
-msgid "_Swirly..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:1
-msgid "Add a Trace of Particles effect to the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:3
-msgid "Base color"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:5
-msgid "Create a logo using a Trace Of Particles effect"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:6
-msgid "Edge only"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:7
-msgid "Edge width"
-msgstr "Kantbredde"
-
-#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:10
-msgid "Hit rate"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:12
-msgid "_Particle Trace..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:1
-msgid "Antialias"
-msgstr "Antialias"
-
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:2
-msgid ""
-"Create a logo by rendering the specified text along the perimeter of a circle"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:3
-msgid "Fill angle"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/text-circle.scm.h:9
-msgid "Text C_ircle..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:3
-msgid ""
-"Create a textured logo with highlights, shadows, and a mosaic background"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:4
-msgid "Ending blend"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:5
-msgid ""
-"Fill the selected region (or alpha) with a texture and add highlights, "
-"shadows, and a mosaic background"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:8
-msgid "Hexagons"
-msgstr "Heksagoner"
-
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:9
-msgid "Mosaic tile type"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:10
-msgid "Octagons"
-msgstr "Oktagoner"
-
 #: ../plug-ins/script-fu/scripts/textured-logo.scm:129
 #: ../plug-ins/script-fu/scripts/textured-logo.scm:171
 msgid "Squares"
 msgstr "Ruter"
 
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:13
-msgid "Starting blend"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:15
-msgid "Text pattern"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:16
-msgid "_Textured..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/tileblur.scm.h:1
-msgid "Blur horizontally"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/tileblur.scm.h:2
-msgid "Blur the edges of an image so the result tiles seamlessly"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/tileblur.scm.h:3
-msgid "Blur type"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/tileblur.scm.h:4
-msgid "Blur vertically"
-msgstr ""
-
 #: ../plug-ins/script-fu/scripts/tileblur.scm:79
 msgid "IIR"
 msgstr "IIR"
-
-#: ../plug-ins/script-fu/scripts/tileblur.scm.h:6
-msgid "RLE"
-msgstr "RLE"
-
-#: ../plug-ins/script-fu/scripts/tileblur.scm.h:8
-msgid "_Tileable Blur..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/title-header.scm.h:1
-msgid "Create a decorative web title header"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/title-header.scm.h:6
-msgid "Web Title Header..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/truchet.scm.h:3
-msgid "Create an image filled with a Truchet pattern"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/truchet.scm.h:4
-msgid "Foreground color"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/truchet.scm.h:7
-msgid "T_ruchet..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/unsharp-mask.scm.h:1
-msgid "Mask opacity"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/unsharp-mask.scm.h:2
-msgid "Mask size"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/waves-anim.scm.h:1
-msgid "Amplitude"
-msgstr "Amplityde"
-
-#: ../plug-ins/script-fu/scripts/waves-anim.scm.h:2
-msgid ""
-"Create a multi-layer image with an effect like a stone was thrown into the "
-"current image"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/waves-anim.scm.h:3
-msgid "Invert direction"
-msgstr "Inverter retning"
-
-#: ../plug-ins/script-fu/scripts/waves-anim.scm.h:5
-msgid "Wavelength"
-msgstr "Bølgelengde"
-
-#: ../plug-ins/script-fu/scripts/waves-anim.scm.h:6
-msgid "_Waves..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/weave.scm.h:1
-msgid ""
-"Create a new layer filled with a weave effect to be used as an overlay or "
-"bump map"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/weave.scm.h:2
-msgid "Ribbon spacing"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/weave.scm.h:3
-msgid "Ribbon width"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/weave.scm.h:4
-msgid "Shadow darkness"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/weave.scm.h:5
-msgid "Shadow depth"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/weave.scm.h:6
-msgid "Thread density"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/weave.scm.h:7
-msgid "Thread intensity"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/weave.scm.h:8
-msgid "Thread length"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/weave.scm.h:9
-msgid "_Weave..."
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/web-browser.scm.h:1
-msgid "Bookmark to the GIMP web site"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/web-browser.scm.h:2
-msgid "Bookmark to the user manual"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/web-browser.scm.h:3
-msgid "Create and Use _Selections"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/web-browser.scm.h:4
-msgid "Create, Open and Save _Files"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/web-browser.scm.h:5
-msgid "Drawing _Simple Objects"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/web-browser.scm.h:6
-msgid "How to Use _Dialogs"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/web-browser.scm.h:7
-msgid "Plug-in _Registry"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/web-browser.scm.h:8
-msgid "Using _Paths"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/web-browser.scm.h:9
-msgid "_Basic Concepts"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/web-browser.scm.h:10
-msgid "_Developer Web Site"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/web-browser.scm.h:11
-msgid "_Main Web Site"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/web-browser.scm.h:12
-msgid "_Preparing your Images for the Web"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/web-browser.scm.h:13
-msgid "_User Manual Web Site"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/web-browser.scm.h:14
-msgid "_Working with Digital Camera Photos"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:1
-msgid "Add a subtle translucent 3D effect to the selected region (or alpha)"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:2
-msgid "Drop shadow X offset"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:3
-msgid "Drop shadow Y offset"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:4
-msgid "Drop shadow blur radius"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:5
-msgid "Drop shadow color"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:6
-msgid "Drop shadow opacity"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:7
-msgid "Highlight X offset"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:8
-msgid "Highlight Y offset"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:10
-msgid "Highlight opacity"
-msgstr ""
-
-#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:12
-msgid "_Xach-Effect..."
-msgstr ""
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gimp20-std-plug-ins.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gimp20-std-plug-ins.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gimp20-std-plug-ins.po	2013-01-29 09:33:55.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gimp20-std-plug-ins.po	2014-01-07 06:37:02.000000000 +0000
@@ -8,45 +8,45 @@
 msgstr ""
 "Project-Id-Version: GIMP po-plug-ins HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-23 08:06+0000\n"
-"PO-Revision-Date: 2011-03-21 12:10+0000\n"
-"Last-Translator: Sigurd Gartmann <Unknown>\n"
+"POT-Creation-Date: 2013-12-06 20:50+0000\n"
+"PO-Revision-Date: 2013-12-10 02:09+0000\n"
+"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:26+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:31+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:118
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:120
 msgid "Original"
 msgstr "Original"
 
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:136
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:138
 msgid "Rotated"
 msgstr "Rotert"
 
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:154
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:156
 msgid "Continuous update"
 msgstr "Kontiuerlig oppdatering"
 
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:167
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:169
 msgid "Area:"
 msgstr "Område:"
 
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:171
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:173
 msgid "Entire Layer"
 msgstr "Hele laget"
 
 #. Create selection
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:172
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:174
 #: ../plug-ins/common/film.c:965 ../plug-ins/imagemap/imap_selection.c:339
 #: ../plug-ins/selection-to-path/selection-to-path.c:434
 msgid "Selection"
 msgstr "Valg"
 
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:173
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:175
 msgid "Context"
 msgstr "Kontekst:"
 
@@ -65,69 +65,69 @@
 msgid "To:"
 msgstr "Til:"
 
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:416
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:418
 #: ../plug-ins/common/file-ps.c:3096 ../plug-ins/imagemap/imap_menu.c:213
 msgid "Gray"
 msgstr "Grå"
 
 #. Gray: Circle: Spinbutton 1
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:464
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:466
 msgid "Hue:"
 msgstr "Glød:"
 
 #. Gray: Circle: Spinbutton 2
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:491
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:553
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:493
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:555
 msgid "Saturation:"
 msgstr "Metning:"
 
 #. * Gray: Operation-Mode *
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:511
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:513
 msgid "Gray Mode"
 msgstr "Gråmodus"
 
 #. Gray: Operation-Mode: two radio buttons
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:520
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:522
 msgid "Treat as this"
 msgstr "Behandle som dette"
 
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:532
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:534
 msgid "Change to this"
 msgstr "Endre til dette"
 
 #. * Gray: What is gray? *
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:545
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:547
 msgid "Gray Threshold"
 msgstr "Grønn terskel"
 
 #. * Misc: Used unit selection *
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:585
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:695
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:587
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:697
 msgid "Units"
 msgstr "Enheter"
 
 #. Misc: Used unit selection: 3 radio buttons
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:594
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:596
 msgid "Radians"
 msgstr "Radianer"
 
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:606
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:608
 msgid "Radians/Pi"
 msgstr "Radianer/Pi"
 
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:618
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:620
 msgid "Degrees"
 msgstr "Grader"
 
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:649
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:651
 msgid "Rotate Colors"
 msgstr "Roter farger"
 
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:689
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:691
 msgid "Main Options"
 msgstr "Hovedalternativer"
 
-#: ../plug-ins/color-rotate/color-rotate-dialog.c:692
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:694
 msgid "Gray Options"
 msgstr "Alternativer for grå"
 
@@ -272,19 +272,19 @@
 msgid "_HSL color model"
 msgstr "_HSL-fargemodell"
 
-#: ../plug-ins/common/align-layers.c:128
+#: ../plug-ins/common/align-layers.c:158
 msgid "Align all visible layers of the image"
 msgstr "Juster alle synlige lag i bildet"
 
-#: ../plug-ins/common/align-layers.c:133
+#: ../plug-ins/common/align-layers.c:163
 msgid "Align Visi_ble Layers..."
 msgstr "Juster synli_ge lag"
 
-#: ../plug-ins/common/align-layers.c:173
+#: ../plug-ins/common/align-layers.c:207
 msgid "There are not enough layers to align."
 msgstr "Det er ikke nok lag til å justere."
 
-#: ../plug-ins/common/align-layers.c:400
+#: ../plug-ins/common/align-layers.c:627
 msgid "Align Visible Layers"
 msgstr "Juster synlige lag"
 
@@ -301,76 +301,76 @@
 msgid "None"
 msgstr "Ingen"
 
-#: ../plug-ins/common/align-layers.c:425 ../plug-ins/common/align-layers.c:456
+#: ../plug-ins/common/align-layers.c:652 ../plug-ins/common/align-layers.c:683
 msgid "Collect"
 msgstr "Samle"
 
-#: ../plug-ins/common/align-layers.c:426
+#: ../plug-ins/common/align-layers.c:653
 msgid "Fill (left to right)"
 msgstr "Fyll (venstre til høyre)"
 
-#: ../plug-ins/common/align-layers.c:427
+#: ../plug-ins/common/align-layers.c:654
 msgid "Fill (right to left)"
 msgstr "Fyll (høyre til venstre)"
 
-#: ../plug-ins/common/align-layers.c:428 ../plug-ins/common/align-layers.c:459
+#: ../plug-ins/common/align-layers.c:655 ../plug-ins/common/align-layers.c:686
 msgid "Snap to grid"
 msgstr "Fest til rutenett"
 
-#: ../plug-ins/common/align-layers.c:437
+#: ../plug-ins/common/align-layers.c:664
 msgid "_Horizontal style:"
 msgstr "_Horisontal stil:"
 
-#: ../plug-ins/common/align-layers.c:441
+#: ../plug-ins/common/align-layers.c:668
 msgid "Left edge"
 msgstr "Venstre kant"
 
-#: ../plug-ins/common/align-layers.c:442 ../plug-ins/common/align-layers.c:472
+#: ../plug-ins/common/align-layers.c:669 ../plug-ins/common/align-layers.c:699
 #: ../plug-ins/gradient-flare/gradient-flare.c:2712
 msgid "Center"
 msgstr "Senter"
 
-#: ../plug-ins/common/align-layers.c:443
+#: ../plug-ins/common/align-layers.c:670
 msgid "Right edge"
 msgstr "Høyre kant"
 
-#: ../plug-ins/common/align-layers.c:452
+#: ../plug-ins/common/align-layers.c:679
 msgid "Ho_rizontal base:"
 msgstr "Ho_risontal base:"
 
-#: ../plug-ins/common/align-layers.c:457
+#: ../plug-ins/common/align-layers.c:684
 msgid "Fill (top to bottom)"
 msgstr "Fyll (topp til bunn)"
 
-#: ../plug-ins/common/align-layers.c:458
+#: ../plug-ins/common/align-layers.c:685
 msgid "Fill (bottom to top)"
 msgstr "Fyll (bunn til topp)"
 
-#: ../plug-ins/common/align-layers.c:468
+#: ../plug-ins/common/align-layers.c:695
 msgid "_Vertical style:"
 msgstr "_Vertikal stil:"
 
-#: ../plug-ins/common/align-layers.c:471
+#: ../plug-ins/common/align-layers.c:698
 msgid "Top edge"
 msgstr "Øvre kant"
 
-#: ../plug-ins/common/align-layers.c:473
+#: ../plug-ins/common/align-layers.c:700
 msgid "Bottom edge"
 msgstr "Nedre kant"
 
-#: ../plug-ins/common/align-layers.c:482
+#: ../plug-ins/common/align-layers.c:709
 msgid "Ver_tical base:"
 msgstr "Ver_tikal base:"
 
-#: ../plug-ins/common/align-layers.c:486
+#: ../plug-ins/common/align-layers.c:713
 msgid "_Grid size:"
 msgstr "_Størrelse på rutenett:"
 
-#: ../plug-ins/common/align-layers.c:495
+#: ../plug-ins/common/align-layers.c:722
 msgid "_Ignore the bottom layer even if visible"
 msgstr "_Ignorer bunnlag selv om det er synlig"
 
-#: ../plug-ins/common/align-layers.c:505
+#: ../plug-ins/common/align-layers.c:732
 msgid "_Use the (invisible) bottom layer as the base"
 msgstr "Br_uk (usynlig) bunnlag som basis"
 
@@ -593,17 +593,17 @@
 #. * Create the "background" layer to hold the image...
 #. 
 #: ../plug-ins/common/blinds.c:279 ../plug-ins/common/compose.c:936
-#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:438
-#: ../plug-ins/common/file-cel.c:441 ../plug-ins/common/file-dicom.c:612
+#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:441
+#: ../plug-ins/common/file-cel.c:444 ../plug-ins/common/file-dicom.c:612
 #: ../plug-ins/common/file-gif-load.c:943
 #: ../plug-ins/common/file-jp2-load.c:354 ../plug-ins/common/file-pcx.c:425
 #: ../plug-ins/common/file-pcx.c:431 ../plug-ins/common/file-pix.c:382
-#: ../plug-ins/common/file-png.c:891 ../plug-ins/common/file-pnm.c:583
+#: ../plug-ins/common/file-png.c:891 ../plug-ins/common/file-pnm.c:585
 #: ../plug-ins/common/file-raw.c:763 ../plug-ins/common/file-sunras.c:977
-#: ../plug-ins/common/file-tga.c:1064 ../plug-ins/common/file-tiff-load.c:1005
+#: ../plug-ins/common/file-tga.c:1072 ../plug-ins/common/file-tiff-load.c:1010
 #: ../plug-ins/common/file-xbm.c:897 ../plug-ins/common/film.c:745
 #: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:262
-#: ../plug-ins/file-bmp/bmp-read.c:380 ../plug-ins/file-bmp/bmp-read.c:647
+#: ../plug-ins/file-bmp/bmp-read.c:391 ../plug-ins/file-bmp/bmp-read.c:658
 #: ../plug-ins/file-faxg3/faxg3.c:474 ../plug-ins/file-fits/fits.c:530
 #: ../plug-ins/file-jpeg/jpeg-load.c:255 ../plug-ins/file-jpeg/jpeg-load.c:819
 #: ../plug-ins/file-psd/psd-image-res-load.c:1001
@@ -783,7 +783,7 @@
 msgid "_Blur"
 msgstr "_Mykne"
 
-#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:582
+#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:589
 msgid "Blurring"
 msgstr "Mykner"
 
@@ -1002,23 +1002,23 @@
 
 #. stat error (file does not exist)
 #: ../plug-ins/common/channel-mixer.c:980
-#: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:892
-#: ../plug-ins/common/file-cel.c:293 ../plug-ins/common/file-cel.c:345
-#: ../plug-ins/common/file-cel.c:576 ../plug-ins/common/file-dicom.c:340
+#: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:891
+#: ../plug-ins/common/file-cel.c:296 ../plug-ins/common/file-cel.c:348
+#: ../plug-ins/common/file-cel.c:579 ../plug-ins/common/file-dicom.c:340
 #: ../plug-ins/common/file-gbr.c:368 ../plug-ins/common/file-gif-load.c:355
 #: ../plug-ins/common/file-gih.c:640 ../plug-ins/common/file-jp2-load.c:194
 #: ../plug-ins/common/file-jp2-load.c:203 ../plug-ins/common/file-mng.c:1156
 #: ../plug-ins/common/file-pat.c:337 ../plug-ins/common/file-pcx.c:361
 #: ../plug-ins/common/file-pix.c:343 ../plug-ins/common/file-png.c:756
-#: ../plug-ins/common/file-pnm.c:494 ../plug-ins/common/file-ps.c:1014
+#: ../plug-ins/common/file-pnm.c:496 ../plug-ins/common/file-ps.c:1014
 #: ../plug-ins/common/file-ps.c:2910 ../plug-ins/common/file-psp.c:1717
 #: ../plug-ins/common/file-raw.c:256 ../plug-ins/common/file-raw.c:711
 #: ../plug-ins/common/file-sunras.c:391 ../plug-ins/common/file-svg.c:333
 #: ../plug-ins/common/file-svg.c:713 ../plug-ins/common/file-tga.c:442
-#: ../plug-ins/common/file-xbm.c:737 ../plug-ins/common/file-xmc.c:663
-#: ../plug-ins/common/file-xmc.c:848 ../plug-ins/common/file-xwd.c:435
+#: ../plug-ins/common/file-xbm.c:737 ../plug-ins/common/file-xmc.c:655
+#: ../plug-ins/common/file-xmc.c:840 ../plug-ins/common/file-xwd.c:435
 #: ../plug-ins/common/sphere-designer.c:2010
-#: ../plug-ins/file-bmp/bmp-read.c:153 ../plug-ins/file-faxg3/faxg3.c:229
+#: ../plug-ins/file-bmp/bmp-read.c:154 ../plug-ins/file-faxg3/faxg3.c:229
 #: ../plug-ins/file-fits/fits.c:358 ../plug-ins/file-fli/fli-gimp.c:459
 #: ../plug-ins/file-fli/fli-gimp.c:496 ../plug-ins/file-ico/ico-load.c:651
 #: ../plug-ins/file-ico/ico-load.c:729 ../plug-ins/file-jpeg/jpeg-load.c:117
@@ -1041,20 +1041,20 @@
 msgstr "Lagre alternativer for kanalmikser"
 
 #: ../plug-ins/common/channel-mixer.c:1058
-#: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:840
-#: ../plug-ins/common/file-cel.c:769 ../plug-ins/common/file-csource.c:407
-#: ../plug-ins/common/file-dicom.c:1351 ../plug-ins/common/file-gbr.c:663
-#: ../plug-ins/common/file-gif-save.c:782 ../plug-ins/common/file-gih.c:1258
+#: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:839
+#: ../plug-ins/common/file-cel.c:772 ../plug-ins/common/file-csource.c:407
+#: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-gbr.c:663
+#: ../plug-ins/common/file-gif-save.c:792 ../plug-ins/common/file-gih.c:1258
 #: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-mng.c:649
 #: ../plug-ins/common/file-mng.c:984 ../plug-ins/common/file-pat.c:486
 #: ../plug-ins/common/file-pcx.c:712 ../plug-ins/common/file-pix.c:526
-#: ../plug-ins/common/file-png.c:1358 ../plug-ins/common/file-pnm.c:1010
+#: ../plug-ins/common/file-png.c:1358 ../plug-ins/common/file-pnm.c:1012
 #: ../plug-ins/common/file-ps.c:1190 ../plug-ins/common/file-raw.c:591
 #: ../plug-ins/common/file-raw.c:619 ../plug-ins/common/file-sunras.c:565
-#: ../plug-ins/common/file-tga.c:1171 ../plug-ins/common/file-tiff-save.c:710
-#: ../plug-ins/common/file-xbm.c:1036 ../plug-ins/common/file-xmc.c:1455
-#: ../plug-ins/common/file-xwd.c:623 ../plug-ins/common/sphere-designer.c:2121
-#: ../plug-ins/file-bmp/bmp-write.c:306 ../plug-ins/file-fits/fits.c:476
+#: ../plug-ins/common/file-tga.c:1179 ../plug-ins/common/file-tiff-save.c:708
+#: ../plug-ins/common/file-xbm.c:1036 ../plug-ins/common/file-xmc.c:1447
+#: ../plug-ins/common/file-xwd.c:635 ../plug-ins/common/sphere-designer.c:2121
+#: ../plug-ins/file-bmp/bmp-write.c:309 ../plug-ins/file-fits/fits.c:476
 #: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1007
 #: ../plug-ins/file-jpeg/jpeg-save.c:332 ../plug-ins/file-psd/psd-save.c:1652
 #: ../plug-ins/file-uri/uri-backend-libcurl.c:166
@@ -1089,7 +1089,7 @@
 msgid "Checkerboard"
 msgstr "Sjakkbrett"
 
-#: ../plug-ins/common/checkerboard.c:413 ../plug-ins/common/file-xmc.c:1162
+#: ../plug-ins/common/checkerboard.c:413 ../plug-ins/common/file-xmc.c:1154
 #: ../plug-ins/gimpressionist/sizemap.c:510
 msgid "_Size:"
 msgstr "_Størrelse:"
@@ -2129,19 +2129,19 @@
 msgid "Cropping"
 msgstr "Beskjærer"
 
-#: ../plug-ins/common/crop-zealous.c:84
+#: ../plug-ins/common/crop-zealous.c:68
 msgid "Autocrop unused space from edges and middle"
 msgstr "Beskjærer ubrukt plass fra kanter og midten"
 
-#: ../plug-ins/common/crop-zealous.c:89
+#: ../plug-ins/common/crop-zealous.c:73
 msgid "_Zealous Crop"
 msgstr "_Ivrig beskjæring"
 
-#: ../plug-ins/common/crop-zealous.c:137
+#: ../plug-ins/common/crop-zealous.c:121
 msgid "Zealous cropping"
 msgstr "Ivrig beskjæring"
 
-#: ../plug-ins/common/crop-zealous.c:238
+#: ../plug-ins/common/crop-zealous.c:252
 msgid "Nothing to crop."
 msgstr "Ingenting å beskjære."
 
@@ -2173,35 +2173,35 @@
 msgid "Cubistic transformation"
 msgstr "Kubistisk transformasjon"
 
-#: ../plug-ins/common/curve-bend.c:527
+#: ../plug-ins/common/curve-bend.c:526
 msgid "Bend the image using two control curves"
 msgstr ""
 
-#: ../plug-ins/common/curve-bend.c:548
+#: ../plug-ins/common/curve-bend.c:547
 msgid "_Curve Bend..."
 msgstr ""
 
-#: ../plug-ins/common/curve-bend.c:684 ../plug-ins/common/edge-dog.c:178
+#: ../plug-ins/common/curve-bend.c:683 ../plug-ins/common/edge-dog.c:178
 msgid "Can operate on layers only (but was called on channel or mask)."
 msgstr ""
 
-#: ../plug-ins/common/curve-bend.c:694
+#: ../plug-ins/common/curve-bend.c:693
 msgid "Cannot operate on layers with masks."
 msgstr ""
 
-#: ../plug-ins/common/curve-bend.c:706
+#: ../plug-ins/common/curve-bend.c:705
 msgid "Cannot operate on empty selections."
 msgstr ""
 
 #. Possibly retrieve data from a previous run
 #. The shell and main vbox
-#: ../plug-ins/common/curve-bend.c:1225 ../plug-ins/common/curve-bend.c:2956
+#: ../plug-ins/common/curve-bend.c:1224 ../plug-ins/common/curve-bend.c:2955
 msgid "Curve Bend"
 msgstr "Kurvebøy"
 
 #. Preview area, top of column
 #. preview
-#: ../plug-ins/common/curve-bend.c:1262
+#: ../plug-ins/common/curve-bend.c:1261
 #: ../plug-ins/gimpressionist/orientmap.c:590
 #: ../plug-ins/gimpressionist/sizemap.c:459
 #: ../plug-ins/print/print-page-layout.c:175
@@ -2209,116 +2209,116 @@
 msgstr "Forhåndsvisning"
 
 #. The preview button
-#: ../plug-ins/common/curve-bend.c:1291
+#: ../plug-ins/common/curve-bend.c:1290
 msgid "_Preview Once"
 msgstr "_Forhåndsvis en gang"
 
 #. The preview toggle
-#: ../plug-ins/common/curve-bend.c:1300
+#: ../plug-ins/common/curve-bend.c:1299
 msgid "Automatic pre_view"
 msgstr "Automatisk forhånds_visning"
 
 #. Options area, bottom of column
 #. Options section
-#: ../plug-ins/common/curve-bend.c:1310 ../plug-ins/common/ripple.c:523
+#: ../plug-ins/common/curve-bend.c:1309 ../plug-ins/common/ripple.c:523
 #: ../plug-ins/gfig/gfig-dialog.c:1243
 msgid "Options"
 msgstr "Alternativer"
 
 #. Rotate spinbutton
-#: ../plug-ins/common/curve-bend.c:1324
+#: ../plug-ins/common/curve-bend.c:1323
 msgid "Rotat_e:"
 msgstr "Rot_er:"
 
 #. The smoothing toggle
-#: ../plug-ins/common/curve-bend.c:1343
+#: ../plug-ins/common/curve-bend.c:1342
 msgid "Smoo_thing"
 msgstr "U_tjevning"
 
 #. The antialiasing toggle
-#: ../plug-ins/common/curve-bend.c:1353 ../plug-ins/common/mosaic.c:729
+#: ../plug-ins/common/curve-bend.c:1352 ../plug-ins/common/mosaic.c:729
 #: ../plug-ins/common/qbist.c:858 ../plug-ins/common/ripple.c:532
 msgid "_Antialiasing"
 msgstr "_Antialiasing"
 
 #. The work_on_copy toggle
-#: ../plug-ins/common/curve-bend.c:1363
+#: ../plug-ins/common/curve-bend.c:1362
 msgid "Work on cop_y"
 msgstr "_Jobb med kopi"
 
 #. The curves graph
-#: ../plug-ins/common/curve-bend.c:1373
+#: ../plug-ins/common/curve-bend.c:1372
 msgid "Modify Curves"
 msgstr "Endre kurver"
 
-#: ../plug-ins/common/curve-bend.c:1401
+#: ../plug-ins/common/curve-bend.c:1400
 msgid "Curve for Border"
 msgstr "_Kantkurve:"
 
-#: ../plug-ins/common/curve-bend.c:1405
+#: ../plug-ins/common/curve-bend.c:1404
 msgid "_Upper"
 msgstr "Ø_vre"
 
-#: ../plug-ins/common/curve-bend.c:1406
+#: ../plug-ins/common/curve-bend.c:1405
 msgid "_Lower"
 msgstr "_Nedre"
 
-#: ../plug-ins/common/curve-bend.c:1416
+#: ../plug-ins/common/curve-bend.c:1415
 msgid "Curve Type"
 msgstr "Kurvetype:"
 
-#: ../plug-ins/common/curve-bend.c:1420
+#: ../plug-ins/common/curve-bend.c:1419
 msgid "Smoot_h"
 msgstr "My_k"
 
-#: ../plug-ins/common/curve-bend.c:1421
+#: ../plug-ins/common/curve-bend.c:1420
 msgid "_Free"
 msgstr "_Fri"
 
 #. The Copy button
-#: ../plug-ins/common/curve-bend.c:1436
+#: ../plug-ins/common/curve-bend.c:1435
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../plug-ins/common/curve-bend.c:1441
+#: ../plug-ins/common/curve-bend.c:1440
 msgid "Copy the active curve to the other border"
 msgstr "Kopier aktiv kurve til den andre kanten"
 
 #. The CopyInv button
-#: ../plug-ins/common/curve-bend.c:1448
+#: ../plug-ins/common/curve-bend.c:1447
 msgid "_Mirror"
 msgstr "_Speil"
 
-#: ../plug-ins/common/curve-bend.c:1453
+#: ../plug-ins/common/curve-bend.c:1452
 msgid "Mirror the active curve to the other border"
 msgstr "Speil aktiv kurve til den andre kanten"
 
 #. The Swap button
-#: ../plug-ins/common/curve-bend.c:1461
+#: ../plug-ins/common/curve-bend.c:1460
 msgid "S_wap"
 msgstr "B_ytt"
 
-#: ../plug-ins/common/curve-bend.c:1466
+#: ../plug-ins/common/curve-bend.c:1465
 msgid "Swap the two curves"
 msgstr "Bytt om de to kurvene"
 
-#: ../plug-ins/common/curve-bend.c:1478
+#: ../plug-ins/common/curve-bend.c:1477
 msgid "Reset the active curve"
 msgstr "Nullstill aktiv kurve"
 
-#: ../plug-ins/common/curve-bend.c:1495
+#: ../plug-ins/common/curve-bend.c:1494
 msgid "Load the curves from a file"
 msgstr "Last kurver fra en fil"
 
-#: ../plug-ins/common/curve-bend.c:1507
+#: ../plug-ins/common/curve-bend.c:1506
 msgid "Save the curves to a file"
 msgstr "Lagre kurver til en fil"
 
-#: ../plug-ins/common/curve-bend.c:2063
+#: ../plug-ins/common/curve-bend.c:2062
 msgid "Load Curve Points from File"
 msgstr "Last kurvepunkter fra fil"
 
-#: ../plug-ins/common/curve-bend.c:2098
+#: ../plug-ins/common/curve-bend.c:2097
 msgid "Save Curve Points to File"
 msgstr "Lagre kurvepunkter til fil"
 
@@ -2599,9 +2599,9 @@
 msgid "R_ecursive"
 msgstr "R_ekursiv"
 
-#: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:734
+#: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:735
 #: ../plug-ins/common/nl-filter.c:1091 ../plug-ins/common/nova.c:362
-#: ../plug-ins/common/unsharp-mask.c:865 ../plug-ins/common/whirl-pinch.c:591
+#: ../plug-ins/common/unsharp-mask.c:872 ../plug-ins/common/whirl-pinch.c:591
 #: ../plug-ins/gradient-flare/gradient-flare.c:2757
 #: ../plug-ins/imagemap/imap_circle.c:277
 msgid "_Radius:"
@@ -2819,11 +2819,11 @@
 msgid "Neon"
 msgstr "Neon"
 
-#: ../plug-ins/common/edge-neon.c:696
+#: ../plug-ins/common/edge-neon.c:697
 msgid "Neon Detection"
 msgstr "Neondeteksjon"
 
-#: ../plug-ins/common/edge-neon.c:749 ../plug-ins/common/unsharp-mask.c:878
+#: ../plug-ins/common/edge-neon.c:750 ../plug-ins/common/unsharp-mask.c:885
 msgid "_Amount:"
 msgstr "_Mengde:"
 
@@ -2974,26 +2974,32 @@
 msgid "KISS CEL"
 msgstr "KISS CEL"
 
-#: ../plug-ins/common/file-cel.c:199
+#: ../plug-ins/common/file-cel.c:202
 msgid "Load KISS Palette"
 msgstr "Last KISS-palett"
 
+#: ../plug-ins/common/file-cel.c:308 ../plug-ins/common/file-cel.c:363
+#: ../plug-ins/common/file-cel.c:383
+#, c-format
+msgid "EOF or error while reading image header"
+msgstr ""
+
 #. max. rows allocated
 #. column, highest column ever used
 #. -1  assume fsel is not available (and not attached to any drawable)
 #. -1  assume there is no floating selection
-#: ../plug-ins/common/file-cel.c:350 ../plug-ins/common/file-dicom.c:345
+#: ../plug-ins/common/file-cel.c:353 ../plug-ins/common/file-dicom.c:345
 #: ../plug-ins/common/file-gbr.c:373 ../plug-ins/common/file-gif-load.c:360
 #: ../plug-ins/common/file-gih.c:645 ../plug-ins/common/file-jp2-load.c:187
 #: ../plug-ins/common/file-pat.c:342 ../plug-ins/common/file-pcx.c:366
 #: ../plug-ins/common/file-pdf-load.c:861 ../plug-ins/common/file-pix.c:348
-#: ../plug-ins/common/file-png.c:763 ../plug-ins/common/file-pnm.c:499
+#: ../plug-ins/common/file-png.c:763 ../plug-ins/common/file-pnm.c:501
 #: ../plug-ins/common/file-ps.c:1020 ../plug-ins/common/file-raw.c:716
 #: ../plug-ins/common/file-sunras.c:487 ../plug-ins/common/file-tga.c:447
 #: ../plug-ins/common/file-tiff-load.c:611 ../plug-ins/common/file-wmf.c:994
-#: ../plug-ins/common/file-xbm.c:742 ../plug-ins/common/file-xmc.c:675
-#: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:526
-#: ../plug-ins/file-bmp/bmp-read.c:158 ../plug-ins/file-faxg3/faxg3.c:213
+#: ../plug-ins/common/file-xbm.c:742 ../plug-ins/common/file-xmc.c:667
+#: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:532
+#: ../plug-ins/file-bmp/bmp-read.c:159 ../plug-ins/file-faxg3/faxg3.c:213
 #: ../plug-ins/file-fli/fli-gimp.c:501 ../plug-ins/file-ico/ico-load.c:644
 #: ../plug-ins/file-jpeg/jpeg-load.c:123 ../plug-ins/file-psd/psd-load.c:135
 #: ../plug-ins/file-sgi/sgi.c:330 ../plug-ins/file-xjt/xjt.c:3333
@@ -3001,28 +3007,77 @@
 msgid "Opening '%s'"
 msgstr "Åpner «%s»"
 
-#: ../plug-ins/common/file-cel.c:429
+#: ../plug-ins/common/file-cel.c:391
+#, c-format
+msgid "is not a CEL image file"
+msgstr ""
+
+#: ../plug-ins/common/file-cel.c:405
+#, c-format
+msgid "illegal bpp value in image: %hhu"
+msgstr ""
+
+#: ../plug-ins/common/file-cel.c:419
+#, c-format
+msgid ""
+"illegal image dimensions: width: %d, horizontal offset: %d, height: %d, "
+"vertical offset: %d"
+msgstr ""
+
+#: ../plug-ins/common/file-cel.c:432
 #, c-format
 msgid "Can't create a new image"
 msgstr "Kan ikke opprette nytt bilde"
 
-#: ../plug-ins/common/file-cel.c:544
+#: ../plug-ins/common/file-cel.c:470 ../plug-ins/common/file-cel.c:505
+#: ../plug-ins/common/file-cel.c:530
+#, c-format
+msgid "EOF or error while reading image data"
+msgstr ""
+
+#: ../plug-ins/common/file-cel.c:547
 #, c-format
 msgid "Unsupported bit depth (%d)!"
 msgstr ""
 
+#: ../plug-ins/common/file-cel.c:629 ../plug-ins/common/file-cel.c:641
+#, c-format
+msgid "'%s': EOF or error while reading palette header"
+msgstr ""
+
+#: ../plug-ins/common/file-cel.c:650
+#, c-format
+msgid "'%s': is not a KCF palette file"
+msgstr ""
+
+#: ../plug-ins/common/file-cel.c:659
+#, c-format
+msgid "'%s': illegal bpp value in palette: %hhu"
+msgstr ""
+
+#: ../plug-ins/common/file-cel.c:668
+#, c-format
+msgid "'%s': illegal number of colors: %u"
+msgstr ""
+
+#: ../plug-ins/common/file-cel.c:683 ../plug-ins/common/file-cel.c:700
+#: ../plug-ins/common/file-cel.c:720
+#, c-format
+msgid "'%s': EOF or error while reading palette data"
+msgstr ""
+
 #. init the progress meter
 #. And let's begin the progress
-#: ../plug-ins/common/file-cel.c:774 ../plug-ins/common/file-gbr.c:668
-#: ../plug-ins/common/file-gif-save.c:789 ../plug-ins/common/file-gih.c:1263
+#: ../plug-ins/common/file-cel.c:777 ../plug-ins/common/file-gbr.c:668
+#: ../plug-ins/common/file-gif-save.c:799 ../plug-ins/common/file-gih.c:1263
 #: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:491
 #: ../plug-ins/common/file-pcx.c:644 ../plug-ins/common/file-pix.c:531
-#: ../plug-ins/common/file-png.c:1365 ../plug-ins/common/file-pnm.c:1015
+#: ../plug-ins/common/file-png.c:1365 ../plug-ins/common/file-pnm.c:1017
 #: ../plug-ins/common/file-ps.c:1195 ../plug-ins/common/file-sunras.c:570
-#: ../plug-ins/common/file-tga.c:1176 ../plug-ins/common/file-tiff-save.c:718
-#: ../plug-ins/common/file-xbm.c:1041 ../plug-ins/common/file-xmc.c:1460
-#: ../plug-ins/common/file-xpm.c:638 ../plug-ins/common/file-xwd.c:628
-#: ../plug-ins/file-bmp/bmp-write.c:317 ../plug-ins/file-fits/fits.c:481
+#: ../plug-ins/common/file-tga.c:1184 ../plug-ins/common/file-tiff-save.c:716
+#: ../plug-ins/common/file-xbm.c:1041 ../plug-ins/common/file-xmc.c:1452
+#: ../plug-ins/common/file-xpm.c:638 ../plug-ins/common/file-xwd.c:640
+#: ../plug-ins/file-bmp/bmp-write.c:320 ../plug-ins/file-fits/fits.c:481
 #: ../plug-ins/file-fli/fli-gimp.c:718 ../plug-ins/file-ico/ico-save.c:1001
 #: ../plug-ins/file-jpeg/jpeg-save.c:289 ../plug-ins/file-psd/psd-save.c:1657
 #: ../plug-ins/file-sgi/sgi.c:576 ../plug-ins/file-xjt/xjt.c:1696
@@ -3112,13 +3167,13 @@
 msgid "'%s' is not a DICOM file."
 msgstr "«%s» er ikke en DICOM-fil."
 
-#: ../plug-ins/common/file-dicom.c:1319 ../plug-ins/common/file-pcx.c:676
-#: ../plug-ins/common/file-pnm.c:1000
+#: ../plug-ins/common/file-dicom.c:1339 ../plug-ins/common/file-pcx.c:676
+#: ../plug-ins/common/file-pnm.c:1002
 msgid "Cannot save images with alpha channel."
 msgstr "Kan ikke lagre bilder med gjennomsiktig kanal."
 
-#: ../plug-ins/common/file-dicom.c:1334 ../plug-ins/common/file-ps.c:1180
-#: ../plug-ins/common/file-ps.c:1212 ../plug-ins/common/file-xwd.c:613
+#: ../plug-ins/common/file-dicom.c:1354 ../plug-ins/common/file-ps.c:1180
+#: ../plug-ins/common/file-ps.c:1212 ../plug-ins/common/file-xwd.c:625
 #: ../plug-ins/file-fits/fits.c:466 ../plug-ins/file-xjt/xjt.c:1691
 msgid "Cannot operate on unknown image types."
 msgstr ""
@@ -3211,39 +3266,39 @@
 "play or re-save perfectly."
 msgstr ""
 
-#: ../plug-ins/common/file-gif-save.c:468
+#: ../plug-ins/common/file-gif-save.c:476
 msgid "Couldn't simply reduce colors further. Saving as opaque."
 msgstr "Kunne ikke redusere fargene ytterligere. Lagrer som ugjennomsiktig."
 
-#: ../plug-ins/common/file-gif-save.c:583
+#: ../plug-ins/common/file-gif-save.c:591
 #, c-format
 msgid ""
 "Unable to save '%s'.  The GIF file format does not support images that are "
 "more than %d pixels wide or tall."
 msgstr ""
 
-#: ../plug-ins/common/file-gif-save.c:694
+#: ../plug-ins/common/file-gif-save.c:704
 msgid ""
 "The GIF format only supports comments in 7bit ASCII encoding. No comment is "
 "saved."
 msgstr ""
 
-#: ../plug-ins/common/file-gif-save.c:753
+#: ../plug-ins/common/file-gif-save.c:763
 msgid ""
 "Cannot save RGB color images. Convert to indexed color or grayscale first."
 msgstr ""
 
-#: ../plug-ins/common/file-gif-save.c:931
+#: ../plug-ins/common/file-gif-save.c:941
 msgid "Delay inserted to prevent evil CPU-sucking animation."
 msgstr ""
 
-#: ../plug-ins/common/file-gif-save.c:972
+#: ../plug-ins/common/file-gif-save.c:982
 msgid ""
 "The image you are trying to save as a GIF contains layers which extend "
 "beyond the actual borders of the image."
 msgstr ""
 
-#: ../plug-ins/common/file-gif-save.c:989
+#: ../plug-ins/common/file-gif-save.c:999
 msgid ""
 "The GIF file format does not allow this.  You may choose whether to crop all "
 "of the layers to the image borders, or cancel this save."
@@ -3285,15 +3340,15 @@
 msgid "_Frame disposal where unspecified:"
 msgstr ""
 
-#: ../plug-ins/common/file-gif-save.c:1187
+#: ../plug-ins/common/file-gif-save.c:1197
 msgid "I don't care"
 msgstr "Jeg bryr meg ikke"
 
-#: ../plug-ins/common/file-gif-save.c:1189
+#: ../plug-ins/common/file-gif-save.c:1199
 msgid "Cumulative layers (combine)"
 msgstr "Kumulative lag (sett sammen)"
 
-#: ../plug-ins/common/file-gif-save.c:1191
+#: ../plug-ins/common/file-gif-save.c:1201
 msgid "One frame per layer (replace)"
 msgstr "En ramme per lag (erstatt)"
 
@@ -3305,12 +3360,12 @@
 msgid "U_se disposal entered above for all frames"
 msgstr ""
 
-#: ../plug-ins/common/file-gif-save.c:2312
+#: ../plug-ins/common/file-gif-save.c:2322
 msgid "Error writing output file."
 msgstr "Feil under skriving av ut-fil."
 
 #. translators: the %d is *always* 240 here
-#: ../plug-ins/common/file-gif-save.c:2385
+#: ../plug-ins/common/file-gif-save.c:2395
 #, c-format
 msgid "The default comment is limited to %d characters."
 msgstr ""
@@ -3649,13 +3704,13 @@
 msgid "'%s' is not a PCX file"
 msgstr ""
 
-#: ../plug-ins/common/file-pcx.c:397 ../plug-ins/file-bmp/bmp-read.c:636
+#: ../plug-ins/common/file-pcx.c:397 ../plug-ins/file-bmp/bmp-read.c:647
 #: ../plug-ins/file-psd/psd-load.c:301
 #, c-format
 msgid "Unsupported or invalid image width: %d"
 msgstr ""
 
-#: ../plug-ins/common/file-pcx.c:403 ../plug-ins/file-bmp/bmp-read.c:642
+#: ../plug-ins/common/file-pcx.c:403 ../plug-ins/file-bmp/bmp-read.c:653
 #: ../plug-ins/file-psd/psd-load.c:293
 #, c-format
 msgid "Unsupported or invalid image height: %d"
@@ -3825,7 +3880,7 @@
 msgid "Co_mpression level:"
 msgstr ""
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1189
+#: ../plug-ins/file-jpeg/jpeg-save.c:1192
 #: ../plug-ins/ui/plug-in-file-png.ui.h:11
 msgid "_Load Defaults"
 msgstr ""
@@ -3854,41 +3909,41 @@
 msgid "PPM image"
 msgstr ""
 
-#: ../plug-ins/common/file-pnm.c:528 ../plug-ins/common/file-pnm.c:550
-#: ../plug-ins/common/file-pnm.c:559 ../plug-ins/common/file-pnm.c:570
-#: ../plug-ins/common/file-pnm.c:656 ../plug-ins/common/file-pnm.c:738
+#: ../plug-ins/common/file-pnm.c:530 ../plug-ins/common/file-pnm.c:552
+#: ../plug-ins/common/file-pnm.c:561 ../plug-ins/common/file-pnm.c:572
+#: ../plug-ins/common/file-pnm.c:658 ../plug-ins/common/file-pnm.c:740
 msgid "Premature end of file."
 msgstr ""
 
-#: ../plug-ins/common/file-pnm.c:530
+#: ../plug-ins/common/file-pnm.c:532
 msgid "Invalid file."
 msgstr ""
 
-#: ../plug-ins/common/file-pnm.c:544
+#: ../plug-ins/common/file-pnm.c:546
 msgid "File not in a supported format."
 msgstr ""
 
-#: ../plug-ins/common/file-pnm.c:553
+#: ../plug-ins/common/file-pnm.c:555
 msgid "Invalid X resolution."
 msgstr ""
 
-#: ../plug-ins/common/file-pnm.c:555
+#: ../plug-ins/common/file-pnm.c:557
 msgid "Image width is larger than GIMP can handle."
 msgstr ""
 
-#: ../plug-ins/common/file-pnm.c:562
+#: ../plug-ins/common/file-pnm.c:564
 msgid "Invalid Y resolution."
 msgstr ""
 
-#: ../plug-ins/common/file-pnm.c:564
+#: ../plug-ins/common/file-pnm.c:566
 msgid "Image height is larger than GIMP can handle."
 msgstr ""
 
-#: ../plug-ins/common/file-pnm.c:574
+#: ../plug-ins/common/file-pnm.c:576
 msgid "Unsupported maximum value."
 msgstr ""
 
-#: ../plug-ins/common/file-pnm.c:814
+#: ../plug-ins/common/file-pnm.c:816
 msgid "Error reading file."
 msgstr ""
 
@@ -3897,11 +3952,11 @@
 msgstr "Lagre som PNM"
 
 #. file save type
-#: ../plug-ins/common/file-pnm.c:1222
+#: ../plug-ins/common/file-pnm.c:1224
 msgid "Data formatting"
 msgstr ""
 
-#: ../plug-ins/common/file-pnm.c:1226
+#: ../plug-ins/common/file-pnm.c:1228
 msgid "Raw"
 msgstr "Rå"
 
@@ -3940,7 +3995,7 @@
 "(%s)"
 msgstr ""
 
-#: ../plug-ins/common/file-ps.c:1804 ../plug-ins/common/file-tiff-load.c:1007
+#: ../plug-ins/common/file-ps.c:1804 ../plug-ins/common/file-tiff-load.c:1012
 #, c-format
 msgid "Page %d"
 msgstr ""
@@ -4210,7 +4265,7 @@
 msgstr "Fargekarttypen er ikke støttet"
 
 #: ../plug-ins/common/file-sunras.c:457 ../plug-ins/common/file-xbm.c:827
-#: ../plug-ins/common/file-xwd.c:491
+#: ../plug-ins/common/file-xwd.c:505
 #, c-format
 msgid ""
 "'%s':\n"
@@ -4218,7 +4273,7 @@
 msgstr ""
 
 #: ../plug-ins/common/file-sunras.c:465 ../plug-ins/common/file-xbm.c:834
-#: ../plug-ins/common/file-xwd.c:501
+#: ../plug-ins/common/file-xwd.c:513
 #, c-format
 msgid ""
 "'%s':\n"
@@ -4226,7 +4281,7 @@
 msgstr ""
 
 #: ../plug-ins/common/file-sunras.c:473 ../plug-ins/common/file-xbm.c:841
-#: ../plug-ins/common/file-xwd.c:510
+#: ../plug-ins/common/file-xwd.c:520
 #, c-format
 msgid ""
 "'%s':\n"
@@ -4234,7 +4289,7 @@
 msgstr ""
 
 #: ../plug-ins/common/file-sunras.c:481 ../plug-ins/common/file-xbm.c:848
-#: ../plug-ins/common/file-xwd.c:519
+#: ../plug-ins/common/file-xwd.c:527
 #, c-format
 msgid ""
 "'%s':\n"
@@ -4256,9 +4311,9 @@
 
 #: ../plug-ins/common/file-sunras.c:1084 ../plug-ins/common/file-sunras.c:1175
 #: ../plug-ins/common/file-sunras.c:1256 ../plug-ins/common/file-sunras.c:1351
-#: ../plug-ins/common/file-xwd.c:1361 ../plug-ins/common/file-xwd.c:1462
-#: ../plug-ins/common/file-xwd.c:1620 ../plug-ins/common/file-xwd.c:1832
-#: ../plug-ins/common/file-xwd.c:2095 ../plug-ins/file-fits/fits.c:698
+#: ../plug-ins/common/file-xwd.c:1373 ../plug-ins/common/file-xwd.c:1474
+#: ../plug-ins/common/file-xwd.c:1632 ../plug-ins/common/file-xwd.c:1844
+#: ../plug-ins/common/file-xwd.c:2107 ../plug-ins/file-fits/fits.c:698
 msgid "EOF encountered on reading"
 msgstr "EOF funnet under lesing"
 
@@ -4374,19 +4429,19 @@
 msgstr "Lagre som TGA"
 
 #. rle
-#: ../plug-ins/common/file-tga.c:1381
+#: ../plug-ins/common/file-tga.c:1389
 msgid "_RLE compression"
 msgstr "_RLE-kompresjon"
 
-#: ../plug-ins/common/file-tga.c:1395
+#: ../plug-ins/common/file-tga.c:1403
 msgid "Or_igin:"
 msgstr ""
 
-#: ../plug-ins/common/file-tga.c:1399
+#: ../plug-ins/common/file-tga.c:1407
 msgid "Bottom left"
 msgstr ""
 
-#: ../plug-ins/common/file-tga.c:1400
+#: ../plug-ins/common/file-tga.c:1408
 msgid "Top left"
 msgstr ""
 
@@ -4405,16 +4460,16 @@
 msgid "Import from TIFF"
 msgstr ""
 
-#: ../plug-ins/common/file-tiff-load.c:788
+#: ../plug-ins/common/file-tiff-load.c:818
 #, c-format
 msgid "%s-%d-of-%d-pages"
 msgstr ""
 
-#: ../plug-ins/common/file-tiff-load.c:1023
+#: ../plug-ins/common/file-tiff-load.c:1028
 msgid "TIFF Channel"
 msgstr "TIFF-kanal"
 
-#: ../plug-ins/common/file-tiff-load.c:1032
+#: ../plug-ins/common/file-tiff-load.c:1037
 #: ../plug-ins/file-psd/psd-load.c:333
 msgid ""
 "Warning:\n"
@@ -4423,7 +4478,7 @@
 "this conversion."
 msgstr ""
 
-#: ../plug-ins/common/file-tiff-save.c:912
+#: ../plug-ins/common/file-tiff-save.c:910
 msgid ""
 "The TIFF format only supports comments in\n"
 "7bit ASCII encoding. No comment is saved."
@@ -4434,43 +4489,43 @@
 msgstr "Lagre som TIFF"
 
 #. compression
-#: ../plug-ins/common/file-tiff-save.c:1093
+#: ../plug-ins/common/file-tiff-save.c:1091
 msgid "Compression"
 msgstr "Kompresjon"
 
-#: ../plug-ins/common/file-tiff-save.c:1097
+#: ../plug-ins/common/file-tiff-save.c:1095
 msgid "_None"
 msgstr "I_ngen"
 
-#: ../plug-ins/common/file-tiff-save.c:1098
+#: ../plug-ins/common/file-tiff-save.c:1096
 msgid "_LZW"
 msgstr "_LZW"
 
-#: ../plug-ins/common/file-tiff-save.c:1099
+#: ../plug-ins/common/file-tiff-save.c:1097
 msgid "_Pack Bits"
 msgstr "_Pakk-biter"
 
-#: ../plug-ins/common/file-tiff-save.c:1100
+#: ../plug-ins/common/file-tiff-save.c:1098
 msgid "_Deflate"
 msgstr "_Pakk ut"
 
-#: ../plug-ins/common/file-tiff-save.c:1101
+#: ../plug-ins/common/file-tiff-save.c:1099
 msgid "_JPEG"
 msgstr "_JPEG"
 
-#: ../plug-ins/common/file-tiff-save.c:1102
+#: ../plug-ins/common/file-tiff-save.c:1100
 msgid "CCITT Group _3 fax"
 msgstr ""
 
-#: ../plug-ins/common/file-tiff-save.c:1103
+#: ../plug-ins/common/file-tiff-save.c:1101
 msgid "CCITT Group _4 fax"
 msgstr ""
 
-#: ../plug-ins/common/file-tiff-save.c:1125
+#: ../plug-ins/common/file-tiff-save.c:1123
 msgid "Save _color values from transparent pixels"
 msgstr ""
 
-#: ../plug-ins/common/file-tiff-save.c:1141 ../plug-ins/common/file-xbm.c:1235
+#: ../plug-ins/common/file-tiff-save.c:1139 ../plug-ins/common/file-xbm.c:1235
 msgid "Comment:"
 msgstr "Kommentar:"
 
@@ -4555,7 +4610,7 @@
 msgid "_Write hot spot values"
 msgstr ""
 
-#: ../plug-ins/common/file-xbm.c:1266 ../plug-ins/common/file-xmc.c:1089
+#: ../plug-ins/common/file-xbm.c:1266 ../plug-ins/common/file-xmc.c:1081
 msgid "Hot spot _X:"
 msgstr ""
 
@@ -4606,26 +4661,45 @@
 msgid "Could not read XWD header from '%s'"
 msgstr ""
 
-#: ../plug-ins/common/file-xwd.c:482
+#: ../plug-ins/common/file-xwd.c:465
+#, c-format
+msgid ""
+"'%s':\n"
+"Illegal number of colormap entries: %ld"
+msgstr ""
+
+#: ../plug-ins/common/file-xwd.c:475
+#, c-format
+msgid ""
+"'%s':\n"
+"Number of colormap entries < number of colors"
+msgstr ""
+
+#: ../plug-ins/common/file-xwd.c:498
 msgid "Can't read color entries"
 msgstr ""
 
-#: ../plug-ins/common/file-xwd.c:579
+#: ../plug-ins/common/file-xwd.c:580
 #, c-format
 msgid ""
 "XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is "
 "not supported."
 msgstr ""
 
-#: ../plug-ins/common/file-xwd.c:602
+#: ../plug-ins/common/file-xwd.c:614
 msgid "Cannot save images with alpha channels."
 msgstr ""
 
-#: ../plug-ins/common/file-xwd.c:2224
+#: ../plug-ins/common/file-xwd.c:1704 ../plug-ins/common/file-xwd.c:1942
+#, c-format
+msgid "XWD-file %s is corrupt."
+msgstr ""
+
+#: ../plug-ins/common/file-xwd.c:2236
 msgid "Error during writing indexed/gray image"
 msgstr ""
 
-#: ../plug-ins/common/file-xwd.c:2320
+#: ../plug-ins/common/file-xwd.c:2332
 msgid "Error during writing rgb image"
 msgstr "Feil under skriving av rgb bilde"
 
@@ -5335,113 +5409,113 @@
 msgid "Color Profile Information"
 msgstr "Fargeprofilinformasjon"
 
-#: ../plug-ins/common/lcms.c:572
+#: ../plug-ins/common/lcms.c:606
 #, c-format
 msgid "Color profile '%s' is not for RGB color space."
 msgstr "Fargeprofil «%s» er ikke laget for RGB-fargerom."
 
-#: ../plug-ins/common/lcms.c:679
+#: ../plug-ins/common/lcms.c:713
 msgid "Default RGB working space"
 msgstr "Standard RGB-rom"
 
-#: ../plug-ins/common/lcms.c:775
+#: ../plug-ins/common/lcms.c:809
 msgid ""
 "Data attached as 'icc-profile' does not appear to be an ICC color profile"
 msgstr ""
 "Data vedlagt som icc-profil ser ikke ut til å være en ICC-fargeprofil"
 
-#: ../plug-ins/common/lcms.c:825
+#: ../plug-ins/common/lcms.c:859
 #, c-format
 msgid "'%s' does not appear to be an ICC color profile"
 msgstr "«%s» ser ikke ut til å være en ICC-fargeprofil"
 
 #. ICC color profile conversion
-#: ../plug-ins/common/lcms.c:885
+#: ../plug-ins/common/lcms.c:919
 #, c-format
 msgid "Converting from '%s' to '%s'"
 msgstr "Konverterer fra «%s» til «%s»"
 
-#: ../plug-ins/common/lcms.c:1129
+#: ../plug-ins/common/lcms.c:1163
 #, c-format
 msgid "Could not load ICC profile from '%s'"
 msgstr "Kunne ikke lese fargeprofil fra «%s»"
 
-#: ../plug-ins/common/lcms.c:1151
+#: ../plug-ins/common/lcms.c:1185
 #, c-format
 msgid "The image '%s' has an embedded color profile:"
 msgstr "Bildet «%s» har en innbakt fargeprofil:"
 
-#: ../plug-ins/common/lcms.c:1195
+#: ../plug-ins/common/lcms.c:1229
 #, c-format
 msgid "Convert the image to the RGB working space (%s)?"
 msgstr "Konverter bildet til RGB-rom (%s)?"
 
-#: ../plug-ins/common/lcms.c:1226
+#: ../plug-ins/common/lcms.c:1260
 msgid "Convert to RGB working space?"
 msgstr "Konverter til RGB-rom?"
 
-#: ../plug-ins/common/lcms.c:1231
+#: ../plug-ins/common/lcms.c:1265
 msgid "_Keep"
 msgstr "_Behold"
 
-#: ../plug-ins/common/lcms.c:1236
+#: ../plug-ins/common/lcms.c:1270
 msgid "_Convert"
 msgstr "_Konverter"
 
-#: ../plug-ins/common/lcms.c:1264 ../plug-ins/file-jpeg/jpeg-exif.c:436
+#: ../plug-ins/common/lcms.c:1298 ../plug-ins/file-jpeg/jpeg-exif.c:436
 msgid "_Don't ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: ../plug-ins/common/lcms.c:1328
+#: ../plug-ins/common/lcms.c:1362
 msgid "Select destination profile"
 msgstr "Velg målprofil"
 
-#: ../plug-ins/common/lcms.c:1355
+#: ../plug-ins/common/lcms.c:1389
 msgid "All files (*.*)"
 msgstr "Alle filer (*.*)"
 
-#: ../plug-ins/common/lcms.c:1360
+#: ../plug-ins/common/lcms.c:1394
 msgid "ICC color profile (*.icc, *.icm)"
 msgstr "ICC-fargeprofil (*.icc, *.icm)"
 
-#: ../plug-ins/common/lcms.c:1403
+#: ../plug-ins/common/lcms.c:1437
 #, c-format
 msgid "RGB workspace (%s)"
 msgstr "RGB-rom (%s)"
 
-#: ../plug-ins/common/lcms.c:1453
+#: ../plug-ins/common/lcms.c:1487
 msgid "Convert to ICC Color Profile"
 msgstr "Konverter til ICC-fargeprofil"
 
-#: ../plug-ins/common/lcms.c:1454
+#: ../plug-ins/common/lcms.c:1488
 msgid "Assign ICC Color Profile"
 msgstr "Velg ICC-fargeprofil"
 
-#: ../plug-ins/common/lcms.c:1462
+#: ../plug-ins/common/lcms.c:1496
 msgid "_Assign"
 msgstr "_Velg"
 
-#: ../plug-ins/common/lcms.c:1480
+#: ../plug-ins/common/lcms.c:1514
 msgid "Current Color Profile"
 msgstr "Aktiv fargeprofil"
 
-#: ../plug-ins/common/lcms.c:1495
+#: ../plug-ins/common/lcms.c:1529
 msgid "Convert to"
 msgstr "Konverter til"
 
-#: ../plug-ins/common/lcms.c:1495
+#: ../plug-ins/common/lcms.c:1529
 msgid "Assign"
 msgstr "Velg"
 
-#: ../plug-ins/common/lcms.c:1519
+#: ../plug-ins/common/lcms.c:1553
 msgid "_Rendering Intent:"
 msgstr "_Rendreintensjon:"
 
-#: ../plug-ins/common/lcms.c:1535
+#: ../plug-ins/common/lcms.c:1569
 msgid "_Black Point Compensation"
 msgstr "_Svartpunktkompensasjon"
 
-#: ../plug-ins/common/lcms.c:1577
+#: ../plug-ins/common/lcms.c:1611
 msgid "Destination profile is not for RGB color space."
 msgstr "Målprofilen er ikke laget for RGB-fargerom."
 
@@ -6327,7 +6401,7 @@
 msgstr ""
 
 #: ../plug-ins/common/red-eye-removal.c:171
-#: ../plug-ins/common/unsharp-mask.c:891 ../plug-ins/common/wind.c:1006
+#: ../plug-ins/common/unsharp-mask.c:898 ../plug-ins/common/wind.c:1006
 #: ../plug-ins/imagemap/imap_preferences.c:455
 #: ../plug-ins/map-object/map-object-ui.c:539
 msgid "_Threshold:"
@@ -6497,31 +6571,31 @@
 msgid "Remap colorized"
 msgstr ""
 
-#: ../plug-ins/common/screenshot.c:240
+#: ../plug-ins/common/screenshot.c:250
 msgid "Create an image from an area of the screen"
 msgstr "Opprett et bilde fra et område av skjermen"
 
-#: ../plug-ins/common/screenshot.c:253
+#: ../plug-ins/common/screenshot.c:272
 msgid "_Screenshot..."
 msgstr "_Skjermbilde..."
 
-#: ../plug-ins/common/screenshot.c:418
+#: ../plug-ins/common/screenshot.c:445
 msgid "Error selecting the window"
 msgstr "Feil under valg av vindu"
 
-#: ../plug-ins/common/screenshot.c:786
+#: ../plug-ins/common/screenshot.c:813
 msgid "Importing screenshot"
 msgstr "Importerer skjermbilde"
 
-#: ../plug-ins/common/screenshot.c:812 ../plug-ins/common/screenshot.c:1085
+#: ../plug-ins/common/screenshot.c:839 ../plug-ins/common/screenshot.c:1204
 msgid "Screenshot"
 msgstr "Skjermbilde"
 
-#: ../plug-ins/common/screenshot.c:853
+#: ../plug-ins/common/screenshot.c:880
 msgid "Mouse Pointer"
 msgstr "Muspeker"
 
-#: ../plug-ins/common/screenshot.c:972
+#: ../plug-ins/common/screenshot.c:1014
 msgid "Specified window not found"
 msgstr "Valgt vindu ikke funnet"
 
@@ -6529,56 +6603,56 @@
 msgid "There was an error taking the screenshot."
 msgstr "Det skjedde en feil ved henting av skjermbilde."
 
-#: ../plug-ins/common/screenshot.c:1094
+#: ../plug-ins/common/screenshot.c:1213
 msgid "S_nap"
 msgstr "_Ta bilde"
 
-#: ../plug-ins/common/screenshot.c:1124
+#: ../plug-ins/common/screenshot.c:1243
 msgid "After the delay, the screenshot is taken."
 msgstr "Bildet blir tatt etter en forsinkelse."
 
-#: ../plug-ins/common/screenshot.c:1126
+#: ../plug-ins/common/screenshot.c:1245
 msgid ""
 "After the delay, drag your mouse to select the region for the screenshot."
 msgstr ""
 "Tar bilde av et område av skjermen noen sekunder etter at du har markert det."
 
-#: ../plug-ins/common/screenshot.c:1129
+#: ../plug-ins/common/screenshot.c:1248
 msgid "At the end of the delay, click in a window to snap it."
 msgstr "Klikk på vindet det skal tas bilde av etter forsinkelsen."
 
 #. Area
-#: ../plug-ins/common/screenshot.c:1135
+#: ../plug-ins/common/screenshot.c:1254
 msgid "Area"
 msgstr "Område"
 
-#: ../plug-ins/common/screenshot.c:1146
+#: ../plug-ins/common/screenshot.c:1265
 msgid "Take a screenshot of a single _window"
 msgstr "Ta bilde av et enkelt _vindu"
 
-#: ../plug-ins/common/screenshot.c:1165
+#: ../plug-ins/common/screenshot.c:1284
 msgid "Include window _decoration"
 msgstr "Ta med vindus_dekorasjoner"
 
-#: ../plug-ins/common/screenshot.c:1185
+#: ../plug-ins/common/screenshot.c:1304
 msgid "Take a screenshot of the entire _screen"
 msgstr "Ta bilde av hele _skjermen"
 
-#: ../plug-ins/common/screenshot.c:1204
+#: ../plug-ins/common/screenshot.c:1323
 msgid "Include _mouse pointer"
 msgstr "Ta med _muspekeren i bildet"
 
-#: ../plug-ins/common/screenshot.c:1225
+#: ../plug-ins/common/screenshot.c:1344
 msgid "Select a _region to grab"
 msgstr "Velg et _område å ta bilde av"
 
 #. Delay
-#: ../plug-ins/common/screenshot.c:1240
+#: ../plug-ins/common/screenshot.c:1359
 msgid "Delay"
 msgstr "Forsinkelse"
 
 #. this is the unit label of a spinbutton
-#: ../plug-ins/common/screenshot.c:1262
+#: ../plug-ins/common/screenshot.c:1381
 msgid "seconds"
 msgstr "sekunder"
 
@@ -7474,11 +7548,11 @@
 msgid "_Unsharp Mask..."
 msgstr "_Uskarp maske"
 
-#: ../plug-ins/common/unsharp-mask.c:684
+#: ../plug-ins/common/unsharp-mask.c:691
 msgid "Merging"
 msgstr "Fletter"
 
-#: ../plug-ins/common/unsharp-mask.c:828
+#: ../plug-ins/common/unsharp-mask.c:835
 msgid "Unsharp Mask"
 msgstr "Uskarp maske"
 
@@ -8010,37 +8084,37 @@
 msgid "Higher values increase the magnitude of the effect"
 msgstr "Høyere verdier øker størrelsen på effekten"
 
-#: ../plug-ins/file-bmp/bmp-read.c:85
+#: ../plug-ins/file-bmp/bmp-read.c:86
 msgid "Bad colormap"
 msgstr "Ugyldig fargekart"
 
-#: ../plug-ins/file-bmp/bmp-read.c:169 ../plug-ins/file-bmp/bmp-read.c:180
-#: ../plug-ins/file-bmp/bmp-read.c:187 ../plug-ins/file-bmp/bmp-read.c:196
-#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-bmp/bmp-read.c:416
-#: ../plug-ins/file-bmp/bmp-read.c:437 ../plug-ins/file-bmp/bmp-read.c:448
-#: ../plug-ins/file-bmp/bmp-read.c:456 ../plug-ins/file-bmp/bmp-read.c:464
-#: ../plug-ins/file-bmp/bmp-read.c:476
+#: ../plug-ins/file-bmp/bmp-read.c:170 ../plug-ins/file-bmp/bmp-read.c:181
+#: ../plug-ins/file-bmp/bmp-read.c:188 ../plug-ins/file-bmp/bmp-read.c:197
+#: ../plug-ins/file-bmp/bmp-read.c:212 ../plug-ins/file-bmp/bmp-read.c:427
+#: ../plug-ins/file-bmp/bmp-read.c:448 ../plug-ins/file-bmp/bmp-read.c:459
+#: ../plug-ins/file-bmp/bmp-read.c:467 ../plug-ins/file-bmp/bmp-read.c:475
+#: ../plug-ins/file-bmp/bmp-read.c:487
 #, c-format
 msgid "'%s' is not a valid BMP file"
 msgstr "«%s» er ikke en gyldig punktgrafikkfil"
 
-#: ../plug-ins/file-bmp/bmp-read.c:225 ../plug-ins/file-bmp/bmp-read.c:252
-#: ../plug-ins/file-bmp/bmp-read.c:280 ../plug-ins/file-bmp/bmp-read.c:345
-#: ../plug-ins/file-bmp/bmp-read.c:395
+#: ../plug-ins/file-bmp/bmp-read.c:226 ../plug-ins/file-bmp/bmp-read.c:253
+#: ../plug-ins/file-bmp/bmp-read.c:281 ../plug-ins/file-bmp/bmp-read.c:356
+#: ../plug-ins/file-bmp/bmp-read.c:406
 #, c-format
 msgid "Error reading BMP file header from '%s'"
 msgstr "Feil ved lesing av punktgrafikkfilhodet fra «%s»"
 
-#: ../plug-ins/file-bmp/bmp-read.c:588
+#: ../plug-ins/file-bmp/bmp-read.c:599
 msgid "Unrecognized or invalid BMP compression format."
 msgstr ""
 
-#: ../plug-ins/file-bmp/bmp-read.c:630
+#: ../plug-ins/file-bmp/bmp-read.c:641
 msgid "Unsupported or invalid bitdepth."
 msgstr ""
 
-#: ../plug-ins/file-bmp/bmp-read.c:818 ../plug-ins/file-bmp/bmp-read.c:859
-#: ../plug-ins/file-bmp/bmp-read.c:909
+#: ../plug-ins/file-bmp/bmp-read.c:829 ../plug-ins/file-bmp/bmp-read.c:870
+#: ../plug-ins/file-bmp/bmp-read.c:920
 msgid "The bitmap ends unexpectedly."
 msgstr ""
 
@@ -8057,24 +8131,24 @@
 msgstr "Lagre som BMP"
 
 #. Run-Length Encoded
-#: ../plug-ins/file-bmp/bmp-write.c:861
+#: ../plug-ins/file-bmp/bmp-write.c:864
 msgid "_Run-Length Encoded"
 msgstr ""
 
 #. Advanced Options
-#: ../plug-ins/file-bmp/bmp-write.c:902 ../plug-ins/file-jpeg/jpeg-save.c:901
+#: ../plug-ins/file-bmp/bmp-write.c:905 ../plug-ins/file-jpeg/jpeg-save.c:901
 msgid "_Advanced Options"
 msgstr "_Avanserte alternativer"
 
-#: ../plug-ins/file-bmp/bmp-write.c:917
+#: ../plug-ins/file-bmp/bmp-write.c:920
 msgid "16 bits"
 msgstr "16-bits"
 
-#: ../plug-ins/file-bmp/bmp-write.c:953
+#: ../plug-ins/file-bmp/bmp-write.c:956
 msgid "24 bits"
 msgstr "24-bits"
 
-#: ../plug-ins/file-bmp/bmp-write.c:970
+#: ../plug-ins/file-bmp/bmp-write.c:973
 msgid "32 bits"
 msgstr "32-bits"
 
@@ -8287,11 +8361,11 @@
 msgid "Save _XMP data"
 msgstr ""
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1055
+#: ../plug-ins/file-jpeg/jpeg-save.c:1058
 msgid "_Use quality settings from original image"
 msgstr ""
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1061
+#: ../plug-ins/file-jpeg/jpeg-save.c:1064
 msgid ""
 "If the original image was loaded from a JPEG file using non-standard quality "
 "settings (quantization tables), enable this option to get almost the same "
@@ -8299,7 +8373,7 @@
 msgstr ""
 
 #. Subsampling
-#: ../plug-ins/file-jpeg/jpeg-save.c:1085
+#: ../plug-ins/file-jpeg/jpeg-save.c:1088
 msgid "Su_bsampling:"
 msgstr ""
 
@@ -8320,27 +8394,27 @@
 msgstr ""
 
 #. DCT method
-#: ../plug-ins/file-jpeg/jpeg-save.c:1128
+#: ../plug-ins/file-jpeg/jpeg-save.c:1131
 msgid "_DCT method:"
 msgstr ""
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1134
+#: ../plug-ins/file-jpeg/jpeg-save.c:1137
 msgid "Fast Integer"
 msgstr "Raskt heltall"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1135
+#: ../plug-ins/file-jpeg/jpeg-save.c:1138
 msgid "Integer"
 msgstr "Heltall"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1136
+#: ../plug-ins/file-jpeg/jpeg-save.c:1139
 msgid "Floating-Point"
 msgstr "Flyttall"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1152
+#: ../plug-ins/file-jpeg/jpeg-save.c:1155
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1198
+#: ../plug-ins/file-jpeg/jpeg-save.c:1201
 msgid "Sa_ve Defaults"
 msgstr ""
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gimp20.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gimp20.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gimp20.po	2013-01-29 09:33:56.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gimp20.po	2014-01-07 06:37:02.000000000 +0000
@@ -8,16 +8,16 @@
 msgstr ""
 "Project-Id-Version: gimp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-23 08:07+0000\n"
-"PO-Revision-Date: 2011-01-22 14:14+0000\n"
-"Last-Translator: Sigurd Gartmann <sigurdga-launchpad@sigurdga.no>\n"
+"POT-Creation-Date: 2013-12-06 20:50+0000\n"
+"PO-Revision-Date: 2013-12-10 05:29+0000\n"
+"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:21+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:26+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../app/about.h:23
 msgid "GIMP"
@@ -403,7 +403,7 @@
 msgid "Tool Options"
 msgstr "Verktøyinnstillinger"
 
-#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:388
+#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391
 msgid "Tools"
 msgstr "Verktøy"
 
@@ -670,7 +670,7 @@
 msgstr "Farge på ny kanal"
 
 #: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:257
-#: ../app/display/gimpdisplayshell-dnd.c:642
+#: ../app/display/gimpdisplayshell-dnd.c:646
 #: ../app/widgets/gimpchanneltreeview.c:258
 #: ../app/widgets/gimplayertreeview.c:776
 #, c-format
@@ -824,13 +824,13 @@
 msgstr "Flett synlige"
 
 #: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344
-#: ../app/actions/file-commands.c:194 ../app/dialogs/file-open-dialog.c:232
+#: ../app/actions/file-commands.c:195 ../app/dialogs/file-open-dialog.c:232
 #: ../app/dialogs/file-open-dialog.c:277
 #: ../app/dialogs/file-open-location-dialog.c:213
 #: ../app/dialogs/file-open-location-dialog.c:225
-#: ../app/display/gimpdisplayshell-dnd.c:588
-#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:170
-#: ../app/widgets/gimptoolbox.c:833
+#: ../app/display/gimpdisplayshell-dnd.c:592
+#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:168
+#: ../app/widgets/gimptoolbox.c:818
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -1847,20 +1847,20 @@
 msgid "Save this image and close its window"
 msgstr "Lagre bildet og lukk vinduet"
 
-#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:489
+#: ../app/actions/file-commands.c:113 ../app/actions/file-commands.c:490
 #: ../app/dialogs/file-open-dialog.c:77
 msgid "Open Image"
 msgstr "Åpne bilde"
 
-#: ../app/actions/file-commands.c:133
+#: ../app/actions/file-commands.c:134
 msgid "Open Image as Layers"
 msgstr "Åpne bilde som lag"
 
-#: ../app/dialogs/file-save-dialog.c:664
+#: ../app/dialogs/file-save-dialog.c:651
 msgid "Saving canceled"
 msgstr "Lagring avbrutt"
 
-#: ../app/dialogs/file-save-dialog.c:672 ../app/widgets/gimpdnd-xds.c:186
+#: ../app/dialogs/file-save-dialog.c:659 ../app/widgets/gimpdnd-xds.c:186
 #, c-format
 msgid ""
 "Saving '%s' failed:\n"
@@ -1871,40 +1871,40 @@
 "\n"
 "%s"
 
-#: ../app/actions/file-commands.c:265
+#: ../app/actions/file-commands.c:266
 msgid "No changes need to be saved"
 msgstr "Ingen endringer å lagre"
 
-#: ../app/actions/file-commands.c:272 ../app/dialogs/file-save-dialog.c:95
+#: ../app/actions/file-commands.c:273 ../app/dialogs/file-save-dialog.c:95
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#: ../app/actions/file-commands.c:278
+#: ../app/actions/file-commands.c:279
 msgid "Save a Copy of the Image"
 msgstr "Lagre en kopi av bildet"
 
-#: ../app/actions/file-commands.c:363
+#: ../app/actions/file-commands.c:364
 msgid "Create New Template"
 msgstr "Opprett ny mal"
 
-#: ../app/actions/file-commands.c:367
+#: ../app/actions/file-commands.c:368
 msgid "Enter a name for this template"
 msgstr "Skriv inn et navn for denne malen"
 
-#: ../app/actions/file-commands.c:397
+#: ../app/actions/file-commands.c:398
 msgid "Revert failed. No file name associated with this image."
 msgstr "Gjenoppretting feilet. Ingen filnavn assosiert med dette bildet."
 
-#: ../app/actions/file-commands.c:409
+#: ../app/actions/file-commands.c:410
 msgid "Revert Image"
 msgstr "Forkast bilde"
 
-#: ../app/actions/file-commands.c:435
+#: ../app/actions/file-commands.c:436
 #, c-format
 msgid "Revert '%s' to '%s'?"
 msgstr "Forkast '%s' til '%s'?"
 
-#: ../app/actions/file-commands.c:441
+#: ../app/actions/file-commands.c:442
 msgid ""
 "By reverting the image to the state saved on disk, you will lose all "
 "changes, including all undo information."
@@ -4303,11 +4303,11 @@
 msgid "_Zoom (%s)"
 msgstr "_Zoom (%s)"
 
-#: ../app/actions/view-commands.c:585
+#: ../app/actions/view-commands.c:605
 msgid "Set Canvas Padding Color"
 msgstr "Sett fyllfarge for lerret"
 
-#: ../app/actions/view-commands.c:587
+#: ../app/actions/view-commands.c:607
 msgid "Set Custom Canvas Padding Color"
 msgstr "Velg egendefinert fyllfarge for lerret"
 
@@ -5052,7 +5052,7 @@
 "kommandoen inneholder '%s' vil den bli erstattet med gjeldende URI, ellers "
 "vil URI bli lagt til kommandoen etter et mellomrom."
 
-#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:133
+#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:136
 #: ../app/core/gimp-units.c:167 ../app/gui/session.c:286
 #: ../app/plug-in/plug-in-rc.c:212
 msgid "fatal parse error"
@@ -5595,8 +5595,8 @@
 msgstr "Konverter til RGB-fargerom"
 
 #: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375
-#: ../app/gui/session.c:399 ../app/menus/menus.c:464
-#: ../app/widgets/gimpdevices.c:206
+#: ../app/gui/session.c:399 ../app/menus/menus.c:466
+#: ../app/widgets/gimpdevices.c:208
 #, c-format
 msgid "Deleting \"%s\" failed: %s"
 msgstr "Sletting av «%s» feilet: %s"
@@ -5932,7 +5932,7 @@
 msgid "Selection Mask"
 msgstr "Utvalgsmaske"
 
-#: ../app/core/gimpdata.c:670
+#: ../app/core/gimpdata.c:681
 #, c-format
 msgid "Could not delete '%s': %s"
 msgstr "Kunne ikke slette «%s»: %s"
@@ -6924,7 +6924,7 @@
 msgid "_Fade"
 msgstr "_Uttoning"
 
-#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:344
+#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:346
 msgid "_Mode:"
 msgstr "_Modus:"
 
@@ -6944,7 +6944,7 @@
 msgid "Enter location (URI):"
 msgstr "Skriv inn lokasjon (URI):"
 
-#: ../app/dialogs/file-save-dialog.c:572
+#: ../app/dialogs/file-save-dialog.c:559
 msgid ""
 "The given filename does not have any known file extension. Please enter a "
 "known file extension or select a file format from the file format list."
@@ -6952,7 +6952,7 @@
 "Det oppgitte filnavnet har ikke noen kjent filendelse. Skriv inn en kjent "
 "filendelse eller velg filformat fra filformatlisten."
 
-#: ../app/dialogs/file-save-dialog.c:432
+#: ../app/dialogs/file-save-dialog.c:419
 msgid ""
 "Saving remote files needs to determine the file format from the file "
 "extension. Please enter a file extension that matches the selected file "
@@ -6962,15 +6962,15 @@
 "filendelsen. Skriv inn en filendelse som passer til det valgte filformatet, "
 "eller ikke oppgi noen filendelse i det hele tatt."
 
-#: ../app/dialogs/file-save-dialog.c:586
+#: ../app/dialogs/file-save-dialog.c:573
 msgid "Extension Mismatch"
 msgstr "Filendelsekonflikt"
 
-#: ../app/dialogs/file-save-dialog.c:602
+#: ../app/dialogs/file-save-dialog.c:589
 msgid "The given file extension does not match the chosen file type."
 msgstr "Den gitte filendelsen passer ikke med den valgte filtypen."
 
-#: ../app/dialogs/file-save-dialog.c:606
+#: ../app/dialogs/file-save-dialog.c:593
 msgid "Do you want to save the image using this name anyway?"
 msgstr "Vil du likevel bruke dette filnavnet?"
 
@@ -7153,31 +7153,31 @@
 msgid "Module"
 msgstr "Modul"
 
-#: ../app/dialogs/module-dialog.c:465
+#: ../app/dialogs/module-dialog.c:468
 msgid "Only in memory"
 msgstr "Bare i minne"
 
-#: ../app/dialogs/module-dialog.c:470
+#: ../app/dialogs/module-dialog.c:473
 msgid "No longer available"
 msgstr "Ikke lenger tilgjengelig"
 
-#: ../app/dialogs/module-dialog.c:495
+#: ../app/dialogs/module-dialog.c:498
 msgid "Author:"
 msgstr "Forfatter:"
 
-#: ../app/dialogs/module-dialog.c:496
+#: ../app/dialogs/module-dialog.c:499
 msgid "Version:"
 msgstr "Versjon:"
 
-#: ../app/dialogs/module-dialog.c:497
+#: ../app/dialogs/module-dialog.c:500
 msgid "Date:"
 msgstr "Dato:"
 
-#: ../app/dialogs/module-dialog.c:498
+#: ../app/dialogs/module-dialog.c:501
 msgid "Copyright:"
 msgstr "Opphavsrett:"
 
-#: ../app/dialogs/module-dialog.c:499
+#: ../app/dialogs/module-dialog.c:502
 msgid "Location:"
 msgstr "Plassering:"
 
@@ -7632,7 +7632,7 @@
 msgstr "Angi laget eller banens tetthet"
 
 #: ../app/actions/dialogs-actions.c:328
-#: ../app/dialogs/preferences-dialog.c:1944 ../app/widgets/gimptoolbox.c:555
+#: ../app/dialogs/preferences-dialog.c:1944 ../app/widgets/gimptoolbox.c:540
 msgid "Toolbox"
 msgstr "Verktøykasse"
 
@@ -8370,7 +8370,7 @@
 msgstr "Naviger bildevisningen"
 
 #: ../app/display/gimpdisplayshell.c:746
-#: ../app/display/gimpdisplayshell.c:1325 ../app/widgets/gimptoolbox.c:256
+#: ../app/display/gimpdisplayshell.c:1327 ../app/widgets/gimptoolbox.c:253
 msgid "Drop image files here to open them"
 msgstr "Slipp bildefiler her for å åpne dem"
 
@@ -8424,32 +8424,32 @@
 "Hvis du ikke lagrer bildet, vil endringer gjort siste minutt gå tapt."
 msgstr[1] "Hvis du ikke lagrer bildet, vil gjort siste %d minutter gå tapt."
 
-#: ../app/display/gimpdisplayshell-dnd.c:242
-#: ../app/display/gimpdisplayshell-dnd.c:645
-#: ../app/display/gimpdisplayshell-dnd.c:703
+#: ../app/display/gimpdisplayshell-dnd.c:246
+#: ../app/display/gimpdisplayshell-dnd.c:649
+#: ../app/display/gimpdisplayshell-dnd.c:707
 msgid "Drop New Layer"
 msgstr "Slipp nytt lag"
 
-#: ../app/display/gimpdisplayshell-dnd.c:285
+#: ../app/display/gimpdisplayshell-dnd.c:289
 msgid "Drop New Path"
 msgstr "Slipp ny bane"
 
-#: ../app/display/gimpdisplayshell-dnd.c:545
+#: ../app/display/gimpdisplayshell-dnd.c:549
 #: ../app/widgets/gimplayertreeview.c:725
 msgid "Drop layers"
 msgstr "Slipp lag"
 
-#: ../app/display/gimpdisplayshell-dnd.c:678
-#: ../app/display/gimpdisplayshell-dnd.c:695
-#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:266
+#: ../app/display/gimpdisplayshell-dnd.c:682
+#: ../app/display/gimpdisplayshell-dnd.c:699
+#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:264
 msgid "Dropped Buffer"
 msgstr "Sluppet buffer"
 
-#: ../app/display/gimpdisplayshell-filter-dialog.c:78
+#: ../app/display/gimpdisplayshell-filter-dialog.c:83
 msgid "Color Display Filters"
 msgstr "Filter for fargevisning"
 
-#: ../app/display/gimpdisplayshell-filter-dialog.c:81
+#: ../app/display/gimpdisplayshell-filter-dialog.c:86
 msgid "Configure Color Display Filters"
 msgstr "Konfigurer filtre for fargevisning"
 
@@ -8552,24 +8552,24 @@
 msgid "%s plug-in could not save image"
 msgstr "Programtillegg %s kunne ikke lagre bilde"
 
-#: ../app/file/file-utils.c:74
+#: ../app/file/file-utils.c:72
 #, c-format
 msgid "'%s:' is not a valid URI scheme"
 msgstr "«%s:» er ikke et gyldig URI-skjema"
 
-#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126
+#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124
 msgid "Invalid character sequence in URI"
 msgstr "Ugyldig tegnsekvens i URI"
 
-#: ../app/gegl/gimpcurvesconfig.c:388
+#: ../app/gegl/gimpcurvesconfig.c:395
 msgid "not a GIMP Curves file"
 msgstr "ikke en GIMP-kurvefil"
 
-#: ../app/gegl/gimpcurvesconfig.c:403 ../app/gegl/gimplevelsconfig.c:789
+#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811
 msgid "parse error"
 msgstr "tolkningsfeil"
 
-#: ../app/gegl/gimplevelsconfig.c:742
+#: ../app/gegl/gimplevelsconfig.c:764
 msgid "not a GIMP Levels file"
 msgstr "ikke en GIMP-nivåfil"
 
@@ -9017,7 +9017,7 @@
 msgid "Cancelled"
 msgstr "Avbrutt"
 
-#: ../app/plug-in/gimpplugin.c:639
+#: ../app/plug-in/gimpplugin.c:643
 #, c-format
 msgid ""
 "Plug-in crashed: \"%s\"\n"
@@ -9067,7 +9067,7 @@
 msgid "Plug-In Environment"
 msgstr "Omgivelser for programtillegg"
 
-#: ../app/plug-in/gimppluginprocedure.c:980
+#: ../app/plug-in/gimppluginprocedure.c:978
 #, c-format
 msgid ""
 "Calling error for '%s':\n"
@@ -9076,7 +9076,7 @@
 "Feil ved kall for prosedyre «%s»:\n"
 "%s"
 
-#: ../app/plug-in/gimppluginprocedure.c:992
+#: ../app/plug-in/gimppluginprocedure.c:990
 #, c-format
 msgid ""
 "Execution error for '%s':\n"
@@ -9085,16 +9085,16 @@
 "Kjørefeil for prosedyre «%s»:\n"
 "%s"
 
-#: ../app/plug-in/plug-in-icc-profile.c:112
-#: ../app/plug-in/plug-in-icc-profile.c:187
-#: ../app/plug-in/plug-in-icc-profile.c:246
+#: ../app/plug-in/plug-in-icc-profile.c:117
+#: ../app/plug-in/plug-in-icc-profile.c:192
+#: ../app/plug-in/plug-in-icc-profile.c:251
 #, c-format
 msgid "Error running '%s'"
 msgstr "Feil under kjøring av «%s»"
 
-#: ../app/plug-in/plug-in-icc-profile.c:136
-#: ../app/plug-in/plug-in-icc-profile.c:197
-#: ../app/plug-in/plug-in-icc-profile.c:256
+#: ../app/plug-in/plug-in-icc-profile.c:141
+#: ../app/plug-in/plug-in-icc-profile.c:202
+#: ../app/plug-in/plug-in-icc-profile.c:261
 #, c-format
 msgid "Plug-In missing (%s)"
 msgstr "Programtillegg mangler (%s)"
@@ -9116,7 +9116,7 @@
 
 #. This is a so-called pangram; it's supposed to
 #. contain all characters found in the alphabet.
-#: ../app/text/gimpfont.c:43
+#: ../app/text/gimpfont.c:45
 msgid ""
 "Pack my box with\n"
 "five dozen liquor jugs."
@@ -9125,7 +9125,7 @@
 "bedre om calypso, watt \n"
 "og klær på vei hjem."
 
-#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1401
+#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1402
 msgid "Add Text Layer"
 msgstr "Legg til tekstlag"
 
@@ -9786,7 +9786,7 @@
 msgid "R_eset Channel"
 msgstr "_Nullstill kanal"
 
-#: ../app/tools/gimpcurvestool.c:583 ../app/widgets/gimpdeviceinfoeditor.c:458
+#: ../app/tools/gimpcurvestool.c:583 ../app/widgets/gimpdeviceinfoeditor.c:461
 msgid "Curve _type:"
 msgstr "Kurve_type:"
 
@@ -10034,11 +10034,11 @@
 msgid "F_oreground Select"
 msgstr "Velg _forgrunn"
 
-#: ../app/tools/gimpforegroundselecttool.c:302
+#: ../app/tools/gimpforegroundselecttool.c:304
 msgid "Add more strokes or press Enter to accept the selection"
 msgstr "Legg til flere strøk eller trykk linjeskift for å akseptere utvalget"
 
-#: ../app/tools/gimpforegroundselecttool.c:304
+#: ../app/tools/gimpforegroundselecttool.c:306
 msgid "Mark foreground by painting on the object to extract"
 msgstr "Marker forgrunn ved å male på objektet som skal hentes ut"
 
@@ -10046,7 +10046,7 @@
 msgid "Rougly outline the object to extract"
 msgstr "Tegn omriss rundt objeket som skal hentes us"
 
-#: ../app/tools/gimpforegroundselecttool.c:751
+#: ../app/tools/gimpforegroundselecttool.c:753
 msgctxt "command"
 msgid "Foreground Select"
 msgstr "Forgrunnsutvalg"
@@ -10229,7 +10229,7 @@
 msgid "Settings saved to '%s'"
 msgstr "Innstillinger lagret til «%s»"
 
-#: ../app/tools/gimpimagemaptool.c:362
+#: ../app/tools/gimpimagemaptool.c:363
 msgid "_Preview"
 msgstr "_Forhåndsvis"
 
@@ -10292,32 +10292,32 @@
 msgid "Intelligent _Scissors"
 msgstr "Intelligent _saks"
 
-#: ../app/tools/gimpiscissorstool.c:900 ../app/tools/gimpmeasuretool.c:605
+#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpmeasuretool.c:605
 msgid "Click-Drag to move this point"
 msgstr "Klikk og dra for å flytte dette punktet"
 
-#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpiscissorstool.c:967
+#: ../app/tools/gimpiscissorstool.c:904 ../app/tools/gimpiscissorstool.c:969
 #, c-format
 msgid "%s: disable auto-snap"
 msgstr "%s: slå av autoinnretting"
 
-#: ../app/tools/gimpiscissorstool.c:919
+#: ../app/tools/gimpiscissorstool.c:921
 msgid "Click to close the curve"
 msgstr "Klikk for å lukke kurven"
 
-#: ../app/tools/gimpiscissorstool.c:925
+#: ../app/tools/gimpiscissorstool.c:927
 msgid "Click to add a point on this segment"
 msgstr "Klikk for å legge til et punkt på segmentet"
 
-#: ../app/tools/gimpiscissorstool.c:939
+#: ../app/tools/gimpiscissorstool.c:941
 msgid "Click or press Enter to convert to a selection"
 msgstr "Klikk med musa eller trykk linjeskift for å konvertere til et utvalg"
 
-#: ../app/tools/gimpiscissorstool.c:949
+#: ../app/tools/gimpiscissorstool.c:951
 msgid "Press Enter to convert to a selection"
 msgstr "Trykk linjeskift for å konvertere til et utvalg"
 
-#: ../app/tools/gimpiscissorstool.c:964
+#: ../app/tools/gimpiscissorstool.c:966
 msgid "Click or Click-Drag to add a point"
 msgstr "Klikk eller klikk og dra for å legge til et punkt"
 
@@ -10942,19 +10942,19 @@
 msgid "Te_xt"
 msgstr "_Tekst"
 
-#: ../app/tools/gimptexttool-editor.c:1180
+#: ../app/tools/gimptexttool-editor.c:1199
 msgid "GIMP Text Editor"
 msgstr "GIMP tekstbehandler"
 
-#: ../app/tools/gimptexttool.c:1512 ../app/tools/gimptexttool.c:1515
+#: ../app/tools/gimptexttool.c:1513 ../app/tools/gimptexttool.c:1516
 msgid "Confirm Text Editing"
 msgstr "Bekreft tekstredigering"
 
-#: ../app/tools/gimptexttool.c:1519
+#: ../app/tools/gimptexttool.c:1520
 msgid "Create _New Layer"
 msgstr "Lag et _nytt lag"
 
-#: ../app/tools/gimptexttool.c:1543
+#: ../app/tools/gimptexttool.c:1544
 msgid ""
 "The layer you selected is a text layer but it has been modified using other "
 "tools. Editing the layer with the text tool will discard these "
@@ -10968,7 +10968,7 @@
 "\n"
 "Du kan endre laget eller opprette et nytt tekstlag fra dets tekstegenskaper."
 
-#: ../app/tools/gimptexttool.c:958
+#: ../app/tools/gimptexttool.c:959
 msgid "Reshape Text Layer"
 msgstr "Endre form på tekstlag"
 
@@ -11034,15 +11034,15 @@
 msgid "Keep aspect  (%s)"
 msgstr "Behold bredde- og høydeforhold  (%s)"
 
-#: ../app/tools/gimptransformtool.c:212
+#: ../app/tools/gimptransformtool.c:213
 msgid "Transforming"
 msgstr "Transformerer..."
 
-#: ../app/tools/gimptransformtool.c:1065
+#: ../app/tools/gimptransformtool.c:1069
 msgid "There is no layer to transform."
 msgstr "Det finnes ingen lag å transformere."
 
-#: ../app/tools/gimptransformtool.c:1078
+#: ../app/tools/gimptransformtool.c:1082
 msgid "There is no path to transform."
 msgstr "Det finnes ingen bane å transformere."
 
@@ -11355,7 +11355,7 @@
 msgid "Name"
 msgstr "Navn"
 
-#: ../app/widgets/gimpactionview.c:633 ../app/widgets/gimpactionview.c:841
+#: ../app/widgets/gimpactionview.c:633 ../app/widgets/gimpactionview.c:843
 msgid "Changing shortcut failed."
 msgstr "Endring av snarvei feilet."
 
@@ -11378,11 +11378,11 @@
 msgstr ""
 "Tilordning av snarvei på nytt vil føre til at den blir fjernet fra «%s»."
 
-#: ../app/widgets/gimpactionview.c:776
+#: ../app/widgets/gimpactionview.c:778
 msgid "Invalid shortcut."
 msgstr "Ugyldig snarvei."
 
-#: ../app/widgets/gimpactionview.c:865
+#: ../app/widgets/gimpactionview.c:867
 msgid "Removing shortcut failed."
 msgstr "Fjerning av snarvei feilet."
 
@@ -11425,37 +11425,37 @@
 msgid "Add the current color to the color history"
 msgstr "Legg gjeldende farge til i fargehistorikken"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:154
+#: ../app/widgets/gimpcolordisplayeditor.c:157
 msgid "Available Filters"
 msgstr "Tilgjengelige filtre"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:216
+#: ../app/widgets/gimpcolordisplayeditor.c:219
 msgid "Move the selected filter up"
 msgstr "Flytt valgt filter opp"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:225
+#: ../app/widgets/gimpcolordisplayeditor.c:228
 msgid "Move the selected filter down"
 msgstr "Flytt valgt filter ned"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:271
+#: ../app/widgets/gimpcolordisplayeditor.c:274
 msgid "Active Filters"
 msgstr "Aktive filtre"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:322
+#: ../app/widgets/gimpcolordisplayeditor.c:325
 msgid "Reset the selected filter to default values"
 msgstr "Nullstill valgt filter til forvalgte verdier"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:503
+#: ../app/widgets/gimpcolordisplayeditor.c:527
 #, c-format
 msgid "Add '%s' to the list of active filters"
 msgstr "Legg «%s» til i listen over aktive filtre"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:540
+#: ../app/widgets/gimpcolordisplayeditor.c:564
 #, c-format
 msgid "Remove '%s' from the list of active filters"
 msgstr "Fjern «%s» fra listen over aktive filtre."
 
-#: ../app/widgets/gimpcolordisplayeditor.c:571
+#: ../app/widgets/gimpcolordisplayeditor.c:595
 msgid "No filter selected"
 msgstr "Ingen filter valgt"
 
@@ -11877,28 +11877,32 @@
 msgid "Messages are redirected to stderr."
 msgstr "Meldinger er videresendt til stderr."
 
-#: ../app/widgets/gimperrordialog.c:170
+#. %s is a message domain,
+#. * like "GIMP Message" or
+#. * "PNG Message"
+#. 
+#: ../app/widgets/gimperrordialog.c:174
 #, c-format
 msgid "%s Message"
 msgstr "%s melding"
 
-#: ../app/widgets/gimpfiledialog.c:327
+#: ../app/widgets/gimpfiledialog.c:330
 msgid "Automatically Detected"
 msgstr "Funnet automatisk"
 
-#: ../app/widgets/gimpfiledialog.c:344
+#: ../app/widgets/gimpfiledialog.c:347
 msgid "By Extension"
 msgstr "Etter type"
 
-#: ../app/widgets/gimpfiledialog.c:793
+#: ../app/widgets/gimpfiledialog.c:801
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../app/widgets/gimpfiledialog.c:798
+#: ../app/widgets/gimpfiledialog.c:806
 msgid "All images"
 msgstr "Alle bilder"
 
-#: ../app/widgets/gimpfiledialog.c:974
+#: ../app/widgets/gimpfiledialog.c:999
 #, c-format
 msgid "Select File _Type (%s)"
 msgstr "Vel fil_type (%s)"
@@ -12200,11 +12204,11 @@
 msgstr "Tomt lag"
 
 #. Auto button
-#: ../app/widgets/gimpdockwindow.c:382
+#: ../app/widgets/gimpdockwindow.c:386
 msgid "Auto"
 msgstr "Auto"
 
-#: ../app/widgets/gimpdockwindow.c:393
+#: ../app/widgets/gimpdockwindow.c:397
 msgid ""
 "When enabled the dialog automatically follows the image you are working on."
 msgstr "Gjør at menyen automatisk følger bildet du jobber på."
@@ -12658,7 +12662,7 @@
 msgid "Keep above"
 msgstr "Behold over"
 
-#: ../app/xcf/xcf-load.c:336
+#: ../app/xcf/xcf-load.c:339
 msgid ""
 "This XCF file is corrupt!  I have loaded as much of it as I can, but it is "
 "incomplete."
@@ -12666,14 +12670,14 @@
 "Denne XCF-filen er ødelagt.  Jeg har lastet så mye av den jeg kan, men ikke "
 "alt."
 
-#: ../app/xcf/xcf-load.c:347
+#: ../app/xcf/xcf-load.c:350
 msgid ""
 "This XCF file is corrupt!  I could not even salvage any partial image data "
 "from it."
 msgstr ""
 "Denne XCF-filen er ødelagt.  Jeg kunne ikke engang hente ut deler av bildet."
 
-#: ../app/xcf/xcf-load.c:420
+#: ../app/xcf/xcf-load.c:423
 msgid ""
 "XCF warning: version 0 of XCF file format\n"
 "did not save indexed colormaps correctly.\n"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gksu.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gksu.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gksu.po	2013-01-29 09:34:03.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gksu.po	2014-01-07 06:37:02.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:27+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:32+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../gksu/gksu.c:75
 #, c-format
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/glade.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/glade.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/glade.po	2013-01-29 09:34:08.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/glade.po	2014-01-07 06:37:10.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:29+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../data/glade.desktop.in.in.h:1 ../src/main.c:42
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/glib-networking.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/glib-networking.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/glib-networking.po	2013-01-29 09:33:59.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/glib-networking.po	2014-01-07 06:37:38.000000000 +0000
@@ -14,11 +14,11 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:36+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:33+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
-#: ../proxy/libproxy/glibproxyresolver.c:150
+#: ../proxy/libproxy/glibproxyresolver.c:157
 msgid "Proxy resolver internal error."
 msgstr "Intern feil i proxy-navneoppslag."
 
@@ -46,48 +46,49 @@
 msgid "No certificate data provided"
 msgstr "Ingen sertifikatdata oppgitt"
 
-#: ../tls/gnutls/gtlsclientconnection-gnutls.c:309
+#: ../tls/gnutls/gtlsclientconnection-gnutls.c:324
 msgid "Server required TLS certificate"
 msgstr "Tjener krever TLS-sertifikat"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:254
+#: ../tls/gnutls/gtlsconnection-gnutls.c:267
 #, c-format
 msgid "Could not create TLS connection: %s"
 msgstr "Kunne ikke lage TLS-tilkobling: %s"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:701
+#: ../tls/gnutls/gtlsconnection-gnutls.c:733
+#: ../tls/gnutls/gtlsconnection-gnutls.c:772
 msgid "Peer failed to perform TLS handshake"
 msgstr "Likemann feilet å utføre TLS-håndtrykk"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:718
+#: ../tls/gnutls/gtlsconnection-gnutls.c:751
 msgid "Peer requested illegal TLS rehandshake"
 msgstr "Likemann ba om ugyldig nytt TLS-håndtrykk"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:744
+#: ../tls/gnutls/gtlsconnection-gnutls.c:778
 msgid "TLS connection closed unexpectedly"
 msgstr "TLS-tilkobling ble lukket uventet"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1055
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1074
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1174
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1207
 #, c-format
 msgid "Error performing TLS handshake: %s"
 msgstr "Feil under utføring av TLS-håndtrykk: %s"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1210
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1292
 msgid "Unacceptable TLS certificate"
 msgstr "Uakseptabelt TLS-sertifikat"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1400
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1495
 #, c-format
 msgid "Error reading data from TLS socket: %s"
 msgstr "Feil under lesing av data fra TLS-plugg: %s"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1429
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1524
 #, c-format
 msgid "Error writing data to TLS socket: %s"
 msgstr "Feil under skriving av data til TLS-plugg: %s"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1483
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1578
 #, c-format
 msgid "Error performing TLS close: %s"
 msgstr "Feil under utføring av lukking av TLS-tilkobling: %s"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/glib20.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/glib20.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/glib20.po	2013-01-29 09:34:03.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/glib20.po	2014-01-07 06:37:05.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: glib 2.31.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-14 18:36-0400\n"
+"POT-Creation-Date: 2012-07-14 18:53-0400\n"
 "PO-Revision-Date: 2012-04-17 10:56+0000\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -16,28 +16,28 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:49+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:58+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
-#: ../gio/gbufferedinputstream.c:427 ../gio/gbufferedinputstream.c:506
-#: ../gio/ginputstream.c:185 ../gio/ginputstream.c:377
-#: ../gio/ginputstream.c:615 ../gio/ginputstream.c:833
-#: ../gio/goutputstream.c:203 ../gio/goutputstream.c:732
+#: ../gio/gbufferedinputstream.c:422 ../gio/gbufferedinputstream.c:501
+#: ../gio/ginputstream.c:175 ../gio/ginputstream.c:367
+#: ../gio/ginputstream.c:605 ../gio/ginputstream.c:823
+#: ../gio/goutputstream.c:202 ../gio/goutputstream.c:826
 #: ../gio/gpollableinputstream.c:207 ../gio/gpollableoutputstream.c:208
 #, c-format
 msgid "Too large count value passed to %s"
 msgstr "Tellerverdi gitt til %s er for stor"
 
-#: ../gio/gbufferedinputstream.c:990 ../gio/ginputstream.c:1023
-#: ../gio/giostream.c:291 ../gio/goutputstream.c:1340
+#: ../gio/gbufferedinputstream.c:985 ../gio/ginputstream.c:1013
+#: ../gio/giostream.c:280 ../gio/goutputstream.c:1468
 msgid "Stream is already closed"
 msgstr "Strømmen er allerede lukket"
 
-#: ../gio/gcancellable.c:318 ../gio/gdbusconnection.c:1885
-#: ../gio/gdbusconnection.c:1977 ../gio/gdbusprivate.c:1420
-#: ../gio/glocalfile.c:2169 ../gio/gsimpleasyncresult.c:843
-#: ../gio/gsimpleasyncresult.c:869
+#: ../gio/gcancellable.c:314 ../gio/gdbusconnection.c:1893
+#: ../gio/gdbusconnection.c:1985 ../gio/gdbusprivate.c:1418
+#: ../gio/glocalfile.c:2183 ../gio/gsimpleasyncresult.c:836
+#: ../gio/gsimpleasyncresult.c:862
 #, c-format
 msgid "Operation was cancelled"
 msgstr "Operasjonen ble avbrutt"
@@ -54,31 +54,30 @@
 msgid "Not enough space in destination"
 msgstr "Ikke nok plass i mål"
 
-#: ../gio/gcharsetconverter.c:344 ../gio/gdatainputstream.c:854
-#: ../gio/gdatainputstream.c:1264 ../glib/gconvert.c:764
-#: ../glib/gconvert.c:1156 ../glib/giochannel.c:1586 ../glib/giochannel.c:1628
-#: ../glib/giochannel.c:2472 ../glib/gutf8.c:841 ../glib/gutf8.c:1292
+#: ../gio/gcharsetconverter.c:344 ../gio/gdatainputstream.c:849
+#: ../gio/gdatainputstream.c:1259 ../glib/gconvert.c:464
+#: ../glib/gconvert.c:856 ../glib/giochannel.c:1582 ../glib/giochannel.c:1624
+#: ../glib/giochannel.c:2468 ../glib/gutf8.c:843 ../glib/gutf8.c:1303
 msgid "Invalid byte sequence in conversion input"
 msgstr "Ugyldig bytesekvens i inndata for konvertering"
 
-#: ../gio/gcharsetconverter.c:349 ../glib/gconvert.c:772
-#: ../glib/gconvert.c:1081 ../glib/giochannel.c:1593 ../glib/giochannel.c:2484
+#: ../gio/gcharsetconverter.c:349 ../glib/gconvert.c:472
+#: ../glib/gconvert.c:781 ../glib/giochannel.c:1589 ../glib/giochannel.c:2480
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Feil under konvertering: %s"
 
-#: ../gio/gcharsetconverter.c:446 ../gio/gsocket.c:975
+#: ../gio/gcharsetconverter.c:446 ../gio/gsocket.c:994
 msgid "Cancellable initialization not supported"
 msgstr "Avbrytbar initiering er ikke støttet"
 
-#: ../gio/gcharsetconverter.c:457 ../glib/gconvert.c:564
-#: ../glib/gconvert.c:642 ../glib/giochannel.c:1414
+#: ../gio/gcharsetconverter.c:457 ../glib/gconvert.c:344
+#: ../glib/giochannel.c:1410
 #, c-format
 msgid "Conversion from character set '%s' to '%s' is not supported"
 msgstr "Konvertering fra tegnsett «%s» til «%s» er ikke støttet"
 
-#: ../gio/gcharsetconverter.c:461 ../glib/gconvert.c:568
-#: ../glib/gconvert.c:646
+#: ../gio/gcharsetconverter.c:461 ../glib/gconvert.c:348
 #, c-format
 msgid "Could not open converter from '%s' to '%s'"
 msgstr "Kunne ikke åpne program for å konvertere fra «%s» til «%s»"
@@ -97,15 +96,15 @@
 msgid "%s type"
 msgstr "type %s"
 
-#: ../gio/gcredentials.c:264 ../gio/gcredentials.c:528
+#: ../gio/gcredentials.c:295 ../gio/gcredentials.c:546
 msgid "GCredentials is not implemented on this OS"
 msgstr "GCredentials er ikke implementert på dette OSet"
 
-#: ../gio/gcredentials.c:438
+#: ../gio/gcredentials.c:447
 msgid "There is no GCredentials support for your platform"
 msgstr "Det finnes ingen støtte for GCredentials for din plattform"
 
-#: ../gio/gdatainputstream.c:311
+#: ../gio/gdatainputstream.c:306
 msgid "Unexpected early end-of-stream"
 msgstr "Uventet tidlig slutt på strøm"
 
@@ -138,12 +137,12 @@
 msgid "Error in address `%s' - the family attribute is malformed"
 msgstr "Feil i adresse «%s» - familieattributten er feilutformet"
 
-#: ../gio/gdbusaddress.c:453
+#: ../gio/gdbusaddress.c:454
 #, c-format
 msgid "Address element `%s', does not contain a colon (:)"
 msgstr "Adresseelement «%s» inneholder ikke et kolon (:)"
 
-#: ../gio/gdbusaddress.c:474
+#: ../gio/gdbusaddress.c:475
 #, c-format
 msgid ""
 "Key/Value pair %d, `%s', in address element `%s', does not contain an equal "
@@ -244,12 +243,12 @@
 msgid "(Type any character to close this window)\n"
 msgstr "(Trykk en tast for å lukke dette vinduet)\n"
 
-#: ../gio/gdbusaddress.c:1421
+#: ../gio/gdbusaddress.c:1427
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr "D-Bus for økten kjører ikke og automatisk start feilet"
 
-#: ../gio/gdbusaddress.c:1442
+#: ../gio/gdbusaddress.c:1448
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr ""
@@ -264,7 +263,7 @@
 "Kan ikke bestemme adresse for buss fra miljøvariabelen DBUS_STARTER_BUS_TYPE "
 "- ukjent verdi «%s»"
 
-#: ../gio/gdbusaddress.c:1550 ../gio/gdbusconnection.c:6766
+#: ../gio/gdbusaddress.c:1556 ../gio/gdbusconnection.c:6913
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
@@ -272,21 +271,21 @@
 "Kan ikke bestemme adressen til bussen fordi miljøvariabelen "
 "DBUS_STARTER_BUS_TYPE ikke er satt"
 
-#: ../gio/gdbusaddress.c:1560
+#: ../gio/gdbusaddress.c:1566
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "Ukjent type buss %d"
 
-#: ../gio/gdbusauth.c:298
+#: ../gio/gdbusauth.c:295
 msgid "Unexpected lack of content trying to read a line"
 msgstr "Uventet mangel på innhold ved forsøk på å lese en linje"
 
-#: ../gio/gdbusauth.c:342
+#: ../gio/gdbusauth.c:339
 msgid "Unexpected lack of content trying to (safely) read a line"
 msgstr ""
 "Uventet mangel på innhold ved forsøk på å lese en linje på trygg måte"
 
-#: ../gio/gdbusauth.c:513
+#: ../gio/gdbusauth.c:510
 #, c-format
 msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
@@ -294,7 +293,7 @@
 "Brukte opp alle tilgjengelige autentiseringsmekanismer (forsøkt: %s) "
 "(tilgjengelig: %s)"
 
-#: ../gio/gdbusauth.c:1175
+#: ../gio/gdbusauth.c:1172
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
 msgstr "Avbrutt via GDBusAuthObserver::authorize-authenticated-peer"
 
@@ -376,15 +375,15 @@
 msgid "(Additionally, releasing the lock for `%s' also failed: %s) "
 msgstr "(I tillegg feilet frislipp av lås for «%s» også: %s) "
 
-#: ../gio/gdbusconnection.c:597 ../gio/gdbusconnection.c:2440
+#: ../gio/gdbusconnection.c:605 ../gio/gdbusconnection.c:2448
 msgid "The connection is closed"
 msgstr "Tilkoblingen er lukket"
 
-#: ../gio/gdbusconnection.c:1930
+#: ../gio/gdbusconnection.c:1938
 msgid "Timeout was reached"
 msgstr "Tidsavbrudd ble nådd"
 
-#: ../gio/gdbusconnection.c:2562
+#: ../gio/gdbusconnection.c:2570
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
 msgstr ""
@@ -423,7 +422,7 @@
 msgid "No such interface `%s'"
 msgstr "Grensesnitt «%s» finnes ikke"
 
-#: ../gio/gdbusconnection.c:4508
+#: ../gio/gdbusconnection.c:4635
 msgid "No such interface"
 msgstr "Grensesnittet finnes ikke"
 
@@ -442,7 +441,7 @@
 msgid "Type of message, `%s', does not match expected type `%s'"
 msgstr "Type melding, «%s», stemmer ikke overens med forventet type «%s»"
 
-#: ../gio/gdbusconnection.c:5032
+#: ../gio/gdbusconnection.c:5179
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
 msgstr "Et objekt er allerede eksportert for grensesnitt %s ved %s"
@@ -457,7 +456,7 @@
 msgid "Method `%s' on interface `%s' with signature `%s' does not exist"
 msgstr "Metode «%s» på grensesnitt «%s» med signatur «%s» eksisterer ikke"
 
-#: ../gio/gdbusconnection.c:6430
+#: ../gio/gdbusconnection.c:6577
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "Et undertre er allerede eksportert for %s"
@@ -642,26 +641,26 @@
 msgid "Error return with empty body"
 msgstr "Feil retur med tom kropp"
 
-#: ../gio/gdbusprivate.c:2068
+#: ../gio/gdbusprivate.c:2066
 #, c-format
 msgid "Unable to get Hardware profile: %s"
 msgstr "Kan ikke hente maskinvareprofil: %s"
 
-#: ../gio/gdbusprivate.c:2113
+#: ../gio/gdbusprivate.c:2111
 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
 msgstr "Kan ikke laste /var/lib/dbus/machine-id eller /etc/machine-id: "
 
-#: ../gio/gdbusproxy.c:1640
+#: ../gio/gdbusproxy.c:1638
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "Feil ved kall til StartServiceByName for %s: "
 
-#: ../gio/gdbusproxy.c:1663
+#: ../gio/gdbusproxy.c:1661
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
 msgstr "Uventet svar %d fra metoden StartServiceByName(«%s»)"
 
-#: ../gio/gdbusproxy.c:2763 ../gio/gdbusproxy.c:2900
+#: ../gio/gdbusproxy.c:2762 ../gio/gdbusproxy.c:2899
 msgid ""
 "Cannot invoke method; proxy is for a well-known name without an owner and "
 "proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"
@@ -669,29 +668,30 @@
 "Kan ikke invokere metode; proxy er for et velkjent navn uten en eier og "
 "proxy ble opprettet med flagget G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START"
 
-#: ../gio/gdbusserver.c:708
+#: ../gio/gdbusserver.c:710
 msgid "Abstract name space not supported"
 msgstr "Abstrakt navneområde er ikke støttet"
 
-#: ../gio/gdbusserver.c:795
+#: ../gio/gdbusserver.c:797
 msgid "Cannot specify nonce file when creating a server"
 msgstr "Kan ikke oppgi nonce-fil når en tjener opprettes"
 
-#: ../gio/gdbusserver.c:873
+#: ../gio/gdbusserver.c:874
 #, c-format
 msgid "Error writing nonce file at `%s': %s"
 msgstr "Feil under skriving av nonce-fil i «%s»: %s"
 
-#: ../gio/gdbusserver.c:1041
+#: ../gio/gdbusserver.c:1043
 #, c-format
 msgid "The string `%s' is not a valid D-Bus GUID"
 msgstr "Strengen «%s» er ikke en gyldig D-Bus-GUID"
 
-#: ../gio/gdbusserver.c:1081
+#: ../gio/gdbusserver.c:1083
 #, c-format
 msgid "Cannot listen on unsupported transport `%s'"
 msgstr "Kan ikke lytte på ikke-støttet transport «%s»"
 
+#: ../gio/gapplication-tool.c:72 ../gio/gapplication-tool.c:135
 #: ../gio/gdbus-tool.c:92
 msgid "COMMAND"
 msgstr "KOMMANDO"
@@ -718,13 +718,13 @@
 "Bruk «%s COMMAND --help» for å få hjelp om hver kommando.\n"
 
 #: ../gio/gdbus-tool.c:166 ../gio/gdbus-tool.c:222 ../gio/gdbus-tool.c:294
-#: ../gio/gdbus-tool.c:318 ../gio/gdbus-tool.c:701 ../gio/gdbus-tool.c:1020
-#: ../gio/gdbus-tool.c:1453
+#: ../gio/gdbus-tool.c:318 ../gio/gdbus-tool.c:701 ../gio/gdbus-tool.c:1022
+#: ../gio/gdbus-tool.c:1456
 #, c-format
 msgid "Error: %s\n"
 msgstr "Feil: %s\n"
 
-#: ../gio/gdbus-tool.c:177 ../gio/gdbus-tool.c:235 ../gio/gdbus-tool.c:1469
+#: ../gio/gdbus-tool.c:177 ../gio/gdbus-tool.c:235 ../gio/gdbus-tool.c:1472
 #, c-format
 msgid "Error parsing introspection XML: %s\n"
 msgstr "Feil under tolking av introspeksjons-XML: %s\n"
@@ -791,8 +791,8 @@
 msgid "Emit a signal."
 msgstr "Send ut et signal."
 
-#: ../gio/gdbus-tool.c:606 ../gio/gdbus-tool.c:832 ../gio/gdbus-tool.c:1559
-#: ../gio/gdbus-tool.c:1791
+#: ../gio/gdbus-tool.c:606 ../gio/gdbus-tool.c:832 ../gio/gdbus-tool.c:1562
+#: ../gio/gdbus-tool.c:1794
 #, c-format
 msgid "Error connecting: %s\n"
 msgstr "Feil under tilkobling: %s\n"
@@ -802,8 +802,8 @@
 msgid "Error: object path not specified.\n"
 msgstr "Feil: Objektsti er ikke oppgitt.\n"
 
-#: ../gio/gdbus-tool.c:623 ../gio/gdbus-tool.c:893 ../gio/gdbus-tool.c:1617
-#: ../gio/gdbus-tool.c:1850
+#: ../gio/gdbus-tool.c:623 ../gio/gdbus-tool.c:893 ../gio/gdbus-tool.c:1620
+#: ../gio/gdbus-tool.c:1853
 #, c-format
 msgid "Error: %s is not a valid object path\n"
 msgstr "Feil: %s er ikke en gyldig objektsti\n"
@@ -858,12 +858,12 @@
 msgid "Invoke a method on a remote object."
 msgstr "Kjør en metode på et eksternt objekt."
 
-#: ../gio/gdbus-tool.c:852 ../gio/gdbus-tool.c:1578 ../gio/gdbus-tool.c:1810
+#: ../gio/gdbus-tool.c:852 ../gio/gdbus-tool.c:1581 ../gio/gdbus-tool.c:1813
 #, c-format
 msgid "Error: Destination is not specified\n"
 msgstr "Feil: Mål er ikke oppgitt\n"
 
-#: ../gio/gdbus-tool.c:873 ../gio/gdbus-tool.c:1597
+#: ../gio/gdbus-tool.c:873 ../gio/gdbus-tool.c:1600
 #, c-format
 msgid "Error: Object path is not specified\n"
 msgstr "Feil: Objektsti er ikke oppgitt\n"
@@ -883,74 +883,75 @@
 msgid "Error parsing parameter %d of type `%s': %s\n"
 msgstr "Feil under tolking av parameter %d av type «%s»: %s\n"
 
-#: ../gio/gdbus-tool.c:1416
+#: ../gio/gdbus-tool.c:1419
 msgid "Destination name to introspect"
 msgstr "Målnavn som skal inspiseres"
 
-#: ../gio/gdbus-tool.c:1417
+#: ../gio/gdbus-tool.c:1420
 msgid "Object path to introspect"
 msgstr "Objektsti som skal inspiseres"
 
-#: ../gio/gdbus-tool.c:1418
+#: ../gio/gdbus-tool.c:1421
 msgid "Print XML"
 msgstr "Skriv ut XML"
 
-#: ../gio/gdbus-tool.c:1419
+#: ../gio/gdbus-tool.c:1422
 msgid "Introspect children"
 msgstr "Bruk introspeksjon for barn"
 
-#: ../gio/gdbus-tool.c:1420
+#: ../gio/gdbus-tool.c:1423
 msgid "Only print properties"
 msgstr "Skriv kun ut egenskaper"
 
-#: ../gio/gdbus-tool.c:1511
+#: ../gio/gdbus-tool.c:1514
 msgid "Introspect a remote object."
 msgstr "Inspiser et eksternt objekt."
 
-#: ../gio/gdbus-tool.c:1709
+#: ../gio/gdbus-tool.c:1712
 msgid "Destination name to monitor"
 msgstr "Navn på mål som skal overvåkes"
 
-#: ../gio/gdbus-tool.c:1710
+#: ../gio/gdbus-tool.c:1713
 msgid "Object path to monitor"
 msgstr "Objektsti som skal overvåkes"
 
-#: ../gio/gdbus-tool.c:1743
+#: ../gio/gdbus-tool.c:1746
 msgid "Monitor a remote object."
 msgstr "Overvåk et eksternt objekt."
 
-#: ../gio/gdesktopappinfo.c:591 ../gio/gwin32appinfo.c:221
+#: ../gio/gdesktopappinfo.c:1421 ../gio/gdesktopappinfo.c:4566
+#: ../gio/gwin32appinfo.c:221
 msgid "Unnamed"
 msgstr "Uten navn"
 
-#: ../gio/gdesktopappinfo.c:1004
+#: ../gio/gdesktopappinfo.c:1840
 msgid "Desktop file didn't specify Exec field"
 msgstr "Desktop-filen hadde ingen verdi i Exec-feltet"
 
-#: ../gio/gdesktopappinfo.c:1292
+#: ../gio/gdesktopappinfo.c:2125
 msgid "Unable to find terminal required for application"
 msgstr "Kan ikke finne terminalen som kreves for programmet"
 
-#: ../gio/gdesktopappinfo.c:1594
+#: ../gio/gdesktopappinfo.c:2542
 #, c-format
 msgid "Can't create user application configuration folder %s: %s"
 msgstr "Kan ikke opprette konfigurasjonsmappe %s for brukers program: %s"
 
-#: ../gio/gdesktopappinfo.c:1598
+#: ../gio/gdesktopappinfo.c:2546
 #, c-format
 msgid "Can't create user MIME configuration folder %s: %s"
 msgstr "Kan ikke opprette brukers konfigurasjonsmappe %s for MIME: %s"
 
-#: ../gio/gdesktopappinfo.c:1838 ../gio/gdesktopappinfo.c:1862
+#: ../gio/gdesktopappinfo.c:2786 ../gio/gdesktopappinfo.c:2810
 msgid "Application information lacks an identifier"
 msgstr "Programinformasjonen mangler en identifikator"
 
-#: ../gio/gdesktopappinfo.c:2094
+#: ../gio/gdesktopappinfo.c:3043
 #, c-format
 msgid "Can't create user desktop file %s"
 msgstr "Kan ikke opprette brukers desktop-fil %s"
 
-#: ../gio/gdesktopappinfo.c:2217
+#: ../gio/gdesktopappinfo.c:3177
 #, c-format
 msgid "Custom definition for %s"
 msgstr "Egendefinert definisjon for %s"
@@ -978,8 +979,8 @@
 msgid "drive doesn't implement stop"
 msgstr "stasjonen implementerer ikke stop"
 
-#: ../gio/gdummytlsbackend.c:168 ../gio/gdummytlsbackend.c:288
-#: ../gio/gdummytlsbackend.c:378
+#: ../gio/gdummytlsbackend.c:191 ../gio/gdummytlsbackend.c:311
+#: ../gio/gdummytlsbackend.c:401
 msgid "TLS support is not available"
 msgstr "TLS-støtte er ikke tilgjengelig"
 
@@ -993,29 +994,28 @@
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
 msgstr "Feil antall tegn (%d) i GEmblem-koding"
 
-#: ../gio/gemblemedicon.c:367
+#: ../gio/gemblemedicon.c:364
 #, c-format
 msgid "Can't handle version %d of GEmblemedIcon encoding"
 msgstr "Kan ikke håndtere versjon %d av GEmblemedIcon-koding"
 
-#: ../gio/gemblemedicon.c:377
+#: ../gio/gemblemedicon.c:374
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
 msgstr "Feil antall tegn (%d) i GEmblemedIcon-koding"
 
-#: ../gio/gemblemedicon.c:400
+#: ../gio/gemblemedicon.c:397
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr "Ventet et GEmblem for GEmblemedIcon"
 
-#: ../gio/gfile.c:913 ../gio/gfile.c:1152 ../gio/gfile.c:1291
-#: ../gio/gfile.c:1531 ../gio/gfile.c:1586 ../gio/gfile.c:1644
-#: ../gio/gfile.c:1728 ../gio/gfile.c:1785 ../gio/gfile.c:1849
-#: ../gio/gfile.c:1904 ../gio/gfile.c:3448 ../gio/gfile.c:3503
-#: ../gio/gfile.c:3649 ../gio/gfile.c:3691 ../gio/gfile.c:4093
-#: ../gio/gfile.c:4505 ../gio/gfile.c:4590 ../gio/gfile.c:4680
-#: ../gio/gfile.c:4777 ../gio/gfile.c:4864 ../gio/gfile.c:4965
-#: ../gio/gfile.c:5238 ../gio/gfile.c:5516 ../gio/gfile.c:5570
-#: ../gio/gfile.c:7114 ../gio/gfile.c:7204 ../gio/gfile.c:7288
+#: ../gio/gfile.c:962 ../gio/gfile.c:1201 ../gio/gfile.c:1340
+#: ../gio/gfile.c:1580 ../gio/gfile.c:1635 ../gio/gfile.c:1693
+#: ../gio/gfile.c:1777 ../gio/gfile.c:1834 ../gio/gfile.c:1898
+#: ../gio/gfile.c:1953 ../gio/gfile.c:3604 ../gio/gfile.c:3659
+#: ../gio/gfile.c:3867 ../gio/gfile.c:3909 ../gio/gfile.c:4375
+#: ../gio/gfile.c:4787 ../gio/gfile.c:4872 ../gio/gfile.c:4962
+#: ../gio/gfile.c:5059 ../gio/gfile.c:5146 ../gio/gfile.c:5247
+#: ../gio/gfile.c:7758 ../gio/gfile.c:7848 ../gio/gfile.c:7932
 #: ../gio/win32/gwinhttpfile.c:439
 msgid "Operation not supported"
 msgstr "Operasjonen er ikke støttet"
@@ -1030,71 +1030,71 @@
 #. Translators: This is an error message when trying to find
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
-#: ../gio/gfile.c:1415 ../gio/glocalfile.c:1093 ../gio/glocalfile.c:1104
-#: ../gio/glocalfile.c:1117
+#: ../gio/gfile.c:1464 ../gio/glocalfile.c:1105 ../gio/glocalfile.c:1116
+#: ../gio/glocalfile.c:1129
 msgid "Containing mount does not exist"
 msgstr "Omsluttende monteringspunkt finnes ikke"
 
-#: ../gio/gfile.c:2470 ../gio/glocalfile.c:2325
+#: ../gio/gfile.c:2519 ../gio/glocalfile.c:2339
 msgid "Can't copy over directory"
 msgstr "Kan ikke kopiere over katalog"
 
-#: ../gio/gfile.c:2530
+#: ../gio/gfile.c:2579
 msgid "Can't copy directory over directory"
 msgstr "Kan ikke kopiere katalog over katalog"
 
-#: ../gio/gfile.c:2538 ../gio/glocalfile.c:2334
+#: ../gio/gfile.c:2587 ../gio/glocalfile.c:2348
 msgid "Target file exists"
 msgstr "Målfilen eksisterer"
 
-#: ../gio/gfile.c:2557
+#: ../gio/gfile.c:2606
 msgid "Can't recursively copy directory"
 msgstr "Kan ikke kopiere katalog rekursivt"
 
-#: ../gio/gfile.c:2821
+#: ../gio/gfile.c:2888
 msgid "Splice not supported"
 msgstr "Splice er ikke støttet"
 
-#: ../gio/gfile.c:2825
+#: ../gio/gfile.c:2892
 #, c-format
 msgid "Error splicing file: %s"
 msgstr "Feil ved bruk av  splice(2) på fil: %s"
 
-#: ../gio/gfile.c:3026
+#: ../gio/gfile.c:3095
 msgid "Can't copy special file"
 msgstr "Kan ikke kopiere spesiell fil"
 
-#: ../gio/gfile.c:3639
+#: ../gio/gfile.c:3857
 msgid "Invalid symlink value given"
 msgstr "Ugyldig verdi oppgitt for symbolsk lenke"
 
-#: ../gio/gfile.c:3799
+#: ../gio/gfile.c:4019
 msgid "Trash not supported"
 msgstr "Papirkurv er ikke støttet"
 
-#: ../gio/gfile.c:3850
+#: ../gio/gfile.c:4132
 #, c-format
 msgid "File names cannot contain '%c'"
 msgstr "Filnavn kan ikke inneholde «%c»"
 
-#: ../gio/gfile.c:6238 ../gio/gvolume.c:365
+#: ../gio/gfile.c:6549 ../gio/gvolume.c:365
 msgid "volume doesn't implement mount"
 msgstr "volumet implementerer ikke montering"
 
-#: ../gio/gfile.c:6347
+#: ../gio/gfile.c:6658
 msgid "No application is registered as handling this file"
 msgstr "Ingen program registrert for å håndtere denne filen"
 
-#: ../gio/gfileenumerator.c:204
+#: ../gio/gfileenumerator.c:213
 msgid "Enumerator is closed"
 msgstr "Enumerator er lukket"
 
-#: ../gio/gfileenumerator.c:211 ../gio/gfileenumerator.c:270
-#: ../gio/gfileenumerator.c:367 ../gio/gfileenumerator.c:467
+#: ../gio/gfileenumerator.c:220 ../gio/gfileenumerator.c:279
+#: ../gio/gfileenumerator.c:379 ../gio/gfileenumerator.c:479
 msgid "File enumerator has outstanding operation"
 msgstr "Filenumerator har utestående operasjon"
 
-#: ../gio/gfileenumerator.c:358 ../gio/gfileenumerator.c:458
+#: ../gio/gfileenumerator.c:370 ../gio/gfileenumerator.c:470
 msgid "File enumerator is already closed"
 msgstr "Filenumerator er allerede lukket"
 
@@ -1107,87 +1107,87 @@
 msgid "Malformed input data for GFileIcon"
 msgstr "Feil inndata for GFileIcon"
 
-#: ../gio/gfileinputstream.c:154 ../gio/gfileinputstream.c:400
-#: ../gio/gfileiostream.c:170 ../gio/gfileoutputstream.c:169
-#: ../gio/gfileoutputstream.c:503
+#: ../gio/gfileinputstream.c:151 ../gio/gfileinputstream.c:397
+#: ../gio/gfileiostream.c:169 ../gio/gfileoutputstream.c:166
+#: ../gio/gfileoutputstream.c:500
 msgid "Stream doesn't support query_info"
 msgstr "Strømmen støtter ikke query_info"
 
-#: ../gio/gfileinputstream.c:331 ../gio/gfileiostream.c:383
-#: ../gio/gfileoutputstream.c:377
+#: ../gio/gfileinputstream.c:328 ../gio/gfileiostream.c:382
+#: ../gio/gfileoutputstream.c:374
 msgid "Seek not supported on stream"
 msgstr "Søking ikke støttet på strøm"
 
-#: ../gio/gfileinputstream.c:375
+#: ../gio/gfileinputstream.c:372
 msgid "Truncate not allowed on input stream"
 msgstr "Avkorting er ikke tillatt på en inndatastrøm"
 
-#: ../gio/gfileiostream.c:459 ../gio/gfileoutputstream.c:453
+#: ../gio/gfileiostream.c:458 ../gio/gfileoutputstream.c:450
 msgid "Truncate not supported on stream"
 msgstr "Avkorting er ikke støttet på strømmen"
 
-#: ../gio/gicon.c:284
+#: ../gio/gicon.c:297
 #, c-format
 msgid "Wrong number of tokens (%d)"
 msgstr "Feil antall tegn (%d)"
 
-#: ../gio/gicon.c:304
+#: ../gio/gicon.c:317
 #, c-format
 msgid "No type for class name %s"
 msgstr "Ingen type for klassenavn %s"
 
-#: ../gio/gicon.c:314
+#: ../gio/gicon.c:327
 #, c-format
 msgid "Type %s does not implement the GIcon interface"
 msgstr "Type %s implementerer ikke GIcon-grensesnittet"
 
-#: ../gio/gicon.c:325
+#: ../gio/gicon.c:338
 #, c-format
 msgid "Type %s is not classed"
 msgstr "Type %s er er ikke en klasse"
 
-#: ../gio/gicon.c:339
+#: ../gio/gicon.c:352
 #, c-format
 msgid "Malformed version number: %s"
 msgstr "Feil versjonsnummer: %s"
 
-#: ../gio/gicon.c:353
+#: ../gio/gicon.c:366
 #, c-format
 msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr "Type %s implementerer ikke from_tokens() på GIcon-grensesnittet"
 
-#: ../gio/gicon.c:428
+#: ../gio/gicon.c:430
 msgid "Can't handle the supplied version the icon encoding"
 msgstr "Kan ikke håndtere oppgitt versjon i ikon-koding"
 
-#: ../gio/ginetaddressmask.c:184
+#: ../gio/ginetaddressmask.c:183
 msgid "No address specified"
 msgstr "Ingen adresse oppgitt"
 
-#: ../gio/ginetaddressmask.c:192
+#: ../gio/ginetaddressmask.c:191
 #, c-format
 msgid "Length %u is too long for address"
 msgstr "Lengde %u er for lang for adressen"
 
-#: ../gio/ginetaddressmask.c:225
+#: ../gio/ginetaddressmask.c:224
 msgid "Address has bits set beyond prefix length"
 msgstr "Adressen har biter satt forbi lengde på prefiks"
 
-#: ../gio/ginetaddressmask.c:304
+#: ../gio/ginetaddressmask.c:301
 #, c-format
 msgid "Could not parse '%s' as IP address mask"
 msgstr "Kunne ikke lese «%s» som IP-adressemaske"
 
-#: ../gio/ginetsocketaddress.c:206 ../gio/ginetsocketaddress.c:223
-#: ../gio/gunixsocketaddress.c:221
+#: ../gio/ginetsocketaddress.c:197 ../gio/ginetsocketaddress.c:214
+#: ../gio/gunixsocketaddress.c:211
 msgid "Not enough space for socket address"
 msgstr "Ikke nok plass til adresse for plugg"
 
-#: ../gio/ginetsocketaddress.c:238
+#: ../gio/ginetsocketaddress.c:229
 msgid "Unsupported socket address"
 msgstr "Adresse for plugg er ikke støttet"
 
-#: ../gio/ginputstream.c:194
+#: ../gio/ginputstream.c:184
 msgid "Input stream doesn't implement read"
 msgstr "Inndatastrøm implementerer ikke lesing"
 
@@ -1197,116 +1197,127 @@
 #. Translators: This is an error you get if there is
 #. * already an operation running against this stream when
 #. * you try to start one
-#: ../gio/ginputstream.c:1033 ../gio/giostream.c:301
-#: ../gio/goutputstream.c:1350
+#: ../gio/ginputstream.c:1023 ../gio/giostream.c:290
+#: ../gio/goutputstream.c:1478
 msgid "Stream has outstanding operation"
 msgstr "Strømmen har utestående operasjoner"
 
-#: ../gio/glib-compile-resources.c:145 ../gio/glib-compile-schemas.c:1459
+#: ../gio/glib-compile-resources.c:144 ../gio/glib-compile-schemas.c:1455
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
 msgstr "Element <%s> er ikke tillatt inne i <%s>"
 
-#: ../gio/glib-compile-resources.c:149
+#: ../gio/glib-compile-resources.c:148
 #, c-format
 msgid "Element <%s> not allowed at toplevel"
 msgstr "Element <%s> er ikke tillatt på toppnivå"
 
-#: ../gio/glib-compile-resources.c:239
+#: ../gio/glib-compile-resources.c:238
 #, c-format
 msgid "File %s appears multiple times in the resource"
 msgstr "Filen %s finnes flere ganger i ressursen"
 
-#: ../gio/glib-compile-resources.c:252
+#: ../gio/glib-compile-resources.c:251
 #, c-format
 msgid "Failed to locate '%s' in any source directory"
 msgstr "Klarte ikke å finne «%s» i noen kildekatalog"
 
-#: ../gio/glib-compile-resources.c:263
+#: ../gio/glib-compile-resources.c:262
 #, c-format
 msgid "Failed to locate '%s' in current directory"
 msgstr "Klarte ikke å finne «%s» i aktiv katalog"
 
-#: ../gio/glib-compile-resources.c:291
+#: ../gio/glib-compile-resources.c:290
 #, c-format
 msgid "Unknown processing option \"%s\""
 msgstr "Ukjente flagg for preprosessering «%s»"
 
-#: ../gio/glib-compile-resources.c:310 ../gio/glib-compile-resources.c:370
+#: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354
 #, c-format
 msgid "Failed to create temp file: %s"
 msgstr "Klarte ikke å opprette midlertidig fil: %s"
 
-#: ../gio/glib-compile-resources.c:338
-msgid "Error processing input file with xmllint"
-msgstr "Feil ved prosessering av inndatafil med xmllint"
-
-#: ../gio/glib-compile-resources.c:393
-msgid "Error processing input file with to-pixdata"
-msgstr "Feil ved prosessering av inndatafil med to-pixdata"
+#: ../gio/glib-compile-resources.c:340
+#, c-format
+msgid ""
+"Error processing input file with xmllint:\n"
+"%s"
+msgstr ""
+"Feil ved prosessering av inndatafil med xmllint:\n"
+"%s"
+
+#: ../gio/glib-compile-resources.c:396
+#, c-format
+msgid ""
+"Error processing input file with to-pixdata:\n"
+"%s"
+msgstr ""
+"Feil ved prosessering av inndatafil med to-pixdata:\n"
+"%s"
 
-#: ../gio/glib-compile-resources.c:410
+#: ../gio/glib-compile-resources.c:382
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Feil ved lesing av fil %s: %s"
 
-#: ../gio/glib-compile-resources.c:430
+#: ../gio/glib-compile-resources.c:402
 #, c-format
 msgid "Error compressing file %s"
 msgstr "Feil ved komprimering av fil %s"
 
-#: ../gio/glib-compile-resources.c:494 ../gio/glib-compile-schemas.c:1571
+#: ../gio/glib-compile-resources.c:466 ../gio/glib-compile-schemas.c:1567
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr "tekst kan ikke forekomme inne i <%s>"
 
-#: ../gio/glib-compile-resources.c:619
+#: ../gio/glib-compile-resources.c:591
 msgid "name of the output file"
 msgstr "navn på utdatafil"
 
-#: ../gio/glib-compile-resources.c:619 ../gio/glib-compile-resources.c:650
-#: ../gio/gresource-tool.c:482 ../gio/gresource-tool.c:548
+#: ../gio/gapplication-tool.c:74 ../gio/glib-compile-resources.c:591
+#: ../gio/glib-compile-resources.c:622 ../gio/gresource-tool.c:482
+#: ../gio/gresource-tool.c:548
 msgid "FILE"
 msgstr "FIL"
 
-#: ../gio/glib-compile-resources.c:620
+#: ../gio/glib-compile-resources.c:592
 msgid ""
 "The directories where files are to be read from (default to current "
 "directory)"
 msgstr "Kataloger filene skal leses fra (aktiv katalog er forvalgt)"
 
-#: ../gio/glib-compile-resources.c:620 ../gio/glib-compile-schemas.c:1999
-#: ../gio/glib-compile-schemas.c:2028
+#: ../gio/glib-compile-resources.c:592 ../gio/glib-compile-schemas.c:1996
+#: ../gio/glib-compile-schemas.c:2025
 msgid "DIRECTORY"
 msgstr "KATALOG"
 
-#: ../gio/glib-compile-resources.c:621
+#: ../gio/glib-compile-resources.c:593
 msgid ""
 "Generate output in the format selected for by the target filename extension"
 msgstr "Lag utdata i formatet som er valgt for målets filtype"
 
-#: ../gio/glib-compile-resources.c:622
+#: ../gio/glib-compile-resources.c:594
 msgid "Generate source header"
 msgstr "Lag hode for kildekode"
 
-#: ../gio/glib-compile-resources.c:623
+#: ../gio/glib-compile-resources.c:595
 msgid "Generate sourcecode used to link in the resource file into your code"
 msgstr ""
 "Lag kildekode som skal brukes til å lenke inn ressursfilen i din kode"
 
-#: ../gio/glib-compile-resources.c:624
+#: ../gio/glib-compile-resources.c:596
 msgid "Generate dependency list"
 msgstr "Lag listet med avhengigheter"
 
-#: ../gio/glib-compile-resources.c:625
+#: ../gio/glib-compile-resources.c:597
 msgid "Don't automatically create and register resource"
 msgstr "Ikke lag og registrer ressursen automatisk"
 
-#: ../gio/glib-compile-resources.c:627
+#: ../gio/glib-compile-resources.c:599
 msgid "C identifier name used for the generated source code"
 msgstr "Navn på C-identifikator som brukes for generert kildekode"
 
-#: ../gio/glib-compile-resources.c:653
+#: ../gio/glib-compile-resources.c:625
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
@@ -1316,16 +1327,16 @@
 "Ressursspesifikasjonsfiler har type .gresource.xml,\n"
 "og ressufsfilen har etternavn .gresource."
 
-#: ../gio/glib-compile-resources.c:669
+#: ../gio/glib-compile-resources.c:641
 #, c-format
 msgid "You should give exactly one file name\n"
 msgstr "Du må kun oppgi ett filnavn\n"
 
-#: ../gio/glib-compile-schemas.c:778
+#: ../gio/glib-compile-schemas.c:774
 msgid "empty names are not permitted"
 msgstr "tomme navn er ikke tillatt"
 
-#: ../gio/glib-compile-schemas.c:788
+#: ../gio/glib-compile-schemas.c:784
 #, c-format
 msgid "invalid name '%s': names must begin with a lowercase letter"
 msgstr "ugyldig navn «%s»: navn må starte med liten bokstav"
@@ -1350,26 +1361,26 @@
 msgid "invalid name '%s': the last character may not be a dash ('-')."
 msgstr "ugyldig navn «%s»: siste tegn kan ikke være en bindestrek («-»)."
 
-#: ../gio/glib-compile-schemas.c:826
+#: ../gio/glib-compile-schemas.c:822
 #, c-format
 msgid "invalid name '%s': maximum length is 1024"
 msgstr "ugyldig navn «%s»: maksimal lengde er 1024"
 
-#: ../gio/glib-compile-schemas.c:895
+#: ../gio/glib-compile-schemas.c:891
 #, c-format
 msgid "<child name='%s'> already specified"
 msgstr "<child name='%s'> allerede oppgitt"
 
-#: ../gio/glib-compile-schemas.c:921
+#: ../gio/glib-compile-schemas.c:917
 msgid "cannot add keys to a 'list-of' schema"
 msgstr "kan ikke legge til nøkler i et «list-of»-schema"
 
-#: ../gio/glib-compile-schemas.c:932
+#: ../gio/glib-compile-schemas.c:928
 #, c-format
 msgid "<key name='%s'> already specified"
 msgstr "<key name='%s'> allerede oppgitt"
 
-#: ../gio/glib-compile-schemas.c:950
+#: ../gio/glib-compile-schemas.c:946
 #, c-format
 msgid ""
 "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -1378,7 +1389,7 @@
 "<key name='%s'> overskygger <key name='%s'> i <schema id='%s'>; bruk "
 "<override> for å endre verdien"
 
-#: ../gio/glib-compile-schemas.c:961
+#: ../gio/glib-compile-schemas.c:957
 #, c-format
 msgid ""
 "exactly one of 'type', 'enum' or 'flags' must be specified as an attribute "
@@ -1387,31 +1398,31 @@
 "eksakt en av 'type', 'enum' eller 'flags' må oppgis som en attributt for "
 "<key>"
 
-#: ../gio/glib-compile-schemas.c:980
+#: ../gio/glib-compile-schemas.c:976
 #, c-format
 msgid "<%s id='%s'> not (yet) defined."
 msgstr "<%s id='%s'>ikke definert ennå."
 
-#: ../gio/glib-compile-schemas.c:995
+#: ../gio/glib-compile-schemas.c:991
 #, c-format
 msgid "invalid GVariant type string '%s'"
 msgstr "ugyldig GVariant-typestreng «%s»"
 
-#: ../gio/glib-compile-schemas.c:1025
+#: ../gio/glib-compile-schemas.c:1021
 msgid "<override> given but schema isn't extending anything"
 msgstr "<override> ble gitt men schema utvider ingenting"
 
-#: ../gio/glib-compile-schemas.c:1038
+#: ../gio/glib-compile-schemas.c:1034
 #, c-format
 msgid "no <key name='%s'> to override"
 msgstr "ingen <key name='%s'> å overstyre"
 
-#: ../gio/glib-compile-schemas.c:1046
+#: ../gio/glib-compile-schemas.c:1042
 #, c-format
 msgid "<override name='%s'> already specified"
 msgstr "<override name='%s'> allerede oppgitt"
 
-#: ../gio/glib-compile-schemas.c:1117
+#: ../gio/glib-compile-schemas.c:1113
 #, c-format
 msgid "<schema id='%s'> already specified"
 msgstr "<schema id='%s'> allerede oppgitt"
@@ -1419,24 +1430,25 @@
 #: ../gio/glib-compile-schemas.c:1125
 #, c-format
 msgid "<schema id='%s'> extends not yet existing schema '%s'"
-msgstr "<schema id='%s'> utvider et ikke-eksisterende schema '%s'"
+msgstr "<schema id='%s'> utvider et schema som ikke eksisterer ennå '%s'"
 
 #: ../gio/glib-compile-schemas.c:1141
 #, c-format
 msgid "<schema id='%s'> is list of not yet existing schema '%s'"
-msgstr "<schema id='%s'> er en liste med ikke-eksisterende schema «%s»"
+msgstr ""
+"<schema id='%s'> er en liste med schema som ikke eksisterer ennå «%s»"
 
-#: ../gio/glib-compile-schemas.c:1153
+#: ../gio/glib-compile-schemas.c:1149
 #, c-format
 msgid "Can not be a list of a schema with a path"
 msgstr "Kan ikke være en liste av et schema med en sti"
 
-#: ../gio/glib-compile-schemas.c:1163
+#: ../gio/glib-compile-schemas.c:1159
 #, c-format
 msgid "Can not extend a schema with a path"
 msgstr "Kan ikke utvide et schema med en sti"
 
-#: ../gio/glib-compile-schemas.c:1173
+#: ../gio/glib-compile-schemas.c:1169
 #, c-format
 msgid ""
 "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
@@ -1444,7 +1456,7 @@
 "<schema id='%s'> er en liste som utvider <schema id='%s'> som ikke er en "
 "liste"
 
-#: ../gio/glib-compile-schemas.c:1183
+#: ../gio/glib-compile-schemas.c:1179
 #, c-format
 msgid ""
 "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but '%s' "
@@ -1453,34 +1465,34 @@
 "<schema id='%s' list-of='%s'> utvider <schema id='%s' list-of='%s'> men '%s' "
 "utvider ikke '%s'"
 
-#: ../gio/glib-compile-schemas.c:1200
+#: ../gio/glib-compile-schemas.c:1196
 #, c-format
 msgid "a path, if given, must begin and end with a slash"
 msgstr "hvis en sti oppgis må denne begynne med «slash»"
 
-#: ../gio/glib-compile-schemas.c:1207
+#: ../gio/glib-compile-schemas.c:1203
 #, c-format
 msgid "the path of a list must end with ':/'"
 msgstr "stien for en liste må slutte med «:/»"
 
-#: ../gio/glib-compile-schemas.c:1239
+#: ../gio/glib-compile-schemas.c:1235
 #, c-format
 msgid "<%s id='%s'> already specified"
 msgstr "<%s id=«%s»> er allerede spesifisert"
 
 #. Translators: Do not translate "--strict".
-#: ../gio/glib-compile-schemas.c:1757 ../gio/glib-compile-schemas.c:1828
-#: ../gio/glib-compile-schemas.c:1904
+#: ../gio/glib-compile-schemas.c:1754 ../gio/glib-compile-schemas.c:1825
+#: ../gio/glib-compile-schemas.c:1901
 #, c-format
 msgid "--strict was specified; exiting.\n"
 msgstr "--strict ble oppgitt; avslutter.\n"
 
-#: ../gio/glib-compile-schemas.c:1765
+#: ../gio/glib-compile-schemas.c:1762
 #, c-format
 msgid "This entire file has been ignored.\n"
 msgstr "Hele filen ble ignorert.\n"
 
-#: ../gio/glib-compile-schemas.c:1824
+#: ../gio/glib-compile-schemas.c:1821
 #, c-format
 msgid "Ignoring this file.\n"
 msgstr "Ignorerer denne filen.\n"
@@ -1490,14 +1502,14 @@
 msgid "No such key `%s' in schema `%s' as specified in override file `%s'"
 msgstr "Ingen nøkkel «%s» i skjema «%s» som oppgitt i overstyringsfil «%s»"
 
-#: ../gio/glib-compile-schemas.c:1870 ../gio/glib-compile-schemas.c:1928
-#: ../gio/glib-compile-schemas.c:1956
+#: ../gio/glib-compile-schemas.c:1867 ../gio/glib-compile-schemas.c:1925
+#: ../gio/glib-compile-schemas.c:1953
 #, c-format
 msgid "; ignoring override for this key.\n"
 msgstr "; ignorerer overstyring for denne nøkkelen.\n"
 
-#: ../gio/glib-compile-schemas.c:1874 ../gio/glib-compile-schemas.c:1932
-#: ../gio/glib-compile-schemas.c:1960
+#: ../gio/glib-compile-schemas.c:1871 ../gio/glib-compile-schemas.c:1929
+#: ../gio/glib-compile-schemas.c:1957
 #, c-format
 msgid " and --strict was specified; exiting.\n"
 msgstr " og --strict ble oppgitt; avslutter.\n"
@@ -1511,7 +1523,7 @@
 "feil ved lesing av nøkkel «%s» i skjema «%s» som oppgitt i overstyringsfil "
 "«%s»: %s.  "
 
-#: ../gio/glib-compile-schemas.c:1900
+#: ../gio/glib-compile-schemas.c:1897
 #, c-format
 msgid "Ignoring override for this key.\n"
 msgstr "Ignorerer overstyring for denne nøkkelen.\n"
@@ -1534,23 +1546,23 @@
 "overstyring for nøkkel «%s» i skjema «%s» i overstyringsfil «%s» er ikke i "
 "listen med gyldige valg"
 
-#: ../gio/glib-compile-schemas.c:1999
+#: ../gio/glib-compile-schemas.c:1996
 msgid "where to store the gschemas.compiled file"
 msgstr "gschemas.compiled filen lagres her"
 
-#: ../gio/glib-compile-schemas.c:2000
+#: ../gio/glib-compile-schemas.c:1997
 msgid "Abort on any errors in schemas"
 msgstr "Avbryt ved feil i schema"
 
-#: ../gio/glib-compile-schemas.c:2001
+#: ../gio/glib-compile-schemas.c:1998
 msgid "Do not write the gschema.compiled file"
 msgstr "Ikke skriv filen gschema.compiled"
 
-#: ../gio/glib-compile-schemas.c:2002
+#: ../gio/glib-compile-schemas.c:1999
 msgid "Do not enforce key name restrictions"
 msgstr "Ikke sett restriksjoner på navn på nøkler"
 
-#: ../gio/glib-compile-schemas.c:2031
+#: ../gio/glib-compile-schemas.c:2028
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -1560,333 +1572,330 @@
 "Skjemafiler må ha type .gschema.xml, og mellomlagerfilen\n"
 "kalles gschemas.compiled."
 
-#: ../gio/glib-compile-schemas.c:2047
+#: ../gio/glib-compile-schemas.c:2044
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "Du må kun oppgi navn på én katalog\n"
 
-#: ../gio/glib-compile-schemas.c:2086
+#: ../gio/glib-compile-schemas.c:2083
 #, c-format
 msgid "No schema files found: "
 msgstr "Ingen schema-filer funnet: "
 
-#: ../gio/glib-compile-schemas.c:2089
+#: ../gio/glib-compile-schemas.c:2086
 #, c-format
 msgid "doing nothing.\n"
 msgstr "gjør ingenting.\n"
 
-#: ../gio/glib-compile-schemas.c:2092
+#: ../gio/glib-compile-schemas.c:2089
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "fjernet eksisterende utdatafil.\n"
 
-#: ../gio/glocaldirectorymonitor.c:288
+#: ../gio/glocaldirectorymonitor.c:226
 msgid "Unable to find default local directory monitor type"
 msgstr "Klarte ikke å finne forvalgt type overvåker for lokal katalog"
 
-#: ../gio/glocalfile.c:594 ../gio/win32/gwinhttpfile.c:422
+#: ../gio/glocalfile.c:606 ../gio/win32/gwinhttpfile.c:422
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Ugyldig filnavn %s"
 
-#: ../gio/glocalfile.c:971
+#: ../gio/glocalfile.c:983
 #, c-format
 msgid "Error getting filesystem info: %s"
 msgstr "Feil under lesing av informasjon om filsystem: %s"
 
-#: ../gio/glocalfile.c:1139
+#: ../gio/glocalfile.c:1151
 msgid "Can't rename root directory"
 msgstr "Kan ikke endre navn på rotkatalogen"
 
-#: ../gio/glocalfile.c:1159 ../gio/glocalfile.c:1185
+#: ../gio/glocalfile.c:1171 ../gio/glocalfile.c:1197
 #, c-format
 msgid "Error renaming file: %s"
 msgstr "Feil under endring av navn på fil: %s"
 
-#: ../gio/glocalfile.c:1168
+#: ../gio/glocalfile.c:1180
 msgid "Can't rename file, filename already exists"
 msgstr "Kan ikke endre navn på filen. Filnavnet eksisterer allerede"
 
-#: ../gio/glocalfile.c:1181 ../gio/glocalfile.c:2198 ../gio/glocalfile.c:2227
-#: ../gio/glocalfile.c:2387 ../gio/glocalfileoutputstream.c:586
-#: ../gio/glocalfileoutputstream.c:639 ../gio/glocalfileoutputstream.c:684
-#: ../gio/glocalfileoutputstream.c:1172
+#: ../gio/glocalfile.c:1193 ../gio/glocalfile.c:2212 ../gio/glocalfile.c:2241
+#: ../gio/glocalfile.c:2401 ../gio/glocalfileoutputstream.c:551
 msgid "Invalid filename"
 msgstr "Ugyldig filnavn"
 
-#: ../gio/glocalfile.c:1348 ../gio/glocalfile.c:1372
+#: ../gio/glocalfile.c:1360 ../gio/glocalfile.c:1384
 msgid "Can't open directory"
 msgstr "Kan ikke åpne mappe"
 
-#: ../gio/glocalfile.c:1356
+#: ../gio/glocalfile.c:1368
 #, c-format
 msgid "Error opening file: %s"
 msgstr "Feil under åpning av fil: %s"
 
-#: ../gio/glocalfile.c:1497
+#: ../gio/glocalfile.c:1509
 #, c-format
 msgid "Error removing file: %s"
 msgstr "Feil ved fjerning av fil: %s"
 
-#: ../gio/glocalfile.c:1877
+#: ../gio/glocalfile.c:1889
 #, c-format
 msgid "Error trashing file: %s"
 msgstr "Feil ved plassering av fil i papirkurv: %s"
 
-#: ../gio/glocalfile.c:1900
+#: ../gio/glocalfile.c:1912
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Kan ikke legge katalog %s i papirkurven: %s"
 
-#: ../gio/glocalfile.c:1921
+#: ../gio/glocalfile.c:1933
 msgid "Unable to find toplevel directory for trash"
 msgstr "Kan ikke finne toppnivå for papirkurv"
 
-#: ../gio/glocalfile.c:2000 ../gio/glocalfile.c:2020
+#: ../gio/glocalfile.c:2012 ../gio/glocalfile.c:2032
 msgid "Unable to find or create trash directory"
 msgstr "Kan ikke finne eller opprette mappe for papirkurv"
 
-#: ../gio/glocalfile.c:2054
+#: ../gio/glocalfile.c:2066
 #, c-format
 msgid "Unable to create trashing info file: %s"
 msgstr "Kan ikke opprette informasjonsfil for papirkurv: %s"
 
-#: ../gio/glocalfile.c:2083 ../gio/glocalfile.c:2088 ../gio/glocalfile.c:2168
-#: ../gio/glocalfile.c:2175
+#: ../gio/glocalfile.c:2097 ../gio/glocalfile.c:2102 ../gio/glocalfile.c:2182
+#: ../gio/glocalfile.c:2189
 #, c-format
 msgid "Unable to trash file: %s"
 msgstr "Kan ikke legge fil i papirkurven: %s"
 
-#: ../gio/glocalfile.c:2176 ../glib/gregex.c:280
+#: ../gio/glocalfile.c:2190 ../glib/gregex.c:280
 msgid "internal error"
 msgstr "intern feil"
 
-#: ../gio/glocalfile.c:2202
+#: ../gio/glocalfile.c:2216
 #, c-format
 msgid "Error creating directory: %s"
 msgstr "Feil under oppretting av katalog: %s"
 
-#: ../gio/glocalfile.c:2231
+#: ../gio/glocalfile.c:2245
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Filsystemet støtter ikke symbolske lenker"
 
-#: ../gio/glocalfile.c:2235
+#: ../gio/glocalfile.c:2249
 #, c-format
 msgid "Error making symbolic link: %s"
 msgstr "Feil ved oppretting av symbolsk lenke: %s"
 
-#: ../gio/glocalfile.c:2297 ../gio/glocalfile.c:2391
+#: ../gio/glocalfile.c:2311 ../gio/glocalfile.c:2405
 #, c-format
 msgid "Error moving file: %s"
 msgstr "Feil under flytting av fil: %s"
 
-#: ../gio/glocalfile.c:2320
+#: ../gio/glocalfile.c:2334
 msgid "Can't move directory over directory"
 msgstr "Kan ikke flytte katalog over katalog"
 
-#: ../gio/glocalfile.c:2347 ../gio/glocalfileoutputstream.c:970
-#: ../gio/glocalfileoutputstream.c:984 ../gio/glocalfileoutputstream.c:999
-#: ../gio/glocalfileoutputstream.c:1015 ../gio/glocalfileoutputstream.c:1029
+#: ../gio/glocalfile.c:2361 ../gio/glocalfileoutputstream.c:927
+#: ../gio/glocalfileoutputstream.c:941 ../gio/glocalfileoutputstream.c:956
+#: ../gio/glocalfileoutputstream.c:972 ../gio/glocalfileoutputstream.c:986
 msgid "Backup file creation failed"
 msgstr "Oppretting av sikkerhetskopi feilet"
 
-#: ../gio/glocalfile.c:2366
+#: ../gio/glocalfile.c:2380
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Feil under fjerning av målfil: %s"
 
-#: ../gio/glocalfile.c:2380
+#: ../gio/glocalfile.c:2394
 msgid "Move between mounts not supported"
 msgstr "Flytting mellom monteringspunkter er ikke støttet"
 
-#: ../gio/glocalfileinfo.c:721
+#: ../gio/glocalfileinfo.c:722
 msgid "Attribute value must be non-NULL"
 msgstr "Attributtverdi må ikke være NULL"
 
-#: ../gio/glocalfileinfo.c:728
+#: ../gio/glocalfileinfo.c:729
 msgid "Invalid attribute type (string expected)"
 msgstr "Ugyldig type attributt (streng forventet)"
 
-#: ../gio/glocalfileinfo.c:735
+#: ../gio/glocalfileinfo.c:736
 msgid "Invalid extended attribute name"
 msgstr "Ugyldig navn på utvidet attributt"
 
-#: ../gio/glocalfileinfo.c:775
+#: ../gio/glocalfileinfo.c:776
 #, c-format
 msgid "Error setting extended attribute '%s': %s"
 msgstr "Feil under setting av utvidet attributt «%s»: %s"
 
-#: ../gio/glocalfileinfo.c:1547
+#: ../gio/glocalfileinfo.c:1557
 msgid " (invalid encoding)"
 msgstr " (ugyldig koding)"
 
-#: ../gio/glocalfileinfo.c:1739 ../gio/glocalfileoutputstream.c:848
+#: ../gio/glocalfileinfo.c:1749 ../gio/glocalfileoutputstream.c:805
 #, c-format
 msgid "Error when getting information for file '%s': %s"
 msgstr "Feil ved henting av informasjon for fil «%s»: %s"
 
-#: ../gio/glocalfileinfo.c:1985
+#: ../gio/glocalfileinfo.c:2000
 #, c-format
 msgid "Error when getting information for file descriptor: %s"
 msgstr "Feil ved henting av informasjon om fildeskriptor: %s"
 
-#: ../gio/glocalfileinfo.c:2030
+#: ../gio/glocalfileinfo.c:2045
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Ugyldig type attributt (uint32 forventet)"
 
-#: ../gio/glocalfileinfo.c:2048
+#: ../gio/glocalfileinfo.c:2063
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Ugyldig type attributt (uint64 forventet)"
 
-#: ../gio/glocalfileinfo.c:2067 ../gio/glocalfileinfo.c:2086
+#: ../gio/glocalfileinfo.c:2082 ../gio/glocalfileinfo.c:2101
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Ugyldig type attributt (byte-streng forventet)"
 
-#: ../gio/glocalfileinfo.c:2121
+#: ../gio/glocalfileinfo.c:2136
 msgid "Cannot set permissions on symlinks"
 msgstr "Kan ikke sette rettigheter på symbolske lenker"
 
-#: ../gio/glocalfileinfo.c:2137
+#: ../gio/glocalfileinfo.c:2152
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Feil ved setting av rettigheter: %s"
 
-#: ../gio/glocalfileinfo.c:2188
+#: ../gio/glocalfileinfo.c:2203
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Feil ved setting av eier: %s"
 
-#: ../gio/glocalfileinfo.c:2211
+#: ../gio/glocalfileinfo.c:2226
 msgid "symlink must be non-NULL"
 msgstr "symbolsk lenke kan ikke være NULL"
 
-#: ../gio/glocalfileinfo.c:2221 ../gio/glocalfileinfo.c:2240
-#: ../gio/glocalfileinfo.c:2251
+#: ../gio/glocalfileinfo.c:2236 ../gio/glocalfileinfo.c:2255
+#: ../gio/glocalfileinfo.c:2266
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Feil ved setting av symbolsk lenke: %s"
 
-#: ../gio/glocalfileinfo.c:2230
+#: ../gio/glocalfileinfo.c:2245
 msgid "Error setting symlink: file is not a symlink"
 msgstr "Feil ved setting av symbolsk lenke: filen er ikke en symbolsk lenke"
 
-#: ../gio/glocalfileinfo.c:2356
+#: ../gio/glocalfileinfo.c:2371
 #, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "Feil ved setting av endrings- eller aksesstid: %s"
 
-#: ../gio/glocalfileinfo.c:2379
+#: ../gio/glocalfileinfo.c:2394
 msgid "SELinux context must be non-NULL"
 msgstr "SELinux-kontekst kan ikke være NULL"
 
-#: ../gio/glocalfileinfo.c:2394
+#: ../gio/glocalfileinfo.c:2409
 #, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Feil ved setting av SELinux-kontekst: %s"
 
-#: ../gio/glocalfileinfo.c:2401
+#: ../gio/glocalfileinfo.c:2416
 msgid "SELinux is not enabled on this system"
 msgstr "SELinux er ikke slått på på dette systemet"
 
-#: ../gio/glocalfileinfo.c:2493
+#: ../gio/glocalfileinfo.c:2508
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Støtter ikke å sette attributt %s"
 
-#: ../gio/glocalfileinputstream.c:185 ../gio/glocalfileoutputstream.c:737
+#: ../gio/glocalfileinputstream.c:170 ../gio/glocalfileoutputstream.c:696
 #, c-format
 msgid "Error reading from file: %s"
 msgstr "Feil under lesing fra fil: %s"
 
-#: ../gio/glocalfileinputstream.c:216 ../gio/glocalfileinputstream.c:228
-#: ../gio/glocalfileinputstream.c:340 ../gio/glocalfileoutputstream.c:475
-#: ../gio/glocalfileoutputstream.c:1047
+#: ../gio/glocalfileinputstream.c:201 ../gio/glocalfileinputstream.c:213
+#: ../gio/glocalfileinputstream.c:227 ../gio/glocalfileinputstream.c:335
+#: ../gio/glocalfileoutputstream.c:458 ../gio/glocalfileoutputstream.c:1004
 #, c-format
 msgid "Error seeking in file: %s"
 msgstr "Feil under søking i fil: %s"
 
-#: ../gio/glocalfileinputstream.c:261 ../gio/glocalfileoutputstream.c:256
-#: ../gio/glocalfileoutputstream.c:353
+#: ../gio/glocalfileinputstream.c:257 ../gio/glocalfileoutputstream.c:248
+#: ../gio/glocalfileoutputstream.c:342
 #, c-format
 msgid "Error closing file: %s"
 msgstr "Feil under lukking av fil: %s"
 
-#: ../gio/glocalfilemonitor.c:212
+#: ../gio/glocalfilemonitor.c:147
 msgid "Unable to find default local file monitor type"
 msgstr "Kan ikke finne forvalgt lokal filovervåkingstype"
 
-#: ../gio/glocalfileoutputstream.c:202 ../gio/glocalfileoutputstream.c:235
-#: ../gio/glocalfileoutputstream.c:758
+#: ../gio/glocalfileoutputstream.c:196 ../gio/glocalfileoutputstream.c:228
+#: ../gio/glocalfileoutputstream.c:717
 #, c-format
 msgid "Error writing to file: %s"
 msgstr "Feil under skriving til fil: %s"
 
-#: ../gio/glocalfileoutputstream.c:283
+#: ../gio/glocalfileoutputstream.c:275
 #, c-format
 msgid "Error removing old backup link: %s"
 msgstr "Feil ved fjerning av gammel sikkerhetskopi av lenke: %s"
 
-#: ../gio/glocalfileoutputstream.c:297 ../gio/glocalfileoutputstream.c:310
+#: ../gio/glocalfileoutputstream.c:289 ../gio/glocalfileoutputstream.c:302
 #, c-format
 msgid "Error creating backup copy: %s"
 msgstr "Feil under oppretting av sikkerhetskopi: %s"
 
-#: ../gio/glocalfileoutputstream.c:328
+#: ../gio/glocalfileoutputstream.c:320
 #, c-format
 msgid "Error renaming temporary file: %s"
 msgstr "Feil ved endring av navn på midlertidig fil: %s"
 
-#: ../gio/glocalfileoutputstream.c:521 ../gio/glocalfileoutputstream.c:1098
+#: ../gio/glocalfileoutputstream.c:504 ../gio/glocalfileoutputstream.c:1055
 #, c-format
 msgid "Error truncating file: %s"
 msgstr "Feil under avkorting av fil: «%s»"
 
-#: ../gio/glocalfileoutputstream.c:592 ../gio/glocalfileoutputstream.c:645
-#: ../gio/glocalfileoutputstream.c:690 ../gio/glocalfileoutputstream.c:830
-#: ../gio/glocalfileoutputstream.c:1079 ../gio/glocalfileoutputstream.c:1178
+#: ../gio/glocalfileoutputstream.c:557 ../gio/glocalfileoutputstream.c:787
+#: ../gio/glocalfileoutputstream.c:1036 ../gio/gsubprocess.c:360
 #, c-format
 msgid "Error opening file '%s': %s"
 msgstr "Feil under åpning av fil «%s»: %s"
 
-#: ../gio/glocalfileoutputstream.c:861
+#: ../gio/glocalfileoutputstream.c:818
 msgid "Target file is a directory"
 msgstr "Målfilen er en katalog"
 
-#: ../gio/glocalfileoutputstream.c:866
+#: ../gio/glocalfileoutputstream.c:823
 msgid "Target file is not a regular file"
 msgstr "Målfilen er ikke en vanlig fil"
 
-#: ../gio/glocalfileoutputstream.c:878
+#: ../gio/glocalfileoutputstream.c:835
 msgid "The file was externally modified"
 msgstr "Filen ble endret eksternt"
 
-#: ../gio/glocalfileoutputstream.c:1063
+#: ../gio/glocalfileoutputstream.c:1020
 #, c-format
 msgid "Error removing old file: %s"
 msgstr "Feil ved fjerning av gammel fil: %s"
 
-#: ../gio/gmemoryinputstream.c:475 ../gio/gmemoryoutputstream.c:739
+#: ../gio/gmemoryinputstream.c:473 ../gio/gmemoryoutputstream.c:773
 msgid "Invalid GSeekType supplied"
 msgstr "Ugyldig GSeekType oppgitt"
 
-#: ../gio/gmemoryinputstream.c:485
+#: ../gio/gmemoryinputstream.c:483
 msgid "Invalid seek request"
 msgstr "Ugyldig søkeforespørsel"
 
-#: ../gio/gmemoryinputstream.c:509
+#: ../gio/gmemoryinputstream.c:507
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "Kan ikke avkorte GMemoryInputStream"
 
-#: ../gio/gmemoryoutputstream.c:544
+#: ../gio/gmemoryoutputstream.c:567
 msgid "Memory output stream not resizable"
 msgstr "Kan ikke endre størrelse på utdatastrøm for minne"
 
-#: ../gio/gmemoryoutputstream.c:560
+#: ../gio/gmemoryoutputstream.c:583
 msgid "Failed to resize memory output stream"
 msgstr "Klarte ikke å endre størrelse på utdatastrøm for minne"
 
-#: ../gio/gmemoryoutputstream.c:648
+#: ../gio/gmemoryoutputstream.c:675
 msgid ""
 "Amount of memory required to process the write is larger than available "
 "address space"
@@ -1894,11 +1903,11 @@
 "Mengden minne som kreves for å prosessere skriveoperasjonen er større enn "
 "tilgjengelig adresseområde"
 
-#: ../gio/gmemoryoutputstream.c:749
+#: ../gio/gmemoryoutputstream.c:783
 msgid "Requested seek before the beginning of the stream"
 msgstr "Forespurt søk før begynnelsen på strømmen"
 
-#: ../gio/gmemoryoutputstream.c:758
+#: ../gio/gmemoryoutputstream.c:798
 msgid "Requested seek beyond the end of the stream"
 msgstr "Forespurt søk forbi slutten på strømmen"
 
@@ -1951,38 +1960,38 @@
 msgid "mount doesn't implement synchronous content type guessing"
 msgstr "mount implementerer ikke synkron gjetting av innholdstype"
 
-#: ../gio/gnetworkaddress.c:322
+#: ../gio/gnetworkaddress.c:353
 #, c-format
 msgid "Hostname '%s' contains '[' but not ']'"
 msgstr "Vertsnavn «%s» inneholder «[» men ikke «]»"
 
-#: ../gio/gnetworkmonitorbase.c:178
+#: ../gio/gnetworkmonitorbase.c:191 ../gio/gnetworkmonitorbase.c:294
 msgid "Network unreachable"
 msgstr "Nettverk kan ikke nås"
 
-#: ../gio/gnetworkmonitorbase.c:218
+#: ../gio/gnetworkmonitorbase.c:229 ../gio/gnetworkmonitorbase.c:259
 msgid "Host unreachable"
 msgstr "Kan ikke nå vert"
 
-#: ../gio/gnetworkmonitornetlink.c:97 ../gio/gnetworkmonitornetlink.c:109
-#: ../gio/gnetworkmonitornetlink.c:128
+#: ../gio/gnetworkmonitornetlink.c:98 ../gio/gnetworkmonitornetlink.c:110
+#: ../gio/gnetworkmonitornetlink.c:129
 #, c-format
 msgid "Could not create network monitor: %s"
 msgstr "Kunne ikke lage nettverksovervåker: %s"
 
-#: ../gio/gnetworkmonitornetlink.c:118
+#: ../gio/gnetworkmonitornetlink.c:119
 msgid "Could not create network monitor: "
 msgstr "Kunne ikke lage nettverksovervåker: "
 
-#: ../gio/gnetworkmonitornetlink.c:176
+#: ../gio/gnetworkmonitornetlink.c:177
 msgid "Could not get network status: "
 msgstr "Kunne ikke hente nettverksstatus: "
 
-#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:464
+#: ../gio/goutputstream.c:211 ../gio/goutputstream.c:553
 msgid "Output stream doesn't implement write"
 msgstr "Ut-strømmen implementerer ikke skriving"
 
-#: ../gio/goutputstream.c:425 ../gio/goutputstream.c:956
+#: ../gio/goutputstream.c:514 ../gio/goutputstream.c:1032
 msgid "Source stream is already closed"
 msgstr "Kildestrømmen er allerede lukket"
 
@@ -1996,17 +2005,17 @@
 msgid "Error reverse-resolving '%s': %s"
 msgstr "Feil under omvendt oppslag av «%s»: %s"
 
-#: gio/gresolver.c:821 gio/gresolver.c:899
+#: ../gio/gresolver.c:849 ../gio/gresolver.c:928
 #, c-format
 msgid "No service record for '%s'"
 msgstr "Ingen tjenesteoppføring for «%s»"
 
-#: ../gio/gthreadedresolver.c:402 ../gio/gthreadedresolver.c:576
+#: ../gio/gthreadedresolver.c:538 ../gio/gthreadedresolver.c:718
 #, c-format
 msgid "Temporarily unable to resolve '%s'"
 msgstr "Midlertidig ute av stand til å slå opp «%s»"
 
-#: ../gio/gthreadedresolver.c:407 ../gio/gthreadedresolver.c:581
+#: ../gio/gthreadedresolver.c:543 ../gio/gthreadedresolver.c:723
 #, c-format
 msgid "Error resolving '%s'"
 msgstr "Feil ved oppslag av «%s»"
@@ -2033,11 +2042,13 @@
 msgid "Input stream doesn't implement seek"
 msgstr "Inndatastrøm implementerer ikke søk"
 
-#: ../gio/gresource-tool.c:475 ../gio/gsettings-tool.c:529
+#: ../gio/gapplication-tool.c:47 ../gio/gapplication-tool.c:48
+#: ../gio/gresource-tool.c:475 ../gio/gsettings-tool.c:507
 msgid "Print help"
 msgstr "Skriv ut hjelp"
 
-#: ../gio/gresource-tool.c:476 ../gio/gresource-tool.c:544
+#: ../gio/gapplication-tool.c:49 ../gio/gresource-tool.c:476
+#: ../gio/gresource-tool.c:544
 msgid "[COMMAND]"
 msgstr "[KOMMANDO]"
 
@@ -2084,7 +2095,8 @@
 msgid "FILE PATH"
 msgstr "STI TIL FIL"
 
-#: ../gio/gresource-tool.c:513 ../gio/gsettings-tool.c:609
+#: ../gio/gapplication-tool.c:98 ../gio/gresource-tool.c:513
+#: ../gio/gsettings-tool.c:593
 #, c-format
 msgid ""
 "Unknown command %s\n"
@@ -2136,7 +2148,8 @@
 "%s\n"
 "\n"
 
-#: ../gio/gresource-tool.c:538 ../gio/gsettings-tool.c:642
+#: ../gio/gapplication-tool.c:116 ../gio/gresource-tool.c:538
+#: ../gio/gsettings-tool.c:627
 msgid "Arguments:\n"
 msgstr "Argumenter:\n"
 
@@ -2144,7 +2157,7 @@
 msgid "  SECTION   An (optional) elf section name\n"
 msgstr "  SEKSJON  Et valgfritt navn på en elf seksjon\n"
 
-#: ../gio/gresource-tool.c:546 ../gio/gsettings-tool.c:649
+#: ../gio/gresource-tool.c:546 ../gio/gsettings-tool.c:634
 msgid "  COMMAND   The (optional) command to explain\n"
 msgstr "  KOMMANDO Valgfri kommando som skal forklares\n"
 
@@ -2176,73 +2189,73 @@
 msgid "  PATH      A resource path\n"
 msgstr "  STI      En ressurssti\n"
 
-#: ../gio/gsettings-tool.c:57 ../gio/gsettings-tool.c:78
+#: ../gio/gsettings-tool.c:53 ../gio/gsettings-tool.c:74
 #, c-format
 msgid "No such schema '%s'\n"
 msgstr "Skjema «%s» finnes ikke\n"
 
-#: ../gio/gsettings-tool.c:63
+#: ../gio/gsettings-tool.c:59
 #, c-format
 msgid "Schema '%s' is not relocatable (path must not be specified)\n"
 msgstr "Skjema «%s» er ikke omplasserbar (stien må ikke oppgis)\n"
 
-#: ../gio/gsettings-tool.c:84
+#: ../gio/gsettings-tool.c:80
 #, c-format
 msgid "Schema '%s' is relocatable (path must be specified)\n"
 msgstr "Skjema «%s» er omplasserbart (sti må oppgis)\n"
 
-#: ../gio/gsettings-tool.c:98
+#: ../gio/gsettings-tool.c:94
 #, c-format
 msgid "Empty path given.\n"
 msgstr "Stien som ble oppgitt er tom.\n"
 
-#: ../gio/gsettings-tool.c:104
+#: ../gio/gsettings-tool.c:100
 #, c-format
 msgid "Path must begin with a slash (/)\n"
 msgstr "Stien må starte med en skråstrek (/)\n"
 
-#: ../gio/gsettings-tool.c:110
+#: ../gio/gsettings-tool.c:106
 #, c-format
 msgid "Path must end with a slash (/)\n"
 msgstr "Stien må slutte med skråstrek (/)\n"
 
-#: ../gio/gsettings-tool.c:116
+#: ../gio/gsettings-tool.c:112
 #, c-format
 msgid "Path must not contain two adjacent slashes (//)\n"
 msgstr "Sti må ikke inneholde to etterfølgende skråstreker (//)\n"
 
-#: ../gio/gsettings-tool.c:137
+#: ../gio/gsettings-tool.c:797
 #, c-format
 msgid "No such key '%s'\n"
 msgstr "Nøkkel «%s» finnes ikke\n"
 
-#: ../gio/gsettings-tool.c:502
+#: ../gio/gsettings-tool.c:476
 #, c-format
 msgid "The provided value is outside of the valid range\n"
 msgstr "Oppgitt verdi er utenfor gyldig område\n"
 
-#: ../gio/gsettings-tool.c:535
+#: ../gio/gsettings-tool.c:519
 msgid "List the installed (non-relocatable) schemas"
 msgstr "Vis installerte (ikke-flyttbare) schema"
 
-#: ../gio/gsettings-tool.c:541
+#: ../gio/gsettings-tool.c:525
 msgid "List the installed relocatable schemas"
 msgstr "Vis installerte flyttbare schema"
 
-#: ../gio/gsettings-tool.c:547
+#: ../gio/gsettings-tool.c:531
 msgid "List the keys in SCHEMA"
 msgstr "Vis nøklene i SCHEMA"
 
-#: ../gio/gsettings-tool.c:548 ../gio/gsettings-tool.c:554
-#: ../gio/gsettings-tool.c:591
+#: ../gio/gsettings-tool.c:532 ../gio/gsettings-tool.c:538
+#: ../gio/gsettings-tool.c:575
 msgid "SCHEMA[:PATH]"
 msgstr "SKJEMA[:STI]"
 
-#: ../gio/gsettings-tool.c:553
+#: ../gio/gsettings-tool.c:537
 msgid "List the children of SCHEMA"
 msgstr "Vis barn av SCHEMA"
 
-#: ../gio/gsettings-tool.c:559
+#: ../gio/gsettings-tool.c:543
 msgid ""
 "List keys and values, recursively\n"
 "If no SCHEMA is given, list all keys\n"
@@ -2250,44 +2263,44 @@
 "Vis nøkler og verdier rekursivt\n"
 "Vis alle nøkler hvis SKJEMA ikke oppgis\n"
 
-#: ../gio/gsettings-tool.c:561
+#: ../gio/gsettings-tool.c:545
 msgid "[SCHEMA[:PATH]]"
 msgstr "SKJEMA[:STI]"
 
-#: ../gio/gsettings-tool.c:566
+#: ../gio/gsettings-tool.c:550
 msgid "Get the value of KEY"
 msgstr "Hent verdi for NØKKEL"
 
-#: ../gio/gsettings-tool.c:567 ../gio/gsettings-tool.c:573
-#: ../gio/gsettings-tool.c:585 ../gio/gsettings-tool.c:597
+#: ../gio/gsettings-tool.c:551 ../gio/gsettings-tool.c:557
+#: ../gio/gsettings-tool.c:569 ../gio/gsettings-tool.c:581
 msgid "SCHEMA[:PATH] KEY"
 msgstr "SKJEMA[:STI] NØKKEL"
 
-#: ../gio/gsettings-tool.c:572
+#: ../gio/gsettings-tool.c:556
 msgid "Query the range of valid values for KEY"
 msgstr "Spør på gyldig verdiområde for NØKKEL"
 
-#: ../gio/gsettings-tool.c:578
+#: ../gio/gsettings-tool.c:562
 msgid "Set the value of KEY to VALUE"
 msgstr "Sett verdien for NØKKEL til VERDI"
 
-#: ../gio/gsettings-tool.c:579
+#: ../gio/gsettings-tool.c:563
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "SKJEMA[:STI] NØKKEL VERDI"
 
-#: ../gio/gsettings-tool.c:584
+#: ../gio/gsettings-tool.c:568
 msgid "Reset KEY to its default value"
 msgstr "Nullstill NØKKEL til forvalgt verdi"
 
-#: ../gio/gsettings-tool.c:590
+#: ../gio/gsettings-tool.c:574
 msgid "Reset all keys in SCHEMA to their defaults"
 msgstr "Nullstill alle nøkler i SKJEMA til sine forvalgte verdier"
 
-#: ../gio/gsettings-tool.c:596
+#: ../gio/gsettings-tool.c:580
 msgid "Check if KEY is writable"
 msgstr "Sjekk om NØKKEL er skrivbar"
 
-#: ../gio/gsettings-tool.c:602
+#: ../gio/gsettings-tool.c:586
 msgid ""
 "Monitor KEY for changes.\n"
 "If no KEY is specified, monitor all keys in SCHEMA.\n"
@@ -2297,11 +2310,11 @@
 "Hvis ingen NØKKEL oppgis overvåkes alle nøkler i SKJEMA.\n"
 "Bruk Ctrl+C for å stoppe overvåking.\n"
 
-#: ../gio/gsettings-tool.c:605
+#: ../gio/gsettings-tool.c:589
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "SCHEMA[:STI] [NØKKEL]"
 
-#: ../gio/gsettings-tool.c:617
+#: ../gio/gsettings-tool.c:636
 msgid ""
 "Usage:\n"
 "  gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n"
@@ -2345,7 +2358,7 @@
 "Bruk «gsettings help KOMMANDO» for å få detaljert hjelp.\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:639
+#: ../gio/gsettings-tool.c:624
 #, c-format
 msgid ""
 "Usage:\n"
@@ -2360,11 +2373,11 @@
 "%s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:645
+#: ../gio/gsettings-tool.c:630
 msgid "  SCHEMADIR A directory to search for additional schemas\n"
 msgstr "  SCHEMAKATALOG en katalog for søk etter ekstra schemas\n"
 
-#: ../gio/gsettings-tool.c:653
+#: ../gio/gsettings-tool.c:638
 msgid ""
 "  SCHEMA    The name of the schema\n"
 "  PATH      The path, for relocatable schemas\n"
@@ -2373,164 +2386,164 @@
 "  SCHEMA      Id for schema\n"
 "  PATH        Sti, for schema som kan relokeres\n"
 
-#: ../gio/gsettings-tool.c:658
+#: ../gio/gsettings-tool.c:643
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  NØKKEL    Valgfri nøkkel i schema\n"
 
-#: ../gio/gsettings-tool.c:662
+#: ../gio/gsettings-tool.c:647
 msgid "  KEY       The key within the schema\n"
 msgstr "  NØKKEL       Nøkkel i schema\n"
 
-#: ../gio/gsettings-tool.c:666
+#: ../gio/gsettings-tool.c:651
 msgid "  VALUE     The value to set\n"
 msgstr "  VERDI     Verdi som skal settes\n"
 
-#: ../gio/gsettings-tool.c:784
+#: ../gio/gsettings-tool.c:768
 #, c-format
 msgid "Empty schema name given\n"
 msgstr "Tomt navn på schema oppgitt\n"
 
-#: ../gio/gsocket.c:311
+#: ../gio/gsocket.c:314
 msgid "Invalid socket, not initialized"
 msgstr "Ugyldig plugg, ikke initiert"
 
-#: ../gio/gsocket.c:318
+#: ../gio/gsocket.c:321
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Ugyldig plugg, initiering feilet pga: %s"
 
-#: ../gio/gsocket.c:326
+#: ../gio/gsocket.c:329
 msgid "Socket is already closed"
 msgstr "Pluggen er allerede lukket"
 
-#: ../gio/gsocket.c:334 ../gio/gsocket.c:3509 ../gio/gsocket.c:3564
+#: ../gio/gsocket.c:337 ../gio/gsocket.c:3624 ../gio/gsocket.c:3679
 msgid "Socket I/O timed out"
 msgstr "Tidsavbrudd for I/U mot plugg"
 
-#: ../gio/gsocket.c:481
+#: ../gio/gsocket.c:484
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "lager GSocket fra fd: %s"
 
-#: ../gio/gsocket.c:515 ../gio/gsocket.c:522 ../gio/gsocket.c:538
+#: ../gio/gsocket.c:512 ../gio/gsocket.c:566 ../gio/gsocket.c:573
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Kunne ikke lage plugg: %s"
 
-#: ../gio/gsocket.c:515
+#: ../gio/gsocket.c:566
 msgid "Unknown family was specified"
 msgstr "Ukjent familie ble oppgitt"
 
-#: ../gio/gsocket.c:522
+#: ../gio/gsocket.c:573
 msgid "Unknown protocol was specified"
 msgstr "Ukjent protokoll ble oppgitt"
 
-#: ../gio/gsocket.c:1712
+#: ../gio/gsocket.c:1731
 #, c-format
 msgid "could not get local address: %s"
 msgstr "kunne ikke hente lokal adresse: %s"
 
-#: ../gio/gsocket.c:1755
+#: ../gio/gsocket.c:1774
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "kunne ikke hente ekstern adresse: %s"
 
-#: ../gio/gsocket.c:1816
+#: ../gio/gsocket.c:1835
 #, c-format
 msgid "could not listen: %s"
 msgstr "kunne ikke lytte: %s"
 
-#: ../gio/gsocket.c:1888
+#: ../gio/gsocket.c:1934
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Feil ved binding til adresse: %s"
 
-#: ../gio/gsocket.c:1941 ../gio/gsocket.c:1978
+#: ../gio/gsocket.c:2046 ../gio/gsocket.c:2083
 #, c-format
 msgid "Error joining multicast group: %s"
 msgstr "Feil ved forsøk på å bli med i multicast-gruppe: %s"
 
-#: ../gio/gsocket.c:1942 ../gio/gsocket.c:1979
+#: ../gio/gsocket.c:2047 ../gio/gsocket.c:2084
 #, c-format
 msgid "Error leaving multicast group: %s"
 msgstr "Feil ved forsøk på å forlate multicast-gruppe: %s"
 
-#: ../gio/gsocket.c:1943
+#: ../gio/gsocket.c:2048
 msgid "No support for source-specific multicast"
 msgstr "Ingen støtte for kildespesifikk multicast"
 
-#: ../gio/gsocket.c:2162
+#: ../gio/gsocket.c:2267
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Feil ved godkjenning av tilkobling: %s"
 
-#: ../gio/gsocket.c:2283
+#: ../gio/gsocket.c:2388
 msgid "Connection in progress"
 msgstr "Tilkobling pågår"
 
-#: ../gio/gsocket.c:4356
+#: ../gio/gsocket.c:4357
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Kan ikke hente utestående feil: %s"
 
-#: ../gio/gsocket.c:2496
+#: ../gio/gsocket.c:2621
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Feil ved mottak av data: %s"
 
-#: ../gio/gsocket.c:2674
+#: ../gio/gsocket.c:2799
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Feil ved sending av data: %s"
 
-#: ../gio/gsocket.c:2788
+#: ../gio/gsocket.c:2913
 #, c-format
 msgid "Unable to shutdown socket: %s"
 msgstr "Kan ikke stenge ned plugg: %s"
 
-#: ../gio/gsocket.c:2867
+#: ../gio/gsocket.c:2992
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Feil ved lukking av plugg: %s"
 
-#: ../gio/gsocket.c:3502
+#: ../gio/gsocket.c:3617
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Venter på tilstand for plugg: %s"
 
-#: ../gio/gsocket.c:3780 ../gio/gsocket.c:3861
+#: ../gio/gsocket.c:3895 ../gio/gsocket.c:3976
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Feil ved sending av melding: %s"
 
-#: ../gio/gsocket.c:3825
+#: ../gio/gsocket.c:3823
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage er ikke støttet på windows"
 
-#: ../gio/gsocket.c:4139 ../gio/gsocket.c:4274
+#: ../gio/gsocket.c:4254 ../gio/gsocket.c:4389
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Feil ved mottak av melding: %s"
 
-#: ../gio/gsocket.c:4375
+#: ../gio/gsocket.c:4503
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "g_socket_get_credentials ikke implementert for dette OSet"
 
-#: ../gio/gsocketclient.c:174
+#: ../gio/gsocketclient.c:178
 #, c-format
 msgid "Could not connect to proxy server %s: "
 msgstr "Kunne ikke koble til proxy-tjener %s: "
 
-#: ../gio/gsocketclient.c:188
+#: ../gio/gsocketclient.c:192
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "Kunne ikke koble til «%s»: "
 
-#: ../gio/gsocketclient.c:190
+#: ../gio/gsocketclient.c:194
 msgid "Could not connect: "
 msgstr "Kunne ikke koble til: "
 
-#: ../gio/gsocketclient.c:976 ../gio/gsocketclient.c:1540
+#: ../gio/gsocketclient.c:1069 ../gio/gsocketclient.c:1636
 msgid "Unknown error on connect"
 msgstr "Ukjent feil ved tilkobling"
 
@@ -2538,16 +2551,16 @@
 msgid "Trying to proxy over non-TCP connection is not supported."
 msgstr "Proxy over annet enn TCP-forbindelser er ikke støttet."
 
-#: ../gio/gsocketclient.c:1055 ../gio/gsocketclient.c:1499
+#: ../gio/gsocketclient.c:1150 ../gio/gsocketclient.c:1595
 #, c-format
 msgid "Proxy protocol '%s' is not supported."
 msgstr "Protokoll «%s» er er ikke støttet"
 
-#: ../gio/gsocketlistener.c:191
+#: ../gio/gsocketlistener.c:187
 msgid "Listener is already closed"
 msgstr "Lytter er allerede lukket"
 
-#: ../gio/gsocketlistener.c:232
+#: ../gio/gsocketlistener.c:228
 msgid "Added socket is closed"
 msgstr "Tillagt plugg er lukket"
 
@@ -2639,7 +2652,7 @@
 msgid "Unknown SOCKSv5 proxy error."
 msgstr "Ukjent feil i SOCKSv5-proxy."
 
-#: ../gio/gthemedicon.c:498
+#: ../gio/gthemedicon.c:524
 #, c-format
 msgid "Can't handle version %d of GThemedIcon encoding"
 msgstr "Kan ikke håndtere versjon %d av GThemedIcon-koding"
@@ -2664,14 +2677,14 @@
 msgid "Could not parse PEM-encoded certificate"
 msgstr "Kunne ikke lese PEM-kodet sertifikat"
 
-#: ../gio/gtlspassword.c:114
+#: ../gio/gtlspassword.c:113
 msgid ""
 "This is the last chance to enter the password correctly before your access "
 "is locked out."
 msgstr ""
 "Dette er siste sjanse til å oppgi korrekt passord før tilgangen blir låst."
 
-#: ../gio/gtlspassword.c:116
+#: ../gio/gtlspassword.c:115
 msgid ""
 "Several password entered have been incorrect, and your access will be locked "
 "out after further failures."
@@ -2679,7 +2692,7 @@
 "Passord har blitt oppgitt feil flere ganger, og tilgangen vil bli låst hvis "
 "det oppgis feil på nytt."
 
-#: ../gio/gtlspassword.c:118
+#: ../gio/gtlspassword.c:117
 msgid "The password entered is incorrect."
 msgstr "Oppgitt passord er ikke korrekt."
 
@@ -2688,7 +2701,7 @@
 msgid "Expecting 1 control message, got %d"
 msgstr "Ventet 1 kontrollmelding, fikk %d"
 
-#: ../gio/gunixconnection.c:172 ../gio/gunixconnection.c:558
+#: ../gio/gunixconnection.c:175 ../gio/gunixconnection.c:566
 msgid "Unexpected type of ancillary data"
 msgstr "Uventet type data"
 
@@ -2697,20 +2710,20 @@
 msgid "Expecting one fd, but got %d\n"
 msgstr "Ventet en fd, men fikk %d\n"
 
-#: ../gio/gunixconnection.c:206
+#: ../gio/gunixconnection.c:212
 msgid "Received invalid fd"
 msgstr "Mottok ugyldig fd"
 
-#: ../gio/gunixconnection.c:342
+#: ../gio/gunixconnection.c:348
 msgid "Error sending credentials: "
 msgstr "Feil ved sending av påloggingsinformasjon: "
 
-#: ../gio/gunixconnection.c:490
+#: ../gio/gunixconnection.c:496
 #, c-format
 msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
 msgstr "Feil under sjekk om SO_PASSCRED er slått på for plugg: %s"
 
-#: ../gio/gunixconnection.c:519
+#: ../gio/gunixconnection.c:520
 #, c-format
 msgid ""
 "Unexpected option length while checking if SO_PASSCRED is enabled for "
@@ -2719,43 +2732,43 @@
 "Uventet lengde på flagg ved sjekk om SO_PASSCRED er slått på for plugg. "
 "Forventet %d byte, fikk %d"
 
-#: ../gio/gunixconnection.c:505
+#: ../gio/gunixconnection.c:511
 #, c-format
 msgid "Error enabling SO_PASSCRED: %s"
 msgstr "Feil under forsøk på å slå på SO_PASSCRED: %s"
 
-#: ../gio/gunixconnection.c:534
+#: ../gio/gunixconnection.c:540
 msgid ""
 "Expecting to read a single byte for receiving credentials but read zero bytes"
 msgstr ""
 "Forventer å lese en enkelt byte for mottak av påloggingsinformasjon, men "
 "leste null byte"
 
-#: ../gio/gunixconnection.c:572
+#: ../gio/gunixconnection.c:580
 #, c-format
 msgid "Not expecting control message, but got %d"
 msgstr "Forventet ikke kontrollmelding, men fikk %d"
 
-#: ../gio/gunixconnection.c:596
+#: ../gio/gunixconnection.c:604
 #, c-format
 msgid "Error while disabling SO_PASSCRED: %s"
 msgstr "Feil ved forsøk på å slå av SO_PASSCRED: %s"
 
-#: ../gio/gunixinputstream.c:382 ../gio/gunixinputstream.c:403
+#: ../gio/gunixinputstream.c:372 ../gio/gunixinputstream.c:393
 #, c-format
 msgid "Error reading from file descriptor: %s"
 msgstr "Feil under lesing fra fildeskriptor: %s"
 
-#: ../gio/gunixinputstream.c:436 ../gio/gunixoutputstream.c:422
+#: ../gio/gunixinputstream.c:426 ../gio/gunixoutputstream.c:412
 #, c-format
 msgid "Error closing file descriptor: %s"
 msgstr "Feil under lukking av fildeskriptor: %s"
 
-#: ../gio/gunixmounts.c:1979 ../gio/gunixmounts.c:2032
+#: ../gio/gunixmounts.c:1985 ../gio/gunixmounts.c:2038
 msgid "Filesystem root"
 msgstr "Filsystemrot"
 
-#: ../gio/gunixoutputstream.c:368 ../gio/gunixoutputstream.c:389
+#: ../gio/gunixoutputstream.c:358 ../gio/gunixoutputstream.c:379
 #, c-format
 msgid "Error writing to file descriptor: %s"
 msgstr "Feil under skriving til fildeskriptor: %s"
@@ -2796,17 +2809,17 @@
 msgid "Association creation not supported on win32"
 msgstr "Oppretting av assosiasjon er ikke støttet på win32"
 
-#: ../gio/gwin32inputstream.c:355
+#: ../gio/gwin32inputstream.c:346
 #, c-format
 msgid "Error reading from handle: %s"
 msgstr "Feil under lesing fra håndtak: %s"
 
-#: ../gio/gwin32inputstream.c:387 ../gio/gwin32outputstream.c:375
+#: ../gio/gwin32inputstream.c:390 ../gio/gwin32outputstream.c:377
 #, c-format
 msgid "Error closing handle: %s"
 msgstr "Feil under lukking av håndtak: %s"
 
-#: ../gio/gwin32outputstream.c:343
+#: ../gio/gwin32outputstream.c:333
 #, c-format
 msgid "Error writing to handle: %s"
 msgstr "Feil under skriving til håndtak: %s"
@@ -2828,393 +2841,393 @@
 msgid "Invalid compressed data"
 msgstr "Ugyldige komprimerte data"
 
-#: ../glib/gbookmarkfile.c:760
+#: ../glib/gbookmarkfile.c:755
 #, c-format
 msgid "Unexpected attribute '%s' for element '%s'"
 msgstr "Uventet attributt «%s» for element «%s»"
 
-#: ../glib/gbookmarkfile.c:771 ../glib/gbookmarkfile.c:842
-#: ../glib/gbookmarkfile.c:852 ../glib/gbookmarkfile.c:959
+#: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837
+#: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954
 #, c-format
 msgid "Attribute '%s' of element '%s' not found"
 msgstr "Attributt «%s» i element «%s» ble ikke funnet"
 
-#: ../glib/gbookmarkfile.c:1129 ../glib/gbookmarkfile.c:1194
-#: ../glib/gbookmarkfile.c:1258 ../glib/gbookmarkfile.c:1268
+#: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189
+#: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263
 #, c-format
 msgid "Unexpected tag '%s', tag '%s' expected"
 msgstr "Uventet tagg «%s», tagg «%s» forventet"
 
-#: ../glib/gbookmarkfile.c:1154 ../glib/gbookmarkfile.c:1168
-#: ../glib/gbookmarkfile.c:1236 ../glib/gbookmarkfile.c:1288
+#: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163
+#: ../glib/gbookmarkfile.c:1231 ../glib/gbookmarkfile.c:1283
 #, c-format
 msgid "Unexpected tag '%s' inside '%s'"
 msgstr "Uventet tagg «%s» i «%s»"
 
-#: ../glib/gbookmarkfile.c:1798
+#: ../glib/gbookmarkfile.c:1793
 msgid "No valid bookmark file found in data dirs"
 msgstr "Ingen gyldig bokmerkefil ble funnet i datakatalogene"
 
-#: ../glib/gbookmarkfile.c:1999
+#: ../glib/gbookmarkfile.c:1994
 #, c-format
 msgid "A bookmark for URI '%s' already exists"
 msgstr "Et bokmerke eksisterer allerede for URI «%s»"
 
-#: ../glib/gbookmarkfile.c:2045 ../glib/gbookmarkfile.c:2203
-#: ../glib/gbookmarkfile.c:2288 ../glib/gbookmarkfile.c:2368
-#: ../glib/gbookmarkfile.c:2453 ../glib/gbookmarkfile.c:2536
-#: ../glib/gbookmarkfile.c:2614 ../glib/gbookmarkfile.c:2693
-#: ../glib/gbookmarkfile.c:2735 ../glib/gbookmarkfile.c:2832
-#: ../glib/gbookmarkfile.c:2952 ../glib/gbookmarkfile.c:3142
-#: ../glib/gbookmarkfile.c:3218 ../glib/gbookmarkfile.c:3386
-#: ../glib/gbookmarkfile.c:3475 ../glib/gbookmarkfile.c:3565
-#: ../glib/gbookmarkfile.c:3693
+#: ../glib/gbookmarkfile.c:2040 ../glib/gbookmarkfile.c:2198
+#: ../glib/gbookmarkfile.c:2283 ../glib/gbookmarkfile.c:2363
+#: ../glib/gbookmarkfile.c:2448 ../glib/gbookmarkfile.c:2531
+#: ../glib/gbookmarkfile.c:2609 ../glib/gbookmarkfile.c:2688
+#: ../glib/gbookmarkfile.c:2730 ../glib/gbookmarkfile.c:2827
+#: ../glib/gbookmarkfile.c:2947 ../glib/gbookmarkfile.c:3137
+#: ../glib/gbookmarkfile.c:3213 ../glib/gbookmarkfile.c:3381
+#: ../glib/gbookmarkfile.c:3470 ../glib/gbookmarkfile.c:3560
+#: ../glib/gbookmarkfile.c:3688
 #, c-format
 msgid "No bookmark found for URI '%s'"
 msgstr "Ingen bokmerker funnet for URI «%s»"
 
-#: ../glib/gbookmarkfile.c:2377
+#: ../glib/gbookmarkfile.c:2372
 #, c-format
 msgid "No MIME type defined in the bookmark for URI '%s'"
 msgstr "Ingen MIME-type definert i bokmerke for URI «%s»"
 
-#: ../glib/gbookmarkfile.c:2462
+#: ../glib/gbookmarkfile.c:2457
 #, c-format
 msgid "No private flag has been defined in bookmark for URI '%s'"
 msgstr "Ingen private flagg er definert i bokmerke for URI «%s»"
 
-#: ../glib/gbookmarkfile.c:2841
+#: ../glib/gbookmarkfile.c:2836
 #, c-format
 msgid "No groups set in bookmark for URI '%s'"
 msgstr "Ingen grupper satt i bokmerke for URI «%s»"
 
-#: ../glib/gbookmarkfile.c:3239 ../glib/gbookmarkfile.c:3396
+#: ../glib/gbookmarkfile.c:3234 ../glib/gbookmarkfile.c:3391
 #, c-format
 msgid "No application with name '%s' registered a bookmark for '%s'"
 msgstr "Ingen program med navn «%s» har registrert et bokmerke for «%s»"
 
-#: ../glib/gbookmarkfile.c:3419
+#: ../glib/gbookmarkfile.c:3414
 #, c-format
 msgid "Failed to expand exec line '%s' with URI '%s'"
 msgstr "Feil under utvidelse av exec-linje «%s» med URI «%s»"
 
-#: ../glib/gconvert.c:803 ../glib/gutf8.c:837 ../glib/gutf8.c:1047
-#: ../glib/gutf8.c:1184 ../glib/gutf8.c:1288
+#: ../glib/gconvert.c:503 ../glib/gutf8.c:839 ../glib/gutf8.c:1054
+#: ../glib/gutf8.c:1193 ../glib/gutf8.c:1299
 msgid "Partial character sequence at end of input"
 msgstr "Ufullstendig tegnsekvens ved slutten på inndata"
 
-#: ../glib/gconvert.c:1053
+#: ../glib/gconvert.c:753
 #, c-format
 msgid "Cannot convert fallback '%s' to codeset '%s'"
 msgstr "Kan ikke konvertere \"fallback\" «%s» til tegnsett «%s»"
 
-#: ../glib/gconvert.c:1871
+#: ../glib/gconvert.c:1573
 #, c-format
 msgid "The URI '%s' is not an absolute URI using the \"file\" scheme"
 msgstr "URI «%s» er ikke en absolutt URI som bruker skjema for filer"
 
-#: ../glib/gconvert.c:1881
+#: ../glib/gconvert.c:1583
 #, c-format
 msgid "The local file URI '%s' may not include a '#'"
 msgstr "Lokal fil-URI «%s» kan ikke inneholde en «#»"
 
-#: ../glib/gconvert.c:1898
+#: ../glib/gconvert.c:1600
 #, c-format
 msgid "The URI '%s' is invalid"
 msgstr "URI «%s» er ugyldig"
 
-#: ../glib/gconvert.c:1910
+#: ../glib/gconvert.c:1612
 #, c-format
 msgid "The hostname of the URI '%s' is invalid"
 msgstr "Vertsnavnet for URI «%s» er ugyldig"
 
-#: ../glib/gconvert.c:1926
+#: ../glib/gconvert.c:1628
 #, c-format
 msgid "The URI '%s' contains invalidly escaped characters"
 msgstr "Vertsnavnet for URI «%s» inneholder ugyldige escape-tegn"
 
-#: ../glib/gconvert.c:2021
+#: ../glib/gconvert.c:1723
 #, c-format
 msgid "The pathname '%s' is not an absolute path"
 msgstr "Stinavnet «%s» er ikke en absolutt sti"
 
-#: ../glib/gconvert.c:2031
+#: ../glib/gconvert.c:1733
 msgid "Invalid hostname"
 msgstr "Ugyldig vertsnavn"
 
 #. Translators: 'before midday' indicator
-#: ../glib/gdatetime.c:205
+#: ../glib/gdatetime.c:201
 msgctxt "GDateTime"
 msgid "AM"
 msgstr "AM"
 
 #. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:207
+#: ../glib/gdatetime.c:203
 msgctxt "GDateTime"
 msgid "PM"
 msgstr "PM"
 
 #. Translators: this is the preferred format for expressing the date and the time
-#: ../glib/gdatetime.c:210
+#: ../glib/gdatetime.c:206
 msgctxt "GDateTime"
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %e %b %H.%M.%S"
 
 #. Translators: this is the preferred format for expressing the date
-#: ../glib/gdatetime.c:213
+#: ../glib/gdatetime.c:209
 msgctxt "GDateTime"
 msgid "%m/%d/%y"
 msgstr "%d.%m.%y"
 
 #. Translators: this is the preferred format for expressing the time
-#: ../glib/gdatetime.c:216
+#: ../glib/gdatetime.c:212
 msgctxt "GDateTime"
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
 #. Translators: this is the preferred format for expressing 12 hour time
-#: ../glib/gdatetime.c:219
+#: ../glib/gdatetime.c:215
 msgctxt "GDateTime"
 msgid "%I:%M:%S %p"
 msgstr "%H.%M.%S"
 
-#: ../glib/gdatetime.c:232
+#: ../glib/gdatetime.c:228
 msgctxt "full month name"
 msgid "January"
 msgstr "Januar"
 
-#: ../glib/gdatetime.c:234
+#: ../glib/gdatetime.c:230
 msgctxt "full month name"
 msgid "February"
 msgstr "Februar"
 
-#: ../glib/gdatetime.c:236
+#: ../glib/gdatetime.c:232
 msgctxt "full month name"
 msgid "March"
 msgstr "Mars"
 
-#: ../glib/gdatetime.c:238
+#: ../glib/gdatetime.c:234
 msgctxt "full month name"
 msgid "April"
 msgstr "April"
 
-#: ../glib/gdatetime.c:240
+#: ../glib/gdatetime.c:236
 msgctxt "full month name"
 msgid "May"
 msgstr "Mai"
 
-#: ../glib/gdatetime.c:242
+#: ../glib/gdatetime.c:238
 msgctxt "full month name"
 msgid "June"
 msgstr "Juni"
 
-#: ../glib/gdatetime.c:244
+#: ../glib/gdatetime.c:240
 msgctxt "full month name"
 msgid "July"
 msgstr "Juli"
 
-#: ../glib/gdatetime.c:246
+#: ../glib/gdatetime.c:242
 msgctxt "full month name"
 msgid "August"
 msgstr "August"
 
-#: ../glib/gdatetime.c:248
+#: ../glib/gdatetime.c:244
 msgctxt "full month name"
 msgid "September"
 msgstr "September"
 
-#: ../glib/gdatetime.c:250
+#: ../glib/gdatetime.c:246
 msgctxt "full month name"
 msgid "October"
 msgstr "Oktober"
 
-#: ../glib/gdatetime.c:252
+#: ../glib/gdatetime.c:248
 msgctxt "full month name"
 msgid "November"
 msgstr "November"
 
-#: ../glib/gdatetime.c:254
+#: ../glib/gdatetime.c:250
 msgctxt "full month name"
 msgid "December"
 msgstr "Desember"
 
-#: ../glib/gdatetime.c:269
+#: ../glib/gdatetime.c:265
 msgctxt "abbreviated month name"
 msgid "Jan"
 msgstr "Jan"
 
-#: ../glib/gdatetime.c:271
+#: ../glib/gdatetime.c:267
 msgctxt "abbreviated month name"
 msgid "Feb"
 msgstr "Feb"
 
-#: ../glib/gdatetime.c:273
+#: ../glib/gdatetime.c:269
 msgctxt "abbreviated month name"
 msgid "Mar"
 msgstr "Mar"
 
-#: ../glib/gdatetime.c:275
+#: ../glib/gdatetime.c:271
 msgctxt "abbreviated month name"
 msgid "Apr"
 msgstr "Apr"
 
-#: ../glib/gdatetime.c:277
+#: ../glib/gdatetime.c:273
 msgctxt "abbreviated month name"
 msgid "May"
 msgstr "Mai"
 
-#: ../glib/gdatetime.c:279
+#: ../glib/gdatetime.c:275
 msgctxt "abbreviated month name"
 msgid "Jun"
 msgstr "Jun"
 
-#: ../glib/gdatetime.c:281
+#: ../glib/gdatetime.c:277
 msgctxt "abbreviated month name"
 msgid "Jul"
 msgstr "Jul"
 
-#: ../glib/gdatetime.c:283
+#: ../glib/gdatetime.c:279
 msgctxt "abbreviated month name"
 msgid "Aug"
 msgstr "Aug"
 
-#: ../glib/gdatetime.c:285
+#: ../glib/gdatetime.c:281
 msgctxt "abbreviated month name"
 msgid "Sep"
 msgstr "Sep"
 
-#: ../glib/gdatetime.c:287
+#: ../glib/gdatetime.c:283
 msgctxt "abbreviated month name"
 msgid "Oct"
 msgstr "Okt"
 
-#: ../glib/gdatetime.c:289
+#: ../glib/gdatetime.c:285
 msgctxt "abbreviated month name"
 msgid "Nov"
 msgstr "Nov"
 
-#: ../glib/gdatetime.c:291
+#: ../glib/gdatetime.c:287
 msgctxt "abbreviated month name"
 msgid "Dec"
 msgstr "Des"
 
-#: ../glib/gdatetime.c:306
+#: ../glib/gdatetime.c:302
 msgctxt "full weekday name"
 msgid "Monday"
 msgstr "Mandag"
 
-#: ../glib/gdatetime.c:308
+#: ../glib/gdatetime.c:304
 msgctxt "full weekday name"
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../glib/gdatetime.c:310
+#: ../glib/gdatetime.c:306
 msgctxt "full weekday name"
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: ../glib/gdatetime.c:312
+#: ../glib/gdatetime.c:308
 msgctxt "full weekday name"
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../glib/gdatetime.c:314
+#: ../glib/gdatetime.c:310
 msgctxt "full weekday name"
 msgid "Friday"
 msgstr "Fredag"
 
-#: ../glib/gdatetime.c:316
+#: ../glib/gdatetime.c:312
 msgctxt "full weekday name"
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: ../glib/gdatetime.c:318
+#: ../glib/gdatetime.c:314
 msgctxt "full weekday name"
 msgid "Sunday"
 msgstr "Søndag"
 
-#: ../glib/gdatetime.c:333
+#: ../glib/gdatetime.c:329
 msgctxt "abbreviated weekday name"
 msgid "Mon"
 msgstr "Man"
 
-#: ../glib/gdatetime.c:335
+#: ../glib/gdatetime.c:331
 msgctxt "abbreviated weekday name"
 msgid "Tue"
 msgstr "Tir"
 
-#: ../glib/gdatetime.c:337
+#: ../glib/gdatetime.c:333
 msgctxt "abbreviated weekday name"
 msgid "Wed"
 msgstr "Ons"
 
-#: ../glib/gdatetime.c:339
+#: ../glib/gdatetime.c:335
 msgctxt "abbreviated weekday name"
 msgid "Thu"
 msgstr "Tor"
 
-#: ../glib/gdatetime.c:341
+#: ../glib/gdatetime.c:337
 msgctxt "abbreviated weekday name"
 msgid "Fri"
 msgstr "Fre"
 
-#: ../glib/gdatetime.c:343
+#: ../glib/gdatetime.c:339
 msgctxt "abbreviated weekday name"
 msgid "Sat"
 msgstr "Lør"
 
-#: ../glib/gdatetime.c:345
+#: ../glib/gdatetime.c:341
 msgctxt "abbreviated weekday name"
 msgid "Sun"
 msgstr "Søn"
 
-#: ../glib/gdir.c:120 ../glib/gdir.c:143
+#: ../glib/gdir.c:157
 #, c-format
 msgid "Error opening directory '%s': %s"
 msgstr "Feil under åpning av katalog «%s»: %s"
 
-#: ../glib/gfileutils.c:671 ../glib/gfileutils.c:759
+#: ../glib/gfileutils.c:675 ../glib/gfileutils.c:763
 #, c-format
 msgid "Could not allocate %lu bytes to read file \"%s\""
 msgstr "Kunne ikke allokere %lu bytes til lest fil «%s»"
 
-#: ../glib/gfileutils.c:686
+#: ../glib/gfileutils.c:671
 #, c-format
 msgid "Error reading file '%s': %s"
 msgstr "Feil under lesing av fil «%s»: %s"
 
-#: ../glib/gfileutils.c:700
+#: ../glib/gfileutils.c:705
 #, c-format
 msgid "File \"%s\" is too large"
 msgstr "Fil «%s» er for stor"
 
-#: ../glib/gfileutils.c:783
+#: ../glib/gfileutils.c:765
 #, c-format
 msgid "Failed to read from file '%s': %s"
 msgstr "Feil under lesing fra fil «%s»: %s"
 
-#: ../glib/gfileutils.c:834 ../glib/gfileutils.c:921
+#: ../glib/gfileutils.c:816 ../glib/gfileutils.c:903
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Feil under åpning av fil «%s»: %s"
 
-#: ../glib/gfileutils.c:851
+#: ../glib/gfileutils.c:833
 #, c-format
 msgid "Failed to get attributes of file '%s': fstat() failed: %s"
 msgstr "Feil ved uthenting av attributter for fil «%s»: fstat() feilet: %s"
 
-#: ../glib/gfileutils.c:885
+#: ../glib/gfileutils.c:867
 #, c-format
 msgid "Failed to open file '%s': fdopen() failed: %s"
 msgstr "Feil under åpning av fil «%s»: fdopen() feilet: %s"
 
-#: ../glib/gfileutils.c:993
+#: ../glib/gfileutils.c:975
 #, c-format
 msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
 msgstr ""
 "Feil under endring av navn på filen «%s» til «%s»: g_rename() feilet: %s"
 
-#: ../glib/gfileutils.c:1035 ../glib/gfileutils.c:1593
+#: ../glib/gfileutils.c:1051 ../glib/gfileutils.c:1558
 #, c-format
 msgid "Failed to create file '%s': %s"
 msgstr "Feil under oppretting av fil «%s»: %s"
@@ -3234,7 +3247,7 @@
 msgid "Failed to write file '%s': fflush() failed: %s"
 msgstr "Kunne ikke skrive fil «%s»: fflush() feilet: %s"
 
-#: ../glib/gfileutils.c:1137
+#: ../glib/gfileutils.c:1115
 #, c-format
 msgid "Failed to write file '%s': fsync() failed: %s"
 msgstr "Kunne ikke skrive fil «%s»: fsync() feilet: %s"
@@ -3244,49 +3257,49 @@
 msgid "Failed to close file '%s': fclose() failed: %s"
 msgstr "Kunne ikke lukke fil «%s»: fclose() feilet: %s"
 
-#: ../glib/gfileutils.c:1282
+#: ../glib/gfileutils.c:1247
 #, c-format
 msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
 msgstr "Eksisterende fil «%s» kunne ikke bli fjernet: g_unlink() feilet: %s"
 
-#: ../glib/gfileutils.c:1556
+#: ../glib/gfileutils.c:1521
 #, c-format
 msgid "Template '%s' invalid, should not contain a '%s'"
 msgstr "Mal «%s» er ugyldig, må ikke inneholde «%s»"
 
-#: ../glib/gfileutils.c:1569
+#: ../glib/gfileutils.c:1534
 #, c-format
 msgid "Template '%s' doesn't contain XXXXXX"
 msgstr "Mal «%s» inneholder ikke XXXXXX"
 
-#: ../glib/gfileutils.c:2097
+#: ../glib/gfileutils.c:2062
 #, c-format
 msgid "Failed to read the symbolic link '%s': %s"
 msgstr "Feil under lesing av symbolsk lenke «%s»: %s"
 
-#: ../glib/gfileutils.c:2118
+#: ../glib/gfileutils.c:2083
 msgid "Symbolic links not supported"
 msgstr "Symbolske lenker er ikke støttet"
 
-#: ../glib/giochannel.c:1418
+#: ../glib/giochannel.c:1414
 #, c-format
 msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "Kunne ikke åpne konverterer fra «%s» til «%s»: %s"
 
-#: ../glib/giochannel.c:1763
+#: ../glib/giochannel.c:1759
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr "Kan ikke utføre rå avlesing i g_io_channel_read_line_string"
 
-#: ../glib/giochannel.c:1810 ../glib/giochannel.c:2068
-#: ../glib/giochannel.c:2155
+#: ../glib/giochannel.c:1806 ../glib/giochannel.c:2064
+#: ../glib/giochannel.c:2151
 msgid "Leftover unconverted data in read buffer"
 msgstr "Overflødig ikke-konvertert data i innlesingsbuffer"
 
-#: ../glib/giochannel.c:1891 ../glib/giochannel.c:1968
+#: ../glib/giochannel.c:1887 ../glib/giochannel.c:1964
 msgid "Channel terminates in a partial character"
 msgstr "Kanalen terminerer i et oppdelt tegn"
 
-#: ../glib/giochannel.c:1954
+#: ../glib/giochannel.c:1950
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr "Kan ikke utføre rå avlesing i g_io_channel_read_to_end"
 
@@ -3325,9 +3338,9 @@
 msgid "Key file contains unsupported encoding '%s'"
 msgstr "Nøkkelfil inneholder ustøttet tegnkoding «%s»"
 
-#: ../glib/gkeyfile.c:1533 ../glib/gkeyfile.c:1695 ../glib/gkeyfile.c:3073
-#: ../glib/gkeyfile.c:3139 ../glib/gkeyfile.c:3265 ../glib/gkeyfile.c:3398
-#: ../glib/gkeyfile.c:3540 ../glib/gkeyfile.c:3770 ../glib/gkeyfile.c:3837
+#: ../glib/gkeyfile.c:1533 ../glib/gkeyfile.c:1695 ../glib/gkeyfile.c:3075
+#: ../glib/gkeyfile.c:3141 ../glib/gkeyfile.c:3267 ../glib/gkeyfile.c:3400
+#: ../glib/gkeyfile.c:3542 ../glib/gkeyfile.c:3772 ../glib/gkeyfile.c:3839
 #, c-format
 msgid "Key file does not have group '%s'"
 msgstr "Nøkkelfil har ikke gruppe «%s»"
@@ -3351,7 +3364,7 @@
 "Nøkkelfilen inneholder nøkkelen «%s» som har en verdi som ikke kan bli "
 "tolket."
 
-#: ../glib/gkeyfile.c:2536 ../glib/gkeyfile.c:2902
+#: ../glib/gkeyfile.c:2536 ../glib/gkeyfile.c:2904
 #, c-format
 msgid ""
 "Key file contains key '%s' in group '%s' which has a value that cannot be "
@@ -3360,57 +3373,57 @@
 "Nøkkelfilen inneholder nøkkelen «%s» i gruppen «%s» som har en verdi som "
 "ikke kan bli tolket."
 
-#: ../glib/gkeyfile.c:2614 ../glib/gkeyfile.c:2690
+#: ../glib/gkeyfile.c:2614 ../glib/gkeyfile.c:2691
 #, c-format
 msgid "Key '%s' in group '%s' has value '%s' where %s was expected"
 msgstr "Nøkkel «%s» i gruppe «%s» har en verdi «%s» hvor %s var forventet"
 
-#: ../glib/gkeyfile.c:3088 ../glib/gkeyfile.c:3280 ../glib/gkeyfile.c:3848
+#: ../glib/gkeyfile.c:3090 ../glib/gkeyfile.c:3282 ../glib/gkeyfile.c:3850
 #, c-format
 msgid "Key file does not have key '%s' in group '%s'"
 msgstr "Nøkkelfilen har ikke nøkkelen i «%s» i gruppen «%s»"
 
-#: ../glib/gkeyfile.c:4080
+#: ../glib/gkeyfile.c:4082
 msgid "Key file contains escape character at end of line"
 msgstr "Nøkkelfilen inneholder skiftetegn ved linjeslutt"
 
-#: ../glib/gkeyfile.c:4102
+#: ../glib/gkeyfile.c:4104
 #, c-format
 msgid "Key file contains invalid escape sequence '%s'"
 msgstr "Nøkkelfil inneholder ugyldig skiftesekvens «%s»"
 
-#: ../glib/gkeyfile.c:4244
+#: ../glib/gkeyfile.c:4246
 #, c-format
 msgid "Value '%s' cannot be interpreted as a number."
 msgstr "Vedien «%s» kan ikke bli tolket som et tall."
 
-#: ../glib/gkeyfile.c:4258
+#: ../glib/gkeyfile.c:4260
 #, c-format
 msgid "Integer value '%s' out of range"
 msgstr "Heltallsverdi «%s» er utenfor gyldig område"
 
-#: ../glib/gkeyfile.c:4291
+#: ../glib/gkeyfile.c:4293
 #, c-format
 msgid "Value '%s' cannot be interpreted as a float number."
 msgstr "Verdi «%s» kan ikke tolkes som et flyttall."
 
-#: ../glib/gkeyfile.c:4315
+#: ../glib/gkeyfile.c:4317
 #, c-format
 msgid "Value '%s' cannot be interpreted as a boolean."
 msgstr "Verdi «%s» kan ikke tolkes som en bolsk verdi."
 
-#: ../glib/gmappedfile.c:130
+#: ../glib/gmappedfile.c:131
 #, c-format
 msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s"
 msgstr ""
 "Klarte ikke å hente attributter for fil «%s%s%s%s»: fstat() feilet: %s"
 
-#: ../glib/gmappedfile.c:196
+#: ../glib/gmappedfile.c:197
 #, c-format
 msgid "Failed to map %s%s%s%s: mmap() failed: %s"
 msgstr "Kunne ikke lese fil «%s%s%s%s» inn i minnet: mmap() feilet: %s"
 
-#: ../glib/gmappedfile.c:262
+#: ../glib/gmappedfile.c:263
 #, c-format
 msgid "Failed to open file '%s': open() failed: %s"
 msgstr "Kunne ikke åpne fil «%s»: open() feilet: %s"
@@ -3425,12 +3438,12 @@
 msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
 msgstr "Ugyldig UTF-8 kodet tekst i navn - ikke gyldig «%s»"
 
-#: ../glib/gmarkup.c:427
+#: ../glib/gmarkup.c:430
 #, c-format
 msgid "'%s' is not a valid name "
 msgstr "«%s» er ikke et gyldig navn "
 
-#: ../glib/gmarkup.c:443
+#: ../glib/gmarkup.c:446
 #, c-format
 msgid "'%s' is not a valid name: '%c' "
 msgstr "«%s» er ikke et gyldig navn: «%c» "
@@ -3484,11 +3497,11 @@
 "tegn uten at det var ment å starte en entitet - ungå ved å bruke &amp; i "
 "stedet"
 
-#: ../glib/gmarkup.c:1119
+#: ../glib/gmarkup.c:1177
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "Dokumentet må starte med et element (f.eks <book>)"
 
-#: ../glib/gmarkup.c:1159
+#: ../glib/gmarkup.c:1217
 #, c-format
 msgid ""
 "'%s' is not a valid character following a '<' character; it may not begin an "
@@ -3497,7 +3510,7 @@
 "«%s» er ikke et gyldig tegn etter en «<» tegn; det kan ikke være begynnelsen "
 "på et elementnavn"
 
-#: ../glib/gmarkup.c:1227
+#: ../glib/gmarkup.c:1259
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' character to end the empty-element tag "
@@ -3506,14 +3519,14 @@
 "Rart tegn «%s», forventet et «>» tegn for å avslutte start-taggen til det "
 "tomme elementet «%s»"
 
-#: ../glib/gmarkup.c:1311
+#: ../glib/gmarkup.c:1340
 #, c-format
 msgid ""
 "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
 msgstr ""
 "Rart tegn «%s», forventet et «=» etter attributtnavn «%s» for element «%s»"
 
-#: ../glib/gmarkup.c:1352
+#: ../glib/gmarkup.c:1381
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' or '/' character to end the start tag of "
@@ -3524,7 +3537,7 @@
 "element «%s», eller alternativt en attributt; kanskje du brukte et ugyldig "
 "tegn i attributtnavnet"
 
-#: ../glib/gmarkup.c:1396
+#: ../glib/gmarkup.c:1425
 #, c-format
 msgid ""
 "Odd character '%s', expected an open quote mark after the equals sign when "
@@ -3533,7 +3546,7 @@
 "Rart tegn «%s», ventet et åpent sitattegn etter likhetstegnet når verdi for "
 "attributt «%s» for element «%s» oppgis"
 
-#: ../glib/gmarkup.c:1529
+#: ../glib/gmarkup.c:1558
 #, c-format
 msgid ""
 "'%s' is not a valid character following the characters '</'; '%s' may not "
@@ -3542,7 +3555,7 @@
 "«%s» er ikke et gyldig tegn etter tegnene «</»; «%s» er kanskje ikke "
 "begynnelsen på et elementnavn"
 
-#: ../glib/gmarkup.c:1565
+#: ../glib/gmarkup.c:1594
 #, c-format
 msgid ""
 "'%s' is not a valid character following the close element name '%s'; the "
@@ -3551,25 +3564,25 @@
 "«%s» er ikke et gyldig tegn etter element for lukking med navn «%s»; tillatt "
 "tegn er «>»"
 
-#: ../glib/gmarkup.c:1576
+#: ../glib/gmarkup.c:1605
 #, c-format
 msgid "Element '%s' was closed, no element is currently open"
 msgstr "Element «%s» ble lukket, ingen åpne elementer nå"
 
-#: ../glib/gmarkup.c:1585
+#: ../glib/gmarkup.c:1614
 #, c-format
 msgid "Element '%s' was closed, but the currently open element is '%s'"
 msgstr "Element «%s» ble lukket, men aktivt åpent element er «%s»"
 
-#: ../glib/gmarkup.c:1753
+#: ../glib/gmarkup.c:1767
 msgid "Document was empty or contained only whitespace"
 msgstr "Dokumentet var tomt eller inneholdt kun blanke tegn"
 
-#: ../glib/gmarkup.c:1767
+#: ../glib/gmarkup.c:1781
 msgid "Document ended unexpectedly just after an open angle bracket '<'"
 msgstr "Dokumentet sluttet uventet rett etter en åpen vinkelparantes «<»"
 
-#: ../glib/gmarkup.c:1775 ../glib/gmarkup.c:1820
+#: ../glib/gmarkup.c:1789 ../glib/gmarkup.c:1834
 #, c-format
 msgid ""
 "Document ended unexpectedly with elements still open - '%s' was the last "
@@ -3577,7 +3590,7 @@
 msgstr ""
 "Dokumentet sluttet uventet med åpne elementer - «%s» var siste åpne element"
 
-#: ../glib/gmarkup.c:1783
+#: ../glib/gmarkup.c:1797
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
@@ -3586,19 +3599,19 @@
 "Dokumentet sluttet uventet, forventet å se en vinkelparantes for å slutte av "
 "den siste taggen <%s/>"
 
-#: ../glib/gmarkup.c:1789
+#: ../glib/gmarkup.c:1803
 msgid "Document ended unexpectedly inside an element name"
 msgstr "Dokumentet sluttet uventet inni et elementnavn"
 
-#: ../glib/gmarkup.c:1795
+#: ../glib/gmarkup.c:1809
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "Dokumentet sluttet uventet inni et attributtnavn"
 
-#: ../glib/gmarkup.c:1800
+#: ../glib/gmarkup.c:1814
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr "Dokumentet sluttet uventet inni en tagg for åpning av element."
 
-#: ../glib/gmarkup.c:1806
+#: ../glib/gmarkup.c:1820
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
@@ -3606,76 +3619,76 @@
 "Dokumentet sluttet uventet etter likhetstegnet som følger et attributtnavn; "
 "ingen attributtverdi"
 
-#: ../glib/gmarkup.c:1813
+#: ../glib/gmarkup.c:1827
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "Dokumentet sluttet uventet inni en attributtverdi"
 
-#: ../glib/gmarkup.c:1829
+#: ../glib/gmarkup.c:1843
 #, c-format
 msgid "Document ended unexpectedly inside the close tag for element '%s'"
 msgstr "Dokumentet sluttet uventet inni tagg for lukking av element «%s»"
 
-#: ../glib/gmarkup.c:1835
+#: ../glib/gmarkup.c:1849
 msgid ""
 "Document ended unexpectedly inside a comment or processing instruction"
 msgstr ""
 "Dokumentet sluttet uventet inni en kommentar eller prosesseringsinstruksjon"
 
-#: ../glib/goption.c:742
+#: ../glib/goption.c:754
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: ../glib/goption.c:742
+#: ../glib/goption.c:754
 msgid "[OPTION...]"
 msgstr "[FLAGG …]"
 
-#: ../glib/goption.c:848
+#: ../glib/goption.c:870
 msgid "Help Options:"
 msgstr "Flagg for hjelp:"
 
-#: ../glib/goption.c:849
+#: ../glib/goption.c:871
 msgid "Show help options"
 msgstr "Vis flagg for hjelp"
 
-#: ../glib/goption.c:855
+#: ../glib/goption.c:877
 msgid "Show all help options"
 msgstr "Vis alle flagg for hjelp"
 
-#: ../glib/goption.c:917
+#: ../glib/goption.c:939
 msgid "Application Options:"
 msgstr "Flagg for applikasjonen"
 
-#: ../glib/goption.c:979 ../glib/goption.c:1049
+#: ../glib/goption.c:1003 ../glib/goption.c:1073
 #, c-format
 msgid "Cannot parse integer value '%s' for %s"
 msgstr "Kan ikke lese heltallsverdi «%s» for %s"
 
-#: ../glib/goption.c:989 ../glib/goption.c:1057
+#: ../glib/goption.c:1013 ../glib/goption.c:1081
 #, c-format
 msgid "Integer value '%s' for %s out of range"
 msgstr "Heltallsverdi «%s» for %s er utenfor gyldig område"
 
-#: ../glib/goption.c:1014
+#: ../glib/goption.c:1038
 #, c-format
 msgid "Cannot parse double value '%s' for %s"
 msgstr "Kan ikke lese verdi for double «%s» for %s"
 
-#: ../glib/goption.c:1022
+#: ../glib/goption.c:1046
 #, c-format
 msgid "Double value '%s' for %s out of range"
 msgstr "Double-verdi «%s» for %s er utenfor gyldig område"
 
-#: ../glib/goption.c:1285 ../glib/goption.c:1364
+#: ../glib/goption.c:1309 ../glib/goption.c:1388
 #, c-format
 msgid "Error parsing option %s"
 msgstr "Feil under tolking av flagg %s"
 
-#: ../glib/goption.c:1395 ../glib/goption.c:1508
+#: ../glib/goption.c:1419 ../glib/goption.c:1532
 #, c-format
 msgid "Missing argument for %s"
 msgstr "Mangler argument for %s"
 
-#: ../glib/goption.c:1961
+#: ../glib/goption.c:1985
 #, c-format
 msgid "Unknown option %s"
 msgstr "Ukjent flagg %s"
@@ -3708,7 +3721,7 @@
 msgid "recursion limit reached"
 msgstr "rekursjonsgrense nådd"
 
-#: glib/gregex.c:173
+#: ../glib/gregex.c:232
 msgid "workspace limit for empty substrings reached"
 msgstr "grense for tomme understrenger nådd"
 
@@ -3736,11 +3749,11 @@
 msgid "\\c at end of pattern"
 msgstr "\\c på slutten av mønsteret"
 
-#: ../glib/gregex.c:335
+#: ../glib/gregex.c:268
 msgid "unrecognized character follows \\"
 msgstr "ugjenkjennelig tegn følger \\"
 
-#: glib/gregex.c:212
+#: ../glib/gregex.c:275
 msgid "case-changing escapes (\\l, \\L, \\u, \\U) are not allowed here"
 msgstr ""
 "escape-verdier som bytter mellom små/store bokstaver (\\l, \\L, \\u, \\U) er "
@@ -3770,7 +3783,7 @@
 msgid "nothing to repeat"
 msgstr "ingenting å gjenta"
 
-#: glib/gregex.c:233
+#: ../glib/gregex.c:296
 msgid "unrecognized character after (?"
 msgstr "ikke gjenkjent tegn etter (?"
 
@@ -3809,7 +3822,7 @@
 msgid "missing ) after comment"
 msgstr "mangler ) etter kommentar"
 
-#: glib/gregex.c:267
+#: ../glib/gregex.c:330
 msgid "regular expression too large"
 msgstr "vanlig uttrykk for stort"
 
@@ -3889,7 +3902,7 @@
 msgid "DEFINE group contains more than one branch"
 msgstr "DEFINE-gruppe inneholder mer enn en gren"
 
-#: glib/gregex.c:327
+#: ../glib/gregex.c:390
 msgid "repeating a DEFINE group is not allowed"
 msgstr "repetering av en DEFINE-gruppe er ikke tillatt"
 
@@ -3897,7 +3910,7 @@
 msgid "inconsistent NEWLINE options"
 msgstr "inkonsistente NEWLINE-alternativer"
 
-#: glib/gregex.c:333
+#: ../glib/gregex.c:396
 msgid ""
 "\\g is not followed by a braced name or an optionally braced non-zero number"
 msgstr ""
@@ -3920,66 +3933,66 @@
 msgid "previously-checked referenced subpattern not found"
 msgstr "tidligere sjekket og referert undermønster ikke funnet"
 
-#: ../glib/gregex.c:745 ../glib/gregex.c:1899
+#: ../glib/gregex.c:745 ../glib/gregex.c:1914
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "Feil under treff på regulært uttrykk %s: %s"
 
-#: ../glib/gregex.c:1319
+#: ../glib/gregex.c:1311
 msgid "PCRE library is compiled without UTF8 support"
 msgstr "PCRE-biblioteket er kompilert uten støtte for UTF8"
 
-#: ../glib/gregex.c:1323
+#: ../glib/gregex.c:1315
 msgid "PCRE library is compiled without UTF8 properties support"
 msgstr "PCRE-biblioteket er kompilert uten støtte for UTF8-egenskaper"
 
-#: ../glib/gregex.c:1390
+#: ../glib/gregex.c:1382
 #, c-format
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "Feil under sammensetting av regulært utrykk %s ved tegn %d: %s"
 
-#: ../glib/gregex.c:1432
+#: ../glib/gregex.c:1424
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr "Feil under optimering av reguært utrykk %s: %s"
 
-#: ../glib/gregex.c:2331
+#: ../glib/gregex.c:2346
 msgid "hexadecimal digit or '}' expected"
 msgstr "heksadesimalt tall eller «}» forventet"
 
-#: ../glib/gregex.c:2347
+#: ../glib/gregex.c:2362
 msgid "hexadecimal digit expected"
 msgstr "heksadesimalt tall forventet"
 
-#: ../glib/gregex.c:2387
+#: ../glib/gregex.c:2402
 msgid "missing '<' in symbolic reference"
 msgstr "mangler «<» i symbolsk referanse"
 
-#: ../glib/gregex.c:2396
+#: ../glib/gregex.c:2411
 msgid "unfinished symbolic reference"
 msgstr "uferdig symbolsk referanse"
 
-#: ../glib/gregex.c:2403
+#: ../glib/gregex.c:2418
 msgid "zero-length symbolic reference"
 msgstr "symbolsk referanse med null lengde"
 
-#: ../glib/gregex.c:2414
+#: ../glib/gregex.c:2429
 msgid "digit expected"
 msgstr "tall forventet"
 
-#: ../glib/gregex.c:2432
+#: ../glib/gregex.c:2447
 msgid "illegal symbolic reference"
 msgstr "ugyldig symbolsk referanse"
 
-#: ../glib/gregex.c:2494
+#: ../glib/gregex.c:2509
 msgid "stray final '\\'"
 msgstr "feilplassert siste «\\\\»"
 
-#: ../glib/gregex.c:2498
+#: ../glib/gregex.c:2513
 msgid "unknown escape sequence"
 msgstr "ukjent escapesekvens"
 
-#: ../glib/gregex.c:2508
+#: ../glib/gregex.c:2523
 #, c-format
 msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
 msgstr "Feil under tolking av erstatningstekst «%s» ved tegn %lu: %s"
@@ -4008,63 +4021,63 @@
 msgid "Text was empty (or contained only whitespace)"
 msgstr "Teksten var tom (eller inneholdt kun blanke tegn)"
 
-#: ../glib/gspawn.c:209
+#: ../glib/gspawn.c:201
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "Feil under lesing av data fra underprosess (%s)"
 
-#: ../glib/gspawn.c:368
+#: ../glib/gspawn.c:345
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr "Uventet feil i select() ved lesing av data fra underprosess (%s)"
 
-#: ../glib/gspawn.c:436
+#: ../glib/gspawn.c:430
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "Uventet feil i waitpid() (%s)"
 
-#: ../glib/gspawn.c:1286 ../glib/gspawn-win32.c:339 ../glib/gspawn-win32.c:347
+#: ../glib/gspawn.c:1277 ../glib/gspawn-win32.c:339 ../glib/gspawn-win32.c:347
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Feil under lesing fra \"child pipe\" (%s)"
 
-#: ../glib/gspawn.c:1354
+#: ../glib/gspawn.c:1347
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Feil under kjøring av fork (%s)"
 
-#: ../glib/gspawn.c:1502 ../glib/gspawn-win32.c:370
+#: ../glib/gspawn.c:1496 ../glib/gspawn-win32.c:370
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Feil ved skifte til katalog «%s» (%s)"
 
-#: ../glib/gspawn.c:1512
+#: ../glib/gspawn.c:1506
 #, c-format
 msgid "Failed to execute child process \"%s\" (%s)"
 msgstr "Feil under kjøring av underprosess «%s» (%s)"
 
-#: ../glib/gspawn.c:1522
+#: ../glib/gspawn.c:1516
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr ""
 "Feil under omdirigering av utdata eller inndata for underprosess (%s)"
 
-#: ../glib/gspawn.c:1531
+#: ../glib/gspawn.c:1525
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Feil under kjøring av fork() for underprosess (%s)"
 
-#: ../glib/gspawn.c:1539
+#: ../glib/gspawn.c:1533
 #, c-format
 msgid "Unknown error executing child process \"%s\""
 msgstr "Ukjent feil under kjøring av underprosess «%s»"
 
-#: ../glib/gspawn.c:1563
+#: ../glib/gspawn.c:1557
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Klarte ikke å lese nok data fra underprosessens pid-rør (%s)"
 
-#: ../glib/gspawn.c:1636 ../glib/gspawn-win32.c:300
+#: ../glib/gspawn-win32.c:300
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Feil under oppretting av rør for kommunikasjon med underprosess (%s)"
@@ -4113,88 +4126,88 @@
 "Uventet feil i g_io_channel_win32_poll() under lesing av data fra en "
 "underprosess"
 
-#: ../glib/gutf8.c:915
+#: ../glib/gutf8.c:919
 msgid "Character out of range for UTF-8"
 msgstr "Tegn utenfor gyldig område for UTF-8"
 
-#: ../glib/gutf8.c:1015 ../glib/gutf8.c:1024 ../glib/gutf8.c:1154
-#: ../glib/gutf8.c:1163 ../glib/gutf8.c:1302 ../glib/gutf8.c:1398
+#: ../glib/gutf8.c:1022 ../glib/gutf8.c:1031 ../glib/gutf8.c:1163
+#: ../glib/gutf8.c:1172 ../glib/gutf8.c:1313 ../glib/gutf8.c:1411
 msgid "Invalid sequence in conversion input"
 msgstr "Ugyldig sekvens i inndata for konvertering"
 
-#: ../glib/gutf8.c:1313 ../glib/gutf8.c:1409
+#: ../glib/gutf8.c:1324 ../glib/gutf8.c:1422
 msgid "Character out of range for UTF-16"
 msgstr "Tegn utenfor gyldig område for UTF-16"
 
-#: ../glib/gutils.c:2185 ../glib/gutils.c:2212 ../glib/gutils.c:2316
+#: ../glib/gutils.c:2121 ../glib/gutils.c:2148 ../glib/gutils.c:2254
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u byte"
 msgstr[1] "%u bytes"
 
-#: ../glib/gutils.c:2191
+#: ../glib/gutils.c:2127
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../glib/gutils.c:2193
+#: ../glib/gutils.c:2129
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../glib/gutils.c:2196
+#: ../glib/gutils.c:2132
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../glib/gutils.c:2199
+#: ../glib/gutils.c:2135
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../glib/gutils.c:2202
+#: ../glib/gutils.c:2138
 #, c-format
 msgid "%.1f PiB"
 msgstr "%.1f PiB"
 
-#: ../glib/gutils.c:2205
+#: ../glib/gutils.c:2141
 #, c-format
 msgid "%.1f EiB"
 msgstr "%.1f EiB"
 
-#: ../glib/gutils.c:2218
+#: ../glib/gutils.c:2154
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f kB"
 
-#: ../glib/gutils.c:2221 ../glib/gutils.c:2334
+#: ../glib/gutils.c:2157 ../glib/gutils.c:2272
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../glib/gutils.c:2224 ../glib/gutils.c:2339
+#: ../glib/gutils.c:2160 ../glib/gutils.c:2277
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../glib/gutils.c:2226 ../glib/gutils.c:2344
+#: ../glib/gutils.c:2162 ../glib/gutils.c:2282
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../glib/gutils.c:2229 ../glib/gutils.c:2349
+#: ../glib/gutils.c:2165 ../glib/gutils.c:2287
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../glib/gutils.c:2232 ../glib/gutils.c:2354
+#: ../glib/gutils.c:2168 ../glib/gutils.c:2292
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
 #. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2269
+#: ../glib/gutils.c:2205
 #, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
@@ -4206,7 +4219,7 @@
 #. * compatibility.  Users will not see this string unless a program is using this deprecated function.
 #. * Please translate as literally as possible.
 #. 
-#: ../glib/gutils.c:2329
+#: ../glib/gutils.c:2267
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-bluetooth2.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-bluetooth2.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-bluetooth2.po	2013-01-29 09:33:52.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-bluetooth2.po	2014-01-07 06:37:10.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-bluetooth 3.1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-03 10:53+0000\n"
+"POT-Creation-Date: 2013-08-08 20:28+0000\n"
 "PO-Revision-Date: 2011-09-18 17:22+0000\n"
 "Last-Translator: Mathias Bynke <Unknown>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:29+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../lib/bluetooth-chooser-button.c:75
@@ -194,7 +194,7 @@
 msgid "Turn On Bluetooth"
 msgstr "Slå på Bluetooth"
 
-#: ../applet/main.c:240 ../applet/notify.c:204
+#: ../applet/main.c:231 ../applet/notify.c:159
 msgid "Bluetooth: Off"
 msgstr "Bluetooth: Av"
 
@@ -202,68 +202,68 @@
 msgid "Turn Off Bluetooth"
 msgstr "Slå av Bluetooth"
 
-#: ../applet/main.c:244 ../applet/notify.c:204
+#: ../applet/main.c:235 ../applet/notify.c:159
 msgid "Bluetooth: On"
 msgstr "Bluetooth: På"
 
-#: ../applet/main.c:249
+#: ../applet/main.c:240
 msgid "Bluetooth: Disabled"
 msgstr "Bluetooth: Slått av"
 
-#: ../applet/main.c:403
+#: ../applet/main.c:387
 msgid "Disconnecting..."
 msgstr "Kobler fra …"
 
-#: ../applet/main.c:406 ../sendto/main.c:192 ../sendto/main.c:292
+#: ../sendto/main.c:192 ../sendto/main.c:292
 msgid "Connecting..."
 msgstr "Kobler til …"
 
-#: ../applet/main.c:409 ../applet/main.c:692
+#: ../applet/main.c:393 ../applet/main.c:676
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: ../applet/main.c:412 ../applet/main.c:692
+#: ../applet/main.c:396 ../applet/main.c:676
 msgid "Disconnected"
 msgstr "Frakoblet"
 
-#: ../applet/main.c:710 ../applet/main.c:774
+#: ../applet/main.c:694 ../applet/main.c:758
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../applet/main.c:710 ../applet/main.c:774
+#: ../applet/main.c:694 ../applet/main.c:758
 msgid "Connect"
 msgstr "Koble til"
 
-#: ../applet/main.c:723
+#: ../applet/main.c:707
 msgid "Send files..."
 msgstr "Send filer …"
 
-#: ../applet/main.c:733
+#: ../applet/main.c:717
 msgid "Browse files..."
 msgstr "Bla gjennom filer …"
 
-#: ../applet/main.c:744
+#: ../applet/main.c:728
 msgid "Keyboard Settings"
 msgstr "Innstillinger for tastatur"
 
-#: ../applet/main.c:752
+#: ../applet/main.c:736
 msgid "Mouse and Touchpad Settings"
 msgstr "Innstillinger for mus og pekeplate"
 
-#: ../applet/main.c:762
+#: ../applet/main.c:746
 msgid "Sound Settings"
 msgstr "Innstillinger for lyd"
 
-#: ../applet/main.c:815
+#: ../applet/main.c:799
 msgid "Debug"
 msgstr "Feilsøk"
 
 #. Parse command-line options
-#: ../applet/main.c:838
+#: ../applet/main.c:818
 msgid "- Bluetooth applet"
 msgstr "- Panelprogram for Bluetooth"
 
-#: ../applet/main.c:843
+#: ../applet/main.c:823
 #, c-format
 msgid ""
 "%s\n"
@@ -273,11 +273,11 @@
 "Kjør «%s --help» for å se en full liste med tilgjengelige "
 "kommandolinjealternativer.\n"
 
-#: ../applet/main.c:869
+#: ../applet/main.c:849
 msgid "Bluetooth Applet"
 msgstr "Panelprogram for Bluetooth"
 
-#: ../applet/main.c:882 ../applet/notify.c:138 ../applet/notify.c:152
+#: ../applet/notify.c:122
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -370,7 +370,7 @@
 msgid "Browse Files on Device…"
 msgstr ""
 
-#: ../lib/bluetooth-chooser.c:987 ../applet/popup-menu.ui.h:4
+#: ../lib/bluetooth-chooser.c:987
 msgid "Devices"
 msgstr "Enheter"
 
@@ -505,14 +505,14 @@
 msgid "Connecting to '%s'..."
 msgstr "Kobler til «%s» …"
 
-#: ../wizard/main.c:522
+#: ../wizard/main.c:524
 #, c-format
 msgid ""
 "Please enter the following PIN on '%s' and press “Enter” on the keyboard:"
 msgstr ""
 "Vennligst oppgi følgende PIN på «%s» og trykk «linjeskift» på tastaturet:"
 
-#: ../wizard/main.c:519
+#: ../wizard/main.c:521
 #, c-format
 msgid "Please enter the following PIN on '%s':"
 msgstr "Vennligst oppgi følgende PIN på «%s»:"
@@ -521,12 +521,12 @@
 #. * The '%s' is the device name, for example:
 #. * Please wait while finishing setup on 'Sony Bluetooth Headset'...
 #. 
-#: ../wizard/main.c:559
+#: ../wizard/main.c:561
 #, c-format
 msgid "Please wait while finishing setup on device '%s'..."
 msgstr "Vennligst vent mens oppsett sluttføres på enhet «%s» …"
 
-#: ../wizard/main.c:577
+#: ../wizard/main.c:579
 #, c-format
 msgid "Successfully set up new device '%s'"
 msgstr "Oppsett av ny enhet «%s» fullført"
@@ -577,7 +577,7 @@
 msgid "Device Setup"
 msgstr "Oppsett av enhet"
 
-#: ../wizard/wizard.ui.h:5
+#: ../wizard/wizard.ui.h:10
 msgid "Finishing New Device Setup"
 msgstr "Fullfører oppsett av ny enhet"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-control-center-2.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-control-center-2.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-control-center-2.0.po	2013-01-29 09:33:58.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-control-center-2.0.po	2014-01-07 06:37:29.000000000 +0000
@@ -8,23 +8,23 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-19 02:38+0000\n"
-"PO-Revision-Date: 2012-12-19 07:53+0000\n"
+"POT-Creation-Date: 2013-12-03 15:29+0000\n"
+"PO-Revision-Date: 2013-12-12 02:43+0000\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:04+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 15:43+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../panels/background/background.ui.h:1
 msgid "Tile"
 msgstr "Flislegg"
 
-#: ../panels/background/background.ui.h:2
+#: ../panels/universal-access/zoom-options.ui.h:7
 msgid "Zoom"
 msgstr "Zoom"
 
@@ -49,7 +49,7 @@
 msgstr "<b>Bakgrunn</b>"
 
 #. This refers to a slideshow background
-#: ../panels/background/background.ui.h:9
+#: ../panels/background/background.ui.h:3
 msgid "Changes throughout the day"
 msgstr "Endres i løpet av dagen"
 
@@ -173,13 +173,12 @@
 msgid "No Desktop Background"
 msgstr "Ingen skrivebordsbakgrunn"
 
-#: ../panels/background/cc-background-panel.c:1068
 #: ../panels/user-accounts/data/photo-dialog.ui.h:4
 #: ../panels/user-accounts/um-photo-dialog.c:218
 msgid "Browse for more pictures"
 msgstr "Se etter flere bilder"
 
-#: ../panels/background/cc-background-panel.c:1160
+#: ../panels/background/cc-background-panel.c:451
 msgid "Current background"
 msgstr "Nåværende bakgrunn"
 
@@ -187,7 +186,7 @@
 msgid "default"
 msgstr "forvalgt"
 
-#: ../panels/background/cc-background-panel.c:1766
+#: ../panels/background/cc-background-chooser-dialog.c:218
 msgid "Wallpapers"
 msgstr "Bakgrunner"
 
@@ -199,7 +198,7 @@
 msgid "Colors & Gradients"
 msgstr "Farger og gradienter"
 
-#: ../panels/background/cc-background-panel.c:1788
+#: ../panels/background/cc-background-chooser-dialog.c:244
 msgid "Flickr"
 msgstr "Flickr"
 
@@ -219,12 +218,12 @@
 "nyer;"
 
 #. TRANSLATORS: device type
-#: ../panels/bluetooth/bluetooth-properties.desktop.in.in.h:1
-#: ../panels/network/panel-common.c:99
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
+#: ../panels/network/panel-common.c:102
 msgid "Bluetooth"
 msgstr "Blåtann"
 
-#: ../panels/bluetooth/bluetooth-properties.desktop.in.in.h:2
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
 msgid "Configure Bluetooth settings"
 msgstr "Konfigurer innstillinger for Bluetooth"
 
@@ -240,79 +239,80 @@
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: ../panels/bluetooth/bluetooth.ui.h:4
+#: ../panels/bluetooth/bluetooth.ui.h:6
 msgid "Paired"
 msgstr "Koblet"
 
-#: ../panels/bluetooth/bluetooth.ui.h:5
+#: ../panels/bluetooth/bluetooth.ui.h:7 ../panels/wacom/cc-wacom-page.c:756
 msgid "Type"
 msgstr "Type:"
 
-#: ../panels/bluetooth/bluetooth.ui.h:6
+#: ../panels/bluetooth/bluetooth.ui.h:8
 msgid "Address"
 msgstr "Adresse"
 
-#: ../panels/bluetooth/bluetooth.ui.h:7
+#: ../panels/bluetooth/bluetooth.ui.h:9
 msgid "Mouse and Touchpad Settings"
 msgstr "Innstillinger for mus og pekeplate"
 
-#: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:43
+#: ../panels/bluetooth/bluetooth.ui.h:10
+#: ../panels/universal-access/uap.ui.h:38
 msgid "Sound Settings"
 msgstr "Innstillinger for lyd"
 
-#: ../panels/bluetooth/bluetooth.ui.h:9 ../panels/universal-access/uap.ui.h:74
+#: ../panels/bluetooth/bluetooth.ui.h:11
 msgid "Keyboard Settings"
 msgstr "Innstillinger for tastatur"
 
-#: ../panels/bluetooth/bluetooth.ui.h:10
+#: ../panels/bluetooth/bluetooth.ui.h:12
 msgid "Send Files..."
 msgstr "Send filer …"
 
-#: ../panels/bluetooth/bluetooth.ui.h:11
+#: ../panels/bluetooth/bluetooth.ui.h:13
 msgid "Browse Files..."
 msgstr "Bla gjennom filer …"
 
 #. Translator: This string appears next to a toggle switch which controls enabling/disabling Bluetooth radio's on the device.
-#: ../panels/bluetooth/bluetooth.ui.h:13
+#: ../panels/bluetooth/bluetooth.ui.h:15
 msgctxt "Power"
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:281
+#: ../panels/bluetooth/cc-bluetooth-panel.c:340
 msgid "Yes"
 msgstr "Ja"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:281
+#: ../panels/bluetooth/cc-bluetooth-panel.c:340
 msgid "No"
 msgstr "Nei"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:393
+#: ../panels/bluetooth/cc-bluetooth-panel.c:454
 msgid "Bluetooth is disabled"
 msgstr "Bluetooth er slått av"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:398
+#: ../panels/bluetooth/cc-bluetooth-panel.c:459
 msgid "Bluetooth is disabled by hardware switch"
 msgstr "Bluetooth er slått av med maskinvarebryter"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:402
+#: ../panels/bluetooth/cc-bluetooth-panel.c:463
 msgid "No Bluetooth adapters found"
 msgstr "Ingen Bluetooth-kort funnet"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:535
+#: ../panels/bluetooth/cc-bluetooth-panel.c:590
 msgid "Visibility"
 msgstr "Synlighet"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:539
+#: ../panels/bluetooth/cc-bluetooth-panel.c:594
 #, c-format
 msgid "Visibility of “%s”"
 msgstr "Synlighet for «%s»"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:583
+#: ../panels/bluetooth/cc-bluetooth-panel.c:638
 #, c-format
 msgid "Remove '%s' from the list of devices?"
 msgstr "Fjern «%s» fra listen med enheter?"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:585
+#: ../panels/bluetooth/cc-bluetooth-panel.c:640
 msgid ""
 "If you remove the device, you will have to set it up again before next use."
 msgstr ""
@@ -405,8 +405,8 @@
 
 #. TRANSLATORS: column for device list
 #: ../panels/color/cc-color-panel.c:936
-#: ../panels/sound/gvc-mixer-dialog.c:1516
-#: ../panels/sound-nua/gvc-mixer-dialog.c:1614
+#: ../panels/sound/gvc-mixer-dialog.c:1525
+#: ../panels/sound-nua/gvc-mixer-dialog.c:1618
 msgid "Device"
 msgstr "Enhet"
 
@@ -445,25 +445,25 @@
 msgstr "Kan ikke fjerne profil som er lagt til automatisk"
 
 #. TRANSLATORS: this is when there is no profile for the device
-#: ../panels/color/cc-color-panel.c:1462
+#: ../panels/color/cc-color-panel.c:1464
 msgid "No profile"
 msgstr "Ingen profil"
 
-#: ../panels/color/cc-color-panel.c:1493
+#: ../panels/color/cc-color-panel.c:1495
 #, c-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i år"
 msgstr[1] "%i år"
 
-#: ../panels/color/cc-color-panel.c:1504
+#: ../panels/color/cc-color-panel.c:1506
 #, c-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i måned"
 msgstr[1] "%i måneder"
 
-#: ../panels/color/cc-color-panel.c:1515
+#: ../panels/color/cc-color-panel.c:1517
 #, c-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -471,40 +471,40 @@
 msgstr[1] "%i uker"
 
 #. fallback
-#: ../panels/color/cc-color-panel.c:1522
+#: ../panels/color/cc-color-panel.c:1524
 #, c-format
 msgid "Less than 1 week"
 msgstr "Mindre enn en uke"
 
-#: ../panels/color/cc-color-panel.c:1584
+#: ../panels/color/cc-color-panel.c:1586
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "Forvalgt RGB"
 
-#: ../panels/color/cc-color-panel.c:1589
+#: ../panels/color/cc-color-panel.c:1591
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "Forvalgt CMYK"
 
-#: ../panels/color/cc-color-panel.c:1594
+#: ../panels/color/cc-color-panel.c:1596
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "Forvalgt grå"
 
-#: ../panels/color/cc-color-panel.c:1712 ../panels/color/cc-color-panel.c:1753
-#: ../panels/color/cc-color-panel.c:1764 ../panels/color/cc-color-panel.c:1775
+#: ../panels/color/cc-color-panel.c:1714 ../panels/color/cc-color-panel.c:1755
+#: ../panels/color/cc-color-panel.c:1766 ../panels/color/cc-color-panel.c:1777
 msgid "Uncalibrated"
 msgstr "Ikke kalibrert"
 
-#: ../panels/color/cc-color-panel.c:1715
+#: ../panels/color/cc-color-panel.c:1717
 msgid "This device is not color managed."
 msgstr "Denne enheten er ikke fargestyrt."
 
-#: ../panels/color/cc-color-panel.c:1756
+#: ../panels/color/cc-color-panel.c:1758
 msgid "This device is using manufacturing calibrated data."
 msgstr "Denne enheten bruker data kalibrert av produsenten."
 
-#: ../panels/color/cc-color-panel.c:1767
+#: ../panels/color/cc-color-panel.c:1769
 msgid ""
 "This device does not have a profile suitable for whole-screen color "
 "correction."
@@ -512,42 +512,42 @@
 "Denne enheten har ikke en profil som passer for fargekorrigering av hele "
 "skjermen."
 
-#: ../panels/color/cc-color-panel.c:1800
+#: ../panels/color/cc-color-panel.c:1802
 msgid "This device has an old profile that may no longer be accurate."
 msgstr "Denne enheten har en gammel profil som kan være unøyaktig."
 
 #. TRANSLATORS: this is when the calibration profile age is not
 #. * specified as it has been autogenerated from the hardware
-#: ../panels/color/cc-color-panel.c:1828
+#: ../panels/color/cc-color-panel.c:1830
 msgid "Not specified"
 msgstr "Ikke spesifisert"
 
 #. add the 'No devices detected' entry
-#: ../panels/color/cc-color-panel.c:2013
+#: ../panels/color/cc-color-panel.c:2015
 msgid "No devices supporting color management detected"
 msgstr "Fant ingen enheter som støtter fargehåndtering"
 
-#: ../panels/color/cc-color-panel.c:2242
+#: ../panels/color/cc-color-panel.c:2244
 msgctxt "Device kind"
 msgid "Display"
 msgstr "Skjerm"
 
-#: ../panels/color/cc-color-panel.c:2244
+#: ../panels/color/cc-color-panel.c:2246
 msgctxt "Device kind"
 msgid "Scanner"
 msgstr "Skanner"
 
-#: ../panels/color/cc-color-panel.c:2246
+#: ../panels/color/cc-color-panel.c:2248
 msgctxt "Device kind"
 msgid "Printer"
 msgstr "Skriver"
 
-#: ../panels/color/cc-color-panel.c:2248
+#: ../panels/color/cc-color-panel.c:2250
 msgctxt "Device kind"
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../panels/color/cc-color-panel.c:2250
+#: ../panels/color/cc-color-panel.c:2252
 msgctxt "Device kind"
 msgid "Webcam"
 msgstr "Nettkamera"
@@ -638,31 +638,31 @@
 msgstr "Farge;ICC;Profil;Kalibrer;Skriver;Skjerm;"
 
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:585
+#: ../panels/common/cc-common-language.c:661
 msgid "United States"
 msgstr "USA"
 
-#: ../panels/common/cc-common-language.c:586
+#: ../panels/common/cc-common-language.c:662
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../panels/common/cc-common-language.c:587
+#: ../panels/common/cc-common-language.c:663
 msgid "France"
 msgstr "Frankrike"
 
-#: ../panels/common/cc-common-language.c:588
+#: ../panels/common/cc-common-language.c:664
 msgid "Spain"
 msgstr "Spania"
 
-#: ../panels/common/cc-common-language.c:589
+#: ../panels/common/cc-common-language.c:665
 msgid "China"
 msgstr "Kina"
 
-#: ../panels/common/cc-language-chooser.c:294
+#: ../panels/common/cc-language-chooser.c:296
 msgid "Select a region"
 msgstr "Velg en region"
 
-#: ../panels/common/gdm-languages.c:781
+#: ../panels/common/gdm-languages.c:787
 msgid "Unspecified"
 msgstr "Uspesifisert"
 
@@ -671,13 +671,12 @@
 msgstr "Velg et språk"
 
 #: ../panels/common/language-chooser.ui.h:2
-#: ../panels/printers/new-printer-dialog.ui.h:4
-#: ../panels/user-accounts/um-user-panel.c:446
+#: ../panels/printers/new-printer-dialog.ui.h:1
+#: ../panels/user-accounts/um-user-panel.c:462
 msgid "_Cancel"
 msgstr "A_vbryt"
 
 #: ../panels/common/language-chooser.ui.h:3
-#: ../panels/universal-access/gconf-property-editor.c:1609
 msgid "_Select"
 msgstr "_Velg"
 
@@ -799,22 +798,22 @@
 msgid "Clock;Timezone;Location;"
 msgstr "Klokke;Tidssone;Plassering;Adresse;"
 
-#: ../panels/display/cc-display-panel.c:509
+#: ../panels/display/cc-display-panel.c:513
 msgctxt "display panel, rotation"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panels/display/cc-display-panel.c:510
+#: ../panels/display/cc-display-panel.c:514
 msgctxt "display panel, rotation"
 msgid "Counterclockwise"
 msgstr "Mot klokken"
 
-#: ../panels/display/cc-display-panel.c:511
+#: ../panels/display/cc-display-panel.c:515
 msgctxt "display panel, rotation"
 msgid "Clockwise"
 msgstr "Med klokken"
 
-#: ../panels/display/cc-display-panel.c:512
+#: ../panels/display/cc-display-panel.c:516
 msgctxt "display panel, rotation"
 msgid "180 Degrees"
 msgstr "180 grader"
@@ -828,26 +827,26 @@
 msgid "Mirror Displays"
 msgstr "Speil skjermer"
 
-#: ../panels/display/cc-display-panel.c:677
+#: ../panels/display/cc-display-panel.c:683
 #: ../panels/display/display-capplet.ui.h:1
 msgid "Monitor"
 msgstr "Skjerm"
 
-#: ../panels/display/cc-display-panel.c:783
+#: ../panels/display/cc-display-panel.c:787
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
 
-#: ../panels/display/cc-display-panel.c:785
+#: ../panels/display/cc-display-panel.c:789
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/cc-display-panel.c:1695
+#: ../panels/display/cc-display-panel.c:1699
 msgid "Drag to change primary display."
 msgstr "Dra for å bytte primær skjerm."
 
-#: ../panels/display/cc-display-panel.c:1753
+#: ../panels/display/cc-display-panel.c:1757
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
@@ -855,33 +854,33 @@
 "Velg en skjerm for å endre egenskaper for denne. Dra den rundt for å bytte "
 "plassering."
 
-#: ../panels/display/cc-display-panel.c:2168
+#: ../panels/display/cc-display-panel.c:2172
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/cc-display-panel.c:2170
+#: ../panels/display/cc-display-panel.c:2174
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../panels/display/cc-display-panel.c:2332
-#: ../panels/display/cc-display-panel.c:2384
+#: ../panels/display/cc-display-panel.c:2336
+#: ../panels/display/cc-display-panel.c:2388
 #, c-format
 msgid "Failed to apply configuration: %s"
 msgstr "Klarte ikke å ta konfigurasjonen i bruk: %s"
 
-#: ../panels/display/cc-display-panel.c:2412
+#: ../panels/display/cc-display-panel.c:2416
 msgid "Could not save the monitor configuration"
 msgstr "Kunne ikke lagre skjermkonfigurasjon"
 
-#: ../panels/display/cc-display-panel.c:2472
+#: ../panels/display/cc-display-panel.c:2476
 msgid "Could not detect displays"
 msgstr "Kunne ikke søke etter skjermer"
 
-#: ../panels/display/cc-display-panel.c:2737
+#: ../panels/display/cc-display-panel.c:2740
 msgid "All displays"
 msgstr "Alle skjermer"
 
-#: ../panels/display/cc-display-panel.c:2888
+#: ../panels/display/cc-display-panel.c:2897
 msgid "Could not get screen information"
 msgstr "Fant ikke informasjon om skjermen"
 
@@ -928,34 +927,34 @@
 msgstr "Panel;Prosjektor;xrandr;Skjerm;Oppløsning;Oppdater;"
 
 #. Translators: VESA is an techncial acronym, don't translate it.
-#: ../panels/info/cc-info-panel.c:402
+#: ../panels/info/cc-info-panel.c:435
 #, c-format
 msgid "VESA: %s"
 msgstr "VESA: %s"
 
 #. TRANSLATORS: device type
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:426 ../panels/network/panel-common.c:79
-#: ../panels/network/panel-common.c:158
+#: ../panels/info/cc-info-panel.c:459 ../panels/network/panel-common.c:82
+#: ../panels/network/panel-common.c:162
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. translators: This is the type of architecture, for example:
 #. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:587
+#: ../panels/info/cc-info-panel.c:615
 #, c-format
 msgid "%d-bit"
 msgstr "%d-bit"
 
-#: ../panels/info/cc-info-panel.c:746
+#: ../panels/info/cc-info-panel.c:774
 msgid "Unknown model"
 msgstr "Ukjent modell"
 
-#: ../panels/info/cc-info-panel.c:829
+#: ../panels/info/cc-info-panel.c:857
 msgid "The next login will attempt to use the standard experience."
 msgstr "Neste pålogging vil forsøke å bruke standard brukeropplevelse."
 
-#: ../panels/info/cc-info-panel.c:831
+#: ../panels/info/cc-info-panel.c:859
 msgid ""
 "The next login will use the fallback mode intended for unsupported graphics "
 "hardware."
@@ -965,47 +964,47 @@
 
 #. translators: The hardware is not able to run GNOME 3's
 #. * shell, so we use the GNOME "Fallback" session
-#: ../panels/info/cc-info-panel.c:873
+#: ../panels/info/cc-info-panel.c:901
 msgctxt "Experience"
 msgid "Fallback"
 msgstr "Reserveløsning"
 
 #. translators: The hardware is able to run GNOME 3's
 #. * shell, also called "Standard" experience
-#: ../panels/info/cc-info-panel.c:879
+#: ../panels/info/cc-info-panel.c:907
 msgctxt "Experience"
 msgid "Standard"
 msgstr "Standard"
 
-#: ../panels/info/cc-info-panel.c:1202
+#: ../panels/info/cc-info-panel.c:1283
 msgid "Ask what to do"
 msgstr "Spør hva som skal gjøres"
 
-#: ../panels/info/cc-info-panel.c:1206 ../panels/power/power.ui.h:9
+#: ../panels/info/cc-info-panel.c:1287 ../panels/power/power.ui.h:11
 msgid "Do nothing"
 msgstr "Ikke gjør noe"
 
-#: ../panels/info/cc-info-panel.c:1210
+#: ../panels/info/cc-info-panel.c:1291
 msgid "Open folder"
 msgstr "Åpne mappe"
 
-#: ../panels/info/cc-info-panel.c:1325
+#: ../panels/info/cc-info-panel.c:1413
 msgid "Select an application for audio CDs"
 msgstr "Velg et program for lyd-CDer"
 
-#: ../panels/info/cc-info-panel.c:1326
+#: ../panels/info/cc-info-panel.c:1414
 msgid "Select an application for video DVDs"
 msgstr "Velg et program for video-DVDer"
 
-#: ../panels/info/cc-info-panel.c:1327
+#: ../panels/info/cc-info-panel.c:1415
 msgid "Select an application to run when a music player is connected"
 msgstr "Velg et program som skal kjøres når en musikkavspiller kobles til"
 
-#: ../panels/info/cc-info-panel.c:1328
+#: ../panels/info/cc-info-panel.c:1416
 msgid "Select an application to run when a camera is connected"
 msgstr "Velg et program som skal kjøres når et kamera kobles til"
 
-#: ../panels/info/cc-info-panel.c:1329
+#: ../panels/info/cc-info-panel.c:1417
 msgid "Select an application for software CDs"
 msgstr "Velg et program for programvare-CDer"
 
@@ -1014,85 +1013,85 @@
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #. 
-#: ../panels/info/cc-info-panel.c:1341
+#: ../panels/info/cc-info-panel.c:1429
 msgid "audio DVD"
 msgstr "Lyd-DVD"
 
-#: ../panels/info/cc-info-panel.c:1342
+#: ../panels/info/cc-info-panel.c:1430
 msgid "blank Blu-ray disc"
 msgstr "Tom Blu-ray-plate"
 
-#: ../panels/info/cc-info-panel.c:1343
+#: ../panels/info/cc-info-panel.c:1431
 msgid "blank CD disc"
 msgstr "Tom CD-plate"
 
-#: ../panels/info/cc-info-panel.c:1344
+#: ../panels/info/cc-info-panel.c:1432
 msgid "blank DVD disc"
 msgstr "Tom DVD-plate"
 
-#: ../panels/info/cc-info-panel.c:1345
+#: ../panels/info/cc-info-panel.c:1433
 msgid "blank HD DVD disc"
 msgstr "tom HD-DVD plate"
 
-#: ../panels/info/cc-info-panel.c:1346
+#: ../panels/info/cc-info-panel.c:1434
 msgid "Blu-ray video disc"
 msgstr "Blu-ray videoplate"
 
-#: ../panels/info/cc-info-panel.c:1347
+#: ../panels/info/cc-info-panel.c:1435
 msgid "e-book reader"
 msgstr "E-bokleser"
 
-#: ../panels/info/cc-info-panel.c:1348
+#: ../panels/info/cc-info-panel.c:1436
 msgid "HD DVD video disc"
 msgstr "HD-DVD-videoplate"
 
-#: ../panels/info/cc-info-panel.c:1349
+#: ../panels/info/cc-info-panel.c:1437
 msgid "Picture CD"
 msgstr "Bilde-CD"
 
-#: ../panels/info/cc-info-panel.c:1350
+#: ../panels/info/cc-info-panel.c:1438
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-panel.c:1351
+#: ../panels/info/cc-info-panel.c:1439
 msgid "Video CD"
 msgstr "Video-CD"
 
-#: ../panels/info/cc-info-panel.c:1474
-#: ../panels/keyboard/keyboard-shortcuts.c:1647
+#: ../panels/info/cc-info-panel.c:1564
+#: ../panels/keyboard/keyboard-shortcuts.c:1667
 msgid "Section"
 msgstr "Seksjon"
 
-#: ../panels/info/cc-info-panel.c:1483 ../panels/info/info.ui.h:11
+#: ../panels/info/cc-info-panel.c:1573 ../panels/info/info.ui.h:11
 msgid "Overview"
 msgstr "Oversikt"
 
-#: ../panels/info/cc-info-panel.c:1489 ../panels/info/info.ui.h:18
+#: ../panels/info/cc-info-panel.c:1579 ../panels/info/info.ui.h:18
 msgid "Default Applications"
 msgstr "Forvalgte programmer"
 
-#: ../panels/info/cc-info-panel.c:1494 ../panels/info/info.ui.h:26
+#: ../panels/info/cc-info-panel.c:1584 ../panels/info/info.ui.h:26
 msgid "Removable Media"
 msgstr "Flyttbare medier"
 
-#: ../panels/info/cc-info-panel.c:1499 ../panels/info/info.ui.h:10
+#: ../panels/info/cc-info-panel.c:1589 ../panels/info/info.ui.h:10
 msgid "Graphics"
 msgstr "Grafikk"
 
-#: ../panels/info/cc-info-panel.c:1701
+#: ../panels/info/cc-info-panel.c:1799
 #, c-format
 msgid "Version %s"
 msgstr "Versjon %s"
 
-#: ../panels/info/cc-info-panel.c:1753
+#: ../panels/info/cc-info-panel.c:1851
 msgid "Install Updates"
 msgstr "Installer oppdateringer"
 
-#: ../panels/info/cc-info-panel.c:1757
+#: ../panels/info/cc-info-panel.c:1855
 msgid "System Up-To-Date"
 msgstr "Systemet er oppdatert"
 
-#: ../panels/info/cc-info-panel.c:1761
+#: ../panels/info/cc-info-panel.c:1859
 msgid "Checking for Updates"
 msgstr "Ser etter oppdateringer"
 
@@ -1275,15 +1274,15 @@
 msgid "Launch email client"
 msgstr "Start e-postprogram"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:5
+#: ../panels/keyboard/01-launchers.xml.in.h:6
 msgid "Launch web browser"
 msgstr "Start nettleser"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:6
+#: ../panels/keyboard/01-launchers.xml.in.h:7
 msgid "Home folder"
 msgstr "Hjemmemappe"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:7
+#: ../panels/keyboard/01-launchers.xml.in.h:8
 msgid "Search"
 msgstr "Søk"
 
@@ -1316,7 +1315,7 @@
 msgstr "Kopier et skjermdump av et område til utklippstavlen"
 
 #: ../panels/keyboard/01-system.xml.in.h:1
-#: ../panels/region/gnome-region-panel.ui.h:40
+#: ../panels/region/gnome-region-panel.ui.h:41
 msgid "System"
 msgstr "System"
 
@@ -1409,15 +1408,13 @@
 
 #. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-#: ../panels/mouse/gnome-mouse-properties.ui.h:26
-#: ../panels/universal-access/uap.ui.h:55
-#: ../panels/universal-access/zoom-options.c:333
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Short"
 msgstr "Kort"
 
 #. slow acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
 msgid "Slow"
 msgstr "Treg"
 
@@ -1427,15 +1424,13 @@
 
 #. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
-#: ../panels/mouse/gnome-mouse-properties.ui.h:28
-#: ../panels/universal-access/uap.ui.h:58
-#: ../panels/universal-access/zoom-options.c:337
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Long"
 msgstr "Lang"
 
 #. fast acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: ../panels/mouse/gnome-mouse-properties.ui.h:7
 msgid "Fast"
 msgstr "Rask"
 
@@ -1459,8 +1454,9 @@
 msgid "Layout Settings"
 msgstr "Innstillinger for oppsett"
 
+#: ../panels/keyboard/01-input-sources.xml.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
-#: ../panels/universal-access/uap.ui.h:75
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Typing"
 msgstr "Skriving"
 
@@ -1482,28 +1478,28 @@
 "en snarveitast, eller trykk slettetast for å fjerne den."
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
+#: ../panels/region/gnome-region-panel.ui.h:28
 msgid "Shortcuts"
 msgstr "Snarveier"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:554
-#: ../panels/keyboard/keyboard-shortcuts.c:562
-#: ../panels/keyboard/keyboard-shortcuts.c:867
-#: ../panels/keyboard/keyboard-shortcuts.c:1410
-#: ../panels/keyboard/keyboard-shortcuts.c:1414
+#: ../panels/keyboard/keyboard-shortcuts.c:557
+#: ../panels/keyboard/keyboard-shortcuts.c:565
 msgid "Custom Shortcuts"
 msgstr "Egendefinerte snarveier"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:722
+#: ../panels/keyboard/keyboard-shortcuts.c:776
 msgid "<Unknown Action>"
 msgstr "<Ukjent handling>"
 
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/keyboard-shortcuts.c:1062
-#: ../panels/sound/gvc-mixer-control.c:1087
+#: ../panels/keyboard/cc-keyboard-option.c:241
+#: ../panels/keyboard/cc-keyboard-option.c:347
+#: ../panels/keyboard/keyboard-shortcuts.c:1132
+#: ../panels/sound/gvc-mixer-control.c:1834
 #: ../panels/user-accounts/um-fingerprint-dialog.c:215
 #: ../panels/user-accounts/um-fingerprint-dialog.c:216
-#: ../panels/sound-nua/gvc-mixer-control.c:1828
+#: ../panels/region/keyboard-shortcuts.c:594
 msgid "Disabled"
 msgstr "Slått av"
 
@@ -1511,7 +1507,8 @@
 msgid "Error saving the new shortcut"
 msgstr "Feil under lagring av ny snarvei"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1219
+#: ../panels/keyboard/keyboard-shortcuts.c:1273
+#: ../panels/region/keyboard-shortcuts.c:724
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1523,7 +1520,8 @@
 "Vennligst prøv med en tastekombinasjon som inkluderer Control, Alt eller "
 "Shift."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1251
+#: ../panels/keyboard/keyboard-shortcuts.c:1305
+#: ../panels/region/keyboard-shortcuts.c:750
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1532,14 +1530,16 @@
 "Snarvei «%s» er allerede brukt for\n"
 "«%s»"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1256
+#: ../panels/keyboard/keyboard-shortcuts.c:1310
+#: ../panels/region/keyboard-shortcuts.c:755
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr ""
 "Hvis du omfordeler snarveien til «%s» vil snarveien for «%s» bli slått av."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1262
+#: ../panels/keyboard/keyboard-shortcuts.c:1316
+#: ../panels/region/keyboard-shortcuts.c:761
 msgid "_Reassign"
 msgstr "_Omfordel"
 
@@ -1547,8 +1547,7 @@
 msgid "Too many custom shortcuts"
 msgstr "For mange egendefinerte snarveier"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1700
-#: ../panels/wacom/cc-wacom-page.c:582
+#: ../panels/wacom/cc-wacom-page.c:777
 msgid "Action"
 msgstr "Handling"
 
@@ -1601,15 +1600,13 @@
 msgid "_Sensitivity:"
 msgstr "_Følsomhet:"
 
-#. low sensitivity
-#. TRANSLATORS: secondary battery
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
-#: ../panels/power/cc-power-panel.c:576
+#. short delay
+#: ../panels/universal-access/zoom-options.ui.h:34
 msgid "Low"
 msgstr "Lav"
 
-#. high sensitivity
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#. long delay
+#: ../panels/universal-access/zoom-options.ui.h:36
 msgid "High"
 msgstr "Høy"
 
@@ -1622,8 +1619,7 @@
 msgstr "T_erskel:"
 
 #. small threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:20
-#: ../panels/universal-access/uap.ui.h:87
+#: ../panels/universal-access/uap.ui.h:81
 msgid "Small"
 msgstr "Liten"
 
@@ -1632,8 +1628,7 @@
 msgstr "Terskel for draoperasjon"
 
 #. large threshold
-#: ../panels/mouse/gnome-mouse-properties.ui.h:23
-#: ../panels/universal-access/uap.ui.h:89
+#: ../panels/universal-access/uap.ui.h:83
 msgid "Large"
 msgstr "Stor"
 
@@ -1645,7 +1640,7 @@
 msgid "_Timeout:"
 msgstr "_Tidsavbrudd:"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:27
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
 msgid "Double-click timeout"
 msgstr "Tidsavbrudd for dobbeltklikk"
 
@@ -1653,7 +1648,7 @@
 msgid "To test your settings, try to double-click on the face."
 msgstr "Klikk på ansiktet for å teste dine innstillinger for dobbeltklikk."
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:30
+#: ../panels/mouse/gnome-mouse-properties.ui.h:12
 msgid "Mouse"
 msgstr "Mus"
 
@@ -1685,12 +1680,12 @@
 msgid "Enable h_orizontal scrolling"
 msgstr "Aktiver h_orisontal rulling"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:38
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
 msgid "Touchpad"
 msgstr "Pekeplate"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/cc-network-panel.c:291
+#: ../panels/network/net-proxy.c:73
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr ""
@@ -1701,94 +1696,94 @@
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: ../panels/network/cc-network-panel.c:299
+#: ../panels/network/net-proxy.c:81
 msgid "This is not recommended for untrusted public networks."
 msgstr "Dette anbefales ikke for offentlige nettverk du ikke stoler på."
 
 #. TRANSLATORS: this is when the access point is not listed
 #. * in the dropdown (or hidden) and the user has to select
 #. * another entry manually
-#: ../panels/network/cc-network-panel.c:1019
+#: ../panels/network/cc-network-panel.c:1034
 msgctxt "Wireless access point"
 msgid "Other..."
 msgstr "Annet …"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/cc-network-panel.c:1183
-#: ../panels/network/cc-network-panel.c:1590
+#: ../panels/network/net-device-wifi.c:259
+#: ../panels/network/net-device-wifi.c:438
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/cc-network-panel.c:1187
-#: ../panels/network/cc-network-panel.c:1594
+#: ../panels/network/net-device-wifi.c:263
+#: ../panels/network/net-device-wifi.c:442
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/cc-network-panel.c:1191
+#: ../panels/network/net-device-wifi.c:267
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/cc-network-panel.c:1196
+#: ../panels/network/net-device-wifi.c:272
 msgid "Enterprise"
 msgstr "Bedrift"
 
-#. TRANSLATORS: this no (!) WiFi security
-#: ../panels/network/cc-network-panel.c:1202
-#: ../panels/network/cc-network-panel.c:1585
-#: ../panels/universal-access/uap.ui.h:5 ../panels/wacom/cc-wacom-page.c:297
-#: ../panels/wacom/cc-wacom-page.c:314
+#: ../panels/universal-access/uap.ui.h:8
 msgid "None"
 msgstr "Ingen"
 
-#: ../panels/network/cc-network-panel.c:1689
+#: ../panels/network/cc-network-panel.c:1704
 msgid "Hotspot"
 msgstr "Hotspot"
 
 #. Translators: network device speed
-#: ../panels/network/cc-network-panel.c:1696
+#: ../panels/network/net-device-mobile.c:261
+#: ../panels/network/net-device-wifi.c:727
+#: ../panels/network/net-device-wired.c:126
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d MB/s"
 
-#: ../panels/network/cc-network-panel.c:2042 ../panels/network/network.ui.h:11
+#: ../panels/network/network-wifi.ui.h:13
+#: ../panels/network/network-wired.ui.h:2 ../panels/network/panel-common.c:683
 msgid "IPv4 Address"
 msgstr "IPv4-adresse"
 
-#: ../panels/network/cc-network-panel.c:2043 ../panels/network/network.ui.h:12
+#: ../panels/network/network-mobile.ui.h:4
+#: ../panels/network/network-wifi.ui.h:14
+#: ../panels/network/network-wired.ui.h:3 ../panels/network/panel-common.c:684
 msgid "IPv6 Address"
 msgstr "IPv6-adresse"
 
-#: ../panels/network/cc-network-panel.c:2046
-#: ../panels/network/cc-network-panel.c:2049 ../panels/network/network.ui.h:27
+#: ../panels/network/network-mobile.ui.h:3
+#: ../panels/network/panel-common.c:686 ../panels/network/panel-common.c:688
 #: ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "IP-adresse"
 
-#: ../panels/network/cc-network-panel.c:2096
-#: ../panels/network/cc-network-panel.c:2471
+#: ../panels/network/cc-network-panel.c:841 ../panels/network/net-vpn.c:278
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"
 
-#: ../panels/network/cc-network-panel.c:2204
+#: ../panels/network/net-proxy.c:515
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../panels/network/cc-network-panel.c:2278
+#: ../panels/network/cc-network-panel.c:649
 msgid "Network proxy"
 msgstr "Nettverksproxy"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:2538
+#: ../panels/network/cc-network-panel.c:908
 msgid "The system network services are not compatible with this version."
 msgstr ""
 "Nettverkstjenesten for dette systemet er ikke kompatibelt med denne "
 "versjonen."
 
-#: ../panels/network/cc-network-panel.c:2736
+#: ../panels/network/cc-network-panel.c:2758
 #, c-format
 msgid ""
 "Network details for %s including password and any custom configuration will "
@@ -1797,46 +1792,47 @@
 "Nettverksdetaljer for %s inklusive passord og tilpasset konfigurasjon vil gå "
 "tapt"
 
-#: ../panels/network/cc-network-panel.c:2746
+#: ../panels/network/net-device-wifi.c:973
 msgid "Forget"
 msgstr "Glem"
 
-#: ../panels/network/cc-network-panel.c:3245
+#: ../panels/network/cc-network-panel.c:3321
 msgid "Not connected to the internet."
 msgstr "Ikke koblet til internett."
 
-#: ../panels/network/cc-network-panel.c:3246
+#: ../panels/network/cc-network-panel.c:3322
 msgid "Create the hotspot anyway?"
 msgstr "Lage hotspot likevel?"
 
-#: ../panels/network/cc-network-panel.c:3264
+#: ../panels/network/cc-network-panel.c:3340
 #, c-format
 msgid "Disconnect from %s and create a new hotspot?"
 msgstr "Koble fra %s og lag ny hotspot?"
 
-#: ../panels/network/cc-network-panel.c:3267
+#: ../panels/network/cc-network-panel.c:3343
 msgid "This is your only connection to the internet."
 msgstr "Dette er din eneste tilkobling til internett."
 
-#: ../panels/network/cc-network-panel.c:3285
+#: ../panels/network/cc-network-panel.c:3361
 msgid "Create _Hotspot"
 msgstr "Lag _hotspot"
 
-#: ../panels/network/cc-network-panel.c:3345
+#: ../panels/network/net-device-wifi.c:1633
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Stopp trådløst aksesspunkt og koble fra brukere?"
 
-#: ../panels/network/cc-network-panel.c:3348
+#: ../panels/network/net-device-wifi.c:1636
 msgid "_Stop Hotspot"
 msgstr "_Stopp hotspot"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:3366
+#: ../panels/network/cc-network-panel.c:3441
 msgid "Airplane Mode"
 msgstr "Flymodus"
 
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:1
+#: ../panels/network/network-mobile.ui.h:7
 msgid "Network"
 msgstr "Nettverk"
 
@@ -1861,21 +1857,21 @@
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: ../panels/network/network.ui.h:4
+#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/network.ui.h:5
+#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
 msgctxt "proxy method"
 msgid "None"
 msgstr "Ingen"
 
-#: ../panels/network/network.ui.h:6
+#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
 msgctxt "proxy method"
 msgid "Manual"
 msgstr "Manuell"
 
-#: ../panels/network/network.ui.h:7
+#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
 msgctxt "proxy method"
 msgid "Automatic"
 msgstr "Automatisk"
@@ -1884,7 +1880,8 @@
 msgid "Add Device"
 msgstr "Legg til enhet"
 
-#: ../panels/network/network.ui.h:10
+#: ../panels/network/network-wifi.ui.h:9
+#: ../panels/network/network-wired.ui.h:1
 msgid "Hardware Address"
 msgstr "Maskinvareadresse"
 
@@ -1892,11 +1889,15 @@
 msgid "Subnet Mask"
 msgstr "Subnettmaske"
 
-#: ../panels/network/network.ui.h:14
+#: ../panels/network/network-mobile.ui.h:5
+#: ../panels/network/network-wifi.ui.h:15
+#: ../panels/network/network-wired.ui.h:4
 msgid "Default Route"
 msgstr "Forvalgt rute"
 
-#: ../panels/network/network.ui.h:15
+#: ../panels/network/network-mobile.ui.h:6
+#: ../panels/network/network-wifi.ui.h:16
+#: ../panels/network/network-wired.ui.h:5
 msgid "DNS"
 msgstr "DNS"
 
@@ -1904,12 +1905,12 @@
 msgid "Device Off"
 msgstr "Enhet av"
 
-#: ../panels/network/network.ui.h:17
-#: ../panels/region/gnome-region-panel.ui.h:26
+#: ../panels/network/network-mobile.ui.h:8
+#: ../panels/network/network-wired.ui.h:6
 msgid "_Options..."
 msgstr "_Alternativer …"
 
-#: ../panels/network/network.ui.h:18
+#: ../panels/network/network-wifi.ui.h:10
 msgid "Security"
 msgstr "Sikkerhet"
 
@@ -1917,7 +1918,7 @@
 msgid "_Network Name"
 msgstr "_Nettverksnavn"
 
-#: ../panels/network/network.ui.h:20
+#: ../panels/network/network-wifi.ui.h:20
 msgid "Network Name"
 msgstr "Nettverksnavn"
 
@@ -1929,7 +1930,7 @@
 msgid "Forget Network"
 msgstr "Glem nettverk"
 
-#: ../panels/network/network.ui.h:23
+#: ../panels/network/network-wifi.ui.h:4
 msgid "_Use as Hotspot..."
 msgstr "Br_uk som trådløst aksesspunkt …"
 
@@ -1937,31 +1938,31 @@
 msgid "_Stop Hotspot..."
 msgstr "_Stopp hotspot …"
 
-#: ../panels/network/network.ui.h:25
+#: ../panels/network/network-mobile.ui.h:1
 msgid "IMEI"
 msgstr "IMEI"
 
-#: ../panels/network/network.ui.h:26
+#: ../panels/network/network-mobile.ui.h:2
 msgid "Provider"
 msgstr "Tilbyder"
 
-#: ../panels/network/network.ui.h:28
+#: ../panels/network/network-vpn.ui.h:2
 msgid "VPN Type"
 msgstr "Type VPN"
 
-#: ../panels/network/network.ui.h:29
+#: ../panels/network/network-vpn.ui.h:3
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../panels/network/network.ui.h:30
+#: ../panels/network/network-vpn.ui.h:4
 msgid "Group Name"
 msgstr "Gruppenavn"
 
-#: ../panels/network/network.ui.h:31
+#: ../panels/network/network-vpn.ui.h:5
 msgid "Group Password"
 msgstr "Gruppepassord"
 
-#: ../panels/network/network.ui.h:32
+#: ../panels/network/network-vpn.ui.h:6
 msgid "Username"
 msgstr "Brukernavn"
 
@@ -1969,31 +1970,31 @@
 msgid "Disable VPN"
 msgstr "Slå av VPN"
 
-#: ../panels/network/network.ui.h:34
+#: ../panels/network/network-vpn.ui.h:7
 msgid "_Configure..."
 msgstr "_Konfigurer …"
 
-#: ../panels/network/network.ui.h:35
+#: ../panels/network/network-proxy.ui.h:4
 msgid "_Method"
 msgstr "_Metode"
 
-#: ../panels/network/network.ui.h:36
+#: ../panels/network/network-proxy.ui.h:5
 msgid "_Configuration URL"
 msgstr "_Konfigurasjons-URL"
 
-#: ../panels/network/network.ui.h:37
+#: ../panels/network/network-proxy.ui.h:6
 msgid "_HTTP Proxy"
 msgstr "_HTTP-proxy"
 
-#: ../panels/network/network.ui.h:38
+#: ../panels/network/network-proxy.ui.h:7
 msgid "H_TTPS Proxy"
 msgstr "H_TTP-proxy"
 
-#: ../panels/network/network.ui.h:39
+#: ../panels/network/network-proxy.ui.h:8
 msgid "_FTP Proxy"
 msgstr "_FTP-proxy"
 
-#: ../panels/network/network.ui.h:40
+#: ../panels/network/network-proxy.ui.h:9
 msgid "_Socks Host"
 msgstr "_Socks-vert"
 
@@ -2013,124 +2014,124 @@
 msgid "Socks Port"
 msgstr "Socks-port"
 
-#: ../panels/network/network.ui.h:45
+#: ../panels/network/network-proxy.ui.h:10
 msgid "Apply system wide"
 msgstr "Bruk på hele systemet"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:83
+#: ../panels/network/panel-common.c:86
 msgid "Wired"
 msgstr "Kablet"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:87
+#: ../panels/network/network-wifi.ui.h:3 ../panels/network/panel-common.c:90
 msgid "Wireless"
 msgstr "Trådløs"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:94
+#: ../panels/network/panel-common.c:97
 msgid "Mobile broadband"
 msgstr "Mobilt bredbånd"
 
 #. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:103
+#: ../panels/network/panel-common.c:106
 msgid "Mesh"
 msgstr "Mesh"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:162
+#: ../panels/network/panel-common.c:166
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:166
+#: ../panels/network/panel-common.c:170
 msgid "Infrastructure"
 msgstr "Infrastruktur"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:190 ../panels/network/panel-common.c:251
+#: ../panels/network/panel-common.c:194 ../panels/network/panel-common.c:255
 msgid "Status unknown"
 msgstr "Ukjent status"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:194
+#: ../panels/network/panel-common.c:198
 msgid "Unmanaged"
 msgstr "Ikke administrert"
 
-#: ../panels/network/panel-common.c:199
+#: ../panels/network/panel-common.c:203
 msgid "Firmware missing"
 msgstr "Fastvare mangler"
 
-#: ../panels/network/panel-common.c:202
+#: ../panels/network/panel-common.c:206
 msgid "Cable unplugged"
 msgstr "Kabel koblet fra"
 
-#: ../panels/network/panel-common.c:204
+#: ../panels/network/panel-common.c:208
 msgid "Unavailable"
 msgstr "Ikke tilgjengelig"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:208
+#: ../panels/network/panel-common.c:212
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:215 ../panels/network/panel-common.c:257
+#: ../panels/network/panel-common.c:219 ../panels/network/panel-common.c:261
 msgid "Connecting"
 msgstr "Kobler til"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:219 ../panels/network/panel-common.c:261
+#: ../panels/network/panel-common.c:223 ../panels/network/panel-common.c:265
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:223 ../panels/network/panel-common.c:265
+#: ../panels/network/panel-common.c:227 ../panels/network/panel-common.c:269
 msgid "Connected"
 msgstr "Tilkoblet"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:227
+#: ../panels/network/panel-common.c:231
 msgid "Disconnecting"
 msgstr "Kobler fra"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:231 ../panels/network/panel-common.c:269
+#: ../panels/network/panel-common.c:235 ../panels/network/panel-common.c:273
 msgid "Connection failed"
 msgstr "Tilkobling feilet"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:235 ../panels/network/panel-common.c:277
+#: ../panels/network/panel-common.c:239 ../panels/network/panel-common.c:281
 msgid "Status unknown (missing)"
 msgstr "Ukjent status (mangler)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:273
+#: ../panels/network/net-device-wifi.c:737
+#: ../panels/network/panel-common.c:277
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:305
+#: ../panels/online-accounts/cc-online-accounts-panel.c:374
 msgid "Error logging into the account"
 msgstr "Feil ved innlogging på kontoen"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:351
+#: ../panels/online-accounts/cc-online-accounts-panel.c:428
 msgid "Expired credentials. Please log in again."
 msgstr "Påloggingsinfirmasjon utløpt. Vennligst logg inn igjen."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:354
+#: ../panels/online-accounts/cc-online-accounts-panel.c:431
 msgid "_Log In"
 msgstr "_Logg inn"
 
-#. translators: This is the title of the "Add Account" dialogue.
-#. * The title is not visible when using GNOME Shell
-#: ../panels/online-accounts/cc-online-accounts-panel.c:461
-#: ../panels/online-accounts/online-accounts.ui.h:1
+#. translators: This is the title of the "Add Account" dialog.
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:253
+#: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "Legg til konto"
 
@@ -2146,23 +2147,23 @@
 msgid "_Add..."
 msgstr "_Legg til …"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:550
+#: ../panels/online-accounts/cc-online-accounts-panel.c:678
 msgid "Error creating account"
 msgstr "Feil under oppretting av konto"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:584
+#: ../panels/online-accounts/cc-online-accounts-panel.c:732
 msgid "Error removing account"
 msgstr "Feil under fjerning av konto"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:620
+#: ../panels/online-accounts/cc-online-accounts-panel.c:768
 msgid "Are you sure you want to remove the account?"
 msgstr "Er du sikker på at du vil fjerne kontoen?"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:622
+#: ../panels/online-accounts/cc-online-accounts-panel.c:770
 msgid "This will not remove the account on the server."
 msgstr "Dette vil ikke fjerne kontoen på tjeneren."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:623
+#: ../panels/online-accounts/cc-online-accounts-panel.c:771
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -2180,7 +2181,7 @@
 msgstr ""
 "Google;Facebook;Twitter;Yahoo;Web;Nett;Lynmeldinger;Kalender;E-post;Kontakt;"
 
-#: ../panels/online-accounts/online-accounts.ui.h:2
+#: ../panels/online-accounts/online-accounts.ui.h:3
 msgid "Remove Account"
 msgstr "Fjern konto"
 
@@ -2188,18 +2189,18 @@
 msgid "Select an account"
 msgstr "Velg en konto"
 
-#: ../panels/power/cc-power-panel.c:168
+#: ../panels/power/cc-power-panel.c:166
 msgid "Unknown time"
 msgstr "Ukjent tid"
 
-#: ../panels/power/cc-power-panel.c:174
+#: ../panels/power/cc-power-panel.c:172
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minutt"
 msgstr[1] "%i minutter"
 
-#: ../panels/power/cc-power-panel.c:186
+#: ../panels/power/cc-power-panel.c:184
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2208,136 +2209,135 @@
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:194
+#: ../panels/power/cc-power-panel.c:192
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:195
+#: ../panels/power/cc-power-panel.c:193
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: ../panels/power/cc-power-panel.c:196
+#: ../panels/power/cc-power-panel.c:194
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:239
+#: ../panels/power/cc-power-panel.c:237
 #, c-format
 msgid "Charging - %s until fully charged"
 msgstr "Lader - fullt ladet om %s"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:247
+#: ../panels/power/cc-power-panel.c:245
 #, c-format
 msgid "Caution low battery, %s remaining"
 msgstr "Advarsel, lite batteri, %s gjenstår"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:255
+#: ../panels/power/cc-power-panel.c:253
 #, c-format
 msgid "Using battery power - %s remaining"
 msgstr "Bruker batteristrøm - %s gjenstår"
 
 #. TRANSLATORS: primary battery
-#. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:272 ../panels/power/cc-power-panel.c:564
+#: ../panels/power/cc-power-panel.c:270
 msgid "Charging"
 msgstr "Lader"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:277
+#: ../panels/power/cc-power-panel.c:275
 msgid "Using battery power"
 msgstr "Bruker batteristrøm"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:281 ../panels/power/cc-power-panel.c:586
+#: ../panels/power/cc-power-panel.c:279
 msgid "Charging - fully charged"
 msgstr "Lader - fullt ladet"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:285 ../panels/power/cc-power-panel.c:590
+#: ../panels/power/cc-power-panel.c:283
 msgid "Empty"
 msgstr "Tom"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:353
+#: ../panels/power/cc-power-panel.c:351
 #, c-format
 msgid "Caution low UPS, %s remaining"
 msgstr "Advarsel, lite strøm på UPS, %s gjenstår"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:359
+#: ../panels/power/cc-power-panel.c:357
 #, c-format
 msgid "Using UPS power - %s remaining"
 msgstr "Bruker UPS-strøm - %s gjenstår"
 
 #. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:377
+#: ../panels/power/cc-power-panel.c:375
 msgid "Caution low UPS"
 msgstr "Advarsel, lite strøm på UPS"
 
 #. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:382
+#: ../panels/power/cc-power-panel.c:380
 msgid "Using UPS power"
 msgstr "Bruker UPS-strøm"
 
 #. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:434
+#: ../panels/power/cc-power-panel.c:432
 msgid "Your secondary battery is fully charged"
 msgstr "Sekundært batteri er fullt ladet"
 
 #. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:438
+#: ../panels/power/cc-power-panel.c:436
 msgid "Your secondary battery is empty"
 msgstr "Sekundært batteri er tomt"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:521
+#: ../panels/power/cc-power-panel.c:519
 msgid "Wireless mouse"
 msgstr "Trådløs mus"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:525
+#: ../panels/power/cc-power-panel.c:523
 msgid "Wireless keyboard"
 msgstr "Trådløst tastatur"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:529
+#: ../panels/power/cc-power-panel.c:527
 msgid "Uninterruptible power supply"
 msgstr "Avbruddsfri strømforsyning"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:533
+#: ../panels/power/cc-power-panel.c:531
 msgid "Personal digital assistant"
 msgstr "Personlig digital assistent"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:537
+#: ../panels/power/cc-power-panel.c:535
 msgid "Cellphone"
 msgstr "Mobiltelefon"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:541
+#: ../panels/power/cc-power-panel.c:539
 msgid "Media player"
 msgstr "Musikkavspiller"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:545
+#: ../panels/power/cc-power-panel.c:543
 msgid "Tablet"
 msgstr "Tegnebrett"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:549
+#: ../panels/power/cc-power-panel.c:547
 msgid "Computer"
 msgstr "Datamaskin"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:553
+#: ../panels/power/cc-power-panel.c:551
 msgid "Battery"
 msgstr "Batteri"
 
@@ -2392,178 +2392,185 @@
 msgid "10 minutes"
 msgstr "10 minutter"
 
-#: ../panels/power/power.ui.h:5 ../panels/screen/screen.ui.h:8
+#: ../panels/power/power.ui.h:5
+msgid "20 minutes"
+msgstr "20 minutter"
+
+#: ../panels/power/power.ui.h:6 ../panels/screen/screen.ui.h:8
 msgid "30 minutes"
 msgstr "30 minutter"
 
-#: ../panels/power/power.ui.h:6 ../panels/screen/screen.ui.h:9
+#: ../panels/power/power.ui.h:7 ../panels/screen/screen.ui.h:9
 msgid "1 hour"
 msgstr "1 time"
 
-#: ../panels/power/power.ui.h:7
+#: ../panels/power/power.ui.h:8
+msgid "2 hours"
+msgstr "2 timer"
+
+#: ../panels/power/power.ui.h:9
 msgid "Don't suspend"
 msgstr "Ikke sett i hvilemodus"
 
-#: ../panels/power/power.ui.h:8
+#: ../panels/power/power.ui.h:10
 msgid "Suspend"
 msgstr "Sett i hvilemodus"
 
-#: ../panels/power/power.ui.h:10
+#: ../panels/power/power.ui.h:12
 msgid "When battery is present"
 msgstr "Når et batteri er tilstede"
 
-#: ../panels/power/power.ui.h:11
+#: ../panels/power/power.ui.h:13
 msgid "When battery is charging/in use"
 msgstr "Når et batteri lades eller tappes"
 
-#: ../panels/power/power.ui.h:12 ../panels/screen/screen.ui.h:10
+#: ../panels/power/power.ui.h:14 ../panels/screen/screen.ui.h:10
 msgid "Never"
 msgstr "Aldri"
 
-#: ../panels/power/power.ui.h:13
+#: ../panels/power/power.ui.h:15
 msgid "On battery power"
 msgstr "På batteristrøm"
 
-#: ../panels/power/power.ui.h:14
+#: ../panels/power/power.ui.h:16
 msgid "When plugged in"
 msgstr "Når den er koblet til strøm"
 
-#: ../panels/power/power.ui.h:15
+#: ../panels/power/power.ui.h:17
 msgid "Suspend when inactive for"
 msgstr "Hvilemodus etter inaktivitet i"
 
-#: ../panels/power/power.ui.h:16
+#: ../panels/power/power.ui.h:18
 msgid "When power is _critically low"
 msgstr "Når strømmen er _kritisk lav"
 
-#: ../panels/power/power.ui.h:17
+#: ../panels/power/power.ui.h:19
 msgid "When the lid is closed"
 msgstr "Når lokket er lukket"
 
-#: ../panels/power/power.ui.h:18
+#: ../panels/power/power.ui.h:20
 msgid "Show battery status in the _menu bar"
 msgstr "Vis batteristatus på _menylinjen"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:541
+#: ../panels/printers/cc-printers-panel.c:592
 msgid "Low on toner"
 msgstr "Lite toner"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:543
+#: ../panels/printers/cc-printers-panel.c:594
 msgid "Out of toner"
 msgstr "Ikke mer toner"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:546
+#: ../panels/printers/cc-printers-panel.c:597
 msgid "Low on developer"
 msgstr "Lite utvikler"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:549
+#: ../panels/printers/cc-printers-panel.c:600
 msgid "Out of developer"
 msgstr "Ikke mer utvikler"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:551
+#: ../panels/printers/cc-printers-panel.c:602
 msgid "Low on a marker supply"
 msgstr "Lite farge igjen"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:553
+#: ../panels/printers/cc-printers-panel.c:604
 msgid "Out of a marker supply"
 msgstr "Tom for farge"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:555
+#: ../panels/printers/cc-printers-panel.c:606
 msgid "Open cover"
 msgstr "Åpne lokket"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:557
+#: ../panels/printers/cc-printers-panel.c:608
 msgid "Open door"
 msgstr "Åpne døren"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:559
+#: ../panels/printers/cc-printers-panel.c:610
 msgid "Low on paper"
 msgstr "Lite papir"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:561
+#: ../panels/printers/cc-printers-panel.c:612
 msgid "Out of paper"
 msgstr "Ikke mer papir"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:563
+#: ../panels/printers/cc-printers-panel.c:614
 msgctxt "printer state"
 msgid "Offline"
 msgstr "Frakoblet"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:565
+#: ../panels/printers/cc-printers-panel.c:616
 msgctxt "printer state"
 msgid "Paused"
 msgstr "På pause"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:567
+#: ../panels/printers/cc-printers-panel.c:618
 msgid "Waste receptacle almost full"
 msgstr "Søppelkurven er nesten full"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:569
+#: ../panels/printers/cc-printers-panel.c:620
 msgid "Waste receptacle full"
 msgstr "Søppelkurven er full"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:571
+#: ../panels/printers/cc-printers-panel.c:622
 msgid "The optical photo conductor is near end of life"
 msgstr "Bildetrommelen er snart utbrukt"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:573
+#: ../panels/printers/cc-printers-panel.c:624
 msgid "The optical photo conductor is no longer functioning"
 msgstr "Bildetrommelen fungerer ikke lenger"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:748
+#: ../panels/printers/cc-printers-panel.c:784
 msgctxt "printer state"
 msgid "Ready"
 msgstr "Klar"
 
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:752
+#: ../panels/printers/cc-printers-panel.c:788
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Prosesserer"
 
 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:756
+#: ../panels/printers/cc-printers-panel.c:792
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Stoppet"
 
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:868
+#: ../panels/printers/cc-printers-panel.c:909
 msgid "Toner Level"
 msgstr "Tonernivå"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:871
+#: ../panels/printers/cc-printers-panel.c:912
 msgid "Ink Level"
 msgstr "Blekknivå"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:874
+#: ../panels/printers/cc-printers-panel.c:915
 msgid "Supply Level"
 msgstr "Beholdningsnivå"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:889
-#: ../panels/printers/cc-printers-panel.c:1284
+#: ../panels/printers/cc-printers-panel.c:1414
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
@@ -2571,86 +2578,85 @@
 msgstr[1] "%u aktive"
 
 #. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:996
+#: ../panels/printers/cc-printers-panel.c:1110
 msgid "No printers available"
 msgstr "Ingen skrivere tilgjengelig"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:1327
+#: ../panels/printers/pp-jobs-dialog.c:143
 msgctxt "print job"
 msgid "Pending"
 msgstr "Utestående"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:1331
+#: ../panels/printers/pp-jobs-dialog.c:147
 msgctxt "print job"
 msgid "Held"
 msgstr "På hold"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:1335
+#: ../panels/printers/pp-jobs-dialog.c:151
 msgctxt "print job"
 msgid "Processing"
 msgstr "Prosesserer"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:1339
+#: ../panels/printers/pp-jobs-dialog.c:155
 msgctxt "print job"
 msgid "Stopped"
 msgstr "Stoppet"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:1343
+#: ../panels/printers/pp-jobs-dialog.c:159
 msgctxt "print job"
 msgid "Canceled"
 msgstr "Avbrutt"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:1347
+#: ../panels/printers/pp-jobs-dialog.c:163
 msgctxt "print job"
 msgid "Aborted"
 msgstr "Avbrutt med feil"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:1351
+#: ../panels/printers/pp-jobs-dialog.c:167
 msgctxt "print job"
 msgid "Completed"
 msgstr "Fullført"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:1431
+#: ../panels/printers/pp-jobs-dialog.c:289
 msgid "Job Title"
 msgstr "Jobbtittel"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:1440
+#: ../panels/printers/pp-jobs-dialog.c:298
 msgid "Job State"
 msgstr "Tilstand for jobb"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:1446
+#: ../panels/printers/pp-jobs-dialog.c:304
 msgid "Time"
 msgstr "Tid"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:2068
+#: ../panels/printers/cc-printers-panel.c:1734
 msgid "Failed to add new printer."
 msgstr "Klarte ikke å legge til ny skriver."
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2272
-#: ../panels/printers/cc-printers-panel.c:2286
+#: ../panels/printers/cc-printers-panel.c:2457
+#: ../panels/printers/cc-printers-panel.c:2480
 msgid "Test page"
 msgstr "Testside"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2535
+#: ../panels/printers/cc-printers-panel.c:2883
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Klarte ikke å laste brukergrensesnitt: %s"
 
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:147
 msgid "Printers"
 msgstr "Skrivere"
 
@@ -2663,7 +2669,7 @@
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr "Skriver;Kø;Utskrift;Papir;Blekk;Toner;"
 
-#: ../panels/printers/new-printer-dialog.ui.h:1
+#: ../panels/printers/new-printer-dialog.ui.h:3
 msgid "Add a New Printer"
 msgstr "Legg til ny skriver"
 
@@ -2675,7 +2681,8 @@
 msgid "_Search by Address"
 msgstr "_Søk etter adresse"
 
-#: ../panels/printers/new-printer-dialog.ui.h:5
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/user-accounts/um-account-dialog.c:1070
 msgid "_Add"
 msgstr "_Legg til"
 
@@ -2768,7 +2775,7 @@
 msgid "Jobs"
 msgstr "Jobber"
 
-#. Tanslators: Switch to tab containing printer's jobs
+#. Tanslators: Opens a dialog containing printer's jobs
 #: ../panels/printers/printers.ui.h:11
 msgid "_Show"
 msgstr "Vi_s"
@@ -2778,12 +2785,12 @@
 msgstr "Modell"
 
 #. Translators: This button executes command which prints test page.
-#: ../panels/printers/printers.ui.h:15
+#: ../panels/printers/printers.ui.h:20
 msgid "Print _Test Page"
 msgstr "Skriv ut _testside"
 
 #. Translators: This button opens printer's options tab
-#: ../panels/printers/printers.ui.h:17
+#: ../panels/printers/printers.ui.h:22
 msgid "_Options"
 msgstr "_Alternativer"
 
@@ -2797,15 +2804,15 @@
 msgid "Active Print Jobs"
 msgstr "Aktive utskriftsjobber"
 
-#: ../panels/printers/printers.ui.h:22
+#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Resume Printing"
 msgstr "Gjenoppta utskrift"
 
-#: ../panels/printers/printers.ui.h:23
+#: ../panels/printers/jobs-dialog.ui.h:6
 msgid "Pause Printing"
 msgstr "Sett utskrift på pause"
 
-#: ../panels/printers/printers.ui.h:24
+#: ../panels/printers/jobs-dialog.ui.h:7
 msgid "Cancel Print Job"
 msgstr "Avbryt utskriftsjobb"
 
@@ -2827,12 +2834,12 @@
 msgstr "Tilatte brukere"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:31
+#: ../panels/printers/printers.ui.h:24
 msgid "Add New Printer"
 msgstr "Legg til ny skriver"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:33
+#: ../panels/printers/printers.ui.h:26
 msgid ""
 "Sorry! The system printing service\n"
 "doesn't seem to be available."
@@ -2853,11 +2860,11 @@
 msgid "Language;Layout;Keyboard;"
 msgstr "Språk;Oppsett;Utforming;Tastatur;"
 
-#: ../panels/region/gnome-region-panel-formats.c:142
+#: ../panels/region/gnome-region-panel-formats.c:143
 msgid "Imperial"
 msgstr "Imperisk"
 
-#: ../panels/region/gnome-region-panel-formats.c:144
+#: ../panels/region/gnome-region-panel-formats.c:145
 msgid "Metric"
 msgstr "Metrisk"
 
@@ -2869,7 +2876,7 @@
 msgid "Preview"
 msgstr "Forhåndsvis"
 
-#: ../panels/region/gnome-region-panel-layout-chooser.ui.h:3
+#: ../panels/region/gnome-region-panel-input-chooser.ui.h:2
 msgid "Select an input source to add"
 msgstr "Velg en inndatakilde som skal legges til"
 
@@ -2877,7 +2884,7 @@
 msgid "Keyboard Layout Options"
 msgstr "Alternativer for tastaturoppsett"
 
-#: ../panels/region/gnome-region-panel-system.c:420
+#: ../panels/region/gnome-region-panel-system.c:512
 msgid ""
 "The login screen, system accounts and new user accounts use the system-wide "
 "Region and Language settings."
@@ -2885,8 +2892,8 @@
 "Innloggingsskjermen, systemkontoene og nye brukerkontoer bruker systemets "
 "innstillinger for område og språk."
 
-#: ../panels/region/gnome-region-panel-system.c:425
-#: ../panels/region/gnome-region-panel.ui.h:32
+#: ../panels/region/gnome-region-panel-system.c:517
+#: ../panels/region/gnome-region-panel.ui.h:33
 msgid ""
 "The login screen, system accounts and new user accounts use the system-wide "
 "Region and Language settings. You may change the system settings to match "
@@ -2896,12 +2903,12 @@
 "innstillinger for område og språk. Du kan sette systeminnstillingene slik du "
 "ønsker."
 
-#: ../panels/region/gnome-region-panel-system.c:428
+#: ../panels/region/gnome-region-panel-system.c:520
 msgid "Copy Settings"
 msgstr "Kopier innstillinger"
 
-#: ../panels/region/gnome-region-panel-system.c:431
-#: ../panels/region/gnome-region-panel.ui.h:39
+#: ../panels/region/gnome-region-panel-system.c:523
+#: ../panels/region/gnome-region-panel.ui.h:40
 msgid "Copy Settings..."
 msgstr "Kopier innstillinger …"
 
@@ -2915,11 +2922,11 @@
 msgstr ""
 "Velg et visningsspråk. Endringen vil tas i bruk neste gang du logger inn"
 
-#: ../panels/region/gnome-region-panel.ui.h:3
+#: ../panels/region/gnome-region-panel.ui.h:4
 msgid "Install languages..."
 msgstr "Installer språk …"
 
-#: ../panels/region/gnome-region-panel.ui.h:4
+#: ../panels/region/gnome-region-panel.ui.h:3
 msgid "Add Language"
 msgstr "Legg til språk"
 
@@ -2927,47 +2934,47 @@
 msgid "Remove Language"
 msgstr "Fjern språk"
 
-#: ../panels/region/gnome-region-panel.ui.h:6
+#: ../panels/region/gnome-region-panel.ui.h:5
 msgid "Language"
 msgstr "Språk"
 
-#: ../panels/region/gnome-region-panel.ui.h:7
+#: ../panels/region/gnome-region-panel.ui.h:6
 msgid "Select a region (change will be applied the next time you log in)"
 msgstr "Velg en region. Endringen vil tas i bruk neste gang du logger inn"
 
-#: ../panels/region/gnome-region-panel.ui.h:8
+#: ../panels/region/gnome-region-panel.ui.h:7
 msgid "Add Region"
 msgstr "Legg til region"
 
-#: ../panels/region/gnome-region-panel.ui.h:9
+#: ../panels/region/gnome-region-panel.ui.h:8
 msgid "Remove Region"
 msgstr "Fjern region"
 
-#: ../panels/region/gnome-region-panel.ui.h:10
+#: ../panels/region/gnome-region-panel.ui.h:9
 msgid "Dates"
 msgstr "Datoer"
 
-#: ../panels/region/gnome-region-panel.ui.h:11
+#: ../panels/region/gnome-region-panel.ui.h:10
 msgid "Times"
 msgstr "Tid"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
+#: ../panels/region/gnome-region-panel.ui.h:11
 msgid "Numbers"
 msgstr "Tall"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
+#: ../panels/region/gnome-region-panel.ui.h:12
 msgid "Currency"
 msgstr "Valuta"
 
-#: ../panels/region/gnome-region-panel.ui.h:14
+#: ../panels/region/gnome-region-panel.ui.h:13
 msgid "Measurement"
 msgstr "Måleenheter"
 
-#: ../panels/region/gnome-region-panel.ui.h:15
+#: ../panels/region/gnome-region-panel.ui.h:14
 msgid "Examples"
 msgstr "Eksempler"
 
-#: ../panels/region/gnome-region-panel.ui.h:16
+#: ../panels/region/gnome-region-panel.ui.h:15
 msgid "Formats"
 msgstr "Formater"
 
@@ -3028,23 +3035,23 @@
 msgstr "Oppsett"
 
 #. 'display' means 'output' here, as in 'translated messages that are displayed to the user'
-#: ../panels/region/gnome-region-panel.ui.h:34
+#: ../panels/region/gnome-region-panel.ui.h:35
 msgid "Display language:"
 msgstr "Vis språk:"
 
-#: ../panels/region/gnome-region-panel.ui.h:35
+#: ../panels/region/gnome-region-panel.ui.h:36
 msgid "Input source:"
 msgstr "Inngangskilde:"
 
-#: ../panels/region/gnome-region-panel.ui.h:36
+#: ../panels/region/gnome-region-panel.ui.h:37
 msgid "Format:"
 msgstr "Format:"
 
-#: ../panels/region/gnome-region-panel.ui.h:37
+#: ../panels/region/gnome-region-panel.ui.h:38
 msgid "Your settings"
 msgstr "Dine innstillinger"
 
-#: ../panels/region/gnome-region-panel.ui.h:38
+#: ../panels/region/gnome-region-panel.ui.h:39
 msgid "System settings"
 msgstr "Systeminnstillinger"
 
@@ -3052,9 +3059,7 @@
 msgid "Layout"
 msgstr "Utseende"
 
-#: ../panels/region/gnome-region-panel-xkbot.c:229
 #: ../panels/sound/gvc-sound-theme-chooser.c:585
-#: ../panels/sound-nua/gvc-sound-theme-chooser.c:586
 msgid "Default"
 msgstr "Forvalg"
 
@@ -3120,19 +3125,19 @@
 msgid "Locations..."
 msgstr "Steder …"
 
-#: ../panels/screen/screen.ui.h:19
+#: ../panels/screen/screen.ui.h:20
 msgid "Lock"
 msgstr "Lås"
 
-#: ../panels/sound/applet-main.c:49 ../panels/sound-nua/applet-main.c:49
+#: ../panels/sound/applet-main.c:49
 msgid "Enable debugging code"
 msgstr "Aktiver feilsøkingsmodus"
 
-#: ../panels/sound/applet-main.c:50 ../panels/sound-nua/applet-main.c:50
+#: ../panels/sound/applet-main.c:50
 msgid "Version of this application"
 msgstr "Versjon av dette programmet"
 
-#: ../panels/sound/applet-main.c:62 ../panels/sound-nua/applet-main.c:62
+#: ../panels/sound/applet-main.c:62
 msgid " — GNOME Volume Control Applet"
 msgstr " – Panelprogram for volumkontroll"
 
@@ -3155,7 +3160,6 @@
 msgstr "Endre lydvolum og lydeffekter"
 
 #. Translators: those are keywords for the sound control-center panel
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
 #: ../panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in.h:4
 msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;"
 msgstr "Kort;Mikrofon;Volum;Fade;Balanse;Bluetooth;Hodetelefon;"
@@ -3184,23 +3188,21 @@
 msgid "Sonar"
 msgstr "Sonar"
 
-#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1768
-#: ../panels/sound-nua/gvc-applet.c:270
-#: ../panels/sound-nua/gvc-mixer-dialog.c:1766
+#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1656
+#: ../panels/sound-nua/gvc-mixer-dialog.c:1770
 msgid "Output"
 msgstr "Utgang"
 
-#: ../panels/sound/gvc-applet.c:272 ../panels/sound-nua/gvc-applet.c:272
+#: ../panels/sound/gvc-applet.c:272
 msgid "Sound Output Volume"
 msgstr "Utgangsvolum for lyd"
 
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1809
-#: ../panels/sound-nua/gvc-applet.c:276
-#: ../panels/sound-nua/gvc-mixer-dialog.c:1899
+#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1697
+#: ../panels/sound-nua/gvc-mixer-dialog.c:1903
 msgid "Input"
 msgstr "Inngang"
 
-#: ../panels/sound/gvc-applet.c:278 ../panels/sound-nua/gvc-applet.c:278
+#: ../panels/sound/gvc-applet.c:278
 msgid "Microphone Volume"
 msgstr "Volum for mikrofon"
 
@@ -3255,28 +3257,24 @@
 msgid "_Subwoofer:"
 msgstr "_Basselement:"
 
-#: ../panels/sound/gvc-channel-bar.c:603 ../panels/sound/gvc-channel-bar.c:612
-#: ../panels/sound-nua/gvc-channel-bar.c:603
-#: ../panels/sound-nua/gvc-channel-bar.c:612
+#: ../panels/sound/gvc-channel-bar.c:613 ../panels/sound/gvc-channel-bar.c:622
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:607
-#: ../panels/sound-nua/gvc-channel-bar.c:607
+#: ../panels/sound/gvc-channel-bar.c:617
 msgctxt "volume"
 msgid "Unamplified"
 msgstr "Ikke forsterket"
 
-#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:1622
-#: ../panels/sound-nua/gvc-combo-box.c:167
+#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:260
+#: ../panels/sound/gvc-mixer-dialog.c:521
 msgid "_Profile:"
 msgstr "_Profil:"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1094
-#: ../panels/sound-nua/gvc-mixer-control.c:1835
+#: ../panels/sound/gvc-mixer-control.c:1841
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -3285,16 +3283,14 @@
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1104
-#: ../panels/sound-nua/gvc-mixer-control.c:1845
+#: ../panels/sound/gvc-mixer-control.c:1851
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u inngang"
 msgstr[1] "%u innganger"
 
-#: ../panels/sound/gvc-mixer-control.c:1402
-#: ../panels/sound-nua/gvc-mixer-control.c:2362
+#: ../panels/sound/gvc-mixer-control.c:2375
 msgid "System Sounds"
 msgstr "Systemlyder"
 
@@ -3303,54 +3299,51 @@
 msgid "Co_nnector:"
 msgstr "Tilkobli_ng:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:541
+#: ../panels/sound/gvc-mixer-dialog.c:426
 #: ../panels/sound-nua/gvc-mixer-dialog.c:343
 msgid "Peak detect"
 msgstr "Bestem høyeste nivå"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1497
-#: ../panels/sound/gvc-mixer-dialog.c:1710
+#: ../panels/sound/gvc-mixer-dialog.c:1506
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
-#: ../panels/sound-nua/gvc-mixer-dialog.c:1596
-#: ../panels/sound-nua/gvc-sound-theme-chooser.c:596
+#: ../panels/sound-nua/gvc-mixer-dialog.c:1600
 msgid "Name"
 msgstr "Navn"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1564
-#: ../panels/sound-nua/gvc-mixer-dialog.c:1698
+#: ../panels/sound/gvc-mixer-dialog.c:1588
+#: ../panels/sound-nua/gvc-mixer-dialog.c:1702
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "Test av høyttaler for %s"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1623
+#: ../panels/sound/gvc-mixer-dialog.c:262
 msgid "_Test Speakers"
 msgstr "_Test høyttalere"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1754
-#: ../panels/sound-nua/gvc-mixer-dialog.c:2039
+#: ../panels/sound/gvc-mixer-dialog.c:1642
+#: ../panels/sound-nua/gvc-mixer-dialog.c:2043
 msgid "_Output volume:"
 msgstr "_Utgangsvolum:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1773
+#: ../panels/sound/gvc-mixer-dialog.c:1661
 msgid "C_hoose a device for sound output:"
 msgstr "_Velg en enhet som lydutgang:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1798
-#: ../panels/sound/gvc-mixer-dialog.c:1927
+#: ../panels/sound/gvc-mixer-dialog.c:1686
 msgid "Settings for the selected device:"
 msgstr "Innstillinger for valgt enhet:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1816
-#: ../panels/sound-nua/gvc-mixer-dialog.c:1946
+#: ../panels/sound/gvc-mixer-dialog.c:1704
+#: ../panels/sound-nua/gvc-mixer-dialog.c:1950
 msgid "_Input volume:"
 msgstr "_Inngangsvolum:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1839
-#: ../panels/sound-nua/gvc-mixer-dialog.c:1979
+#: ../panels/sound/gvc-mixer-dialog.c:1727
+#: ../panels/sound-nua/gvc-mixer-dialog.c:1983
 msgid "Input level:"
 msgstr "Inngangsnivå:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1867
+#: ../panels/sound/gvc-mixer-dialog.c:1755
 msgid "C_hoose a device for sound input:"
 msgstr "_Velg en enhet som lydinngang:"
 
@@ -3362,104 +3355,86 @@
 msgid "C_hoose a device to configure:"
 msgstr "_Velg en enhet å konfigurere:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1938
-#: ../panels/sound-nua/gvc-mixer-dialog.c:2000
+#: ../panels/sound/gvc-mixer-dialog.c:1782
+#: ../panels/sound-nua/gvc-mixer-dialog.c:2004
 msgid "Sound Effects"
 msgstr "Lydeffekter"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1945
-#: ../panels/sound-nua/gvc-mixer-dialog.c:2007
+#: ../panels/sound/gvc-mixer-dialog.c:1789
+#: ../panels/sound-nua/gvc-mixer-dialog.c:2011
 msgid "_Alert volume:"
 msgstr "V_arselvolum:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1958
-#: ../panels/sound-nua/gvc-mixer-dialog.c:2020
+#: ../panels/sound/gvc-mixer-dialog.c:1802
+#: ../panels/sound-nua/gvc-mixer-dialog.c:2024
 msgid "Applications"
 msgstr "Programmer"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1962
-#: ../panels/sound-nua/gvc-mixer-dialog.c:2024
+#: ../panels/sound/gvc-mixer-dialog.c:1806
+#: ../panels/sound-nua/gvc-mixer-dialog.c:2028
 msgid "No application is currently playing or recording audio."
 msgstr "Ingen programmer spiller av eller tar opp lyd."
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:189
-#: ../panels/sound-nua/gvc-sound-theme-chooser.c:190
 msgid "Built-in"
 msgstr "Innebygget"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:455
 #: ../panels/sound/gvc-sound-theme-chooser.c:467
 #: ../panels/sound/gvc-sound-theme-chooser.c:479
-#: ../panels/sound-nua/gvc-sound-theme-chooser.c:456
-#: ../panels/sound-nua/gvc-sound-theme-chooser.c:468
-#: ../panels/sound-nua/gvc-sound-theme-chooser.c:480
 msgid "Sound Preferences"
 msgstr "Brukervalg for lyd"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:458
 #: ../panels/sound/gvc-sound-theme-chooser.c:469
 #: ../panels/sound/gvc-sound-theme-chooser.c:481
-#: ../panels/sound-nua/gvc-sound-theme-chooser.c:459
-#: ../panels/sound-nua/gvc-sound-theme-chooser.c:470
-#: ../panels/sound-nua/gvc-sound-theme-chooser.c:482
 msgid "Testing event sound"
 msgstr "Tester lyd for hendelse"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:586
-#: ../panels/sound-nua/gvc-sound-theme-chooser.c:587
 msgid "From theme"
 msgstr "Fra tema"
 
 #: ../panels/sound/gvc-sound-theme-chooser.c:770
-#: ../panels/sound-nua/gvc-sound-theme-chooser.c:782
 msgid "C_hoose an alert sound:"
 msgstr "_Velg en varsellyd:"
 
-#: ../panels/sound/gvc-speaker-test.c:221
-#: ../panels/sound-nua/gvc-speaker-test.c:221
+#: ../panels/sound/gvc-speaker-test.c:220
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../panels/sound/gvc-speaker-test.c:221
-#: ../panels/sound/gvc-speaker-test.c:333
-#: ../panels/sound-nua/gvc-speaker-test.c:221
-#: ../panels/sound-nua/gvc-speaker-test.c:333
+#: ../panels/sound/gvc-speaker-test.c:220
+#: ../panels/sound/gvc-speaker-test.c:332
 msgid "Test"
 msgstr "Test"
 
-#: ../panels/sound/gvc-speaker-test.c:229
-#: ../panels/sound-nua/gvc-speaker-test.c:229
+#: ../panels/sound/gvc-speaker-test.c:228
 msgid "Subwoofer"
 msgstr "Basselement"
 
 #: ../panels/sound/gvc-stream-status-icon.c:236
-#: ../panels/sound-nua/gvc-stream-status-icon.c:235
 #, c-format
 msgid "Failed to start Sound Preferences: %s"
 msgstr "Klarte ikke å starte brukervalg for lyd: %s"
 
 #: ../panels/sound/gvc-stream-status-icon.c:262
-#: ../panels/sound-nua/gvc-stream-status-icon.c:261
 msgid "_Mute"
 msgstr "_Demp"
 
 #: ../panels/sound/gvc-stream-status-icon.c:271
-#: ../panels/sound-nua/gvc-stream-status-icon.c:270
 msgid "_Sound Preferences"
 msgstr "Brukervalg for _lyd"
 
 #: ../panels/sound/gvc-stream-status-icon.c:416
-#: ../panels/sound-nua/gvc-stream-status-icon.c:415
 msgid "Muted"
 msgstr "Dempet"
 
 #: ../panels/sound/sound-theme-file-utils.c:292
-#: ../panels/sound-nua/sound-theme-file-utils.c:292
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../panels/universal-access/cc-ua-panel.c:522
-#: ../panels/universal-access/cc-ua-panel.c:528
+#: ../panels/universal-access/cc-ua-panel.c:289
+#: ../panels/universal-access/cc-ua-panel.c:295
 msgid "No shortcut set"
 msgstr "Ingen snarvei satt"
 
@@ -3476,7 +3451,7 @@
 "Tastatur;Mus;a11y;Tilgjengelighet;Kontrast;Zoom;Skjermleser;tekst;skrift;stør"
 "relse;AccessX;Klebrige taster;Trege taster;Sprettetaster;Mustaster;"
 
-#: ../panels/universal-access/uap.ui.h:1
+#: ../panels/universal-access/uap.ui.h:5
 msgid "On screen keyboard"
 msgstr "Tastatur på skjermen"
 
@@ -3492,51 +3467,51 @@
 msgid "Caribou"
 msgstr "Caribou"
 
-#: ../panels/universal-access/uap.ui.h:7
+#: ../panels/universal-access/uap.ui.h:10
 #, no-c-format
 msgid "75%"
 msgstr "75%"
 
-#: ../panels/universal-access/uap.ui.h:8
+#: ../panels/universal-access/uap.ui.h:11
 msgctxt "universal access, text size"
 msgid "Small"
 msgstr "Liten"
 
-#: ../panels/universal-access/uap.ui.h:10
+#: ../panels/universal-access/uap.ui.h:13
 #, no-c-format
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/universal-access/uap.ui.h:11
+#: ../panels/universal-access/uap.ui.h:14
 msgctxt "universal access, text size"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: ../panels/universal-access/uap.ui.h:16
 #, no-c-format
 msgid "125%"
 msgstr "125%"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: ../panels/universal-access/uap.ui.h:17
 msgctxt "universal access, text size"
 msgid "Large"
 msgstr "Stor"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: ../panels/universal-access/uap.ui.h:19
 #, no-c-format
 msgid "150%"
 msgstr "150%"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: ../panels/universal-access/uap.ui.h:20
 msgctxt "universal access, text size"
 msgid "Larger"
 msgstr "Større"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: ../panels/universal-access/uap.ui.h:6
 msgid "GOK"
 msgstr "GOK"
 
-#: ../panels/universal-access/uap.ui.h:19
+#: ../panels/universal-access/uap.ui.h:7
 msgid "OnBoard"
 msgstr "OnBoard"
 
@@ -3566,19 +3541,19 @@
 msgid "Display"
 msgstr "Vis"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: ../panels/universal-access/uap.ui.h:25
 msgid "Turn on or off:"
 msgstr "Slå på eller av:"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: ../panels/universal-access/uap.ui.h:27
 msgid "Zoom in:"
 msgstr "Zoom inn:"
 
-#: ../panels/universal-access/uap.ui.h:29
+#: ../panels/universal-access/uap.ui.h:28
 msgid "Zoom out:"
 msgstr "Zoom ut:"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: ../panels/universal-access/uap.ui.h:23
 msgid "Options..."
 msgstr "Alternativer …"
 
@@ -3588,7 +3563,7 @@
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../panels/universal-access/uap.ui.h:33
+#: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "Skjermleser"
 
@@ -3596,11 +3571,11 @@
 msgid "Beep when Caps and Num Lock are used"
 msgstr "Pip når Caps og Num Lock er i bruk"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: ../panels/universal-access/uap.ui.h:30
 msgid "Seeing"
 msgstr "Syn"
 
-#: ../panels/universal-access/uap.ui.h:36
+#: ../panels/universal-access/uap.ui.h:32
 msgid "Use a visual indication when an alert sound occurs"
 msgstr "Bruk en visuell indikasjon når en varsellyd spilles av"
 
@@ -3608,27 +3583,27 @@
 msgid "_Test flash"
 msgstr "_Test blinking"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: ../panels/universal-access/uap.ui.h:33
 msgid "Flash the window title"
 msgstr "La tittelfeltet i vinduet blinke"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: ../panels/universal-access/uap.ui.h:34
 msgid "Flash the entire screen"
 msgstr "La hele skjermen blinke"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: ../panels/universal-access/uap.ui.h:31
 msgid "Visual Alerts"
 msgstr "Synlige varsel"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: ../panels/universal-access/uap.ui.h:36
 msgid "Display a textual description of speech and sounds"
 msgstr "Vis en tekstlig beskrivelse av tale og lyder"
 
-#: ../panels/universal-access/uap.ui.h:42
+#: ../panels/universal-access/uap.ui.h:35
 msgid "Closed Captioning"
 msgstr "Lukket bildetekst"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: ../panels/universal-access/uap.ui.h:39
 msgid "Hearing"
 msgstr "Hørsel"
 
@@ -3644,75 +3619,75 @@
 msgid "_Turn on accessibility features from the keyboard"
 msgstr "Slå på funksjoner for tilgjengelighet fra tastaturet"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: ../panels/universal-access/uap.ui.h:42
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "Behandler en sekvens med endringstaster som en tastekombinasjon"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: ../panels/universal-access/uap.ui.h:43
 msgid "_Disable if two keys are pressed together"
 msgstr "_Slå av hvis to taster trykkes ned samtidig"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:44
 msgid "Beep when a _modifer key is pressed"
 msgstr "Pip når e_ndringstast er trykket ned"
 
-#: ../panels/universal-access/uap.ui.h:51
+#: ../panels/universal-access/uap.ui.h:41
 msgid "Sticky Keys"
 msgstr "Klebrige taster"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: ../panels/universal-access/uap.ui.h:46
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "Setter inn en pause fra en tast trykkes ned til den godtas"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: ../panels/universal-access/uap.ui.h:47
 msgid "A_cceptance delay:"
 msgstr "_Pause før aksept:"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:50
 msgid "Slow keys typing delay"
 msgstr "Pause for tasting med trege taster"
 
 #. This string is part of a line of checkboxes: Beep when a key is [ ] pressed  [ ] accepted  [ ] rejected
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:54
 msgid "Beep when a key is"
 msgstr "Pip når en tast"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:56
 msgid "pressed"
 msgstr "trykket"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:58
 msgid "accepted"
 msgstr "godtatt"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:60
 msgid "rejected"
 msgstr "avvist"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:45
 msgid "Slow Keys"
 msgstr "Trege taster"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Ignores fast duplicate keypresses"
 msgstr "Ignorer raskt dupliserte tastaturtrykk"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Acc_eptance delay:"
 msgstr "Paus_e før aksept:"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Bounce keys typing delay"
 msgstr "Pause for tasting med sprettetaster"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:65
 msgid "Beep when a key is _rejected"
 msgstr "Pip nå_r en tast avvises"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Bounce Keys"
 msgstr "Sprettetaster"
 
@@ -3720,74 +3695,74 @@
 msgid "Type here to test settings"
 msgstr "Skriv her for å prøve ut innstillinger"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Control the pointer using the keypad"
 msgstr "Kontroller peker med det numeriske tastaturet"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Mouse Keys"
 msgstr "Mustaster"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:72
 msgid "Control the pointer using the video camera."
 msgstr "Kontroller pekeren med videokamera."
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Video Mouse"
 msgstr "Videomus"
 
-#: ../panels/universal-access/uap.ui.h:80
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "Utløs sekundærklikk ved å holde nede primærknappen"
 
-#: ../panels/universal-access/uap.ui.h:81
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Secondary click delay"
 msgstr "Pause for sekundært klikk"
 
-#: ../panels/universal-access/uap.ui.h:82
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Simulated Secondary Click"
 msgstr "Simulert andreklikk"
 
-#: ../panels/universal-access/uap.ui.h:83
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Trigger a click when the pointer hovers"
 msgstr "Initier klikk når pekeren henger over et punkt"
 
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:78
 msgid "D_elay:"
 msgstr "Paus_e:"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:79
 msgid "Motion _threshold:"
 msgstr "_Terskel for bevegelse:"
 
-#: ../panels/universal-access/uap.ui.h:90
+#: ../panels/universal-access/uap.ui.h:76
 msgid "Hover Click"
 msgstr "Dwell-klikk"
 
-#: ../panels/universal-access/uap.ui.h:91
+#: ../panels/universal-access/uap.ui.h:84
 msgid "Mouse Settings"
 msgstr "Innstillinger for mus"
 
-#: ../panels/universal-access/uap.ui.h:92
+#: ../panels/universal-access/uap.ui.h:85
 msgid "Pointing and Clicking"
 msgstr "Pek og klikk"
 
-#: ../panels/universal-access/uap.ui.h:93
+#: ../panels/universal-access/uap.ui.h:1
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "Lav"
 
-#: ../panels/universal-access/uap.ui.h:94
+#: ../panels/universal-access/uap.ui.h:2
 msgctxt "universal access, contrast"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panels/universal-access/uap.ui.h:95
+#: ../panels/universal-access/uap.ui.h:3
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "Høy"
 
-#: ../panels/universal-access/uap.ui.h:96
+#: ../panels/universal-access/uap.ui.h:4
 msgctxt "universal access, contrast"
 msgid "High/Inverse"
 msgstr "Høy/omvendt"
@@ -3804,89 +3779,89 @@
 msgid "3/4 Screen"
 msgstr "Trekvart skjerm"
 
-#: ../panels/universal-access/zoom-options.ui.h:1
+#: ../panels/universal-access/zoom-options.ui.h:6
 msgid "Zoom Options"
 msgstr "Alternativer for zoom"
 
-#: ../panels/universal-access/zoom-options.ui.h:2
+#: ../panels/universal-access/zoom-options.ui.h:8
 msgid "Magnification:"
 msgstr "Forstørrelse:"
 
-#: ../panels/universal-access/zoom-options.ui.h:3
+#: ../panels/universal-access/zoom-options.ui.h:9
 msgid "Follow mouse cursor"
 msgstr "Følg muspeker"
 
-#: ../panels/universal-access/zoom-options.ui.h:4
+#: ../panels/universal-access/zoom-options.ui.h:10
 msgid "Screen part:"
 msgstr "Del av skjermen:"
 
-#: ../panels/universal-access/zoom-options.ui.h:5
+#: ../panels/universal-access/zoom-options.ui.h:11
 msgid "Magnifier extends outside of screen"
 msgstr "Forstørrelsesglass fortsetter utenfor skjermen"
 
-#: ../panels/universal-access/zoom-options.ui.h:6
+#: ../panels/universal-access/zoom-options.ui.h:12
 msgid "Keep magnifier cursor centered"
 msgstr "Hold forstørrelsesglasspeker sentrert"
 
-#: ../panels/universal-access/zoom-options.ui.h:7
+#: ../panels/universal-access/zoom-options.ui.h:13
 msgid "Magnifier cursor pushes contents around"
 msgstr "Forstørrelsesglasspeker dytter innholdet rundt"
 
-#: ../panels/universal-access/zoom-options.ui.h:8
+#: ../panels/universal-access/zoom-options.ui.h:14
 msgid "Magnifier cursor moves with contents"
 msgstr "Forstørrelsesglasspeker flytter seg med innholdet"
 
-#: ../panels/universal-access/zoom-options.ui.h:9
+#: ../panels/universal-access/zoom-options.ui.h:15
 msgid "Magnifier Position:"
 msgstr "Posisjon for forstørrelse:"
 
-#: ../panels/universal-access/zoom-options.ui.h:10
+#: ../panels/universal-access/zoom-options.ui.h:17
 msgid "Thickness:"
 msgstr "Tykkelse:"
 
 #. short delay
-#: ../panels/universal-access/zoom-options.ui.h:12
+#: ../panels/universal-access/zoom-options.ui.h:19
 msgid "Thin"
 msgstr "Tynn"
 
 #. long delay
-#: ../panels/universal-access/zoom-options.ui.h:14
+#: ../panels/universal-access/zoom-options.ui.h:21
 msgid "Thick"
 msgstr "Tykk"
 
-#: ../panels/universal-access/zoom-options.ui.h:15
+#: ../panels/universal-access/zoom-options.ui.h:22
 msgid "Length:"
 msgstr "Lengde:"
 
-#: ../panels/universal-access/zoom-options.ui.h:16
+#: ../panels/universal-access/zoom-options.ui.h:23
 msgid "Color:"
 msgstr "Farge:"
 
-#: ../panels/universal-access/zoom-options.ui.h:17
+#: ../panels/universal-access/zoom-options.ui.h:24
 msgid "Crosshairs:"
 msgstr "Siktekryss:"
 
-#: ../panels/universal-access/zoom-options.ui.h:18
+#: ../panels/universal-access/zoom-options.ui.h:25
 msgid "Overlaps mouse cursor"
 msgstr "Overlapper med muspeker"
 
-#: ../panels/universal-access/zoom-options.ui.h:19
+#: ../panels/universal-access/zoom-options.ui.h:1
 msgid "Full Screen"
 msgstr "Full skjerm"
 
-#: ../panels/universal-access/zoom-options.ui.h:20
+#: ../panels/universal-access/zoom-options.ui.h:2
 msgid "Top Half"
 msgstr "Øverste halvdel"
 
-#: ../panels/universal-access/zoom-options.ui.h:21
+#: ../panels/universal-access/zoom-options.ui.h:3
 msgid "Bottom Half"
 msgstr "Nederste halvdel"
 
-#: ../panels/universal-access/zoom-options.ui.h:22
+#: ../panels/universal-access/zoom-options.ui.h:4
 msgid "Left Half"
 msgstr "Venstre halvdel"
 
-#: ../panels/universal-access/zoom-options.ui.h:23
+#: ../panels/universal-access/zoom-options.ui.h:5
 msgid "Right Half"
 msgstr "Høyre halvdel"
 
@@ -3904,7 +3879,7 @@
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: ../panels/user-accounts/data/account-dialog.ui.h:6
 msgid "_Username"
 msgstr "Br_ukernavn"
 
@@ -3912,7 +3887,7 @@
 msgid "Create new account"
 msgstr "Lag ny konto"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:5
+#: ../panels/user-accounts/data/account-dialog.ui.h:7
 msgid "_Full name"
 msgstr "_Fullt navn"
 
@@ -4091,10 +4066,14 @@
 msgid "Photograph"
 msgstr "Bilde"
 
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
 #: ../panels/user-accounts/data/photo-dialog.ui.h:8
+#: ../panels/user-accounts/um-account-dialog.c:1069
 msgid "Cancel"
 msgstr "Avbryt"
 
+#: ../panels/background/cc-background-chooser-dialog.c:286
+#: ../panels/printers/ppd-selection-dialog.ui.h:3
 #: ../panels/user-accounts/data/photo-dialog.ui.h:9
 #: ../panels/user-accounts/um-photo-dialog.c:98
 msgid "Select"
@@ -4120,6 +4099,7 @@
 msgid "Login Options"
 msgstr "Alternativer for pålogging"
 
+#: ../panels/user-accounts/data/account-dialog.ui.h:11
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
 msgid "_Password"
 msgstr "_Passord"
@@ -4145,7 +4125,7 @@
 msgstr "Autentisering feilet"
 
 #: ../panels/user-accounts/run-passwd.c:504
-#: ../panels/user-accounts/um-password-dialog.c:376
+#: ../panels/user-accounts/um-password-dialog.c:240
 #, c-format
 msgid "The new password is too short"
 msgstr "Det nye passordet er for kort"
@@ -4287,73 +4267,73 @@
 msgid "More choices..."
 msgstr "Flere valg …"
 
-#: ../panels/user-accounts/um-password-dialog.c:286
+#: ../panels/user-accounts/um-password-dialog.c:151
 msgid "Please choose another password."
 msgstr "Vennligst velg et annet passord."
 
-#: ../panels/user-accounts/um-password-dialog.c:295
+#: ../panels/user-accounts/um-password-dialog.c:160
 msgid "Please type your current password again."
 msgstr "Vennligst skriv inn nåværende passord igjen."
 
-#: ../panels/user-accounts/um-password-dialog.c:301
+#: ../panels/user-accounts/um-password-dialog.c:166
 msgid "Password could not be changed"
 msgstr "Passordet kunne ikke endres"
 
-#: ../panels/user-accounts/um-password-dialog.c:373
+#: ../panels/user-accounts/um-password-dialog.c:237
 msgid "You need to enter a new password"
 msgstr "Du må skrive inn et nytt passord"
 
-#: ../panels/user-accounts/um-password-dialog.c:382
+#: ../panels/user-accounts/um-password-dialog.c:246
 msgid "You need to confirm the password"
 msgstr "Du må bekrefte passordet"
 
-#: ../panels/user-accounts/um-password-dialog.c:385
+#: ../panels/user-accounts/um-password-dialog.c:249
 msgid "The passwords do not match"
 msgstr "Passordene er for like"
 
-#: ../panels/user-accounts/um-password-dialog.c:391
+#: ../panels/user-accounts/um-password-dialog.c:255
 msgid "You need to enter your current password"
 msgstr "Du må oppgi ditt nåværende passord"
 
-#: ../panels/user-accounts/um-password-dialog.c:394
+#: ../panels/user-accounts/um-password-dialog.c:258
 msgid "The current password is not correct"
 msgstr "Nåværende passord er ikke korrekt"
 
-#: ../panels/user-accounts/um-password-dialog.c:467
-#: ../panels/user-accounts/um-password-dialog.c:731
+#: ../panels/user-accounts/pw-utils.c:94
+#: ../panels/user-accounts/um-password-dialog.c:607
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "For kort"
 
-#: ../panels/user-accounts/um-password-dialog.c:470
-#: ../panels/user-accounts/um-password-dialog.c:732
+#: ../panels/user-accounts/pw-utils.c:108
+#: ../panels/user-accounts/um-password-dialog.c:608
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "Svakt"
 
-#: ../panels/user-accounts/um-password-dialog.c:472
-#: ../panels/user-accounts/um-password-dialog.c:733
+#: ../panels/user-accounts/pw-utils.c:111
+#: ../panels/user-accounts/um-password-dialog.c:609
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "Bra"
 
-#: ../panels/user-accounts/um-password-dialog.c:474
-#: ../panels/user-accounts/um-password-dialog.c:734
+#: ../panels/user-accounts/pw-utils.c:114
+#: ../panels/user-accounts/um-password-dialog.c:610
 msgctxt "Password strength"
 msgid "Good"
 msgstr "God"
 
-#: ../panels/user-accounts/um-password-dialog.c:476
-#: ../panels/user-accounts/um-password-dialog.c:735
+#: ../panels/user-accounts/pw-utils.c:117
+#: ../panels/user-accounts/um-password-dialog.c:611
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "Sterk"
 
-#: ../panels/user-accounts/um-password-dialog.c:515
+#: ../panels/user-accounts/um-password-dialog.c:348
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../panels/user-accounts/um-password-dialog.c:541
+#: ../panels/user-accounts/um-password-dialog.c:410
 msgid "Wrong password"
 msgstr "Feil passord"
 
@@ -4374,29 +4354,29 @@
 msgid "Used by %s"
 msgstr "Brukt av %s"
 
-#: ../panels/user-accounts/um-user-manager.c:463
+#: ../panels/user-accounts/um-user-manager.c:466
 #, c-format
 msgid "A user with name '%s' already exists."
 msgstr "En bruker med navn «%s» eksisterer allerede."
 
-#: ../panels/user-accounts/um-user-manager.c:569
+#: ../panels/user-accounts/um-user-manager.c:631
 msgid "This user does not exist."
 msgstr "Denne brukeren eksisterer ikke."
 
-#: ../panels/user-accounts/um-user-panel.c:355
+#: ../panels/user-accounts/um-user-panel.c:371
 msgid "Failed to delete user"
 msgstr "Klarte ikke å slette bruker"
 
-#: ../panels/user-accounts/um-user-panel.c:415
+#: ../panels/user-accounts/um-user-panel.c:431
 msgid "You cannot delete your own account."
 msgstr "Du kan ikke slette din egen konto."
 
-#: ../panels/user-accounts/um-user-panel.c:424
+#: ../panels/user-accounts/um-user-panel.c:440
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s er fremdeles logget inn"
 
-#: ../panels/user-accounts/um-user-panel.c:428
+#: ../panels/user-accounts/um-user-panel.c:444
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -4404,12 +4384,12 @@
 "Hvis du sletter en innlogget bruker kan systemet ende opp i en inkonsistent "
 "tilstand."
 
-#: ../panels/user-accounts/um-user-panel.c:437
+#: ../panels/user-accounts/um-user-panel.c:453
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "Vil du beholde filene til %s?"
 
-#: ../panels/user-accounts/um-user-panel.c:441
+#: ../panels/user-accounts/um-user-panel.c:457
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -4417,38 +4397,38 @@
 "Det er mulig å beholde hjemmekatalogen, e-postkøen og midlertidige filer når "
 "du sletter en brukerkonto."
 
-#: ../panels/user-accounts/um-user-panel.c:444
+#: ../panels/user-accounts/um-user-panel.c:460
 msgid "_Delete Files"
 msgstr "_Slett filer"
 
-#: ../panels/user-accounts/um-user-panel.c:445
+#: ../panels/user-accounts/um-user-panel.c:461
 msgid "_Keep Files"
 msgstr "_Behold filer"
 
-#: ../panels/user-accounts/um-user-panel.c:497
+#: ../panels/user-accounts/um-user-panel.c:513
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Konto deaktivert"
 
-#: ../panels/user-accounts/um-user-panel.c:505
+#: ../panels/user-accounts/um-user-panel.c:521
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "Settes ved neste innlogging"
 
-#: ../panels/user-accounts/um-user-panel.c:508
+#: ../panels/user-accounts/um-user-panel.c:524
 msgctxt "Password mode"
 msgid "None"
 msgstr "Ingen"
 
-#: ../panels/user-accounts/um-user-panel.c:860
+#: ../panels/user-accounts/um-user-panel.c:875
 msgid "Failed to contact the accounts service"
 msgstr "Klarte ikke å kontakte kontotjenesten"
 
-#: ../panels/user-accounts/um-user-panel.c:862
+#: ../panels/user-accounts/um-user-panel.c:877
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "Sjekk at kontotjenesten er installert og aktivert."
 
-#: ../panels/user-accounts/um-user-panel.c:902
+#: ../panels/user-accounts/um-user-panel.c:917
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -4456,12 +4436,12 @@
 "Klikk på *-ikonet\n"
 "for å gjøre endringer"
 
-#: ../panels/user-accounts/um-user-panel.c:940
+#: ../panels/user-accounts/um-user-panel.c:955
 msgid "Create a user account"
 msgstr "Lag en ny brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:951
-#: ../panels/user-accounts/um-user-panel.c:1241
+#: ../panels/user-accounts/um-user-panel.c:966
+#: ../panels/user-accounts/um-user-panel.c:1278
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -4469,12 +4449,12 @@
 "Klikk på *-ikonet\n"
 "for å lage en brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:960
+#: ../panels/user-accounts/um-user-panel.c:975
 msgid "Delete the selected user account"
 msgstr "Slett valgt brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:972
-#: ../panels/user-accounts/um-user-panel.c:1246
+#: ../panels/user-accounts/um-user-panel.c:987
+#: ../panels/user-accounts/um-user-panel.c:1283
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -4482,11 +4462,11 @@
 "Klikk på *-ikonet\n"
 "for å slette valgt brukerkonto"
 
-#: ../panels/user-accounts/um-user-panel.c:1149
+#: ../panels/user-accounts/um-user-panel.c:1180
 msgid "My Account"
 msgstr "Min konto"
 
-#: ../panels/user-accounts/um-user-panel.c:1159
+#: ../panels/user-accounts/um-user-panel.c:1190
 msgid "Other Accounts"
 msgstr "Andre kontoer"
 
@@ -4553,6 +4533,7 @@
 msgid "Bluetooth Settings"
 msgstr "Innstillinger for Bluetooth"
 
+#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1
 #: ../panels/wacom/gnome-wacom-properties.ui.h:7
 msgid "Wacom Tablet"
 msgstr "Wacom pekeplate"
@@ -4657,77 +4638,77 @@
 msgid "Map buttons to functions"
 msgstr "Koble knapper til funksjoner"
 
-#: ../panels/wacom/gsd-wacom-device.c:909
+#: ../panels/wacom/gsd-wacom-device.c:1013
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr "Venstre ringmodus #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:916
+#: ../panels/wacom/gsd-wacom-device.c:1023
 #, c-format
 msgid "Right Ring Mode #%d"
 msgstr "Høyre ringmodus #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:944
+#: ../panels/wacom/gsd-wacom-device.c:1054
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr "Venstre berøringsstripe modus #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:951
+#: ../panels/wacom/gsd-wacom-device.c:1064
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr "Høyre berøringsstripe modus #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:966
+#: ../panels/wacom/gsd-wacom-device.c:1081
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr "Bytt modus for venstre berøringsring"
 
-#: ../panels/wacom/gsd-wacom-device.c:968
+#: ../panels/wacom/gsd-wacom-device.c:1083
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr "Bytt modus for høyre berøringsring"
 
-#: ../panels/wacom/gsd-wacom-device.c:971
+#: ../panels/wacom/gsd-wacom-device.c:1086
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr "Bytt modus for venstre berøringsstripe"
 
-#: ../panels/wacom/gsd-wacom-device.c:973
+#: ../panels/wacom/gsd-wacom-device.c:1088
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr "Bytt modus for høyre berøringsstripe"
 
-#: ../panels/wacom/gsd-wacom-device.c:978
+#: ../panels/wacom/gsd-wacom-device.c:1093
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "Modusbytte #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1050
+#: ../panels/wacom/gsd-wacom-device.c:1164
 #, c-format
 msgid "Left Button #%d"
 msgstr "Venstre knapp #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1053
+#: ../panels/wacom/gsd-wacom-device.c:1167
 #, c-format
 msgid "Right Button #%d"
 msgstr "Høyre knapp #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1056
+#: ../panels/wacom/gsd-wacom-device.c:1170
 #, c-format
 msgid "Top Button #%d"
 msgstr "Øverste knapp #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1059
+#: ../panels/wacom/gsd-wacom-device.c:1173
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "Nederste knapp #%d"
 
 #. Text printed on screen
-#: ../panels/wacom/calibrator/gui_gtk.c:70
+#: ../panels/wacom/calibrator/gui_gtk.c:78
 msgid "Screen Calibration"
 msgstr "Kalibrering av skjerm"
 
-#: ../panels/wacom/calibrator/gui_gtk.c:71
+#: ../panels/wacom/calibrator/gui_gtk.c:79
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
@@ -4735,7 +4716,7 @@
 "Vennligst tapp på målmarkørene når de vises på skjermen for å kalibrere "
 "tegnebrettet."
 
-#: ../panels/wacom/calibrator/gui_gtk.c:271
+#: ../panels/wacom/calibrator/gui_gtk.c:368
 msgid "Mis-click detected, restarting..."
 msgstr "Feil klikk oppdaget. Starter på nytt …"
 
@@ -4744,33 +4725,33 @@
 msgid "%d of %d"
 msgstr "%d av %d"
 
-#: ../panels/wacom/cc-wacom-mapping-panel.c:235
+#: ../panels/wacom/cc-wacom-mapping-panel.c:275
 msgid "Output:"
 msgstr "Utgang:"
 
 #. Whole-desktop checkbox
-#: ../panels/wacom/cc-wacom-mapping-panel.c:248
+#: ../panels/wacom/cc-wacom-mapping-panel.c:298
 msgid "Map to single monitor"
 msgstr "Tilegne til en enkelt skjerm"
 
+#: ../panels/wacom/cc-wacom-page.c:724
 #: ../panels/wacom/cc-wacom-stylus-page.c:376
-#: ../panels/wacom/cc-wacom-page.c:561
 msgid "Button"
 msgstr "Knapp"
 
-#: ../panels/wacom/cc-wacom-page.c:279
+#: ../panels/wacom/cc-wacom-page.c:638
 msgid "Switch Modes"
 msgstr "Bytt modus"
 
-#: ../panels/wacom/cc-wacom-page.c:526
+#: ../panels/wacom/cc-wacom-page.c:601
 msgid "Up"
 msgstr "Opp"
 
-#: ../panels/wacom/cc-wacom-page.c:526
+#: ../panels/wacom/cc-wacom-page.c:601
 msgid "Down"
 msgstr "Ned"
 
-#: ../panels/wacom/cc-wacom-page.c:681
+#: ../panels/wacom/cc-wacom-page.c:886
 msgid "Display Mapping"
 msgstr "Vis kobling"
 
@@ -4821,35 +4802,35 @@
 msgid "Mute"
 msgstr "Demp"
 
-#: ../panels/sound-nua/gvc-mixer-dialog.c:777
-#: ../panels/sound-nua/gvc-mixer-dialog.c:952
+#: ../panels/sound-nua/gvc-mixer-dialog.c:776
+#: ../panels/sound-nua/gvc-mixer-dialog.c:946
 #, c-format
 msgid "Settings for %s"
 msgstr "Innstillinger for %s"
 
-#: ../panels/sound-nua/gvc-mixer-dialog.c:807
-#: ../panels/sound-nua/gvc-mixer-dialog.c:965
+#: ../panels/sound-nua/gvc-mixer-dialog.c:802
+#: ../panels/sound-nua/gvc-mixer-dialog.c:955
 msgid "Mode:"
 msgstr "Modus:"
 
-#: ../panels/sound-nua/gvc-mixer-dialog.c:1771
+#: ../panels/sound-nua/gvc-mixer-dialog.c:1775
 msgid "Play sound through"
-msgstr ""
+msgstr "Spill lyd gjennom"
 
-#: ../panels/sound-nua/gvc-mixer-dialog.c:1796
-#: ../panels/sound-nua/gvc-mixer-dialog.c:1928
+#: ../panels/sound-nua/gvc-mixer-dialog.c:1800
+#: ../panels/sound-nua/gvc-mixer-dialog.c:1932
 msgid "Settings for the selected device"
 msgstr "Innstillinger for den valgte enheten"
 
-#: ../panels/sound-nua/gvc-mixer-dialog.c:1869
+#: ../panels/sound-nua/gvc-mixer-dialog.c:1873
 msgid "Test:"
 msgstr "Test:"
 
-#: ../panels/sound-nua/gvc-mixer-dialog.c:1876
+#: ../panels/sound-nua/gvc-mixer-dialog.c:1880
 msgid "Test Sound"
 msgstr "Test lyd"
 
-#: ../panels/sound-nua/gvc-mixer-dialog.c:1903
+#: ../panels/sound-nua/gvc-mixer-dialog.c:1907
 msgid "Record sound from"
 msgstr "Ta opp lyd fra"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-desktop-2.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-desktop-2.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-desktop-2.0.po	2013-01-29 09:33:53.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-desktop-2.0.po	2014-01-07 06:37:02.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:27+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:33+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../gnome-about/gnome-about.desktop.in.in.h:1
 #: ../gnome-about/gnome-about.in:60
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-desktop-3.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-desktop-3.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-desktop-3.0.po	2013-01-29 09:33:49.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-desktop-3.0.po	2014-01-07 06:37:38.000000000 +0000
@@ -7,21 +7,21 @@
 msgstr ""
 "Project-Id-Version: gnome-desktop 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-20 02:18+0000\n"
-"PO-Revision-Date: 2011-09-06 22:49+0000\n"
+"POT-Creation-Date: 2013-12-05 20:50+0000\n"
+"PO-Revision-Date: 2013-12-18 12:04+0000\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:28+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:26+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #. Translators: "Unknown" here is used to identify a monitor for which
 #. * we don't know the vendor. When a vendor is known, the name of the
 #. * vendor is used.
-#: ../libgnome-desktop/display-name.c:91
+#: ../libgnome-desktop/display-name.c:107
 msgctxt "Monitor vendor"
 msgid "Unknown"
 msgstr "Ukjent"
@@ -52,7 +52,7 @@
 msgid "RANDR extension is not present"
 msgstr "RANDR-tillegget er ikke tilstede"
 
-#: ../libgnome-desktop/gnome-rr.c:1577
+#: ../libgnome-desktop/gnome-rr.c:1580
 #, c-format
 msgid "could not get information about output %d"
 msgstr "kunne ikke hente informasjon om utdata %d"
@@ -60,7 +60,7 @@
 #. Translators: the "position", "size", and "maximum"
 #. * words here are not keywords; please translate them
 #. * as usual.  A CRTC is a CRT Controller (this is X terminology)
-#: ../libgnome-desktop/gnome-rr.c:2170
+#: ../libgnome-desktop/gnome-rr.c:2237
 #, c-format
 msgid ""
 "requested position/size for CRTC %d is outside the allowed limit: "
@@ -69,43 +69,43 @@
 "forespurt posisjon/størrelse for CRTC %d er utenfor tillatt område: "
 "posisjon=(%d, %d), størrelse=(%d, %d), maksimum=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr.c:2206
+#: ../libgnome-desktop/gnome-rr.c:2271
 #, c-format
 msgid "could not set the configuration for CRTC %d"
 msgstr "kunne ikke sette konfigurasjon for CRTC %d"
 
-#: ../libgnome-desktop/gnome-rr.c:2351
+#: ../libgnome-desktop/gnome-rr.c:2425
 #, c-format
 msgid "could not get information about CRTC %d"
 msgstr "kunne ikke hente informasjon om CRTC %d"
 
-#: ../libgnome-desktop/gnome-rr-config.c:562
+#: ../libgnome-desktop/gnome-rr-config.c:557
 msgid "Laptop"
 msgstr "Bærbar"
 
-#: ../libgnome-desktop/gnome-rr-config.c:717
+#: ../libgnome-desktop/gnome-rr-config.c:712
 #, c-format
 msgid ""
 "none of the saved display configurations matched the active configuration"
 msgstr ""
 "ingen av de lagrede skjermkonfigurasjonene var lik aktiv konfigurasjon"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1473
+#: ../libgnome-desktop/gnome-rr-config.c:1468
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d kan ikke drive utdata %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1480
+#: ../libgnome-desktop/gnome-rr-config.c:1475
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "utdata %s støtter ikke modus %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1491
+#: ../libgnome-desktop/gnome-rr-config.c:1486
 #, c-format
 msgid "CRTC %d does not support rotation=%s"
 msgstr "CRTC %d støtter ikke rotation=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1505
+#: ../libgnome-desktop/gnome-rr-config.c:1500
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
@@ -118,22 +118,22 @@
 "eksisterende koordinater = (%d, %d), nye koordinater = (%d, %d)\n"
 "eksisterende rotasjon = %s, ny rotasjon = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1520
+#: ../libgnome-desktop/gnome-rr-config.c:1515
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "kan ikke klone til utgang %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1689
+#: ../libgnome-desktop/gnome-rr-config.c:1684
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Prøver modus for CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1713
+#: ../libgnome-desktop/gnome-rr-config.c:1708
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr "CRTC %d: prøver modus %dx%d@%dHz med utdata %dx%d@%dHz (forsøk %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1760
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -142,7 +142,7 @@
 "kunne ikke tilegne CRTCer til utdata:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1764
+#: ../libgnome-desktop/gnome-rr-config.c:1759
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -154,7 +154,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1958
+#: ../libgnome-desktop/gnome-rr-config.c:1953
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -163,7 +163,7 @@
 "nødvendig virtuell størrelse passer ikke med tilgjengelig størrelse: "
 "forespurt=(%d, %d), minimum=(%d, %d), maksimum=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1980
+#: ../libgnome-desktop/gnome-rr-config.c:1992
 #, c-format
 msgid ""
 "Requested size (%d, %d) exceeds 3D hardware limit (%d, %d).\n"
@@ -178,46 +178,46 @@
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #. 
-#: ../libgnome-desktop/gnome-rr-labeler.c:381
+#: ../libgnome-desktop/gnome-rr-labeler.c:312
 msgid "Mirror Screens"
 msgstr "Speil skjermer"
 
-#. Translators: This is the time format with full date used
+#. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:238
+#: ../libgnome-desktop/gnome-wall-clock.c:195
 msgid "%a %b %e, %R:%S"
-msgstr "%a %e %b, %R.%S"
+msgstr "%e %a %b, %H.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:239
+#: ../libgnome-desktop/gnome-wall-clock.c:272
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %R"
 
-#. Translators: This is the time format with day used
+#. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:243
+#: ../libgnome-desktop/gnome-wall-clock.c:200
 msgid "%a %R:%S"
-msgstr "%a %R.%S"
+msgstr "%a %H.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:244
+#: ../libgnome-desktop/gnome-wall-clock.c:278
 msgid "%a %R"
 msgstr "%a %R"
 
-#. Translators: This is a time format with full date used
+#. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:254
+#: ../libgnome-desktop/gnome-wall-clock.c:206
 msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %e %b, %H.%M.%S"
+msgstr "%e %a %, %H.%M.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:255
+#: ../libgnome-desktop/gnome-wall-clock.c:207
 msgid "%a %b %e, %l:%M %p"
-msgstr "%a %e %b, %H.%M"
+msgstr "%e %a %b, %H.%M"
 
-#. Translators: This is a time format with day used
+#. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:259
+#: ../libgnome-desktop/gnome-wall-clock.c:211
 msgid "%a %l:%M:%S %p"
 msgstr "%a %H.%M.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:260
+#: ../libgnome-desktop/gnome-wall-clock.c:212
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-disk-utility.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-disk-utility.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-disk-utility.po	2013-01-29 09:33:49.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-disk-utility.po	2014-01-07 06:37:34.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:54+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:44+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #. Translators: Window title when no item is selected.
@@ -51,7 +51,7 @@
 "Vent til operasjonen er fullført før du fjerner medie eller kobler fra "
 "enheten for å unngå korrupte data."
 
-#: ../data/ui/disks.ui.h:27
+#: ../data/ui/disks.ui.h:40
 msgid "Device"
 msgstr "Enhet"
 
@@ -151,7 +151,7 @@
 msgid "Cancelling..."
 msgstr "Avbryter …"
 
-#: ../src/disks/gduformatvolumedialog.c:86
+#: ../src/disks/gduformatvolumedialog.c:87
 msgid "Error formatting volume"
 msgstr "Feil under formattering av volum"
 
@@ -218,11 +218,11 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:127
+#: ../src/disks/gduatasmartdialog.c:151
 msgid "Read Error Rate"
 msgstr "Rate for lesefeil"
 
-#: ../src/disks/gduatasmartdialog.c:128
+#: ../src/disks/gduatasmartdialog.c:152
 msgid ""
 "Frequency of errors while reading raw data from the disk. A non-zero value "
 "indicates a problem with either the disk surface or read/write heads"
@@ -231,40 +231,40 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:137
+#: ../src/disks/gduatasmartdialog.c:161
 msgid "Throughput Performance"
 msgstr "Ytelse for gjennomstrømming"
 
-#: ../src/disks/gduatasmartdialog.c:138
+#: ../src/disks/gduatasmartdialog.c:162
 msgid "Average efficiency of the disk"
 msgstr "Gjennomsnittlig effektivitet for disken"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:145
+#: ../src/disks/gduatasmartdialog.c:169
 msgid "Spinup Time"
 msgstr "Oppspinningstid"
 
-#: ../src/disks/gduatasmartdialog.c:146
+#: ../src/disks/gduatasmartdialog.c:170
 msgid "Time needed to spin up the disk"
 msgstr "Tid som kreves for å starte opp disken"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:153
+#: ../src/disks/gduatasmartdialog.c:177
 msgid "Start/Stop Count"
 msgstr "Start/stopp antall"
 
-#: ../src/disks/gduatasmartdialog.c:154
+#: ../src/disks/gduatasmartdialog.c:178
 msgid "Number of spindle start/stop cycles"
 msgstr "Antall sykluser med start/stopp av spindel"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:161
+#: ../src/disks/gduatasmartdialog.c:185
 msgid "Reallocated Sector Count"
 msgstr "Antall reallokerte sektorer"
 
@@ -278,84 +278,84 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:171
+#: ../src/disks/gduatasmartdialog.c:195
 msgid "Read Channel Margin"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:172
+#: ../src/disks/gduatasmartdialog.c:196
 msgid "Margin of a channel while reading data."
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:179
+#: ../src/disks/gduatasmartdialog.c:203
 msgid "Seek Error Rate"
 msgstr "Feilrate for søking"
 
-#: ../src/disks/gduatasmartdialog.c:180
+#: ../src/disks/gduatasmartdialog.c:204
 msgid "Frequency of errors while positioning"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:187
+#: ../src/disks/gduatasmartdialog.c:211
 msgid "Seek Timer Performance"
 msgstr "Ytelse for søkeklokke"
 
-#: ../src/disks/gduatasmartdialog.c:188
+#: ../src/disks/gduatasmartdialog.c:212
 msgid "Average efficiency of operations while positioning"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:195 ../src/disks/gduatasmartdialog.c:520
+#: ../src/disks/gduatasmartdialog.c:219 ../src/disks/gduatasmartdialog.c:544
 msgid "Power-On Hours"
 msgstr "Timer på strøm"
 
-#: ../src/disks/gduatasmartdialog.c:196 ../src/disks/gduatasmartdialog.c:521
+#: ../src/disks/gduatasmartdialog.c:220 ../src/disks/gduatasmartdialog.c:545
 msgid "Number of hours elapsed in the power-on state"
 msgstr "Antall timer medgått med strøm på"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:203
+#: ../src/disks/gduatasmartdialog.c:227
 msgid "Spinup Retry Count"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:204
+#: ../src/disks/gduatasmartdialog.c:228
 msgid "Number of retry attempts to spin up"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:211
+#: ../src/disks/gduatasmartdialog.c:235
 msgid "Calibration Retry Count"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:212
+#: ../src/disks/gduatasmartdialog.c:236
 msgid "Number of attempts to calibrate the device"
-msgstr ""
+msgstr "Antall forsøk på å kalibrere enheten"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:219
+#: ../src/disks/gduatasmartdialog.c:243
 msgid "Power Cycle Count"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:220
+#: ../src/disks/gduatasmartdialog.c:244
 msgid "Number of power-on events"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:227
+#: ../src/disks/gduatasmartdialog.c:251
 msgid "Soft read error rate"
 msgstr ""
 
@@ -366,11 +366,11 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:236
+#: ../src/disks/gduatasmartdialog.c:260
 msgid "Reported Uncorrectable Errors"
 msgstr "Rapporterte feil som ikke kan rettes"
 
-#: ../src/disks/gduatasmartdialog.c:237
+#: ../src/disks/gduatasmartdialog.c:261
 msgid "Number of errors that could not be recovered using hardware ECC"
 msgstr ""
 "Antall feil som ikke kunne gjenopprettes med feilkorrigering i maskinvare"
@@ -378,11 +378,11 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:244
+#: ../src/disks/gduatasmartdialog.c:268
 msgid "High Fly Writes"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:245
+#: ../src/disks/gduatasmartdialog.c:269
 msgid ""
 "Number of times a recording head is flying outside its normal operating range"
 msgstr ""
@@ -390,78 +390,78 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:252
+#: ../src/disks/gduatasmartdialog.c:276
 msgid "Airflow Temperature"
 msgstr "Temperatur på luftstrøm"
 
-#: ../src/disks/gduatasmartdialog.c:253
+#: ../src/disks/gduatasmartdialog.c:277
 msgid "Airflow temperature of the drive"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:260 ../src/disks/gduatasmartdialog.c:430
+#: ../src/disks/gduatasmartdialog.c:284 ../src/disks/gduatasmartdialog.c:454
 msgid "G-sense Error Rate"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:261
+#: ../src/disks/gduatasmartdialog.c:285
 msgid "Frequency of mistakes as a result of impact loads"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:268 ../src/disks/gduatasmartdialog.c:487
+#: ../src/disks/gduatasmartdialog.c:292 ../src/disks/gduatasmartdialog.c:511
 msgid "Power-off Retract Count"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:269
+#: ../src/disks/gduatasmartdialog.c:293
 msgid "Number of power-off or emergency retract cycles"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:276 ../src/disks/gduatasmartdialog.c:463
+#: ../src/disks/gduatasmartdialog.c:300 ../src/disks/gduatasmartdialog.c:487
 msgid "Load/Unload Cycle Count"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:277
+#: ../src/disks/gduatasmartdialog.c:301
 msgid "Number of cycles into landing zone position"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../data/ui/smart-dialog.ui.h:6 ../src/disks/gduatasmartdialog.c:284
-#: ../src/disks/gduatasmartdialog.c:503
+#: ../data/ui/smart-dialog.ui.h:9 ../src/disks/gduatasmartdialog.c:308
+#: ../src/disks/gduatasmartdialog.c:527
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: ../src/disks/gduatasmartdialog.c:285
+#: ../src/disks/gduatasmartdialog.c:309
 msgid "Current internal temperature of the drive"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:292
+#: ../src/disks/gduatasmartdialog.c:316
 msgid "Hardware ECC Recovered"
 msgstr "Gjenopprettet med feilkorrigering i maskinvare"
 
-#: ../src/disks/gduatasmartdialog.c:293
+#: ../src/disks/gduatasmartdialog.c:317
 msgid "Number of ECC on-the-fly errors"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:300
+#: ../src/disks/gduatasmartdialog.c:324
 msgid "Reallocation Count"
 msgstr "Antall reallokert"
 
-#: ../src/disks/gduatasmartdialog.c:301
+#: ../src/disks/gduatasmartdialog.c:325
 msgid ""
 "Number of remapping operations. The raw value of this attribute shows the "
 "total number of (successful and unsuccessful) attempts to transfer data from "
@@ -471,11 +471,11 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:311
+#: ../src/disks/gduatasmartdialog.c:335
 msgid "Current Pending Sector Count"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:312
+#: ../src/disks/gduatasmartdialog.c:336
 msgid ""
 "Number of sectors waiting to be remapped. If the sector waiting to be "
 "remapped is subsequently written or read successfully, this value is "
@@ -486,11 +486,11 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:323
+#: ../src/disks/gduatasmartdialog.c:347
 msgid "Uncorrectable Sector Count"
 msgstr "Antall sektorer som ikke kan rettes"
 
-#: ../src/disks/gduatasmartdialog.c:324
+#: ../src/disks/gduatasmartdialog.c:348
 msgid ""
 "The total number of uncorrectable errors when reading/writing a sector. A "
 "rise in the value of this attribute indicates defects of the disk surface "
@@ -500,22 +500,22 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:333
+#: ../src/disks/gduatasmartdialog.c:357
 msgid "UDMA CRC Error Rate"
 msgstr "Feilrate for UDMA CRC"
 
-#: ../src/disks/gduatasmartdialog.c:334
+#: ../src/disks/gduatasmartdialog.c:358
 msgid "Number of CRC errors during UDMA mode"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:341
+#: ../src/disks/gduatasmartdialog.c:365
 msgid "Write Error Rate"
 msgstr "Feilrate for skriving"
 
-#: ../src/disks/gduatasmartdialog.c:342
+#: ../src/disks/gduatasmartdialog.c:366
 msgid ""
 "Number of errors while writing to disk (or) multi-zone error rate (or) "
 "flying-height"
@@ -524,95 +524,95 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:349
+#: ../src/disks/gduatasmartdialog.c:373
 msgid "Soft Read Error Rate"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:350
+#: ../src/disks/gduatasmartdialog.c:374
 msgid "Number of off-track errors"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:357
+#: ../src/disks/gduatasmartdialog.c:381
 msgid "Data Address Mark Errors"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:358
+#: ../src/disks/gduatasmartdialog.c:382
 msgid "Number of Data Address Mark (DAM) errors (or) vendor-specific"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:365
+#: ../src/disks/gduatasmartdialog.c:389
 msgid "Run Out Cancel"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:366
+#: ../src/disks/gduatasmartdialog.c:390
 msgid "Number of ECC errors"
 msgstr "Antall ECC-feil"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:373
+#: ../src/disks/gduatasmartdialog.c:397
 msgid "Soft ECC correction"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:374
+#: ../src/disks/gduatasmartdialog.c:398
 msgid "Number of errors corrected by software ECC"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:381
+#: ../src/disks/gduatasmartdialog.c:405
 msgid "Thermal Asperity Rate"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:382
+#: ../src/disks/gduatasmartdialog.c:406
 msgid "Number of Thermal Asperity Rate errors"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:389
+#: ../src/disks/gduatasmartdialog.c:413
 msgid "Flying Height"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:390
+#: ../src/disks/gduatasmartdialog.c:414
 msgid "Height of heads above the disk surface"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:397
+#: ../src/disks/gduatasmartdialog.c:421
 msgid "Spin High Current"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:398
+#: ../src/disks/gduatasmartdialog.c:422
 msgid "Amount of high current used to spin up the drive"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:405
+#: ../src/disks/gduatasmartdialog.c:429
 msgid "Spin Buzz"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:406
+#: ../src/disks/gduatasmartdialog.c:430
 msgid "Number of buzz routines to spin up the drive"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:413
+#: ../src/disks/gduatasmartdialog.c:437
 msgid "Offline Seek Performance"
 msgstr ""
 
@@ -623,17 +623,17 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:421
+#: ../src/disks/gduatasmartdialog.c:445
 msgid "Disk Shift"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:422
+#: ../src/disks/gduatasmartdialog.c:446
 msgid ""
 "Shift of disk is possible as a result of strong shock loading in the store, "
 "as a result of falling (or) temperature"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:431
+#: ../src/disks/gduatasmartdialog.c:455
 msgid ""
 "Number of errors as a result of impact loads as detected by a shock sensor"
 msgstr ""
@@ -641,22 +641,22 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:438
+#: ../src/disks/gduatasmartdialog.c:462
 msgid "Loaded Hours"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:439
+#: ../src/disks/gduatasmartdialog.c:463
 msgid "Number of hours in general operational state"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:446
+#: ../src/disks/gduatasmartdialog.c:470
 msgid "Load/Unload Retry Count"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:447
+#: ../src/disks/gduatasmartdialog.c:471
 msgid ""
 "Loading on drive caused by numerous recurrences of operations, like reading, "
 "recording, positioning of heads, etc"
@@ -665,67 +665,67 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:455
+#: ../src/disks/gduatasmartdialog.c:479
 msgid "Load Friction"
 msgstr "Friksjonsbelastning"
 
-#: ../src/disks/gduatasmartdialog.c:456
+#: ../src/disks/gduatasmartdialog.c:480
 msgid "Load on drive caused by friction in mechanical parts of the store"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:464
+#: ../src/disks/gduatasmartdialog.c:488
 msgid "Total number of load cycles"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:471
+#: ../src/disks/gduatasmartdialog.c:495
 msgid "Load-in Time"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:472
+#: ../src/disks/gduatasmartdialog.c:496
 msgid "General time for loading in a drive"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:479
+#: ../src/disks/gduatasmartdialog.c:503
 msgid "Torque Amplification Count"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:480
+#: ../src/disks/gduatasmartdialog.c:504
 msgid "Quantity efforts of the rotating moment of a drive"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:488
+#: ../src/disks/gduatasmartdialog.c:512
 msgid "Number of power-off retract events"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:495
+#: ../src/disks/gduatasmartdialog.c:519
 msgid "GMR Head Amplitude"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:496
+#: ../src/disks/gduatasmartdialog.c:520
 msgid "Amplitude of heads trembling (GMR-head) in running mode"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:504
+#: ../src/disks/gduatasmartdialog.c:528
 msgid "Temperature of the drive"
 msgstr "Temperatur for stasjonen"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:511
+#: ../src/disks/gduatasmartdialog.c:535
 msgid "Endurance Remaining"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:512
+#: ../src/disks/gduatasmartdialog.c:536
 msgid ""
 "Number of physical erase cycles completed on the drive as a percentage of "
 "the maximum physical erase cycles the drive supports"
@@ -734,22 +734,22 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:528
+#: ../src/disks/gduatasmartdialog.c:552
 msgid "Uncorrectable ECC Count"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:529
+#: ../src/disks/gduatasmartdialog.c:553
 msgid "Number of uncorrectable ECC errors"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:536
+#: ../src/disks/gduatasmartdialog.c:560
 msgid "Good Block Rate"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:537
+#: ../src/disks/gduatasmartdialog.c:561
 msgid ""
 "Number of available reserved blocks as a percentage of the total number of "
 "reserved blocks"
@@ -758,26 +758,26 @@
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:545
+#: ../src/disks/gduatasmartdialog.c:569
 msgid "Head Flying Hours"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:546
+#: ../src/disks/gduatasmartdialog.c:570
 msgid "Time while head is positioning"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #. 
-#: ../src/disks/gduatasmartdialog.c:553
+#: ../src/disks/gduatasmartdialog.c:577
 msgid "Read Error Retry Rate"
 msgstr ""
 
-#: ../src/disks/gduatasmartdialog.c:554
+#: ../src/disks/gduatasmartdialog.c:578
 msgid "Number of errors while reading from a disk"
 msgstr "Antall feil under lesing fra en disk"
 
-#: ../src/disks/gduatasmartdialog.c:614
+#: ../src/disks/gduatasmartdialog.c:637
 #, c-format
 msgid "No description for attribute %d"
 msgstr "Ingen beskrivelse for attributt %d"
@@ -805,7 +805,10 @@
 #. SK_SMART_ATTRIBUTE_UNIT_UNKNOWN
 #. Translators: Used in the treeview for the pretty/interpreted value of an attribute
 #. * where the value cannot be interpreted
-#: ../src/disks/gduatasmartdialog.c:728
+#. Translators: Shown for normalized values (current, worst, threshold) if the value is
+#. * not applicable, e.g. meaningless. See http://en.wikipedia.org/wiki/N/A
+#. 
+#: ../src/disks/gduatasmartdialog.c:747 ../src/disks/gduatasmartdialog.c:1117
 msgid "N/A"
 msgstr "I/T"
 
@@ -815,7 +818,7 @@
 msgstr "Feiler"
 
 #. Translators: Shown in the treeview for an attribute that failed in the past
-#: ../src/disks/gduatasmartdialog.c:674
+#: ../src/disks/gduatasmartdialog.c:693
 msgid "Failed in the past"
 msgstr "Feilet i fortiden"
 
@@ -995,22 +998,23 @@
 msgstr "_Attributter"
 
 #. Translators: This string is used as the column title in the treeview for the Attribute ID (0-255)
-#: ../src/disks/gduatasmartdialog.c:1465
+#: ../src/disks/gduatasmartdialog.c:1515
 msgid "ID"
 msgstr "ID"
 
 #. Translators: This string is used as the column title in the treeview for the attribute name and description
-#: ../src/disks/gduatasmartdialog.c:1477
+#: ../src/disks/gduatasmartdialog.c:1527
 msgid "Attribute"
 msgstr "Attributt"
 
 #. Translators: This string is used as the column title in the treeview for the assessment of the attribute
-#: ../data/ui/disks.ui.h:21 ../src/disks/gduatasmartdialog.c:1503
+#: ../data/ui/disks.ui.h:25 ../data/ui/md-raid-disks-dialog.ui.h:3
+#: ../src/disks/gduatasmartdialog.c:1613
 msgid "Assessment"
 msgstr "Evaluering"
 
 #. Translators: This string is used as the column title in the treeview for the value
-#: ../data/ui/smart-dialog.ui.h:11 ../src/disks/gduatasmartdialog.c:1491
+#: ../src/disks/gduatasmartdialog.c:1541
 msgid "Value"
 msgstr "Verdi"
 
@@ -1067,7 +1071,7 @@
 msgid "%s msec"
 msgstr "%s msec"
 
-#: ../src/disks/gduatasmartdialog.c:705
+#: ../src/disks/gduatasmartdialog.c:724
 #, c-format
 msgid "%d sector"
 msgid_plural "%d sectors"
@@ -1081,7 +1085,7 @@
 #. * The first %f is the temperature in degrees Celcius and
 #. * the second %f is the temperature in degrees Fahrenheit.
 #. 
-#: ../src/disks/gduatasmartdialog.c:717 ../src/disks/gduatasmartdialog.c:929
+#: ../src/disks/gduatasmartdialog.c:736 ../src/disks/gduatasmartdialog.c:869
 #, c-format
 msgid "%.0f° C / %.0f° F"
 msgstr "%.0f° C / %.0f° F"
@@ -1184,7 +1188,7 @@
 msgstr "Godkjent"
 
 #. Translators: Shown in the treeview for a failing attribute
-#: ../src/disks/gduatasmartdialog.c:665
+#: ../src/disks/gduatasmartdialog.c:684
 msgid "FAILING"
 msgstr "FEILER"
 
@@ -1339,6 +1343,7 @@
 msgstr "Forespurt størrelse på logisk volum"
 
 #: ../data/ui/create-partition-dialog.ui.h:2
+#: ../src/disks/gducreateraidarraydialog.c:575
 msgid "C_reate"
 msgstr "Opp_rett"
 
@@ -1358,7 +1363,7 @@
 msgid "The pool of devices"
 msgstr ""
 
-#: ../src/gdu-gtk/gdu-create-linux-md-dialog.c:192
+#: ../data/ui/disks.ui.h:29
 msgid "RAID Level"
 msgstr "RAID-nivå"
 
@@ -1366,8 +1371,7 @@
 msgid "The selected RAID level"
 msgstr "Valgt RAID-nivå"
 
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../src/disks/gduatasmartdialog.c:861
+#: ../data/ui/disks.ui.h:28
 msgid "Name"
 msgstr "Navn"
 
@@ -1375,7 +1379,7 @@
 msgid "The requested name for the array"
 msgstr "Forespurt navn på array"
 
-#: ../data/ui/disks.ui.h:20
+#: ../data/ui/disks.ui.h:30
 msgid "Size"
 msgstr "Størrelse"
 
@@ -1408,7 +1412,7 @@
 msgid "Array of drives to use for the array"
 msgstr ""
 
-#: ../src/gdu-gtk/gdu-create-linux-md-dialog.c:517
+#: ../data/ui/create-raid-array-dialog.ui.h:1
 msgid "Create RAID Array"
 msgstr "Lag RAID-sett"
 
@@ -1821,7 +1825,7 @@
 msgstr "%3g ms"
 
 #. Translators: This is a mark on the Standby scale. The string should be as short as possible
-#: ../src/disks/gdudisksettingsdialog.c:390
+#: ../src/disks/gdudisksettingsdialog.c:414
 msgid "Never"
 msgstr "Aldri"
 
@@ -1930,7 +1934,7 @@
 msgid "Component"
 msgstr "Komponent"
 
-#: ../src/gdu-gtk/gdu-edit-linux-md-dialog.c:436
+#: ../data/ui/disks.ui.h:31
 msgid "State"
 msgstr "Tilstand"
 
@@ -2105,8 +2109,8 @@
 msgid "The mnemonic label for the affirmative button"
 msgstr ""
 
-#: ../src/disks/gduformatdiskdialog.c:411
-#: ../src/disks/gduformatvolumedialog.c:164
+#: ../src/disks/gduformatdiskdialog.c:445
+#: ../src/disks/gduformatvolumedialog.c:224
 msgid "_Format"
 msgstr "_Formater"
 
@@ -2403,35 +2407,35 @@
 msgid "_Scheme:"
 msgstr "_Utforming:"
 
-#: ../src/gdu-gtk/gdu-size-widget.c:89
+#: ../data/ui/create-partition-dialog.ui.h:6
 msgid "kB"
 msgstr "kB"
 
-#: ../data/ui/create-partition-dialog.ui.h:5
+#: ../data/ui/create-partition-dialog.ui.h:7
 msgid "MB"
 msgstr "MB"
 
-#: ../src/gdu-gtk/gdu-size-widget.c:98
+#: ../data/ui/create-partition-dialog.ui.h:8
 msgid "GB"
 msgstr "GB"
 
-#: ../src/gdu-gtk/gdu-size-widget.c:101
+#: ../data/ui/create-partition-dialog.ui.h:9
 msgid "TB"
 msgstr "TB"
 
-#: ../src/gdu-gtk/gdu-size-widget.c:104
+#: ../data/ui/create-partition-dialog.ui.h:11
 msgid "KiB"
 msgstr "KiB"
 
-#: ../src/gdu-gtk/gdu-size-widget.c:107
+#: ../data/ui/create-partition-dialog.ui.h:12
 msgid "MiB"
 msgstr "MiB"
 
-#: ../src/gdu-gtk/gdu-size-widget.c:110
+#: ../data/ui/create-partition-dialog.ui.h:13
 msgid "GiB"
 msgstr "GiB"
 
-#: ../src/gdu-gtk/gdu-size-widget.c:113
+#: ../data/ui/create-partition-dialog.ui.h:14
 msgid "TiB"
 msgstr "TiB"
 
@@ -2498,7 +2502,7 @@
 msgid "No Media Detected"
 msgstr "Ingen media funnet"
 
-#: ../data/ui/smart-dialog.ui.h:15
+#: ../data/ui/smart-dialog.ui.h:16
 msgid "Extended"
 msgstr "Utvidet"
 
@@ -2755,8 +2759,8 @@
 msgid "%s Free"
 msgstr "%s ledig"
 
-#. Translators: used to convey free space for partitions (partition table format not known)
-#: ../src/disks/gduwindow.c:2475
+#. Translators: used to convey free space for partitions
+#: ../src/disks/gduwindow.c:3528
 msgid "Unallocated Space"
 msgstr "Ikke allokert plass"
 
@@ -4857,15 +4861,15 @@
 msgid "Error mounting volume"
 msgstr "Feil ved montering av volum"
 
-#: ../src/disks/gduwindow.c:3006
+#: ../src/disks/gduwindow.c:4391
 msgid "Error deleting partition"
 msgstr "Feil ved sletting av partisjon"
 
-#: ../src/disks/gduwindow.c:3022
+#: ../src/disks/gduwindow.c:4429
 msgid "Are you sure you want to delete the partition?"
 msgstr "Er du sikker på at du vil slette partisjonen?"
 
-#: ../src/disks/gduwindow.c:3024
+#: ../src/disks/gduwindow.c:4431
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -4873,7 +4877,7 @@
 msgid "Error creating filesystem"
 msgstr "Feil ved oppretting av filsystem"
 
-#: ../src/disks/gduformatvolumedialog.c:147
+#: ../src/disks/gduformatvolumedialog.c:206
 msgid "Are you sure you want to format the volume?"
 msgstr "Er du sikker på at du vil formatere volumet?"
 
@@ -4897,7 +4901,7 @@
 msgid "Error unlocking LUKS volume"
 msgstr "Feil under opplåsing av LUKS-volum"
 
-#: ../src/disks/gducreatepartitiondialog.c:229
+#: ../src/disks/gducreatepartitiondialog.c:365
 msgid "Error creating partition"
 msgstr "Feil ved oppretting av partisjon"
 
@@ -5087,7 +5091,7 @@
 msgid "Logical _Volumes"
 msgstr "Logiske _volumer"
 
-#: ../data/ui/disks.ui.h:24
+#: ../data/ui/disks.ui.h:37
 msgid "_Volumes"
 msgstr "_Volum"
 
@@ -5151,7 +5155,7 @@
 msgid "_Create Partition"
 msgstr "_Lag partisjon"
 
-#: ../src/palimpsest/gdu-section-volumes.c:2459
+#: ../data/ui/disks.ui.h:1
 msgid "Create a new partition"
 msgstr "Lag en ny partisjon"
 
@@ -5271,7 +5275,7 @@
 msgid "%s (%s) — Disk Utility"
 msgstr "%s (%s) - Diskverktøy"
 
-#: ../src/palimpsest/gdu-shell.c:627
+#: ../src/disks/gducreateraidarraydialog.c:417
 msgid "Error creating RAID array"
 msgstr "Feil ved oppretting av RAID-sett"
 
@@ -5280,7 +5284,7 @@
 msgid "Error connecting to “%s”"
 msgstr "Feil ved tilkobling til «%s»"
 
-#: ../data/ui/about-dialog.ui.h:5
+#: ../data/ui/about-dialog.ui.h:4
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -5318,11 +5322,11 @@
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../src/palimpsest/gdu-shell.c:845 ../src/palimpsest/gdu-shell.c:848
+#: ../data/ui/app-menu.ui.h:2
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../data/ui/app-menu.ui.h:3
+#: ../data/ui/app-menu.ui.h:4
 msgid "_Quit"
 msgstr "A_vslutt"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-doc-utils.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-doc-utils.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-doc-utils.po	2013-01-29 09:34:06.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-doc-utils.po	2014-01-07 06:37:03.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:27+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:33+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. 
 #. Translate to default:RTL if your language should be displayed
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-games.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-games.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-games.po	2013-01-29 09:33:57.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-games.po	2014-01-07 06:37:03.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:28+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:34+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #. Title of the main window
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-icon-theme.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-icon-theme.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-icon-theme.po	2013-01-29 09:33:53.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-icon-theme.po	2014-01-07 06:37:03.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:29+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:36+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: no\n"
 
 #: ../index.theme.in.in.h:1
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-keyring.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-keyring.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-keyring.po	2013-01-29 09:33:53.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-keyring.po	2014-01-07 06:37:03.000000000 +0000
@@ -8,16 +8,16 @@
 msgstr ""
 "Project-Id-Version: gnome-keyring 3.1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-13 21:54+0000\n"
-"PO-Revision-Date: 2011-09-18 20:49+0000\n"
+"POT-Creation-Date: 2013-06-04 23:45+0000\n"
+"PO-Revision-Date: 2013-03-28 21:43+0000\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:29+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:36+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: no\n"
 
 #. TRANSLATORS: This is the label for an keyring created without a label
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-media-2.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-media-2.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-media-2.0.po	2013-01-29 09:33:59.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-media-2.0.po	2014-01-07 06:37:03.000000000 +0000
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:31+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:37+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../grecord/gnome-sound-recorder.desktop.in.in.h:1
 #: ../grecord/src/gsr-window.c:1226
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-menus-3.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-menus-3.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-menus-3.0.po	2013-01-29 09:33:55.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-menus-3.0.po	2014-01-07 06:37:03.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:31+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:37+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../desktop-directories/AudioVideo.directory.in.h:1
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-mime-data.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-mime-data.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-mime-data.po	2013-01-29 09:34:04.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-mime-data.po	2014-01-07 06:37:03.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:31+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:37+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../gnome-vfs.keys.in.h:1
 msgid "2D chemical structure"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-nettool.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-nettool.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-nettool.po	2013-01-29 09:33:50.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-nettool.po	2014-01-07 06:37:03.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:32+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:38+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: no\n"
 
 #: ../src/callbacks.c:332
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-online-accounts.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-online-accounts.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-online-accounts.po	2013-01-29 09:34:01.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-online-accounts.po	2014-01-07 06:37:51.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:28+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 20:54+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../src/daemon/goadaemon.c:990
@@ -26,16 +26,20 @@
 msgid "Open Online Accounts..."
 msgstr "Åpne kontoer på nettet …"
 
-#: ../src/goabackend/goafacebookprovider.c:79
+#: ../src/goabackend/goafacebookprovider.c:82
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../src/goabackend/goafacebookprovider.c:193
-#: ../src/goabackend/goagoogleprovider.c:216
-#: ../src/goabackend/goawindowsliveprovider.c:176
+#. Translators: the %d is a HTTP status code and the %s is a textual description of it
+#: ../src/goabackend/goafacebookprovider.c:211
+#: ../src/goabackend/goagoogleprovider.c:210
+#: ../src/goabackend/goatwitterprovider.c:166
+#: ../src/goabackend/goawindowsliveprovider.c:197
+#: ../src/goabackend/goayahooprovider.c:187
 #, c-format
 msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
 msgstr ""
+"Forventet status 200 ved forespørsel om guid. Fikk i stedet status %d (%s)"
 
 #: ../src/goabackend/goafacebookprovider.c:205
 #: ../src/goabackend/goagoogleprovider.c:228
@@ -105,7 +109,7 @@
 msgid "Documents"
 msgstr "Dokumenter"
 
-#: ../src/goabackend/goawindowsliveprovider.c:82
+#: ../src/goabackend/goawindowsliveprovider.c:84
 msgid "Windows Live"
 msgstr "Windows Live"
 
@@ -126,12 +130,14 @@
 msgstr "Brukernavn"
 
 #. Translators: the %d is a HTTP status code and the %s is a textual description of it
-#: ../src/goabackend/goaoauth2provider.c:543
+#: ../src/goabackend/goaoauth2provider.c:658
 #: ../src/goabackend/goaoauthprovider.c:586
 #, c-format
 msgid ""
 "Expected status 200 when requesting access token, instead got status %d (%s)"
 msgstr ""
+"Forventet status 200 ved forespørsel om tilgangstegn (access token). Fikk i "
+"stedet status %d (%s)"
 
 #: ../src/goabackend/goaoauth2provider.c:563
 #, c-format
@@ -143,14 +149,13 @@
 msgid "Didn't find access_token in JSON data"
 msgstr "Fant ikke access_token i JSON-data"
 
-#: ../src/goabackend/goaoauth2provider.c:776
-#: ../src/goabackend/goaoauth2provider.c:815
+#: ../src/goabackend/goaoauth2provider.c:965
 #, c-format
 msgid "Authorization response was \"%s\""
 msgstr "Autoriseringssvar var «%s»"
 
 #. Translators: The verb "Paste" is used when asking the user to paste a string from a web browser window
-#: ../src/goabackend/goaoauth2provider.c:920
+#: ../src/goabackend/goaoauth2provider.c:1062
 #, c-format
 msgid ""
 "Paste authorization code obtained from the <a href=\"%s\">authorization "
@@ -158,21 +163,31 @@
 msgstr ""
 "Lim inn autorisasjonskode hentet fra <a href=\"%s\">autorisasjonssiden</a>:"
 
-#: ../src/goabackend/goaexchangeprovider.c:614
-#: ../src/goabackend/goaexchangeprovider.c:780
-#: ../src/goabackend/goakerberosprovider.c:1510
-#: ../src/goabackend/goaoauth2provider.c:986
+#: ../src/goabackend/goaexchangeprovider.c:650
+#: ../src/goabackend/goaexchangeprovider.c:845
+#: ../src/goabackend/goaimapsmtpprovider.c:929
+#: ../src/goabackend/goaimapsmtpprovider.c:964
+#: ../src/goabackend/goaimapsmtpprovider.c:1052
+#: ../src/goabackend/goaimapsmtpprovider.c:1308
+#: ../src/goabackend/goaimapsmtpprovider.c:1381
+#: ../src/goabackend/goakerberosprovider.c:1548
+#: ../src/goabackend/goaoauth2provider.c:1136
 #: ../src/goabackend/goaoauthprovider.c:1041
+#: ../src/goabackend/goaowncloudprovider.c:795
+#: ../src/goabackend/goaowncloudprovider.c:1008
+#: ../src/goabackend/goatelepathyprovider.c:487
+#: ../src/goabackend/goatelepathyprovider.c:536
+#: ../src/goabackend/goatelepathyprovider.c:710
 #, c-format
 msgid "Dialog was dismissed"
 msgstr "Dialogen ble forkastet"
 
-#: ../src/goabackend/goaoauth2provider.c:1012
+#: ../src/goabackend/goaoauth2provider.c:1162
 #: ../src/goabackend/goaoauthprovider.c:1072
 msgid "Error getting an Access Token: "
 msgstr "Feil ved henting av tilgangskode: "
 
-#: ../src/goabackend/goaoauth2provider.c:1027
+#: ../src/goabackend/goaoauth2provider.c:1177
 #: ../src/goabackend/goaoauthprovider.c:1085
 msgid "Error getting identity: "
 msgstr "Feil ved henting av identitet: "
@@ -183,13 +198,13 @@
 msgid "There is already an account for the identity %s"
 msgstr "Det finnes allerede en konto for identiteten %s"
 
-#: ../src/goabackend/goaoauth2provider.c:1304
-#: ../src/goabackend/goaoauthprovider.c:1390
+#: ../src/goabackend/goaoauth2provider.c:1389
+#: ../src/goabackend/goaoauthprovider.c:1391
 #, c-format
 msgid "Was asked to login as %s, but logged in as %s"
 msgstr "Ble spurt om å logge inn som %s, men logget inn som %s"
 
-#: ../src/goabackend/goaexchangeprovider.c:279
+#: ../src/goabackend/goaexchangeprovider.c:282
 #: ../src/goabackend/goagoogleprovider.c:651
 #: ../src/goabackend/goaoauth2provider.c:1443
 #: ../src/goabackend/goaoauthprovider.c:1545
@@ -197,13 +212,13 @@
 msgid "Credentials not found in keyring (%s, %d): "
 msgstr "Påloggingsinformasjon ikke funnet i nøkkelring (%s, %d): "
 
-#: ../src/goabackend/goaoauth2provider.c:1470
+#: ../src/goabackend/goaoauth2provider.c:1548
 #, c-format
 msgid "Credentials do not contain access_token"
 msgstr "Påloggingsinformasjon inneholder ikke access_token"
 
-#: ../src/goabackend/goaoauth2provider.c:1509
-#: ../src/goabackend/goaoauthprovider.c:1620
+#: ../src/goabackend/goaoauth2provider.c:1587
+#: ../src/goabackend/goaoauthprovider.c:1619
 #, c-format
 msgid "Failed to refresh access token (%s, %d): "
 msgstr "Klarte ikke å oppdatere tilgangstoken (%s, %d): "
@@ -229,6 +244,8 @@
 msgid ""
 "Expected status 200 for getting a Request Token, instead got status %d (%s)"
 msgstr ""
+"Forventet status 200 ved forespørsel om anmodningstegn (request token). Fikk "
+"i stedet status %d (%s)"
 
 #: ../src/goabackend/goaoauthprovider.c:961
 #, c-format
@@ -240,20 +257,21 @@
 #, c-format
 msgid "Paste token obtained from the <a href=\"%s\">authorization page</a>:"
 msgstr ""
+"Lim inn informasjon hentet fra <a href=\"%s\">autorisasjonssiden</a>:"
 
-#: ../src/goabackend/goaoauthprovider.c:1576
+#: ../src/goabackend/goaoauthprovider.c:1575
 #, c-format
 msgid "Credentials do not contain access_token or access_token_secret"
 msgstr ""
 "Påloggingsinformasjon inneholder ikke access_token eller access_token_secret"
 
-#: ../src/goabackend/goaprovider.c:549
+#: ../src/goabackend/goaprovider.c:688
 #, c-format
 msgid "ensure_credentials_sync is not implemented on type %s"
 msgstr "ensure_credentials_sync er ikke implementert på type %s"
 
-#. Translators: The %s is the type of the provider, e.g. 'google' or 'facebook'
-#: ../src/goabackend/goautils.c:248
+#. Translators: The %s is the type of the provider, e.g. 'google' or 'yahoo'
+#: ../src/goabackend/goautils.c:304
 #, c-format
 msgid "GOA %s credentials for identity %s"
 msgstr "GOA %s påloggingsinformasjon for identitet %s"
@@ -270,11 +288,11 @@
 msgid "Failed to retrieve credentials from the keyring: %s"
 msgstr "Klarte ikke å hente påloggingsinformasjon fra nøkkelring: %s"
 
-#: ../src/goabackend/goautils.c:206
+#: ../src/goabackend/goautils.c:261
 msgid "Error parsing result obtained from the keyring: "
 msgstr "Feil ved lesing av resultat hentet fra nøkkelring: "
 
-#: ../src/goabackend/goatwitterprovider.c:78
+#: ../src/goabackend/goatwitterprovider.c:81
 msgid "Twitter"
 msgstr "Twitter"
 
@@ -288,7 +306,7 @@
 msgid "Didn't find screen_name member in JSON data"
 msgstr "Fant ikke screen_name-medlem i JSON-data"
 
-#: ../src/goabackend/goayahooprovider.c:78
+#: ../src/goabackend/goayahooprovider.c:81
 msgid "Yahoo"
 msgstr "Yahoo"
 
@@ -302,10 +320,12 @@
 msgid "Didn't find value member in JSON data"
 msgstr "Fant ikke value-medlem i JSON-data"
 
-#: ../src/goabackend/goayahooprovider.c:222
+#: ../src/goabackend/goayahooprovider.c:255
 #, c-format
 msgid "Expected status 200 when requesting name, instead got status %d (%s)"
 msgstr ""
+"Forventet statuskode 200 da navn ble etterspurt, men fikk status %d (%s) i "
+"stedet"
 
 #: ../src/goabackend/goayahooprovider.c:235
 msgid "Error parsing usercard response as JSON: "
@@ -321,7 +341,6 @@
 msgid "Didn't find nickname member in JSON data"
 msgstr "Fant ikke nickname-medlem i JSON-data"
 
-#. TODO: look up email address / screenname from GUID
-#: ../src/goabackend/goayahooprovider.c:324
+#: ../src/goabackend/goaimapsmtpprovider.c:1521
 msgid "Name"
 msgstr "Navn"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-power-manager.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-power-manager.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-power-manager.po	2013-01-29 09:34:01.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-power-manager.po	2014-01-07 06:37:21.000000000 +0000
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 13:51+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:18+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:1
@@ -105,41 +105,41 @@
 
 #. TRANSLATORS: shown on the titlebar
 #. TRANSLATORS: the program name
-#: ../data/gnome-power-statistics.desktop.in.in.h:2
-#: ../data/gpm-statistics.ui.h:6 ../src/gpm-statistics.c:1044
-#: ../src/gpm-statistics.c:1517
+#: ../data/gnome-power-statistics.desktop.in.in.h:1
+#: ../data/gpm-statistics.ui.h:1 ../src/gpm-statistics.c:1370
+#: ../src/gpm-statistics.c:1859
 msgid "Power Statistics"
 msgstr "Strømstatistikk"
 
-#: ../data/gnome-power-statistics.desktop.in.in.h:1
+#: ../data/gnome-power-statistics.desktop.in.in.h:2
 msgid "Observe power management"
 msgstr "Overvåk strømstyring"
 
-#: ../data/gpm-statistics.ui.h:3 ../src/gpm-statistics.c:206
+#: ../data/gpm-statistics.ui.h:2 ../src/gpm-statistics.c:473
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../data/gpm-statistics.ui.h:4
+#: ../data/gpm-statistics.ui.h:3
 msgid "Graph type:"
 msgstr "Type graf:"
 
-#: ../data/gpm-statistics.ui.h:2
+#: ../data/gpm-statistics.ui.h:4
 msgid "Data length:"
 msgstr "Datalengde:"
 
-#: ../data/gpm-statistics.ui.h:10
+#: ../data/gpm-statistics.ui.h:5
 msgid "There is no data to display."
 msgstr "Ingen data å vise"
 
-#: ../data/gpm-statistics.ui.h:11
+#: ../data/gpm-statistics.ui.h:6
 msgid "Use smoothed line"
 msgstr "Bruk utjevnet linje"
 
-#: ../data/gpm-statistics.ui.h:8
+#: ../data/gpm-statistics.ui.h:7
 msgid "Show data points"
 msgstr "Vis datapunkter"
 
-#: ../data/gpm-statistics.ui.h:5
+#: ../data/gpm-statistics.ui.h:8
 msgid "History"
 msgstr "Historikk"
 
@@ -147,79 +147,80 @@
 msgid "Statistics"
 msgstr "Statistikk"
 
-#: ../data/gpm-statistics.ui.h:7
+#: ../data/gpm-statistics.ui.h:10
 msgid "Processor wakeups per second:"
 msgstr "Antall ganger prosessoren våkner opp per sekund:"
 
-#: ../data/gpm-statistics.ui.h:1
+#: ../data/gpm-statistics.ui.h:11
 msgid "0"
 msgstr "0"
 
-#: ../data/gpm-statistics.ui.h:12 ../src/gpm-statistics.c:192
+#: ../data/gpm-statistics.ui.h:12 ../src/gpm-statistics.c:459
 msgid "Wakeups"
 msgstr "Oppvåkninger"
 
 #. Translators: This is %i days
-#: ../src/gpm-graph-widget.c:434
+#: ../src/gpm-graph-widget.c:426
 #, c-format
 msgid "%id"
 msgstr "%id"
 
 #. Translators: This is %i days %02i hours
-#: ../src/gpm-graph-widget.c:437
+#: ../src/gpm-graph-widget.c:429
 #, c-format
 msgid "%id%02ih"
 msgstr "%id%02ih"
 
 #. Translators: This is %i hours
-#: ../src/gpm-graph-widget.c:442
+#: ../src/gpm-graph-widget.c:434
 #, c-format
 msgid "%ih"
 msgstr "%ih"
 
 #. Translators: This is %i hours %02i minutes
-#: ../src/gpm-graph-widget.c:445
+#: ../src/gpm-graph-widget.c:437
 #, c-format
 msgid "%ih%02im"
 msgstr "%ih%02im"
 
 #. Translators: This is %2i minutes
-#: ../src/gpm-graph-widget.c:450
+#: ../src/gpm-graph-widget.c:442
 #, c-format
 msgid "%2im"
 msgstr "%2im"
 
 #. Translators: This is %2i minutes %02i seconds
-#: ../src/gpm-graph-widget.c:453
+#: ../src/gpm-graph-widget.c:445
 #, c-format
 msgid "%2im%02i"
 msgstr "%2im%02i"
 
 #. Translators: This is %2i seconds
-#: ../src/gpm-graph-widget.c:457
+#: ../src/gpm-graph-widget.c:449
 #, c-format
 msgid "%2is"
 msgstr "%2is"
 
 #. Translators: This is %i Percentage
-#: ../src/gpm-graph-widget.c:461
+#: ../src/gpm-graph-widget.c:453
 #, c-format
 msgid "%i%%"
 msgstr "%i%%"
 
 #. Translators: This is %.1f Watts
-#: ../src/gpm-graph-widget.c:464
+#: ../src/gpm-graph-widget.c:456
 #, c-format
 msgid "%.1fW"
 msgstr "%.1fW"
 
 #. Translators: This is %.1f Volts
-#: ../src/gpm-graph-widget.c:469
+#: ../src/gpm-graph-widget.c:461
 #, c-format
 msgid "%.1fV"
 msgstr "%.1fV"
 
-#: ../src/gpm-statistics.c:80 ../src/gpm-statistics.c:446
+#. TRANSLATORS: the rate of discharge for the device
+#: ../src/gpm-statistics.c:80 ../src/gpm-statistics.c:731
 msgid "Rate"
 msgstr "Rate"
 
@@ -227,11 +228,11 @@
 msgid "Charge"
 msgstr "Lading"
 
-#: ../src/gpm-statistics.c:82 ../src/gpm-statistics.c:460
+#: ../src/gpm-statistics.c:82 ../src/gpm-statistics.c:745
 msgid "Time to full"
 msgstr "Tid til full"
 
-#: ../src/gpm-statistics.c:83 ../src/gpm-statistics.c:465
+#: ../src/gpm-statistics.c:83 ../src/gpm-statistics.c:750
 msgid "Time to empty"
 msgstr "Tid til tom"
 
@@ -247,204 +248,210 @@
 msgid "6 hours"
 msgstr "6 timer"
 
-#: ../src/gpm-statistics.c:92
+#: ../src/gpm-statistics.c:93
 msgid "1 day"
 msgstr "1 dag"
 
-#: ../src/gpm-statistics.c:93
+#: ../src/gpm-statistics.c:94
 msgid "1 week"
 msgstr "1 uke"
 
-#: ../src/gpm-statistics.c:100
+#. TRANSLATORS: what we've observed about the device
+#: ../src/gpm-statistics.c:103
 msgid "Charge profile"
 msgstr "Ladeprofil"
 
-#: ../src/gpm-statistics.c:102
+#: ../src/gpm-statistics.c:104
 msgid "Discharge profile"
 msgstr "Profil for utlading"
 
-#: ../src/gpm-statistics.c:101
+#. TRANSLATORS: how accurately we can predict the time remaining of the battery
+#: ../src/gpm-statistics.c:106
 msgid "Charge accuracy"
 msgstr "Nøyaktighet for ladetid"
 
-#: ../src/gpm-statistics.c:103
+#: ../src/gpm-statistics.c:107
 msgid "Discharge accuracy"
 msgstr "Nøyaktighet for utladingstid"
 
 #. TRANSLATORS: system power cord
-#: ../src/gpm-upower.c:533
+#: ../src/gpm-statistics.c:248
 msgid "AC adapter"
 msgid_plural "AC adapters"
 msgstr[0] "AC-adapter"
 msgstr[1] "AC-adaptere"
 
 #. TRANSLATORS: laptop primary battery
-#: ../src/gpm-upower.c:537
+#: ../src/gpm-statistics.c:252
 msgid "Laptop battery"
 msgid_plural "Laptop batteries"
 msgstr[0] "Batteri"
 msgstr[1] "Batterier"
 
 #. TRANSLATORS: battery-backed AC power source
-#: ../src/gpm-upower.c:541
+#: ../src/gpm-statistics.c:256
 msgid "UPS"
 msgid_plural "UPSs"
 msgstr[0] "UPS"
 msgstr[1] "UPSer"
 
 #. TRANSLATORS: a monitor is a device to measure voltage and current
-#: ../src/gpm-upower.c:545
+#: ../src/gpm-statistics.c:260
 msgid "Monitor"
 msgid_plural "Monitors"
 msgstr[0] "Skjerm"
 msgstr[1] "Skjermer"
 
 #. TRANSLATORS: wireless mice with internal batteries
-#: ../src/gpm-statistics.c:304
+#: ../src/gpm-statistics.c:264
 msgid "Mouse"
 msgid_plural "Mice"
 msgstr[0] "Mus"
 msgstr[1] "Mus"
 
 #. TRANSLATORS: wireless keyboard with internal battery
-#: ../src/gpm-statistics.c:308
+#: ../src/gpm-statistics.c:268
 msgid "Keyboard"
 msgid_plural "Keyboards"
 msgstr[0] "Tastatur"
 msgstr[1] "Tastatur"
 
 #. TRANSLATORS: portable device
-#: ../src/gpm-upower.c:557
+#: ../src/gpm-statistics.c:272
 msgid "PDA"
 msgid_plural "PDAs"
 msgstr[0] "PDA"
 msgstr[1] "PDAer"
 
 #. TRANSLATORS: cell phone (mobile...)
-#: ../src/gpm-upower.c:561
+#: ../src/gpm-statistics.c:276
 msgid "Cell phone"
 msgid_plural "Cell phones"
 msgstr[0] "Mobiltelefon"
 msgstr[1] "Mobiltelefoner"
 
 #. TRANSLATORS: media player, mp3 etc
-#: ../src/gpm-statistics.c:321
+#: ../src/gpm-statistics.c:281
 msgid "Media player"
 msgid_plural "Media players"
 msgstr[0] "Mediespiller"
 msgstr[1] "Mediespillere"
 
 #. TRANSLATORS: tablet device
-#: ../src/gpm-statistics.c:325
+#: ../src/gpm-statistics.c:285
 msgid "Tablet"
 msgid_plural "Tablets"
 msgstr[0] "Tablet"
 msgstr[1] "Tableter"
 
 #. TRANSLATORS: tablet device
-#: ../src/gpm-statistics.c:329
+#: ../src/gpm-statistics.c:289
 msgid "Computer"
 msgid_plural "Computers"
 msgstr[0] "Datamaskin"
 msgstr[1] "Datamaskiner"
 
 #. TRANSLATORS: battery technology
-#: ../src/gpm-upower.c:619
+#: ../src/gpm-statistics.c:309
 msgid "Lithium Ion"
 msgstr "Litium ion"
 
 #. TRANSLATORS: battery technology
-#: ../src/gpm-upower.c:623
+#: ../src/gpm-statistics.c:313
 msgid "Lithium Polymer"
 msgstr "Litium polymer"
 
 #. TRANSLATORS: battery technology
-#: ../src/gpm-upower.c:627
+#: ../src/gpm-statistics.c:317
 msgid "Lithium Iron Phosphate"
 msgstr "Litium jern fosfat"
 
 #. TRANSLATORS: battery technology
-#: ../src/gpm-upower.c:631
+#: ../src/gpm-statistics.c:321
 msgid "Lead acid"
 msgstr "Lead acid"
 
 #. TRANSLATORS: battery technology
-#: ../src/gpm-upower.c:635
+#: ../src/gpm-statistics.c:325
 msgid "Nickel Cadmium"
 msgstr "Nikkel-kadmium"
 
 #. TRANSLATORS: battery technology
-#: ../src/gpm-upower.c:639
+#: ../src/gpm-statistics.c:329
 msgid "Nickel metal hydride"
 msgstr "Nikkel/metall hybrid"
 
 #. TRANSLATORS: battery technology
-#: ../src/gpm-upower.c:643
+#: ../src/gpm-statistics.c:333
 msgid "Unknown technology"
 msgstr "Ukjent teknologi"
 
-#: ../src/gpm-upower.c:422
+#. TRANSLATORS: battery state
+#: ../src/gpm-statistics.c:353
 msgid "Charging"
 msgstr "Lader"
 
-#: ../src/gpm-upower.c:425
+#. TRANSLATORS: battery state
+#: ../src/gpm-statistics.c:357
 msgid "Discharging"
 msgstr "Lader ut"
 
 #. TRANSLATORS: battery state
-#: ../src/gpm-statistics.c:401
+#: ../src/gpm-statistics.c:361
 msgid "Empty"
 msgstr "Tom"
 
-#: ../src/gpm-upower.c:419
+#. TRANSLATORS: battery state
+#: ../src/gpm-statistics.c:365
 msgid "Charged"
 msgstr "Ladet"
 
 #. TRANSLATORS: battery state
-#: ../src/gpm-statistics.c:409
+#: ../src/gpm-statistics.c:369
 msgid "Waiting to charge"
 msgstr "Venter på å lade"
 
 #. TRANSLATORS: battery state
-#: ../src/gpm-statistics.c:413
+#: ../src/gpm-statistics.c:373
 msgid "Waiting to discharge"
 msgstr "Venter på å lade ut"
 
-#: ../src/gpm-statistics.c:130
+#: ../src/gpm-statistics.c:397
 msgid "Attribute"
 msgstr "Attributt"
 
-#: ../src/gpm-statistics.c:137
+#: ../src/gpm-statistics.c:404
 msgid "Value"
 msgstr "Verdi"
 
-#: ../src/gpm-statistics.c:154
+#: ../src/gpm-statistics.c:421
 msgid "Image"
 msgstr "Bilde"
 
-#: ../src/gpm-statistics.c:160
+#: ../src/gpm-statistics.c:427
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../src/gpm-statistics.c:179 ../src/gpm-statistics.c:402
+#: ../src/gpm-statistics.c:446 ../src/gpm-statistics.c:670
 msgid "Type"
 msgstr "Type"
 
-#: ../src/gpm-statistics.c:185
+#: ../src/gpm-statistics.c:452
 msgid "ID"
 msgstr "ID"
 
-#: ../src/gpm-statistics.c:199
+#: ../src/gpm-statistics.c:466
 msgid "Command"
 msgstr "Kommando"
 
+#. TRANSLATORS: battery state
 #. TRANSLATORS: this is when the stats time is not known
-#: ../src/gpm-statistics.c:284
+#: ../src/gpm-statistics.c:377 ../src/gpm-statistics.c:551
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. TRANSLATORS: this is a time value, usually to show on a graph
-#: ../src/gpm-statistics.c:288
+#: ../src/gpm-statistics.c:555
 #, c-format
 msgid "%.0f second"
 msgid_plural "%.0f seconds"
@@ -452,7 +459,7 @@
 msgstr[1] "%.0f sekunder"
 
 #. TRANSLATORS: this is a time value, usually to show on a graph
-#: ../src/gpm-statistics.c:293
+#: ../src/gpm-statistics.c:560
 #, c-format
 msgid "%.1f minute"
 msgid_plural "%.1f minutes"
@@ -460,7 +467,7 @@
 msgstr[1] "%.1f minutter"
 
 #. TRANSLATORS: this is a time value, usually to show on a graph
-#: ../src/gpm-statistics.c:298
+#: ../src/gpm-statistics.c:565
 #, c-format
 msgid "%.1f hour"
 msgid_plural "%.1f hours"
@@ -468,275 +475,298 @@
 msgstr[1] "%.1f timer"
 
 #. TRANSLATORS: this is a time value, usually to show on a graph
-#: ../src/gpm-statistics.c:302
+#: ../src/gpm-statistics.c:569
 #, c-format
 msgid "%.1f day"
 msgid_plural "%.1f days"
 msgstr[0] "%.1f dag"
 msgstr[1] "%.1f dager"
 
-#: ../src/gpm-statistics.c:311
+#: ../src/gpm-statistics.c:578
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/gpm-statistics.c:311
+#: ../src/gpm-statistics.c:578
 msgid "No"
 msgstr "Nei"
 
-#: ../src/gpm-statistics.c:399
+#. TRANSLATORS: the device ID of the current device, e.g. "battery0"
+#: ../src/gpm-statistics.c:667
 msgid "Device"
 msgstr "Enhet"
 
-#: ../src/gpm-statistics.c:404
+#: ../src/gpm-statistics.c:672
 msgid "Vendor"
 msgstr "Leverandør"
 
-#: ../src/gpm-statistics.c:406
+#: ../src/gpm-statistics.c:674
 msgid "Model"
 msgstr "Modell"
 
-#: ../src/gpm-statistics.c:408
+#: ../src/gpm-statistics.c:676
 msgid "Serial number"
 msgstr "Serienummer"
 
-#: ../src/gpm-statistics.c:409
+#. TRANSLATORS: a boolean attribute that means if the device is supplying the
+#. * main power for the computer. For instance, an AC adapter or laptop battery
+#. * would be TRUE,  but a mobile phone or mouse taking power is FALSE
+#: ../src/gpm-statistics.c:681
 msgid "Supply"
 msgstr "Forsyning"
 
-#: ../src/gpm-statistics.c:412
+#: ../src/gpm-statistics.c:684
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: ../src/gpm-statistics.c:413
+#. TRANSLATORS: when the device was last updated with new data. It's
+#. * usually a few seconds when a device is discharging or charging.
+#: ../src/gpm-statistics.c:688
 msgid "Refreshed"
 msgstr "Oppdatert"
 
-#: ../src/gpm-statistics.c:420
+#. TRANSLATORS: Present is whether the device is currently attached
+#. * to the computer, as some devices (e.g. laptop batteries) can
+#. * be removed, but still observed as devices on the system
+#: ../src/gpm-statistics.c:698
 msgid "Present"
 msgstr "Tilstede"
 
-#: ../src/gpm-statistics.c:424
+#. TRANSLATORS: If the device can be recharged, e.g. lithium
+#. * batteries rather than alkaline ones
+#: ../src/gpm-statistics.c:705
 msgid "Rechargeable"
 msgstr "Ladbart"
 
-#: ../src/gpm-statistics.c:428
+#. TRANSLATORS: The state of the device, e.g. "Changing" or "Fully charged"
+#: ../src/gpm-statistics.c:711
 msgid "State"
 msgstr "Tilstand"
 
-#: ../src/gpm-statistics.c:431
+#: ../src/gpm-statistics.c:715
 msgid "Energy"
 msgstr "Strømstyrke"
 
-#: ../src/gpm-statistics.c:434
+#: ../src/gpm-statistics.c:718
 msgid "Energy when empty"
 msgstr "Strømstyrke når tom"
 
-#: ../src/gpm-statistics.c:437
+#: ../src/gpm-statistics.c:721
 msgid "Energy when full"
 msgstr "Strømstyrke når full"
 
-#: ../src/gpm-statistics.c:440
+#: ../src/gpm-statistics.c:724
 msgid "Energy (design)"
 msgstr "Strømstyrke (fabrikk)"
 
-#: ../src/gpm-statistics.c:453
+#: ../src/gpm-statistics.c:738
 msgid "Voltage"
 msgstr "Spenning"
 
-#: ../src/gpm-statistics.c:474
+#. TRANSLATORS: the amount of charge the cell contains
+#: ../src/gpm-statistics.c:760
 msgid "Percentage"
 msgstr "Prosent"
 
-#: ../src/gpm-statistics.c:479
+#. TRANSLATORS: the capacity of the device, which is basically a measure
+#. * of how full it can get, relative to the design capacity
+#: ../src/gpm-statistics.c:767
 msgid "Capacity"
 msgstr "Kapasitet"
 
-#: ../src/gpm-statistics.c:483
+#. TRANSLATORS: the type of battery, e.g. lithium or nikel metal hydroxide
+#: ../src/gpm-statistics.c:772
 msgid "Technology"
 msgstr "Teknologi"
 
-#: ../src/gpm-statistics.c:485
+#. TRANSLATORS: this is when the device is plugged in, typically
+#. * only shown for the ac adaptor device
+#: ../src/gpm-statistics.c:777
 msgid "Online"
 msgstr "Tilkoblet"
 
 #. TRANSLATORS: the command line was not provided
-#: ../src/gpm-statistics.c:796
+#: ../src/gpm-statistics.c:1104
 msgid "No data"
 msgstr "Ingen data"
 
 #. TRANSLATORS: kernel module, usually a device driver
-#: ../src/gpm-statistics.c:803 ../src/gpm-statistics.c:808
+#: ../src/gpm-statistics.c:1111 ../src/gpm-statistics.c:1116
 msgid "Kernel module"
 msgstr "Kjernemodul"
 
 #. TRANSLATORS: kernel housekeeping
-#: ../src/gpm-statistics.c:813
+#: ../src/gpm-statistics.c:1121
 msgid "Kernel core"
 msgstr "Kjerne"
 
 #. TRANSLATORS: interrupt between processors
-#: ../src/gpm-statistics.c:818
+#: ../src/gpm-statistics.c:1126
 msgid "Interprocessor interrupt"
 msgstr "Avbrudd på tvers av prosessorene"
 
 #. TRANSLATORS: unknown interrupt
-#: ../src/gpm-statistics.c:823
+#: ../src/gpm-statistics.c:1131
 msgid "Interrupt"
 msgstr "Avbrudd"
 
 #. TRANSLATORS: the keyboard and mouse device event
-#: ../src/gpm-statistics.c:866
+#: ../src/gpm-statistics.c:1178
 msgid "PS/2 keyboard/mouse/touchpad"
 msgstr "PS/2 tastatur/mus/musplate"
 
 #. TRANSLATORS: ACPI, the Intel power standard on laptops and desktops
-#: ../src/gpm-statistics.c:869
+#: ../src/gpm-statistics.c:1181
 msgid "ACPI"
 msgstr "ACPI"
 
 #. TRANSLATORS: serial ATA is a new style of hard disk interface
-#: ../src/gpm-statistics.c:872
+#: ../src/gpm-statistics.c:1184
 msgid "Serial ATA"
 msgstr "Seriell ATA"
 
 #. TRANSLATORS: this is the old-style ATA interface
-#: ../src/gpm-statistics.c:875
+#: ../src/gpm-statistics.c:1187
 msgid "ATA host controller"
 msgstr "ATA vertskontroller"
 
 #. TRANSLATORS: 802.11 wireless adaptor
-#: ../src/gpm-statistics.c:878
+#: ../src/gpm-statistics.c:1190
 msgid "Intel wireless adaptor"
 msgstr "Intel trådløskort"
 
-#. TRANSLATORS: a timer is something that fires periodically
-#: ../src/gpm-statistics.c:883 ../src/gpm-statistics.c:886
-#: ../src/gpm-statistics.c:889 ../src/gpm-statistics.c:892
-#: ../src/gpm-statistics.c:895
+#. TRANSLATORS: a timer is something that fires periodically.
+#. * The parameter is a process name, e.g. "firefox-bin".
+#. * This is shown when the timer wakes up.
+#: ../src/gpm-statistics.c:1197 ../src/gpm-statistics.c:1202
+#: ../src/gpm-statistics.c:1207 ../src/gpm-statistics.c:1212
+#: ../src/gpm-statistics.c:1217
 #, c-format
 msgid "Timer %s"
 msgstr "Stoppeklokke %s"
 
-#. TRANSLATORS: this is a task that's woken up from sleeping
-#: ../src/gpm-statistics.c:898
+#. TRANSLATORS: the parameter is the name of task that's woken up from sleeping.
+#. * This is shown when the task wakes up.
+#: ../src/gpm-statistics.c:1221
 #, c-format
 msgid "Sleep %s"
 msgstr "Sov %s"
 
-#. TRANSLATORS: this is a new realtime task
-#: ../src/gpm-statistics.c:901
+#. TRANSLATORS: this is the name of a new realtime task.
+#: ../src/gpm-statistics.c:1224
 #, c-format
 msgid "New task %s"
 msgstr "Ny oppgave %s"
 
-#. TRANSLATORS: this is a task thats woken to check state
-#: ../src/gpm-statistics.c:904
+#. TRANSLATORS: this is the name of a task that's woken to check state.
+#. * This is shown when the task wakes up.
+#: ../src/gpm-statistics.c:1228
 #, c-format
 msgid "Wait %s"
 msgstr "Vent %s"
 
-#. TRANSLATORS: a work queue is a list of work that has to be done
-#: ../src/gpm-statistics.c:907 ../src/gpm-statistics.c:910
+#. TRANSLATORS: this is the name of a work queue.
+#. * A work queue is a list of work that has to be done.
+#: ../src/gpm-statistics.c:1232 ../src/gpm-statistics.c:1236
 #, c-format
 msgid "Work queue %s"
 msgstr "Arbeidskø %s"
 
 #. TRANSLATORS: this is when the networking subsystem clears out old entries
-#: ../src/gpm-statistics.c:913
+#: ../src/gpm-statistics.c:1239
 #, c-format
 msgid "Network route flush %s"
 msgstr "Tømming av nettverksruter %s"
 
-#. TRANSLATORS: activity on the USB bus
-#: ../src/gpm-statistics.c:916
+#. TRANSLATORS: this is the name of an activity on the USB bus
+#: ../src/gpm-statistics.c:1242
 #, c-format
 msgid "USB activity %s"
 msgstr "USB aktivitet %s"
 
-#. TRANSLATORS: we've timed out of an aligned timer
-#: ../src/gpm-statistics.c:919
+#. TRANSLATORS: we've timed out of an aligned timer, with the name
+#: ../src/gpm-statistics.c:1245
 #, c-format
 msgid "Wakeup %s"
 msgstr "Vekk %s"
 
 #. TRANSLATORS: interupts on the system required for basic operation
-#: ../src/gpm-statistics.c:922
+#: ../src/gpm-statistics.c:1248
 msgid "Local interrupts"
 msgstr "Lokale avbrudd"
 
 #. TRANSLATORS: interrupts when a task gets moved from one core to another
-#: ../src/gpm-statistics.c:925
+#: ../src/gpm-statistics.c:1251
 msgid "Rescheduling interrupts"
 msgstr "Planlegger avbrudd på nytt"
 
 #. TRANSLATORS: shown on the titlebar
-#: ../src/gpm-statistics.c:1034
+#: ../src/gpm-statistics.c:1360
 msgid "Device Information"
 msgstr "Informasjon om enhet"
 
 #. TRANSLATORS: shown on the titlebar
-#: ../src/gpm-statistics.c:1036
+#: ../src/gpm-statistics.c:1362
 msgid "Device History"
 msgstr "Historikk for enhet"
 
 #. TRANSLATORS: shown on the titlebar
-#: ../src/gpm-statistics.c:1038
+#: ../src/gpm-statistics.c:1364
 msgid "Device Profile"
 msgstr "Profil for enhet"
 
 #. TRANSLATORS: shown on the titlebar
-#: ../src/gpm-statistics.c:1040
+#: ../src/gpm-statistics.c:1366
 msgid "Processor Wakeups"
 msgstr "Prosessoroppvåkninger"
 
 #. TRANSLATORS: this is the X axis on the graph
-#: ../src/gpm-statistics.c:1246 ../src/gpm-statistics.c:1252
-#: ../src/gpm-statistics.c:1258 ../src/gpm-statistics.c:1264
+#: ../src/gpm-statistics.c:1562 ../src/gpm-statistics.c:1568
+#: ../src/gpm-statistics.c:1574 ../src/gpm-statistics.c:1580
 msgid "Time elapsed"
 msgstr "Medgått tid"
 
 #. TRANSLATORS: this is the Y axis on the graph
-#: ../src/gpm-statistics.c:1248
+#: ../src/gpm-statistics.c:1564
 msgid "Power"
 msgstr "Strøm"
 
 #. TRANSLATORS: this is the Y axis on the graph for the whole battery device
 #. TRANSLATORS: this is the X axis on the graph for the whole battery device
-#: ../src/gpm-statistics.c:1254 ../src/gpm-statistics.c:1297
-#: ../src/gpm-statistics.c:1303 ../src/gpm-statistics.c:1309
-#: ../src/gpm-statistics.c:1315
+#: ../src/gpm-statistics.c:1570 ../src/gpm-statistics.c:1613
+#: ../src/gpm-statistics.c:1619 ../src/gpm-statistics.c:1625
+#: ../src/gpm-statistics.c:1631
 msgid "Cell charge"
 msgstr "Spenning for celle"
 
 #. TRANSLATORS: this is the Y axis on the graph
-#: ../src/gpm-statistics.c:1260 ../src/gpm-statistics.c:1266
+#: ../src/gpm-statistics.c:1576 ../src/gpm-statistics.c:1582
 msgid "Predicted time"
 msgstr "Estimert tid"
 
 #. TRANSLATORS: this is the Y axis on the graph
-#: ../src/gpm-statistics.c:1299 ../src/gpm-statistics.c:1311
+#: ../src/gpm-statistics.c:1615 ../src/gpm-statistics.c:1627
 msgid "Correction factor"
 msgstr "Korrigeringsfaktor"
 
 #. TRANSLATORS: this is the Y axis on the graph
-#: ../src/gpm-statistics.c:1305 ../src/gpm-statistics.c:1317
+#: ../src/gpm-statistics.c:1621 ../src/gpm-statistics.c:1633
 msgid "Prediction accuracy"
 msgstr "Nøyaktighet for forutbestemmelse"
 
 #. TRANSLATORS: show verbose debugging
-#: ../src/gpm-main.c:171 ../src/gpm-prefs.c:90 ../src/gpm-statistics.c:1497
+#: ../src/gpm-statistics.c:1847
 msgid "Show extra debugging information"
 msgstr "Vis ekstra feilsøkingsinformasjon"
 
 #. TRANSLATORS: show a device by default
-#: ../src/gpm-statistics.c:1500
+#: ../src/gpm-statistics.c:1850
 msgid "Select this device at startup"
 msgstr "Velg denne enheten ved oppstart"
 
 #. TRANSLATORS: the icon for the CPU
-#: ../src/gpm-statistics.c:1776
+#: ../src/gpm-statistics.c:2116
 msgid "Processor"
 msgstr "Prosessor"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-screensaver.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-screensaver.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-screensaver.po	2013-01-29 09:33:58.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-screensaver.po	2014-01-07 06:37:21.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 13:52+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:18+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: no\n"
 
 #: ../src/gnome-screensaver-command.c:46
@@ -213,38 +213,38 @@
 msgid "No longer permitted to access the system."
 msgstr "Har ikke rettigheter til å aksessere systemet lenger."
 
-#: ../src/gs-listener-dbus.c:1285
+#: ../src/gs-listener-dbus.c:1307
 msgid "failed to register with the message bus"
 msgstr "kunne ikke registrere hos dbus"
 
-#: ../src/gs-listener-dbus.c:1295
+#: ../src/gs-listener-dbus.c:1317
 msgid "not connected to the message bus"
 msgstr "ikke koblet til meldingsbussen"
 
-#: ../src/gs-listener-dbus.c:1304 ../src/gs-listener-dbus.c:1334
+#: ../src/gs-listener-dbus.c:1326 ../src/gs-listener-dbus.c:1356
 msgid "screensaver already running in this session"
 msgstr "skjermsparer kjører allerede i denne sesjonen"
 
-#: ../src/gs-lock-plug.c:288
+#: ../src/gs-lock-plug.c:294
 msgid "Time has expired."
 msgstr "Tiden har løpt ut."
 
-#: ../src/gs-lock-plug.c:319
+#: ../src/gs-lock-plug.c:325
 msgid "You have the Caps Lock key on."
 msgstr "Caps-Lock-tasten er på."
 
-#: ../src/gs-lock-plug.c:1392
+#: ../src/gs-lock-plug.c:1398
 msgid "S_witch User…"
 msgstr "_Bytt bruker …"
 
-#: ../src/gs-lock-plug.c:1401
+#: ../src/gs-lock-plug.c:1407
 msgid "Log _Out"
 msgstr "L_ogg ut"
 
-#: ../src/gs-lock-plug.c:1408
+#: ../src/gs-lock-plug.c:1414
 msgid "_Unlock"
 msgstr "Lås _opp"
 
-#: ../src/gs-lock-plug.c:1490 ../src/gs-lock-plug.c:1513
+#: ../src/gs-lock-plug.c:1622 ../src/gs-lock-plug.c:1672
 msgid "_Password:"
 msgstr "_Passord:"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-screenshot.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-screenshot.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-screenshot.po	2013-01-29 09:34:02.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-screenshot.po	2014-01-07 06:37:52.000000000 +0000
@@ -8,18 +8,18 @@
 msgstr ""
 "Project-Id-Version: gnome-screenshot 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-16 23:21+0000\n"
-"PO-Revision-Date: 2012-04-18 15:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2013-03-20 22:34+0000\n"
+"PO-Revision-Date: 2013-03-21 06:34+0000\n"
+"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:39+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 21:11+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
-#: ../src/gnome-screenshot.desktop.in.h:1 ../src/screenshot-application.c:680
+#: ../src/gnome-screenshot.desktop.in.h:1 ../src/screenshot-application.c:779
 msgid "Screenshot"
 msgstr "Skjermdump"
 
@@ -27,23 +27,23 @@
 msgid "Save images of your desktop or individual windows"
 msgstr "Lagre bilder av ditt skrivebord eller individuelle vinduer"
 
-#: ../src/gnome-screenshot.desktop.in.h:3
+#: ../src/gnome-screenshot.desktop.in.h:4
 msgid "Take a Screenshot of the Whole Screen"
 msgstr "Ta skjermdump av hele skjermen"
 
-#: ../src/gnome-screenshot.desktop.in.h:4
+#: ../src/gnome-screenshot.desktop.in.h:5
 msgid "Take a Screenshot of the Current Window"
 msgstr "Ta skjermdump av aktivt vindu"
 
-#: ../src/gnome-screenshot.desktop.in.h:5
+#: ../src/gnome-screenshot.desktop.in.h:6
 msgid "Take a Screenshot of a Selected Area"
-msgstr ""
+msgstr "Ta skjermdump av et valgt område"
 
-#: ../src/screenshot-dialog.c:172
+#: ../src/screenshot-dialog.ui.h:1
 msgid "Save Screenshot"
 msgstr "Lagre skjermdump"
 
-#: ../src/screenshot-dialog.ui.h:1
+#: ../src/screenshot-dialog.ui.h:4
 msgid "C_opy to Clipboard"
 msgstr "K_opier til utklippstavlen"
 
@@ -131,87 +131,87 @@
 "Effekt som skal legges til på utsiden av kanten. Mulige verdier er «shadow», "
 "«none» og «border»."
 
-#: ../src/screenshot-application.c:142
+#: ../src/screenshot-application.c:145
 #, c-format
 msgid "A file named \"%s\" already exists in \"%s\""
 msgstr "En fil med navn «%s» eksisterer allerede i «%s»"
 
-#: ../src/screenshot-application.c:149
+#: ../src/screenshot-application.c:152
 msgid "Overwrite existing file?"
 msgstr "Overskriv eksisterende fil?"
 
-#: ../src/screenshot-application.c:170 ../src/screenshot-application.c:179
-#: ../src/screenshot-application.c:350 ../src/screenshot-application.c:354
-#: ../src/screenshot-application.c:395 ../src/screenshot-application.c:398
+#: ../src/screenshot-application.c:174 ../src/screenshot-application.c:183
+#: ../src/screenshot-application.c:463 ../src/screenshot-application.c:467
+#: ../src/screenshot-application.c:507 ../src/screenshot-application.c:510
 msgid "Unable to capture a screenshot"
 msgstr "Kan ikke utføre skjermdump"
 
-#: ../src/screenshot-application.c:171
+#: ../src/screenshot-application.c:175
 msgid "Error creating file. Please choose another location and retry."
 msgstr ""
 "Feil ved oppretting av fil. Vennligst velg en annen lokasjon og prøv igjen."
 
-#: ../src/screenshot-application.c:351
+#: ../src/screenshot-application.c:464
 msgid "Error creating file"
 msgstr "Feil ved oppretting av fil"
 
-#: ../src/screenshot-application.c:362 ../src/screenshot-application.c:428
+#: ../src/screenshot-application.c:475 ../src/screenshot-application.c:540
 msgid "Screenshot taken"
 msgstr "Skjermdump tatt"
 
-#: ../src/screenshot-application.c:396
+#: ../src/screenshot-application.c:508
 msgid "All possible methods failed"
 msgstr "Alle mulige metoder feilet"
 
-#: ../src/screenshot-application.c:522
+#: ../src/screenshot-application.c:641
 msgid "Send the grab directly to the clipboard"
 msgstr "Send dump direkte til utklippstavlen"
 
-#: ../src/screenshot-application.c:523
+#: ../src/screenshot-application.c:642
 msgid "Grab a window instead of the entire screen"
 msgstr "Dump et vindu i stedet for hele skjermen"
 
-#: ../src/screenshot-application.c:524
+#: ../src/screenshot-application.c:643
 msgid "Grab an area of the screen instead of the entire screen"
 msgstr "Dump en del av skjermen i stedet for hele området"
 
-#: ../src/screenshot-application.c:525
+#: ../src/screenshot-application.c:644
 msgid "Include the window border with the screenshot"
 msgstr "Ta med vinduskant i skjermdumpet"
 
-#: ../src/screenshot-application.c:526
+#: ../src/screenshot-application.c:645
 msgid "Remove the window border from the screenshot"
 msgstr "Fjern vinduskanten i skjermdumpet"
 
-#: ../src/screenshot-application.c:528
+#: ../src/screenshot-application.c:647
 msgid "Take screenshot after specified delay [in seconds]"
 msgstr "Ta skjermdump etter oppgitt pause [i sekunder]"
 
 #. translators: this is the last part of the "grab after a
 #. * delay of <spin button> seconds".
 #. 
-#: ../src/screenshot-application.c:528
-#: ../src/screenshot-interactive-dialog.c:409
+#: ../src/screenshot-application.c:647
+#: ../src/screenshot-interactive-dialog.c:415
 msgid "seconds"
 msgstr "sekunder"
 
-#: ../src/screenshot-application.c:529
+#: ../src/screenshot-application.c:648
 msgid "Effect to add to the border (shadow, border or none)"
 msgstr "Effekt som skal brukes på vinduskanten (skygge, kant eller ingen)"
 
-#: ../src/screenshot-application.c:529
+#: ../src/screenshot-application.c:648
 msgid "effect"
 msgstr "effekt"
 
-#: ../src/screenshot-application.c:530
+#: ../src/screenshot-application.c:649
 msgid "Interactively set options"
 msgstr "Spør etter alternativer"
 
-#: ../src/screenshot-application.c:545
+#: ../src/screenshot-application.c:664
 msgid "Take a picture of the screen"
 msgstr "Ta et bilde av skjermen"
 
-#: ../src/screenshot-config.c:56
+#: ../src/screenshot-config.c:59
 #, c-format
 msgid ""
 "Conflicting options: --window and --area should not be used at the same "
@@ -219,7 +219,7 @@
 msgstr ""
 "Konflikt mellom flagg: --window og --area kan ikke brukes samtidig.\n"
 
-#: ../src/screenshot-config.c:63
+#: ../src/screenshot-config.c:66
 #, c-format
 msgid ""
 "Conflicting options: --area and --delay should not be used at the same "
@@ -234,11 +234,11 @@
 "Fil med definisjon av brukergrensesnitt for skjermdumpprogrammet mangler.\n"
 "Vennligst sjekk gnome-utils-installasjonen."
 
-#: ../src/screenshot-dialog.c:188
+#: ../src/screenshot-dialog.c:173
 msgid "Select a folder"
 msgstr "Velg en mappe"
 
-#: ../src/screenshot-dialog.c:285
+#: ../src/screenshot-dialog.c:309
 msgid "Screenshot.png"
 msgstr "Skjermdump.png"
 
@@ -257,29 +257,29 @@
 msgid "Screenshot from %s - %d.png"
 msgstr "Skjermdump fra %s - %d.png"
 
-#: ../src/screenshot-interactive-dialog.c:148
+#: ../src/screenshot-interactive-dialog.c:154
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/screenshot-interactive-dialog.c:149
+#: ../src/screenshot-interactive-dialog.c:155
 msgid "Drop shadow"
 msgstr "Skygge"
 
-#: ../src/screenshot-interactive-dialog.c:150
+#: ../src/screenshot-interactive-dialog.c:156
 msgid "Border"
 msgstr "Kant"
 
 #. * Include pointer *
-#: ../src/screenshot-interactive-dialog.c:254
+#: ../src/screenshot-interactive-dialog.c:260
 msgid "Include _pointer"
 msgstr "Ta med _peker"
 
 #. * Include window border *
-#: ../src/screenshot-interactive-dialog.c:264
+#: ../src/screenshot-interactive-dialog.c:270
 msgid "Include the window _border"
 msgstr "Ta med vin_dukant"
 
-#: ../src/screenshot-interactive-dialog.c:281
+#: ../src/screenshot-interactive-dialog.c:287
 msgid "Apply _effect:"
 msgstr "Bruk _effekt:"
 
@@ -287,31 +287,31 @@
 msgid "Grab the whole _desktop"
 msgstr "Ta skjermdump av hele skrivebor_det"
 
-#: ../src/screenshot-interactive-dialog.c:357
+#: ../src/screenshot-interactive-dialog.c:363
 msgid "Grab the current _window"
 msgstr "Ta skjermdump av aktivt _vindu"
 
-#: ../src/screenshot-interactive-dialog.c:369
+#: ../src/screenshot-interactive-dialog.c:375
 msgid "Select _area to grab"
 msgstr "Velg _område for skjermdump"
 
 #. translators: this is the first part of the "grab after a
 #. * delay of <spin button> seconds".
 #. 
-#: ../src/screenshot-interactive-dialog.c:389
+#: ../src/screenshot-interactive-dialog.c:406
 msgid "Grab _after a delay of"
 msgstr "T_a skjermdump etter"
 
-#: ../src/screenshot-interactive-dialog.c:435
-#: ../src/screenshot-interactive-dialog.c:453
+#: ../src/screenshot-interactive-dialog.c:448
+#: ../src/screenshot-interactive-dialog.c:458
 msgid "Take Screenshot"
 msgstr "Ta skjermdump"
 
-#: ../src/screenshot-interactive-dialog.c:454
+#: ../src/screenshot-interactive-dialog.c:459
 msgid "Effects"
 msgstr "Effekter"
 
-#: ../src/screenshot-interactive-dialog.c:457
+#: ../src/screenshot-interactive-dialog.c:479
 msgid "Take _Screenshot"
 msgstr "Ta _skjermdump"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-session-3.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-session-3.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-session-3.0.po	2013-01-29 09:33:55.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-session-3.0.po	2014-01-07 06:37:04.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:32+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:38+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: no\n"
 
 #: ../capplet/gsm-app-dialog.c:120
@@ -63,7 +63,7 @@
 msgid "No description"
 msgstr "Ingen beskrivelse"
 
-#: ../capplet/main.c:35 ../gnome-session/main.c:295
+#: ../capplet/main.c:35 ../gnome-session/main.c:288
 msgid "Version of this application"
 msgstr "Versjon av dette programmet"
 
@@ -75,7 +75,7 @@
 msgid "GNOME fallback (Safe Mode)"
 msgstr ""
 
-#: ../data/gnome.session.desktop.in.in.h:1 ../data/gnome.desktop.in.h:1
+#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1
 msgid "GNOME"
 msgstr "GNOME"
 
@@ -209,15 +209,15 @@
 msgid "Icon '%s' not found"
 msgstr "Ikon «%s» ikke funnet"
 
-#: ../gnome-session/gsm-inhibit-dialog.c:588
+#: ../gnome-session/gsm-inhibit-dialog.c:462
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../gnome-session/gsm-inhibit-dialog.c:639
+#: ../gnome-session/gsm-inhibit-dialog.c:510
 msgid "A program is still running:"
 msgstr "Et program kjører fremdeles:"
 
-#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:643
+#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514
 msgid "Some programs are still running:"
 msgstr "Noen programmer kjører fremdeles:"
 
@@ -229,98 +229,97 @@
 "Venter på at programmer skal avsluttes. Hvis du avbryter disse programmene "
 "kan du miste data."
 
-#: ../gnome-session/gsm-inhibit-dialog.c:874
+#: ../gnome-session/gsm-inhibit-dialog.c:745
 msgid "Switch User Anyway"
 msgstr "Bytt bruker likevel"
 
-#: ../gnome-session/gsm-inhibit-dialog.c:877
+#: ../gnome-session/gsm-inhibit-dialog.c:748
 msgid "Log Out Anyway"
 msgstr "Logg ut likevel"
 
-#: ../gnome-session/gsm-inhibit-dialog.c:880
+#: ../gnome-session/gsm-inhibit-dialog.c:751
 msgid "Suspend Anyway"
 msgstr "Gå i hvilemodus likevel"
 
-#: ../gnome-session/gsm-inhibit-dialog.c:883
+#: ../gnome-session/gsm-inhibit-dialog.c:754
 msgid "Hibernate Anyway"
 msgstr "Gå i dvalemodus likevel"
 
-#: ../gnome-session/gsm-inhibit-dialog.c:886
+#: ../gnome-session/gsm-inhibit-dialog.c:757
 msgid "Shut Down Anyway"
 msgstr "Slå av likevel"
 
-#: ../gnome-session/gsm-inhibit-dialog.c:889
+#: ../gnome-session/gsm-inhibit-dialog.c:760
 msgid "Restart Anyway"
 msgstr "Start på nytt likevel"
 
-#: ../gnome-session/gsm-inhibit-dialog.c:897
+#: ../gnome-session/gsm-inhibit-dialog.c:768
 msgid "Lock Screen"
 msgstr "Lås skjerm"
 
-#: ../gnome-session/gsm-inhibit-dialog.c:900
+#: ../gnome-session/gsm-inhibit-dialog.c:771
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. This string is shared with gsm-fail-whale-dialog.c
-#: ../gnome-session/gsm-logout-dialog.c:266
+#: ../gnome-session/gsm-logout-dialog.c:263
 #, c-format
 msgid "You will be automatically logged out in %d second."
 msgid_plural "You will be automatically logged out in %d seconds."
 msgstr[0] "Du vil bli logget ut automatisk om %d sekund."
 msgstr[1] "Du vil bli logget ut automatisk om %d sekunder."
 
-#: ../gnome-session/gsm-logout-dialog.c:274
+#: ../gnome-session/gsm-logout-dialog.c:271
 #, c-format
 msgid "This system will be automatically shut down in %d second."
 msgid_plural "This system will be automatically shut down in %d seconds."
 msgstr[0] "Systemet vil bli slått av automatisk om %d sekund."
 msgstr[1] "Systemet vil bli slått automatisk av om %d sekunder."
 
-#: ../gnome-session/gsm-logout-dialog.c:306
+#: ../gnome-session/gsm-logout-dialog.c:303
 #, c-format
 msgid "You are currently logged in as \"%s\"."
 msgstr "Du er logget inn som «%s»"
 
-#: ../gnome-session/gsm-logout-dialog.c:372
+#: ../gnome-session/gsm-logout-dialog.c:369
 msgid "Log out of this system now?"
 msgstr "Logg ut av dette systemet nå?"
 
-#: ../gnome-session/gsm-logout-dialog.c:378
+#: ../gnome-session/gsm-logout-dialog.c:375
 msgid "_Switch User"
 msgstr "_Bytt bruker"
 
-#: ../gnome-session/gsm-logout-dialog.c:387
-#: ../gnome-session/gsm-fail-whale-dialog.c:337
-#: ../gnome-session/gsm-util.c:428
+#: ../gnome-session/gsm-fail-whale-dialog.c:312
+#: ../gnome-session/gsm-logout-dialog.c:384
 msgid "_Log Out"
 msgstr "_Logg ut"
 
-#: ../gnome-session/gsm-logout-dialog.c:393
+#: ../gnome-session/gsm-logout-dialog.c:390
 msgid "Shut down this system now?"
 msgstr "Slå av dette systemet nå?"
 
-#: ../gnome-session/gsm-logout-dialog.c:399
+#: ../gnome-session/gsm-logout-dialog.c:396
 msgid "S_uspend"
 msgstr "H_vilemodus"
 
-#: ../gnome-session/gsm-logout-dialog.c:405
+#: ../gnome-session/gsm-logout-dialog.c:402
 msgid "_Hibernate"
 msgstr "_Dvalemodus"
 
-#: ../gnome-session/gsm-logout-dialog.c:411
-#: ../gnome-session/gsm-logout-dialog.c:437
+#: ../gnome-session/gsm-logout-dialog.c:408
+#: ../gnome-session/gsm-logout-dialog.c:434
 msgid "_Restart"
 msgstr "Sta_rt på nytt"
 
-#: ../gnome-session/gsm-logout-dialog.c:421
+#: ../gnome-session/gsm-logout-dialog.c:418
 msgid "_Shut Down"
 msgstr "_Slå av"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:311
+#: ../gnome-session/gsm-fail-whale-dialog.c:286
 msgid "Oh no!  Something has gone wrong."
 msgstr "Å nei! Noe har gått galt."
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:318
+#: ../gnome-session/gsm-fail-whale-dialog.c:293
 msgid ""
 "A problem has occurred and the system can't recover. Please contact a system "
 "administrator"
@@ -338,7 +337,7 @@
 "utvidelsene under kan ha forårsaket dette.\n"
 "Prøv å slå av noen av disse og logg ut for å prøve igjen."
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:322
+#: ../gnome-session/gsm-fail-whale-dialog.c:297
 msgid ""
 "A problem has occurred and the system can't recover.\n"
 "Please log out and try again."
@@ -383,7 +382,7 @@
 msgid "Learn more about GNOME 3"
 msgstr "Lær mer om GNOME 3"
 
-#: ../gnome-session/gsm-manager.c:1531 ../gnome-session/gsm-manager.c:2272
+#: ../gnome-session/gsm-manager.c:1471 ../gnome-session/gsm-manager.c:2230
 msgid "Not responding"
 msgstr "Svarer ikke"
 
@@ -391,21 +390,21 @@
 #. * then the XSMP client already has set several XSMP
 #. * properties. But it could still be that SmProgram is not set.
 #. 
-#: ../gnome-session/gsm-xsmp-client.c:559
+#: ../gnome-session/gsm-xsmp-client.c:558
 msgid "Remembered Application"
 msgstr "Husket program"
 
-#: ../gnome-session/gsm-xsmp-client.c:1197
+#: ../gnome-session/gsm-xsmp-client.c:1196
 msgid "This program is blocking logout."
 msgstr "Dette programmet hindrer utlogging."
 
-#: ../gnome-session/gsm-xsmp-server.c:326
+#: ../gnome-session/gsm-xsmp-server.c:341
 msgid ""
 "Refusing new client connection because the session is currently being shut "
 "down\n"
 msgstr "Nekter ny klient tilgang fordi økten er i ferd med å avsluttes\n"
 
-#: ../gnome-session/gsm-xsmp-server.c:595
+#: ../gnome-session/gsm-xsmp-server.c:610
 #, c-format
 msgid "Could not create ICE listening socket: %s"
 msgstr "Kunne ikke opprette plugg for ICE-lytting: %s"
@@ -416,36 +415,36 @@
 msgid "Unable to start login session (and unable to connect to the X server)"
 msgstr "Kan ikke starte påloggingsøkten (kan ikke koble til X-tjeneren)"
 
-#: ../gnome-session/main.c:291
+#: ../gnome-session/main.c:284
 msgid "Override standard autostart directories"
-msgstr "Overstyr forvalgte kataloger for autostart"
+msgstr "Overstyr standardmapper for autostart"
 
-#: ../gnome-session/main.c:291
+#: ../gnome-session/main.c:284
 msgid "AUTOSTART_DIR"
 msgstr "AUTOSTART_DIR"
 
-#: ../gnome-session/main.c:292
+#: ../gnome-session/main.c:285
 msgid "Session to use"
 msgstr "Økt som skal brukes"
 
-#: ../gnome-session/main.c:292
+#: ../gnome-session/main.c:285
 msgid "SESSION_NAME"
 msgstr "SESSION_NAME"
 
-#: ../gnome-session/main.c:293
+#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:286
 msgid "Enable debugging code"
 msgstr "Aktiver feilsøkingskode"
 
-#: ../gnome-session/main.c:294
+#: ../gnome-session/main.c:287
 msgid "Do not load user-specified applications"
 msgstr "Ikke last brukerdefinerte programmer"
 
 #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong
-#: ../gnome-session/main.c:297
+#: ../gnome-session/main.c:290
 msgid "Show the fail whale dialog for testing"
 msgstr "Vis feildialog for testing"
 
-#: ../gnome-session/main.c:317
+#: ../gnome-session/main.c:324
 msgid " - the GNOME session manager"
 msgstr " - GNOME økthåndterer"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-settings-daemon.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-settings-daemon.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-settings-daemon.po	2013-01-29 09:33:50.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-settings-daemon.po	2014-01-07 06:37:31.000000000 +0000
@@ -8,16 +8,16 @@
 msgstr ""
 "Project-Id-Version: gnome-settings-daemon 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-19 02:06+0000\n"
-"PO-Revision-Date: 2012-12-19 07:19+0000\n"
-"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
+"POT-Creation-Date: 2013-11-05 14:58+0000\n"
+"PO-Revision-Date: 2013-11-05 19:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:27+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:09+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../data/gnome-settings-daemon.desktop.in.in.h:1
@@ -33,6 +33,8 @@
 "Set this to one of \"none\", \"lock-screen\", or \"force-logout\". The "
 "action will get performed when the smartcard used for log in is removed."
 msgstr ""
+"Velg enten «none», «lock-screen» eller «force-logout». Handlingen utføres "
+"når du fjerner smartkortet som brukes til pålogging."
 
 #: ../data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in.h:3
 msgid "Disable touchpad while typing"
@@ -67,6 +69,8 @@
 "Select the touchpad scroll method. Supported values are: \"disabled\", "
 "\"edge-scrolling\", \"two-finger-scrolling\"."
 msgstr ""
+"Velg rullemetode for berøringsplate. Støttede verdier: «disabled», «edge-"
+"scrolling» og «two-finger-scrolling»."
 
 #: ../data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in.h:9
 msgid "Enable mouse clicks with touchpad"
@@ -89,7 +93,7 @@
 msgid ""
 "Highlights the current location of the pointer when the Control key is "
 "pressed and released."
-msgstr ""
+msgstr "Uthever pekerens plassering når Ctrl-tasten trykkes ned og slippes."
 
 #: ../data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in.h:14
 msgid "Double click time"
@@ -116,6 +120,8 @@
 "Enables middle mouse button emulation through simultaneous left and right "
 "button click."
 msgstr ""
+"Aktiverer etterligning av en tredje museknapp ved samtidig trykk på venstre "
+"og høyre museknapp."
 
 #: ../data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in.h:20
 msgid "Whether the tablet's orientation is locked, or rotated automatically."
@@ -131,7 +137,7 @@
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:1
 #: ../data/org.gnome.settings-daemon.plugins.color.gschema.xml.in.in.h:1
-#: ../data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.h:1
+#: ../data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.h:3
 #: ../data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in.h:1
 #: ../data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in.h:1
 #: ../data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in.h:1
@@ -146,7 +152,7 @@
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:2
 #: ../data/org.gnome.settings-daemon.plugins.color.gschema.xml.in.in.h:2
-#: ../data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.h:2
+#: ../data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.h:4
 #: ../data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in.h:2
 #: ../data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in.h:2
 #: ../data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in.h:2
@@ -163,7 +169,7 @@
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:3
 #: ../data/org.gnome.settings-daemon.plugins.color.gschema.xml.in.in.h:3
-#: ../data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.h:3
+#: ../data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.h:5
 #: ../data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in.h:13
 #: ../data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in.h:3
 #: ../data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in.h:27
@@ -178,7 +184,7 @@
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:4
 #: ../data/org.gnome.settings-daemon.plugins.color.gschema.xml.in.in.h:4
-#: ../data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.h:4
+#: ../data/org.gnome.settings-daemon.plugins.gschema.xml.in.in.h:6
 #: ../data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in.h:14
 #: ../data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in.h:4
 #: ../data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in.h:28
@@ -208,7 +214,7 @@
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:8
 msgid "Set this to x1, y1 and x2, y2 of the area usable by the tools."
-msgstr ""
+msgstr "Velg x1, y1 og x2, y2 for området som verktøyene kan benytte."
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:11
 msgid "Wacom tablet rotation"
@@ -219,6 +225,8 @@
 "Set this to 'none', 'cw' for 90 degree clockwise, 'half' for 180 degree, and "
 "'ccw' for 90 degree counterclockwise."
 msgstr ""
+"Velg «none», «cw» 90 graders rotasjon med klokka, «half» for opp-ned, og "
+"«ccw» for 90 graders rotasjon mot klokka."
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:13
 msgid "Wacom touch feature"
@@ -226,73 +234,83 @@
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:14
 msgid "Enable this to move the cursor when the user touches the tablet."
-msgstr ""
+msgstr "Slå på dette for å flytte markøren når bruker berører tegnebrettet."
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:15
 msgid "Wacom tablet PC feature"
-msgstr ""
+msgstr "Wacom nettbrettfunksjon"
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:16
 msgid "Enable this to only report stylus events when the tip is pressed."
 msgstr ""
+"Aktiver dette for å bare rapportere penn-hendelser når tuppen trykkes på."
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:17
 msgid "Wacom display mapping"
-msgstr ""
+msgstr "Wacom skjermkobling"
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:18
 msgid ""
 "EDID information of monitor to map tablet to. Must be in the format [vendor, "
 "product, serial]. [\"\",\"\",\"\"] disables mapping."
 msgstr ""
+"EDID-informasjon om skjerm som brettet skal kobles med. Verdien må være i "
+"formatet [produsent, produkt, serienummer]. Du kan deaktivere sammenkobling "
+"med [\"\",\"\",\"\"]."
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:19
 msgid "Wacom stylus pressure curve"
-msgstr ""
+msgstr "Wacom kurve for pekerenhet"
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:20
 msgid ""
 "Set this to x1, y1 and x2, y2 of the pressure curve applied to the stylus."
 msgstr ""
+"Velg x1, y1 og x2, y2 av trykkskurven som skal anvendes med pekerenheten."
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:21
 msgid "Wacom stylus button mapping"
-msgstr ""
+msgstr "Wacom kobling av knapper på pekerenhet"
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:22
 msgid "Set this to the logical button mapping."
-msgstr ""
+msgstr "Velg logisk knappekobling her."
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:23
 msgid "Wacom stylus pressure threshold"
-msgstr ""
+msgstr "Wacom terskel for pekertrykk"
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:24
 msgid ""
 "Set this to the pressure value at which a stylus click event is generated."
 msgstr ""
+"Velg hvor høy trykkverdi som skal til for at en trykkehendelse skal "
+"genereres av pekeren."
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:25
 msgid "Wacom eraser pressure curve"
-msgstr ""
+msgstr "Wacom kurve for viskelærtrykk"
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:26
 msgid ""
 "Set this to x1, y1 and x2, y2 of the pressure curve applied to the eraser."
 msgstr ""
+"Velg x1, y1 og x2, y2 av trykkskurven som skal brukes med viskelæret."
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:27
 msgid "Wacom eraser button mapping"
-msgstr ""
+msgstr "Wacom viskelær-knappkobling"
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:28
 msgid "Wacom eraser pressure threshold"
-msgstr ""
+msgstr "Wacom terskel for trykk på viskelær"
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:29
 msgid ""
 "Set this to the pressure value at which an eraser click event is generated."
 msgstr ""
+"Velg hvor høy trykkverdi som skal til for at en trykkhendelse skal genereres "
+"av viskelæret."
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:30
 msgid "Wacom button action type"
@@ -300,7 +318,7 @@
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:31
 msgid "The type of action triggered by the button being pressed."
-msgstr ""
+msgstr "Type handling som utføres når knappen trykkes ned."
 
 #: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:32
 msgid "Key combination for the custom action"
@@ -314,7 +332,7 @@
 "Tastatursnarvei som genereres når knappen trykkes ned for egendefinerte "
 "handlinger."
 
-#: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:34
+#: ../data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in.h:32
 msgid "Key combinations for an elevator custom action"
 msgstr ""
 
@@ -323,6 +341,8 @@
 "The keyboard shortcuts generated when a touchring or touchstrip is used for "
 "custom actions (up followed by down)."
 msgstr ""
+"Tastatursnarveier som skal brukes når en berøringsenhet brukes til "
+"egendefinerte handlinger (opp etterfulgt av ned)."
 
 #: ../data/org.gnome.settings-daemon.plugins.color.gschema.xml.in.in.h:5
 msgid "The duration a display profile is valid"
@@ -342,7 +362,7 @@
 msgid ""
 "This is the number of days after which the printer color profile is "
 "considered invalid."
-msgstr ""
+msgstr "Antall dager før fargeprofilen for skriveren anses som ugyldig."
 
 #: ../data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in.h:3
 msgid "Mount paths to ignore"
@@ -373,7 +393,7 @@
 msgid ""
 "Specify the percentage that the free disk space should reduce by before "
 "issuing a subsequent warning."
-msgstr ""
+msgstr "Angi hvor få prosent ledig diskplass du kan ha før du blir advart."
 
 #: ../data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in.h:9
 msgid "Free space notify threshold"
@@ -665,6 +685,8 @@
 "The percentage of the battery when it is considered low. Only valid when use-"
 "time-for-policy is false."
 msgstr ""
+"Hvor lav batterikapasiteten kan være - i prosent - før den regnes som lav. "
+"Dette gjelder bare hvis verdien av «use-time-for-policy» er «false»."
 
 #: ../data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in.h:7
 msgid "Percentage considered critical"
@@ -675,6 +697,9 @@
 "The percentage of the battery when it is considered critical. Only valid "
 "when use-time-for-policy is false."
 msgstr ""
+"Hvor lav batterikapasiteten kan være - i prosent - før den regnes som "
+"kritisk lav. Dette gjelder bare hvis verdien av «use-time-for-policy» er "
+"«false»."
 
 #: ../data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in.h:9
 msgid "Percentage action is taken"
@@ -685,6 +710,8 @@
 "The percentage of the battery when the critical action is performed. Only "
 "valid when use-time-for-policy is false."
 msgstr ""
+"Hvor lav batterikapasiteten kan være - i prosent - før en kritisk handling "
+"utføres. Dette gjelder bare hvis verdien av «use-time-for-policy» er «false»."
 
 #: ../data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in.h:11
 msgid "The time remaining when low"
@@ -695,6 +722,9 @@
 "The time remaining in seconds of the battery when it is considered low. Only "
 "valid when use-time-for-policy is true."
 msgstr ""
+"Hvor lav batterikapasiteten kan være - målt i gjenstående brukstid - før den "
+"regnes som lav. Dette gjelder bare hvis verdien av «use-time-for-policy» er "
+"«true»."
 
 #: ../data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in.h:13
 msgid "The time remaining when critical"
@@ -705,6 +735,9 @@
 "The time remaining in seconds of the battery when it is considered critical. "
 "Only valid when use-time-for-policy is true."
 msgstr ""
+"Hvor lav batterikapasiteten kan være - målt i gjenstående brukstid - før den "
+"regnes som kritisk. Dette gjelder bare hvis verdien av «use-time-for-policy» "
+"er «true»."
 
 #: ../data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in.h:15
 msgid "The time remaining when action is taken"
@@ -715,6 +748,9 @@
 "The time remaining in seconds of the battery when critical action is taken. "
 "Only valid when use-time-for-policy is true."
 msgstr ""
+"Hvor lav batterikapasiteten kan være - målt i gjenstående brukstid - før en "
+"kritisk handling utføres. Dette gjelder bare hvis verdien av «use-time-for-"
+"policy» er «true»."
 
 #: ../data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in.h:17
 msgid "Whether to use time-based notifications"
@@ -725,16 +761,21 @@
 "If time based notifications should be used. If set to false, then the "
 "percentage change is used instead, which may fix a broken ACPI BIOS."
 msgstr ""
+"Om tidsbaserte påminnelser skal brukes. Hvis usann/«false» velges her, "
+"brukes prosentvis endring i stedet, som kan kompensere for en dårlig "
+"implementering av ACPI i BIOS."
 
 #: ../data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in.h:19
 msgid "If we should show the recalled battery warning for a broken battery"
-msgstr ""
+msgstr "Om ødelagte batterier skal utløse et tilbakekallingsvarsel"
 
 #: ../data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in.h:20
 msgid ""
 "If we should show the recalled battery warning for a broken battery. Set "
 "this to false only if you know your battery is okay."
 msgstr ""
+"Om vi skal varsle brukeren når et batteri er ødelagt. Du bør ikke velge "
+"«false» (usant) her med mindre du vet at batteriet ditt er i orden."
 
 #: ../data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in.h:5
 msgid "The install root to use when adding and removing packages"
@@ -754,6 +795,8 @@
 msgid ""
 "Use mobile broadband connections such as GSM and CDMA to check for updates."
 msgstr ""
+"Bruk mobil bredbåndstilkobling som f.eks. GSM og CDMA for å se etter "
+"oppdateringer."
 
 #: ../data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in.h:9
 msgid "Use WiFi connections"
@@ -807,10 +850,16 @@
 "amount of time that can pass between a security update being published, and "
 "the update being automatically installed or the user notified."
 msgstr ""
+"Hvor ofte programmet skal se etter oppdateringer. Verdien er antall "
+"sekunder. Dette er maksimal tid som kan gå mellom at en "
+"sikkerhetsoppdatering gis ut, og at den enten installeres automatisk eller "
+"at brukeren varsles."
 
 #: ../data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in.h:11
 msgid "How often to notify the user that non-critical updates are available"
 msgstr ""
+"Hvor ofte brukeren skal få beskjed om at ikke-kritiske oppdateringer er "
+"tilgjengelig"
 
 #: ../data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in.h:12
 msgid ""
@@ -819,16 +868,22 @@
 "updates, but non-critical notifications should be shown a lot less "
 "frequently."
 msgstr ""
+"Hvor ofte brukeren skal få beskjed om at ikke-kritiske oppdateringer er "
+"tilgjengelig. Verdien er i sekunder. Brukeren får alltid beskjed om "
+"sikkerhetsoppdateringer, men ikke-kritiske beskjeder bør vises langt "
+"sjeldnere."
 
 #: ../data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in.h:13
 msgid "The last time we told the user about non-critical notifications"
-msgstr ""
+msgstr "Forrige gang vi ga brukeren ikke-kritiske beskjeder"
 
 #: ../data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in.h:14
 msgid ""
 "The last time we notified the user about non-critical updates. Value is in "
 "seconds since the epoch, or zero for never."
 msgstr ""
+"Forrige gang vi ga brukeren beskjed om ikke-kritiske oppdateringer. Verdien "
+"er i antall påløpte sekunder siden UNIX-epokens start, eller null for aldri."
 
 #: ../data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in.h:15
 msgid "How often to check for distribution upgrades"
@@ -843,11 +898,13 @@
 
 #: ../data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in.h:17
 msgid "How often to refresh the package cache"
-msgstr ""
+msgstr "Hvor ofte skal pakkedatabasen oppdateres"
 
 #: ../data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in.h:18
 msgid "How often to refresh the package cache. Value is in seconds."
 msgstr ""
+"Hvor ofte hurtiglageret for pakker skal oppdateres. Verdien er i antall "
+"sekunder."
 
 #: ../data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in.h:27
 msgid ""
@@ -934,6 +991,8 @@
 "Firmware files that should not be searched for, separated by commas. These "
 "can include '*' and '?' characters."
 msgstr ""
+"Fastvarefiler som det ikke skal søkes etter, adskilt med komma. Du kan bruke "
+"tegnene «*» og «?» her."
 
 #: ../data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in.h:27
 msgid "Devices that should be ignored"
@@ -944,6 +1003,8 @@
 "Devices that should be ignored, separated by commas. These can include '*' "
 "and '?' characters."
 msgstr ""
+"Enheter som skal ignoreres, adskilt med komma. Du kan bruke tegnene «*» og "
+"«?» her."
 
 #: ../data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in.h:29
 msgid "The filenames on removable media that designate it a software source."
@@ -956,6 +1017,9 @@
 "updates check is performed. This allows post-install disks to be used to "
 "update running systems."
 msgstr ""
+"Når du setter inn bærbare medier, gjennomsøkes de for viktige filnavn i "
+"rotmappa. Hvis et viktig filnavn finnes, ser programmet etter oppdateringer. "
+"Dette tillater disker å oppdatere kjørende systemer."
 
 #: ../data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in.h:3
 msgid "File for default configuration for RandR"
@@ -969,10 +1033,15 @@
 "such a file, or has one that does not match the user's setup of monitors, "
 "then the file specified by this key will be used instead."
 msgstr ""
+"XRandR-tillegget ser etter standardoppsett i fila som angis av denne "
+"nøkkelen. Dette ligner fila ~/.config/monitors.xml som vanligvis lagres i "
+"brukernes hjemmemapper. Hvis en bruker mangler en slik fil, eller fila ikke "
+"stemmer med brukerens skjermoppsett, brukes fila som angitt av denne "
+"nøkkelen i stedet."
 
 #: ../data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in.h:7
 msgid "Whether to turn off specific monitors after boot"
-msgstr ""
+msgstr "Om enkelte skjermer skal skrus av etter oppstart"
 
 #: ../data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in.h:8
 msgid ""
@@ -1027,29 +1096,33 @@
 
 #: ../data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in.h:11
 msgid "List of explicitly disabled GTK+ modules"
-msgstr ""
+msgstr "Liste over eksplisitt avslåtte moduler av GTK+"
 
 #: ../data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in.h:12
 msgid ""
 "A list of strings representing the GTK+ modules that will not be loaded, "
 "even if enabled by default in their configuration."
 msgstr ""
+"En liste over moduler av GTK+ som ikke lastes inn, selv hvis de er aktivert "
+"som standard i oppsettsfila."
 
 #: ../data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in.h:13
 msgid "List of explicitly enabled GTK+ modules"
-msgstr ""
+msgstr "Liste over eksplisitt påslåtte moduler av GTK+"
 
 #: ../data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in.h:14
 msgid ""
 "A list of strings representing the GTK+ modules that will be loaded, usually "
 "in addition to conditional and forcibly disabled ones."
 msgstr ""
+"En liste over moduler av GTK+ som lastes inn, vanligvis i tillegg til "
+"betingede og tvangsavslåtte moduler."
 
-#: ../gnome-settings-daemon/main.c:54
+#: ../gnome-settings-daemon/main.c:52
 msgid "Enable debugging code"
 msgstr "Aktiver kode for feilsøking"
 
-#: ../gnome-settings-daemon/main.c:55
+#: ../gnome-settings-daemon/main.c:54
 msgid "Exit after a time (for debugging)"
 msgstr "Avslutt etter oppgitt tid (for feilsøking)"
 
@@ -1066,18 +1139,15 @@
 msgid "There was an error displaying help: %s"
 msgstr "Det oppsto en feil under visning av hjelp: %s"
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:528
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:593
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:400
 msgid "Slow Keys Turned On"
 msgstr "Trege taster er slått på"
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:529
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:594
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:401
 msgid "Slow Keys Turned Off"
 msgstr "Trege taster er slått av"
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:530
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:595
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:402
 msgid ""
 "You just held down the Shift key for 8 seconds.  This is the shortcut for "
 "the Slow Keys feature, which affects the way your keyboard works."
@@ -1085,64 +1155,61 @@
 "Du holdt nettopp nede Shift-tasten i 8 sekunder. Dette er snarveien for "
 "funksjonen trege taster som påvirker hvordan tastaturet ditt virker."
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:551
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:688
-#: ../plugins/mouse/gsd-mouse-manager.c:924
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:412
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:480
+#: ../plugins/mouse/gsd-mouse-manager.c:940
 msgid "Universal Access"
 msgstr "Universell tilgang"
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:557
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:694
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:418
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:486
 msgid "Turn Off"
 msgstr "Slå av"
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:557
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:694
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:418
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:486
 msgid "Turn On"
 msgstr "Slå på"
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:563
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:700
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:424
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:492
 msgid "Leave On"
 msgstr "La være på"
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:563
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:700
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:424
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:492
 msgid "Leave Off"
 msgstr "La være av"
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:616
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:756
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:618
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:758
 msgid "_Turn Off"
 msgstr "_Slå av"
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:616
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:756
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:618
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:758
 msgid "_Turn On"
 msgstr "_Slå på"
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:619
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:759
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:621
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:761
 msgid "_Leave On"
 msgstr "_La være på"
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:619
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:759
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:621
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:761
 msgid "_Leave Off"
 msgstr "_La være av"
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:662
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:730
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:465
 msgid "Sticky Keys Turned On"
 msgstr "Klebrige taster er slått på"
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:663
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:731
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:466
 msgid "Sticky Keys Turned Off"
 msgstr "Klebrige taster er slått av"
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:665
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:733
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:468
 msgid ""
 "You just pressed the Shift key 5 times in a row.  This is the shortcut for "
 "the Sticky Keys feature, which affects the way your keyboard works."
@@ -1150,8 +1217,7 @@
 "Du trykket nettopp ned Shift-tasten 5 ganger på rad. Dette er snarveien for "
 "funksjonen «klebrige taster» som påvirker måten tastaturet fungerer."
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:667
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:735
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:470
 msgid ""
 "You just pressed two keys at once, or pressed the Shift key 5 times in a "
 "row.  This turns off the Sticky Keys feature, which affects the way your "
@@ -1161,8 +1227,8 @@
 "rad. Dette skrur av funksjonen «klebrige taster» som påvirker tasteturets "
 "virkemåte."
 
-#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:1144
-#: ../plugins/a11y-keyboard/gsd-a11y-preferences-dialog.c:412
+#: ../plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:1146
+#: ../plugins/a11y-keyboard/gsd-a11y-preferences-dialog.c:414
 #: ../plugins/a11y-keyboard/gsd-a11y-preferences-dialog.ui.h:1
 msgid "Universal Access Preferences"
 msgstr "Brukervalg for universell tilgang"
@@ -1343,16 +1409,17 @@
 msgid "Background plugin"
 msgstr "Tillegg for bakgrunn"
 
-#: ../plugins/clipboard/clipboard.gnome-settings-plugin.in.h:1
+#. Priority=100
+#: ../plugins/clipboard/clipboard.gnome-settings-plugin.in.h:2
 msgid "Clipboard"
 msgstr "Utklippstavle"
 
-#: ../plugins/clipboard/clipboard.gnome-settings-plugin.in.h:2
+#: ../plugins/clipboard/clipboard.gnome-settings-plugin.in.h:3
 msgid "Clipboard plugin"
 msgstr "Tillegg for utklippstavle"
 
 #: ../plugins/color/color.gnome-settings-plugin.in.h:1
-#: ../plugins/color/gsd-color-manager.c:1817
+#: ../plugins/color/gsd-color-manager.c:1666
 msgid "Color"
 msgstr "Farger"
 
@@ -1360,40 +1427,40 @@
 msgid "Color plugin"
 msgstr "Tillegg for farger"
 
-#: ../plugins/color/gsd-color-manager.c:1822
+#: ../plugins/color/gsd-color-manager.c:1671
 msgid "Recalibrate now"
 msgstr "Kalibrer på nytt nå"
 
 #. TRANSLATORS: this is when the device has not been recalibrated in a while
-#: ../plugins/color/gsd-color-manager.c:1865
+#: ../plugins/color/gsd-color-manager.c:1714
 msgid "Recalibration required"
 msgstr "Ny kalibrering kreves"
 
 #. TRANSLATORS: this is when the display has not been recalibrated in a while
-#: ../plugins/color/gsd-color-manager.c:1877
+#: ../plugins/color/gsd-color-manager.c:1726
 #, c-format
 msgid "The display '%s' should be recalibrated soon."
 msgstr "Skjermen «%s» bør kalibreres på nytt snart."
 
 #. TRANSLATORS: this is when the printer has not been recalibrated in a while
-#: ../plugins/color/gsd-color-manager.c:1886
+#: ../plugins/color/gsd-color-manager.c:1735
 #, c-format
 msgid "The printer '%s' should be recalibrated soon."
 msgstr "Skriver «%s» bør kalibreres på nytt snart."
 
 #. TRANSLATORS: this is the application name
-#: ../plugins/color/gsd-color-manager.c:2210
-#: ../plugins/color/gsd-color-manager.c:2226
+#: ../plugins/color/gsd-color-manager.c:2059
+#: ../plugins/color/gsd-color-manager.c:2075
 msgid "GNOME Settings Daemon Color Plugin"
 msgstr "Fargetillegg for GNOME konfigurasjonstjeneste"
 
 #. TRANSLATORS: this is a sound description
-#: ../plugins/color/gsd-color-manager.c:2212
+#: ../plugins/color/gsd-color-manager.c:2061
 msgid "Color calibration device added"
 msgstr "Enhet for kalibrering av farger ble lagt til"
 
 #. TRANSLATORS: this is a sound description
-#: ../plugins/color/gsd-color-manager.c:2228
+#: ../plugins/color/gsd-color-manager.c:2077
 msgid "Color calibration device removed"
 msgstr "Enhet for kalibrering av farger ble fjernet"
 
@@ -1405,12 +1472,12 @@
 msgid "Dummy plugin"
 msgstr "Dummy-tillegg"
 
-#: ../plugins/housekeeping/gsd-disk-space.c:334
+#: ../plugins/housekeeping/gsd-disk-space.c:588
 #, c-format
 msgid "Low Disk Space on \"%s\""
 msgstr "Lite diskplass på «%s»"
 
-#: ../plugins/housekeeping/gsd-disk-space.c:336
+#: ../plugins/housekeeping/gsd-disk-space.c:590
 #, c-format
 msgid ""
 "The volume \"%s\" has only %s disk space remaining.  You may free up some "
@@ -1419,19 +1486,19 @@
 "Volumet «%s» har kun %s gjenværende plass. Du kan frigjøre plass ved å tømme "
 "papirkurven."
 
-#: ../plugins/housekeeping/gsd-disk-space.c:340
+#: ../plugins/housekeeping/gsd-disk-space.c:594
 #: ../plugins/housekeeping/gsd-ldsm-dialog.c:81
 #, c-format
 msgid "The volume \"%s\" has only %s disk space remaining."
 msgstr "Volumet «%s» har kun %s gjenværende plass."
 
 #. Set up all the window stuff here
-#: ../plugins/housekeeping/gsd-disk-space.c:345
+#: ../plugins/housekeeping/gsd-disk-space.c:599
 #: ../plugins/housekeeping/gsd-ldsm-dialog.c:205
 msgid "Low Disk Space"
 msgstr "Lite diskplass"
 
-#: ../plugins/housekeeping/gsd-disk-space.c:347
+#: ../plugins/housekeeping/gsd-disk-space.c:601
 #, c-format
 msgid ""
 "This computer has only %s disk space remaining.  You may free up some space "
@@ -1440,26 +1507,26 @@
 "Denne datamaskinen har kun %s gjenværende diskplass. Du kan frigjøre noe "
 "plass ved å tømme papirkurven."
 
-#: ../plugins/housekeeping/gsd-disk-space.c:350
+#: ../plugins/housekeeping/gsd-disk-space.c:604
 #: ../plugins/housekeeping/gsd-ldsm-dialog.c:84
 #, c-format
 msgid "This computer has only %s disk space remaining."
 msgstr "Denne datamaskinen har kun %s gjenværende diskplass."
 
-#: ../plugins/housekeeping/gsd-disk-space.c:365
+#: ../plugins/housekeeping/gsd-disk-space.c:619
 msgid "Disk space"
 msgstr "Diskplass"
 
-#: ../plugins/housekeeping/gsd-disk-space.c:372
+#: ../plugins/housekeeping/gsd-disk-space.c:626
 msgid "Examine"
 msgstr "Undersøk"
 
-#: ../plugins/housekeeping/gsd-disk-space.c:380
+#: ../plugins/housekeeping/gsd-disk-space.c:634
 #: ../plugins/housekeeping/gsd-ldsm-dialog.c:437
 msgid "Empty Trash"
 msgstr "Tøm papirkurv"
 
-#: ../plugins/housekeeping/gsd-disk-space.c:387
+#: ../plugins/housekeeping/gsd-disk-space.c:641
 #: ../plugins/housekeeping/gsd-ldsm-dialog.c:452
 msgid "Ignore"
 msgstr "Overse"
@@ -1531,7 +1598,7 @@
 
 #. TRANSLATORS: wireless keyboard with internal battery
 #: ../plugins/keyboard/keyboard.gnome-settings-plugin.in.h:1
-#: ../plugins/power/gpm-common.c:585
+#: ../plugins/power/gpm-common.c:612
 msgid "Keyboard"
 msgid_plural "Keyboards"
 msgstr[0] "Tastatur"
@@ -1565,13 +1632,13 @@
 
 #. translators:
 #. * The device has been disabled
-#: ../plugins/media-keys/cut-n-paste/gvc-mixer-control.c:1087
+#: ../plugins/media-keys/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Slått av"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../plugins/media-keys/cut-n-paste/gvc-mixer-control.c:1094
+#: ../plugins/media-keys/gvc/gvc-mixer-control.c:1837
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1580,30 +1647,31 @@
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../plugins/media-keys/cut-n-paste/gvc-mixer-control.c:1104
+#: ../plugins/media-keys/gvc/gvc-mixer-control.c:1847
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u inngang"
 msgstr[1] "%u innganger"
 
-#: ../plugins/media-keys/cut-n-paste/gvc-mixer-control.c:1402
+#: ../plugins/media-keys/gvc/gvc-mixer-control.c:2371
 msgid "System Sounds"
 msgstr "Systemlyder"
 
-#: ../plugins/media-keys/media-keys.gnome-settings-plugin.in.h:1
+#. Priority=100
+#: ../plugins/media-keys/media-keys.gnome-settings-plugin.in.h:2
 msgid "Media keys"
 msgstr "Medietaster"
 
-#: ../plugins/media-keys/media-keys.gnome-settings-plugin.in.h:2
+#: ../plugins/media-keys/media-keys.gnome-settings-plugin.in.h:3
 msgid "Media keys plugin"
 msgstr "Tillegg for medietaster"
 
-#: ../plugins/mouse/gsd-mouse-manager.c:920
+#: ../plugins/mouse/gsd-mouse-manager.c:936
 msgid "Could not enable mouse accessibility features"
 msgstr "Kunne ikke aktivere tilgjengelighetsfunksjoner for mus"
 
-#: ../plugins/mouse/gsd-mouse-manager.c:922
+#: ../plugins/mouse/gsd-mouse-manager.c:938
 msgid ""
 "Mouse accessibility requires Mousetweaks to be installed on your system."
 msgstr ""
@@ -1611,7 +1679,7 @@
 
 #. TRANSLATORS: wireless mice with internal batteries
 #: ../plugins/mouse/mouse.gnome-settings-plugin.in.h:1
-#: ../plugins/power/gpm-common.c:581
+#: ../plugins/power/gpm-common.c:608
 msgid "Mouse"
 msgid_plural "Mice"
 msgstr[0] "Mus"
@@ -1621,18 +1689,18 @@
 msgid "Mouse plugin"
 msgstr "Tillegg for mus"
 
-#: ../plugins/power/gpm-common.c:47
+#: ../plugins/power/gpm-common.c:74
 msgid "Unknown time"
 msgstr "Ukjent tid"
 
-#: ../plugins/power/gpm-common.c:52
+#: ../plugins/power/gpm-common.c:79
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minutt"
 msgstr[1] "%i minutter"
 
-#: ../plugins/power/gpm-common.c:62
+#: ../plugins/power/gpm-common.c:89
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -1641,18 +1709,18 @@
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../plugins/power/gpm-common.c:68
+#: ../plugins/power/gpm-common.c:95
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../plugins/power/gpm-common.c:69
+#: ../plugins/power/gpm-common.c:96
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: ../plugins/power/gpm-common.c:70
+#: ../plugins/power/gpm-common.c:97
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
@@ -1660,7 +1728,7 @@
 
 #. TRANSLATORS: The laptop battery is charged, and we know a time.
 #. * The parameter is the time, e.g. 7 hours 6 minutes
-#: ../plugins/power/gpm-common.c:317
+#: ../plugins/power/gpm-common.c:344
 #, c-format
 msgid "provides %s laptop runtime"
 msgstr "gir %s kjøretid for bærbar"
@@ -1668,7 +1736,7 @@
 #. TRANSLATORS: the device is discharging, and we have a time remaining
 #. * The first parameter is the device type, e.g. "Laptop battery" and
 #. * the second is the time, e.g. 7 hours 6 minutes
-#: ../plugins/power/gpm-common.c:328
+#: ../plugins/power/gpm-common.c:355
 #, c-format
 msgid "%s %s remaining"
 msgstr "%s %s gjenstår"
@@ -1679,20 +1747,20 @@
 #. TRANSLATORS: device is charging, and we have a time to full and a percentage.
 #. * The first parameter is the device type, e.g. "Laptop battery" and
 #. * the second is the time, e.g. "7 hours 6 minutes"
-#: ../plugins/power/gpm-common.c:349 ../plugins/power/gpm-common.c:366
+#: ../plugins/power/gpm-common.c:376 ../plugins/power/gpm-common.c:393
 #, c-format
 msgid "%s %s until charged"
 msgstr "%s %s før lading er ferdig"
 
 #. TRANSLATORS: the device is charging, and we have a time to full and empty.
 #. * The parameter is a time string, e.g. "7 hours 6 minutes"
-#: ../plugins/power/gpm-common.c:356
+#: ../plugins/power/gpm-common.c:383
 #, c-format
 msgid "provides %s battery runtime"
 msgstr "gir %s batteritid"
 
 #. TRANSLATORS: the type of data, e.g. Laptop battery
-#: ../plugins/power/gpm-common.c:447
+#: ../plugins/power/gpm-common.c:474
 msgid "Product:"
 msgstr "Produkt:"
 
@@ -1700,416 +1768,416 @@
 #. TRANSLATORS: device is charged
 #. TRANSLATORS: device is charging
 #. TRANSLATORS: device is discharging
-#: ../plugins/power/gpm-common.c:451 ../plugins/power/gpm-common.c:454
-#: ../plugins/power/gpm-common.c:457 ../plugins/power/gpm-common.c:460
+#: ../plugins/power/gpm-common.c:478 ../plugins/power/gpm-common.c:481
+#: ../plugins/power/gpm-common.c:484 ../plugins/power/gpm-common.c:487
 msgid "Status:"
 msgstr "Status:"
 
-#: ../plugins/power/gpm-common.c:451
+#: ../plugins/power/gpm-common.c:478
 msgid "Missing"
 msgstr "Mangler"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:454 ../plugins/power/gpm-common.c:723
+#: ../plugins/power/gpm-common.c:481 ../plugins/power/gpm-common.c:750
 msgid "Charged"
 msgstr "Ladet"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:457 ../plugins/power/gpm-common.c:711
+#: ../plugins/power/gpm-common.c:484 ../plugins/power/gpm-common.c:738
 msgid "Charging"
 msgstr "Lader"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:460 ../plugins/power/gpm-common.c:715
+#: ../plugins/power/gpm-common.c:487 ../plugins/power/gpm-common.c:742
 msgid "Discharging"
 msgstr "Lader ut"
 
 #. TRANSLATORS: percentage
-#: ../plugins/power/gpm-common.c:465
+#: ../plugins/power/gpm-common.c:492
 msgid "Percentage charge:"
 msgstr "Prosent ladet:"
 
 #. TRANSLATORS: manufacturer
-#: ../plugins/power/gpm-common.c:469
+#: ../plugins/power/gpm-common.c:496
 msgid "Vendor:"
 msgstr "Leverandør:"
 
 #. TRANSLATORS: how the battery is made, e.g. Lithium Ion
-#: ../plugins/power/gpm-common.c:474
+#: ../plugins/power/gpm-common.c:501
 msgid "Technology:"
 msgstr "Teknologi:"
 
 #. TRANSLATORS: serial number of the battery
-#: ../plugins/power/gpm-common.c:478
+#: ../plugins/power/gpm-common.c:505
 msgid "Serial number:"
 msgstr "Serienummer:"
 
 #. TRANSLATORS: model number of the battery
-#: ../plugins/power/gpm-common.c:482
+#: ../plugins/power/gpm-common.c:509
 msgid "Model:"
 msgstr "Modell:"
 
 #. TRANSLATORS: time to fully charged
-#: ../plugins/power/gpm-common.c:487
+#: ../plugins/power/gpm-common.c:514
 msgid "Charge time:"
 msgstr "Ladetid:"
 
 #. TRANSLATORS: time to empty
-#: ../plugins/power/gpm-common.c:493
+#: ../plugins/power/gpm-common.c:520
 msgid "Discharge time:"
 msgstr "Utladingstid:"
 
 #. TRANSLATORS: Excellent, Good, Fair and Poor are all related to battery Capacity
-#: ../plugins/power/gpm-common.c:500
+#: ../plugins/power/gpm-common.c:527
 msgid "Excellent"
 msgstr "Utmerket"
 
-#: ../plugins/power/gpm-common.c:502
+#: ../plugins/power/gpm-common.c:529
 msgid "Good"
 msgstr "God"
 
-#: ../plugins/power/gpm-common.c:504
+#: ../plugins/power/gpm-common.c:531
 msgid "Fair"
 msgstr "Bra"
 
-#: ../plugins/power/gpm-common.c:506
+#: ../plugins/power/gpm-common.c:533
 msgid "Poor"
 msgstr "Dårlig"
 
-#: ../plugins/power/gpm-common.c:510
+#: ../plugins/power/gpm-common.c:537
 msgid "Capacity:"
 msgstr "Kapasitet:"
 
-#: ../plugins/power/gpm-common.c:516 ../plugins/power/gpm-common.c:541
+#: ../plugins/power/gpm-common.c:543 ../plugins/power/gpm-common.c:568
 msgid "Current charge:"
 msgstr "Nåværende ladenivå:"
 
-#: ../plugins/power/gpm-common.c:522
+#: ../plugins/power/gpm-common.c:549
 msgid "Last full charge:"
 msgstr "Sist fult ladet:"
 
-#: ../plugins/power/gpm-common.c:528 ../plugins/power/gpm-common.c:546
+#: ../plugins/power/gpm-common.c:555 ../plugins/power/gpm-common.c:573
 msgid "Design charge:"
 msgstr "Design-ladenivå:"
 
-#: ../plugins/power/gpm-common.c:533
+#: ../plugins/power/gpm-common.c:560
 msgid "Charge rate:"
 msgstr "Laderate:"
 
 #. TRANSLATORS: system power cord
-#: ../plugins/power/gpm-common.c:565
+#: ../plugins/power/gpm-common.c:592
 msgid "AC adapter"
 msgid_plural "AC adapters"
 msgstr[0] "Strømadapter"
 msgstr[1] "Strømadaptere"
 
 #. TRANSLATORS: laptop primary battery
-#: ../plugins/power/gpm-common.c:569
+#: ../plugins/power/gpm-common.c:596
 msgid "Laptop battery"
 msgid_plural "Laptop batteries"
 msgstr[0] "Batteri til bærbar"
 msgstr[1] "Batterier til bærbar"
 
 #. TRANSLATORS: battery-backed AC power source
-#: ../plugins/power/gpm-common.c:573
+#: ../plugins/power/gpm-common.c:600
 msgid "UPS"
 msgid_plural "UPSs"
 msgstr[0] "UPS"
 msgstr[1] "UPSer"
 
 #. TRANSLATORS: a monitor is a device to measure voltage and current
-#: ../plugins/power/gpm-common.c:577
+#: ../plugins/power/gpm-common.c:604
 msgid "Monitor"
 msgid_plural "Monitors"
 msgstr[0] "Skjerm"
 msgstr[1] "Skjermer"
 
 #. TRANSLATORS: portable device
-#: ../plugins/power/gpm-common.c:589
+#: ../plugins/power/gpm-common.c:616
 msgid "PDA"
 msgid_plural "PDAs"
 msgstr[0] "PDA"
 msgstr[1] "PDAer"
 
 #. TRANSLATORS: cell phone (mobile...)
-#: ../plugins/power/gpm-common.c:593
+#: ../plugins/power/gpm-common.c:620
 msgid "Cell phone"
 msgid_plural "Cell phones"
 msgstr[0] "Mobiltelefon"
 msgstr[1] "Mobiltelefoner"
 
 #. TRANSLATORS: media player, mp3 etc
-#: ../plugins/power/gpm-common.c:598
+#: ../plugins/power/gpm-common.c:625
 msgid "Media player"
 msgid_plural "Media players"
 msgstr[0] "Medieavspiller"
 msgstr[1] "Medieavspillere"
 
 #. TRANSLATORS: tablet device
-#: ../plugins/power/gpm-common.c:602
+#: ../plugins/power/gpm-common.c:629
 msgid "Tablet"
 msgid_plural "Tablets"
 msgstr[0] "Nettbrett"
 msgstr[1] "Nettbrett"
 
 #. TRANSLATORS: tablet device
-#: ../plugins/power/gpm-common.c:606
+#: ../plugins/power/gpm-common.c:633
 msgid "Computer"
 msgid_plural "Computers"
 msgstr[0] "Datamaskin"
 msgstr[1] "Datamaskiner"
 
 #. TRANSLATORS: battery technology
-#: ../plugins/power/gpm-common.c:670
+#: ../plugins/power/gpm-common.c:697
 msgid "Lithium Ion"
 msgstr "Litium ion"
 
 #. TRANSLATORS: battery technology
-#: ../plugins/power/gpm-common.c:674
+#: ../plugins/power/gpm-common.c:701
 msgid "Lithium Polymer"
 msgstr "Litium polymer"
 
 #. TRANSLATORS: battery technology
-#: ../plugins/power/gpm-common.c:678
+#: ../plugins/power/gpm-common.c:705
 msgid "Lithium Iron Phosphate"
 msgstr "Litium jern fosfat"
 
 #. TRANSLATORS: battery technology
-#: ../plugins/power/gpm-common.c:682
+#: ../plugins/power/gpm-common.c:709
 msgid "Lead acid"
 msgstr "Blysyre"
 
 #. TRANSLATORS: battery technology
-#: ../plugins/power/gpm-common.c:686
+#: ../plugins/power/gpm-common.c:713
 msgid "Nickel Cadmium"
 msgstr "Nikkel kadmium"
 
 #. TRANSLATORS: battery technology
-#: ../plugins/power/gpm-common.c:690
+#: ../plugins/power/gpm-common.c:717
 msgid "Nickel metal hydride"
 msgstr "Nikkel metall hybrid"
 
 #. TRANSLATORS: battery technology
-#: ../plugins/power/gpm-common.c:694
+#: ../plugins/power/gpm-common.c:721
 msgid "Unknown technology"
 msgstr "Ukjent teknologi"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:719
+#: ../plugins/power/gpm-common.c:746
 msgid "Empty"
 msgstr "Tom"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:727
+#: ../plugins/power/gpm-common.c:754
 msgid "Waiting to charge"
 msgstr "Venter på å lade"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:731
+#: ../plugins/power/gpm-common.c:758
 msgid "Waiting to discharge"
 msgstr "Venter på å lade ut"
 
 #. TRANSLATORS: device not present
-#: ../plugins/power/gpm-common.c:759
+#: ../plugins/power/gpm-common.c:786
 msgid "Laptop battery not present"
 msgstr "Batteri på bærbar er ikke tilstede"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:763
+#: ../plugins/power/gpm-common.c:790
 msgid "Laptop battery is charging"
 msgstr "Batteri på bærbar lader"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:767
+#: ../plugins/power/gpm-common.c:794
 msgid "Laptop battery is discharging"
 msgstr "Batteri på bærbar lader ut"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:771
+#: ../plugins/power/gpm-common.c:798
 msgid "Laptop battery is empty"
 msgstr "Batteri på bærbar er tomt"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:775
+#: ../plugins/power/gpm-common.c:802
 msgid "Laptop battery is charged"
 msgstr "Batteri på bærbar er ladet"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:779
+#: ../plugins/power/gpm-common.c:806
 msgid "Laptop battery is waiting to charge"
 msgstr "Batteri på bærbar venter på å lade"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:783
+#: ../plugins/power/gpm-common.c:810
 msgid "Laptop battery is waiting to discharge"
 msgstr "Batteri på bærbar venter på å lade ut"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:792
+#: ../plugins/power/gpm-common.c:819
 msgid "UPS is charging"
 msgstr "UPS lader"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:796
+#: ../plugins/power/gpm-common.c:823
 msgid "UPS is discharging"
 msgstr "UPS lades ut"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:800
+#: ../plugins/power/gpm-common.c:827
 msgid "UPS is empty"
 msgstr "UPS er tom"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:804
+#: ../plugins/power/gpm-common.c:831
 msgid "UPS is charged"
 msgstr "UPS er ladet"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:813
+#: ../plugins/power/gpm-common.c:840
 msgid "Mouse is charging"
 msgstr "Mus lader"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:817
+#: ../plugins/power/gpm-common.c:844
 msgid "Mouse is discharging"
 msgstr "Mus lades ut"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:821
+#: ../plugins/power/gpm-common.c:848
 msgid "Mouse is empty"
 msgstr "Mus er tom"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:825
+#: ../plugins/power/gpm-common.c:852
 msgid "Mouse is charged"
 msgstr "Mus er ladet"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:834
+#: ../plugins/power/gpm-common.c:861
 msgid "Keyboard is charging"
 msgstr "Tastatur lader"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:838
+#: ../plugins/power/gpm-common.c:865
 msgid "Keyboard is discharging"
 msgstr "Tastatur lades ut"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:842
+#: ../plugins/power/gpm-common.c:869
 msgid "Keyboard is empty"
 msgstr "Tastatur er tomt"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:846
+#: ../plugins/power/gpm-common.c:873
 msgid "Keyboard is charged"
 msgstr "Tastatur er ladet"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:855
+#: ../plugins/power/gpm-common.c:882
 msgid "PDA is charging"
 msgstr "PDA lader"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:859
+#: ../plugins/power/gpm-common.c:886
 msgid "PDA is discharging"
 msgstr "PDA lades ut"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:863
+#: ../plugins/power/gpm-common.c:890
 msgid "PDA is empty"
 msgstr "PDA er tom"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:867
+#: ../plugins/power/gpm-common.c:894
 msgid "PDA is charged"
 msgstr "PDA er ladet"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:876
+#: ../plugins/power/gpm-common.c:903
 msgid "Cell phone is charging"
 msgstr "Mobiltelefon lader"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:880
+#: ../plugins/power/gpm-common.c:907
 msgid "Cell phone is discharging"
 msgstr "Mobiltelefon lades ut"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:884
+#: ../plugins/power/gpm-common.c:911
 msgid "Cell phone is empty"
 msgstr "Mobiltelefonen er tom"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:888
+#: ../plugins/power/gpm-common.c:915
 msgid "Cell phone is charged"
 msgstr "Mobiltelefon er ladet"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:898
+#: ../plugins/power/gpm-common.c:925
 msgid "Media player is charging"
 msgstr "Mediespiller lader"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:902
+#: ../plugins/power/gpm-common.c:929
 msgid "Media player is discharging"
 msgstr "Mediespiller lades ut"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:906
+#: ../plugins/power/gpm-common.c:933
 msgid "Media player is empty"
 msgstr "Mediespiller er tom"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:910
+#: ../plugins/power/gpm-common.c:937
 msgid "Media player is charged"
 msgstr "Mediespiller er ladet"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:919
+#: ../plugins/power/gpm-common.c:946
 msgid "Tablet is charging"
 msgstr "Nettbrett lader"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:923
+#: ../plugins/power/gpm-common.c:950
 msgid "Tablet is discharging"
 msgstr "Nettbrett lades ut"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:927
+#: ../plugins/power/gpm-common.c:954
 msgid "Tablet is empty"
 msgstr "Nettbrett er tomt"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:931
+#: ../plugins/power/gpm-common.c:958
 msgid "Tablet is charged"
 msgstr "Nettbrett er ladet"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:940
+#: ../plugins/power/gpm-common.c:967
 msgid "Computer is charging"
 msgstr "Datamaskin lader"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:944
+#: ../plugins/power/gpm-common.c:971
 msgid "Computer is discharging"
 msgstr "Datamaskin lades ut"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:948
+#: ../plugins/power/gpm-common.c:975
 msgid "Computer is empty"
 msgstr "Datamaskin er tom"
 
 #. TRANSLATORS: battery state
-#: ../plugins/power/gpm-common.c:952
+#: ../plugins/power/gpm-common.c:979
 msgid "Computer is charged"
 msgstr "Datamaskin er ladet"
 
 #. TRANSLATORS: the battery may be recalled by its vendor
-#: ../plugins/power/gsd-power-manager.c:1003
+#: ../plugins/power/gsd-power-manager.c:931
 msgid "Battery may be recalled"
 msgstr "Batteriet kan ha blitt tilbakekalt"
 
-#: ../plugins/power/gsd-power-manager.c:1006
+#: ../plugins/power/gsd-power-manager.c:934
 #, c-format
 msgid ""
 "A battery in your computer may have been recalled by %s and you may be at "
@@ -2118,47 +2186,48 @@
 "Et batteri i din datamaskin kan ha blitt tilbakekalt av %s og du kan være "
 "utsatt for risiko."
 
-#: ../plugins/power/gsd-power-manager.c:1009
+#: ../plugins/power/gsd-power-manager.c:937
 msgid "For more information visit the battery recall website."
 msgstr "For med informasjon besøk nettsted for tilbakekalling av batterier."
 
 #. TRANSLATORS: button text, visit the manufacturers recall website
-#: ../plugins/power/gsd-power-manager.c:1020
+#: ../plugins/power/gsd-power-manager.c:948
 msgid "Visit recall website"
 msgstr "Besøk nettsted for tilbakekalling"
 
 #. TRANSLATORS: button text, do not show this bubble again
-#: ../plugins/power/gsd-power-manager.c:1024
+#: ../plugins/power/gsd-power-manager.c:952
 msgid "Do not show me this again"
 msgstr "Ikke vis dette igjen"
 
 #. TRANSLATORS: UPS is now discharging
-#: ../plugins/power/gsd-power-manager.c:1257
+#: ../plugins/power/gsd-power-manager.c:1205
 msgid "UPS Discharging"
 msgstr "UPS lades ut"
 
 #. TRANSLATORS: tell the user how much time they have got
-#: ../plugins/power/gsd-power-manager.c:1262
+#: ../plugins/power/gsd-power-manager.c:1210
 #, c-format
 msgid "%s of UPS backup power remaining"
 msgstr "%s UPS reservestrøm gjenstår"
 
 #. TRANSLATORS: this is the notification application name
-#: ../plugins/power/gsd-power-manager.c:1283
-#: ../plugins/power/gsd-power-manager.c:1500
-#: ../plugins/power/gsd-power-manager.c:1682
-#: ../plugins/power/gsd-power-manager.c:1829
+#: ../plugins/power/gsd-power-manager.c:1231
+#: ../plugins/power/gsd-power-manager.c:1440
+#: ../plugins/power/gsd-power-manager.c:1613
+#: ../plugins/power/gsd-power-manager.c:1751
+#: ../plugins/power/gsd-power-manager.c:3100
 #: ../plugins/power/power.gnome-settings-plugin.in.h:1
 msgid "Power"
 msgstr "Strøm"
 
 #. TRANSLATORS: laptop battery low, and we only have one battery
-#: ../plugins/power/gsd-power-manager.c:1410
+#: ../plugins/power/gsd-power-manager.c:1350
 msgid "Battery low"
 msgstr "Batteri har lav kapasitet"
 
 #. TRANSLATORS: laptop battery low, and we have more than one kind of battery
-#: ../plugins/power/gsd-power-manager.c:1413
+#: ../plugins/power/gsd-power-manager.c:1353
 msgid "Laptop battery low"
 msgstr "Batteri på bærbar har lite strøm"
 
@@ -2169,7 +2238,7 @@
 msgstr "Omtrent <b>%s</b> gjenstår (%.0f%%)"
 
 #. TRANSLATORS: UPS is starting to get a little low
-#: ../plugins/power/gsd-power-manager.c:1425
+#: ../plugins/power/gsd-power-manager.c:1367
 msgid "UPS low"
 msgstr "UPS har lite strøm"
 
@@ -2181,140 +2250,140 @@
 
 #. TRANSLATORS: mouse is getting a little low
 #. TRANSLATORS: the mouse battery is very low
-#: ../plugins/power/gsd-power-manager.c:1436
-#: ../plugins/power/gsd-power-manager.c:1603
+#: ../plugins/power/gsd-power-manager.c:1378
+#: ../plugins/power/gsd-power-manager.c:1537
 msgid "Mouse battery low"
 msgstr "Mus har lite strøm"
 
 #. TRANSLATORS: tell user more details
-#: ../plugins/power/gsd-power-manager.c:1439
+#: ../plugins/power/gsd-power-manager.c:1381
 #, c-format
 msgid "Wireless mouse is low in power (%.0f%%)"
 msgstr "Trådløs mus har lite strøm (%.0f%%)"
 
 #. TRANSLATORS: keyboard is getting a little low
 #. TRANSLATORS: the keyboard battery is very low
-#: ../plugins/power/gsd-power-manager.c:1443
-#: ../plugins/power/gsd-power-manager.c:1611
+#: ../plugins/power/gsd-power-manager.c:1385
+#: ../plugins/power/gsd-power-manager.c:1545
 msgid "Keyboard battery low"
 msgstr "Batteri i tastatur har lav kapasitet"
 
 #. TRANSLATORS: tell user more details
-#: ../plugins/power/gsd-power-manager.c:1446
+#: ../plugins/power/gsd-power-manager.c:1388
 #, c-format
 msgid "Wireless keyboard is low in power (%.0f%%)"
 msgstr "Trådløst tastatur har lite strøm (%.0f%%)"
 
 #. TRANSLATORS: PDA is getting a little low
 #. TRANSLATORS: the PDA battery is very low
-#: ../plugins/power/gsd-power-manager.c:1450
-#: ../plugins/power/gsd-power-manager.c:1620
+#: ../plugins/power/gsd-power-manager.c:1392
+#: ../plugins/power/gsd-power-manager.c:1554
 msgid "PDA battery low"
 msgstr "Batteri i PDA har lav kapasitet"
 
 #. TRANSLATORS: tell user more details
-#: ../plugins/power/gsd-power-manager.c:1453
+#: ../plugins/power/gsd-power-manager.c:1395
 #, c-format
 msgid "PDA is low in power (%.0f%%)"
 msgstr "PDA har lite strøm (%.0f%%)"
 
 #. TRANSLATORS: cell phone (mobile) is getting a little low
 #. TRANSLATORS: the cell battery is very low
-#: ../plugins/power/gsd-power-manager.c:1457
-#: ../plugins/power/gsd-power-manager.c:1630
-#: ../plugins/power/gsd-power-manager.c:1641
+#: ../plugins/power/gsd-power-manager.c:1399
+#: ../plugins/power/gsd-power-manager.c:1564
+#: ../plugins/power/gsd-power-manager.c:1573
 msgid "Cell phone battery low"
 msgstr "Batteri i mobiltelefon har lav kapasitet"
 
 #. TRANSLATORS: tell user more details
-#: ../plugins/power/gsd-power-manager.c:1460
+#: ../plugins/power/gsd-power-manager.c:1402
 #, c-format
 msgid "Cell phone is low in power (%.0f%%)"
 msgstr "Mobiltelefon har lite strøm (%.0f%%)"
 
 #. TRANSLATORS: media player, e.g. mp3 is getting a little low
-#: ../plugins/power/gsd-power-manager.c:1465
+#: ../plugins/power/gsd-power-manager.c:1406
 msgid "Media player battery low"
 msgstr "Batteri i mediespiller har lav kapasitet"
 
 #. TRANSLATORS: tell user more details
-#: ../plugins/power/gsd-power-manager.c:1468
+#: ../plugins/power/gsd-power-manager.c:1409
 #, c-format
 msgid "Media player is low in power (%.0f%%)"
 msgstr "Mediespiller har lite strøm (%.0f%%)"
 
 #. TRANSLATORS: graphics tablet, e.g. wacom is getting a little low
 #. TRANSLATORS: the cell battery is very low
-#: ../plugins/power/gsd-power-manager.c:1472
-#: ../plugins/power/gsd-power-manager.c:1650
+#: ../plugins/power/gsd-power-manager.c:1413
+#: ../plugins/power/gsd-power-manager.c:1582
 msgid "Tablet battery low"
 msgstr "Batteri i nettbrett har lav kapasitet"
 
 #. TRANSLATORS: tell user more details
-#: ../plugins/power/gsd-power-manager.c:1475
+#: ../plugins/power/gsd-power-manager.c:1416
 #, c-format
 msgid "Tablet is low in power (%.0f%%)"
 msgstr "Nettbrett har lite strøm (%.0f%%)"
 
 #. TRANSLATORS: computer, e.g. ipad is getting a little low
 #. TRANSLATORS: the cell battery is very low
-#: ../plugins/power/gsd-power-manager.c:1479
-#: ../plugins/power/gsd-power-manager.c:1659
+#: ../plugins/power/gsd-power-manager.c:1420
+#: ../plugins/power/gsd-power-manager.c:1591
 msgid "Attached computer battery low"
 msgstr "Batteri i tilkoblet datamaskin har lav kapasitet"
 
 #. TRANSLATORS: tell user more details
-#: ../plugins/power/gsd-power-manager.c:1482
+#: ../plugins/power/gsd-power-manager.c:1423
 #, c-format
 msgid "Attached computer is low in power (%.0f%%)"
 msgstr "Tilkoblet datamaskin har lite strøm (%.0f%%)"
 
 #. TRANSLATORS: this is the sound description
-#: ../plugins/power/gsd-power-manager.c:1517
+#: ../plugins/power/gsd-power-manager.c:1450
 msgid "Battery is low"
 msgstr "Batteri har lav kapasitet"
 
 #. TRANSLATORS: laptop battery critically low, and only have one kind of battery
-#: ../plugins/power/gsd-power-manager.c:1559
+#: ../plugins/power/gsd-power-manager.c:1491
 msgid "Battery critically low"
 msgstr "Batteri har kritisk lav kapasitet"
 
 #. TRANSLATORS: laptop battery critically low, and we have more than one type of battery
 #. TRANSLATORS: laptop battery is really, really, low
-#: ../plugins/power/gsd-power-manager.c:1562
-#: ../plugins/power/gsd-power-manager.c:1747
+#: ../plugins/power/gsd-power-manager.c:1494
+#: ../plugins/power/gsd-power-manager.c:1665
 msgid "Laptop battery critically low"
 msgstr "Batteri på bærbar har kritisk lav kapasitet"
 
 #. TRANSLATORS: tell the use to insert the plug, as we're not going to do anything
-#: ../plugins/power/gsd-power-manager.c:1571
+#: ../plugins/power/gsd-power-manager.c:1503
 msgid "Plug in your AC adapter to avoid losing data."
 msgstr "Koble til strøm for å unngå å tape data."
 
 #. TRANSLATORS: give the user a ultimatum
-#: ../plugins/power/gsd-power-manager.c:1575
+#: ../plugins/power/gsd-power-manager.c:1507
 #, c-format
 msgid "Computer will suspend very soon unless it is plugged in."
 msgstr ""
 "Datamaskinen vil gå i hvilemodus meget snart med mindre den kobles til."
 
 #. TRANSLATORS: give the user a ultimatum
-#: ../plugins/power/gsd-power-manager.c:1579
+#: ../plugins/power/gsd-power-manager.c:1511
 #, c-format
 msgid "Computer will hibernate very soon unless it is plugged in."
 msgstr ""
 "Datamaskinen vil gå i dvalemodus meget snart med mindre den kobles til."
 
 #. TRANSLATORS: give the user a ultimatum
-#: ../plugins/power/gsd-power-manager.c:1583
+#: ../plugins/power/gsd-power-manager.c:1515
 #, c-format
 msgid "Computer will shutdown very soon unless it is plugged in."
 msgstr "Datamaskinen vil slås av meget snart med mindre den kobles til."
 
 #. TRANSLATORS: the UPS is very low
 #. TRANSLATORS: UPS is really, really, low
-#: ../plugins/power/gsd-power-manager.c:1591
-#: ../plugins/power/gsd-power-manager.c:1783
+#: ../plugins/power/gsd-power-manager.c:1525
+#: ../plugins/power/gsd-power-manager.c:1703
 msgid "UPS critically low"
 msgstr "UPS har kritisk lav batterikapasitet"
 
@@ -2329,7 +2398,7 @@
 "strømtilkobling til din datamaskin for å unngå å tape data."
 
 #. TRANSLATORS: the device is just going to stop working
-#: ../plugins/power/gsd-power-manager.c:1606
+#: ../plugins/power/gsd-power-manager.c:1540
 #, c-format
 msgid ""
 "Wireless mouse is very low in power (%.0f%%). This device will soon stop "
@@ -2339,7 +2408,7 @@
 "hvis den ikke lades."
 
 #. TRANSLATORS: the device is just going to stop working
-#: ../plugins/power/gsd-power-manager.c:1614
+#: ../plugins/power/gsd-power-manager.c:1548
 #, c-format
 msgid ""
 "Wireless keyboard is very low in power (%.0f%%). This device will soon stop "
@@ -2349,7 +2418,7 @@
 "virke hvis den ikke lades."
 
 #. TRANSLATORS: the device is just going to stop working
-#: ../plugins/power/gsd-power-manager.c:1623
+#: ../plugins/power/gsd-power-manager.c:1557
 #, c-format
 msgid ""
 "PDA is very low in power (%.0f%%). This device will soon stop functioning if "
@@ -2359,7 +2428,7 @@
 "ikke lades."
 
 #. TRANSLATORS: the device is just going to stop working
-#: ../plugins/power/gsd-power-manager.c:1633
+#: ../plugins/power/gsd-power-manager.c:1567
 #, c-format
 msgid ""
 "Cell phone is very low in power (%.0f%%). This device will soon stop "
@@ -2369,7 +2438,7 @@
 "virke hvis den ikke lades."
 
 #. TRANSLATORS: the device is just going to stop working
-#: ../plugins/power/gsd-power-manager.c:1644
+#: ../plugins/power/gsd-power-manager.c:1576
 #, c-format
 msgid ""
 "Media player is very low in power (%.0f%%). This device will soon stop "
@@ -2379,7 +2448,7 @@
 "hvis den ikke lades."
 
 #. TRANSLATORS: the device is just going to stop working
-#: ../plugins/power/gsd-power-manager.c:1653
+#: ../plugins/power/gsd-power-manager.c:1585
 #, c-format
 msgid ""
 "Tablet is very low in power (%.0f%%). This device will soon stop functioning "
@@ -2389,7 +2458,7 @@
 "hvis den ikke lades."
 
 #. TRANSLATORS: the device is just going to stop working
-#: ../plugins/power/gsd-power-manager.c:1662
+#: ../plugins/power/gsd-power-manager.c:1594
 #, c-format
 msgid ""
 "Attached computer is very low in power (%.0f%%). The device will soon "
@@ -2399,14 +2468,14 @@
 "å virke hvis den ikke lades."
 
 #. TRANSLATORS: this is the sound description
-#: ../plugins/power/gsd-power-manager.c:1700
-#: ../plugins/power/gsd-power-manager.c:1710
-#: ../plugins/power/gsd-power-manager.c:1844
+#: ../plugins/power/gpm-common.c:1742
+#: ../plugins/power/gsd-power-manager.c:1630
+#: ../plugins/power/gsd-power-manager.c:1760
 msgid "Battery is critically low"
 msgstr "Batteri har kritisk lav kapasitet"
 
 #. TRANSLATORS: computer will shutdown without saving data
-#: ../plugins/power/gsd-power-manager.c:1755
+#: ../plugins/power/gsd-power-manager.c:1673
 msgid ""
 "The battery is below the critical level and this computer will <b>power-"
 "off</b> when the battery becomes completely empty."
@@ -2415,7 +2484,7 @@
 "batteriet blir helt tomt."
 
 #. TRANSLATORS: computer will suspend
-#: ../plugins/power/gsd-power-manager.c:1761
+#: ../plugins/power/gsd-power-manager.c:1679
 msgid ""
 "The battery is below the critical level and this computer is about to "
 "suspend.\n"
@@ -2427,7 +2496,7 @@
 "<b>MERK:</b> Det kreves noe strøm for å holde datamaskinen i hvilemodus."
 
 #. TRANSLATORS: computer will hibernate
-#: ../plugins/power/gsd-power-manager.c:1768
+#: ../plugins/power/gsd-power-manager.c:1686
 msgid ""
 "The battery is below the critical level and this computer is about to "
 "hibernate."
@@ -2436,7 +2505,7 @@
 "dvalemodus."
 
 #. TRANSLATORS: computer will just shutdown
-#: ../plugins/power/gsd-power-manager.c:1773
+#: ../plugins/power/gsd-power-manager.c:1691
 msgid ""
 "The battery is below the critical level and this computer is about to "
 "shutdown."
@@ -2445,7 +2514,7 @@
 "av."
 
 #. TRANSLATORS: computer will shutdown without saving data
-#: ../plugins/power/gsd-power-manager.c:1791
+#: ../plugins/power/gsd-power-manager.c:1711
 msgid ""
 "UPS is below the critical level and this computer will <b>power-off</b> when "
 "the UPS becomes completely empty."
@@ -2454,7 +2523,7 @@
 "er helt tom."
 
 #. TRANSLATORS: computer will hibernate
-#: ../plugins/power/gsd-power-manager.c:1797
+#: ../plugins/power/gsd-power-manager.c:1717
 msgid ""
 "UPS is below the critical level and this computer is about to hibernate."
 msgstr ""
@@ -2462,25 +2531,25 @@
 "dvalemodus."
 
 #. TRANSLATORS: computer will just shutdown
-#: ../plugins/power/gsd-power-manager.c:1802
+#: ../plugins/power/gsd-power-manager.c:1722
 msgid ""
 "UPS is below the critical level and this computer is about to shutdown."
 msgstr ""
 "UPS er under kritisk nivå og denne datamaskinen er i ferd med å slås av."
 
 #. TRANSLATORS: this is the sound description
-#: ../plugins/power/gsd-power-manager.c:2191
+#: ../plugins/power/gsd-power-manager.c:2228
 msgid "Lid has been opened"
 msgstr "Lokket ble åpnet"
 
 #. TRANSLATORS: this is the sound description
-#: ../plugins/power/gsd-power-manager.c:2347
+#: ../plugins/power/gsd-power-manager.c:2266
 msgid "Lid has been closed"
 msgstr "Lokket ble lukket"
 
 #. TRANSLATORS: this is the title of the power manager status icon
 #. * that is only shown in fallback mode
-#: ../plugins/power/gsd-power-manager.c:3870
+#: ../plugins/power/gsd-power-manager.c:3722
 msgid "Power Manager"
 msgstr "Strømstyring"
 
@@ -2527,80 +2596,80 @@
 msgstr "Ingen driver for denne skriveren."
 
 #: ../plugins/print-notifications/gsd-printer.c:1032
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:233
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:672
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:762
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:805
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:264
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:703
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:793
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:836
 msgid "Printers"
 msgstr "Skrivere"
 
 #. Translators: The printer is low on toner (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:323
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:361
 msgid "Toner low"
 msgstr "Lite toner"
 
 #. Translators: The printer has no toner left (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:325
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:363
 msgid "Toner empty"
 msgstr "Ikke mer toner"
 
 #. Translators: The printer is in the process of connecting to a shared network output device (same as in system-config-printer)
 #. N_("Not connected?"),
 #. Translators: One or more covers on the printer are open (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:329
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:367
 msgid "Cover open"
 msgstr "Lokket er åpent"
 
 #. Translators: A filter or backend is not installed (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:331
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:369
 msgid "Printer configuration error"
 msgstr "Feil med konfigurasjon av skriver"
 
 #. Translators: One or more doors on the printer are open (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:333
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:371
 msgid "Door open"
 msgstr "Dør åpen"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:335
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:373
 msgid "Marker supply low"
 msgstr "Lite farge"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:337
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:375
 msgid "Out of a marker supply"
 msgstr "Ikke mer farge"
 
 #. Translators: At least one input tray is low on media (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:339
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:377
 msgid "Paper low"
 msgstr "Lite papir"
 
 #. Translators: At least one input tray is empty (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:341
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:379
 msgid "Out of paper"
 msgstr "Ikke mer papir"
 
 #. Translators: The printer is offline (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:343
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:381
 msgid "Printer off-line"
 msgstr "Skriver frakoblet"
 
 #. Translators: The printer has detected an error (same as in system-config-printer)
 #. Translators: This is a title of an error notification for a printer
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:345
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:748
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:383
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:779
 msgid "Printer error"
 msgstr "Feil med skriver"
 
 #. Translators: The printer is low on toner (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:349
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:387
 #, c-format
 msgid "Printer '%s' is low on toner."
 msgstr "Skriver «%s» har lite toner."
 
 #. Translators: The printer has no toner left (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:351
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:389
 #, c-format
 msgid "Printer '%s' has no toner left."
 msgstr "Skriver «%s» har ikke mer toner."
@@ -2608,125 +2677,136 @@
 #. Translators: The printer is in the process of connecting to a shared network output device (same as in system-config-printer)
 #. N_("Printer '%s' may not be connected."),
 #. Translators: One or more covers on the printer are open (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:355
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:393
 #, c-format
 msgid "The cover is open on printer '%s'."
 msgstr "Lokket er åpent på skriver «%s»."
 
 #. Translators: A filter or backend is not installed (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:357
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:395
 #, c-format
 msgid "There is a missing print filter for printer '%s'."
 msgstr "Det mangler et utskriftsfilter for skriver «%s»."
 
 #. Translators: One or more doors on the printer are open (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:360
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:398
 #, c-format
 msgid "The door is open on printer '%s'."
 msgstr "Døren er åpen på skriver «%s»."
 
 #. Translators: "marker" is one color bin of the printer
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:362
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:400
 #, c-format
 msgid "Printer '%s' is low on a marker supply."
 msgstr "Skriver «%s» har lite farge."
 
 #. Translators: "marker" is one color bin of the printer
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:364
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:402
 #, c-format
 msgid "Printer '%s' is out of a marker supply."
 msgstr "Skriver «%s» har ikke mer farge."
 
 #. Translators: At least one input tray is low on media (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:366
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:404
 #, c-format
 msgid "Printer '%s' is low on paper."
 msgstr "Skriver «%s» har lite papir."
 
 #. Translators: At least one input tray is empty (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:368
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:406
 #, c-format
 msgid "Printer '%s' is out of paper."
 msgstr "Skriver «%s» har ikke mer papir."
 
 #. Translators: The printer is offline (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:370
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:408
 #, c-format
 msgid "Printer '%s' is currently off-line."
 msgstr "Skriver «%s» er ikke tilkoblet."
 
 #. Translators: The printer has detected an error (same as in system-config-printer)
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:372
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:410
 #, c-format
 msgid "There is a problem on printer '%s'."
 msgstr "Det er et problem med skriver «%s»."
 
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:449
+#. Translators: New printer has been added
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:457
 msgid "Printer added"
 msgstr "Skriver lagt til"
 
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:457
+#. Translators: A printer has been removed
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:465
 msgid "Printer removed"
 msgstr "Skriver fjernet"
 
 #. Translators: A print job has been stopped
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:474
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:482
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:520
 msgid "Printing stopped"
 msgstr "Utskrift stoppet"
 
 #. Translators: "print-job xy" on a printer
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:476
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:482
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:488
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:494
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:506
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:526
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:484
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:490
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:496
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:502
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:514
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:522
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:530
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:538
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:546
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:559
 #, c-format
 msgid "\"%s\" on %s"
 msgstr "«%s» på %s"
 
 #. Translators: A print job has been canceled
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:480
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:488
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:528
 msgid "Printing canceled"
 msgstr "Utskrift avbrutt"
 
 #. Translators: A print job has been aborted
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:486
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:494
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:536
 msgid "Printing aborted"
 msgstr "Utskrift terminert"
 
 #. Translators: A print job has been completed
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:492
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:500
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:544
 msgid "Printing completed"
 msgstr "Utskrift fullført"
 
 #. Translators: A job is printing
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:504
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:524
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:512
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:557
 msgid "Printing"
 msgstr "Skriver ut"
 
 #. Translators: This is a title of a report notification for a printer
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:742
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:773
 msgid "Printer report"
 msgstr "Skriverrapport"
 
 #. Translators: This is a title of a warning notification for a printer
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:745
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:776
 msgid "Printer warning"
 msgstr "Skriveradvarsel"
 
 #. Translators: "Printer 'MyPrinterName': 'Description of the report/warning/error from a PPD file'."
-#: ../plugins/print-notifications/gsd-print-notifications-manager.c:755
+#: ../plugins/print-notifications/gsd-print-notifications-manager.c:786
 #, c-format
 msgid "Printer '%s': '%s'."
 msgstr "Skriver «%s»: «%s»."
 
-#: ../plugins/print-notifications/print-notifications.gnome-settings-plugin.in.h:1
+#. Priority=100
+#: ../plugins/print-notifications/print-notifications.gnome-settings-plugin.in.h:2
 msgid "Print-notifications"
 msgstr "Utskriftsvarsling"
 
-#: ../plugins/print-notifications/print-notifications.gnome-settings-plugin.in.h:2
+#: ../plugins/print-notifications/print-notifications.gnome-settings-plugin.in.h:3
 msgid "Print-notifications plugin"
 msgstr "Tillegg for varsling av utskrift"
 
@@ -2769,37 +2849,37 @@
 
 #. TRANSLATORS: title of libnotify bubble
 #: ../plugins/updates/gsd-updates-firmware.c:253
-#: ../plugins/updates/gsd-updates-firmware.c:280
-#: ../plugins/updates/gsd-updates-firmware.c:307
+#: ../plugins/updates/gsd-updates-firmware.c:281
+#: ../plugins/updates/gsd-updates-firmware.c:309
 msgid "Additional software was installed"
 msgstr "Ekstra programvare ble installert"
 
-#: ../plugins/updates/gsd-updates-firmware.c:254
-#: ../plugins/updates/gsd-updates-firmware.c:281
-#: ../plugins/updates/gsd-updates-firmware.c:308
-#: ../plugins/updates/gsd-updates-firmware.c:599
-#: ../plugins/updates/gsd-updates-manager.c:346
-#: ../plugins/updates/gsd-updates-manager.c:473
-#: ../plugins/updates/gsd-updates-manager.c:534
-#: ../plugins/updates/gsd-updates-manager.c:587
-#: ../plugins/updates/gsd-updates-manager.c:1295
+#: ../plugins/updates/gsd-updates-firmware.c:255
+#: ../plugins/updates/gsd-updates-firmware.c:283
+#: ../plugins/updates/gsd-updates-firmware.c:311
+#: ../plugins/updates/gsd-updates-firmware.c:603
+#: ../plugins/updates/gsd-updates-manager.c:347
+#: ../plugins/updates/gsd-updates-manager.c:478
+#: ../plugins/updates/gsd-updates-manager.c:542
+#: ../plugins/updates/gsd-updates-manager.c:598
+#: ../plugins/updates/gsd-updates-manager.c:1240
 msgid "Software Updates"
 msgstr "Programvareoppdateringer"
 
 #. TRANSLATORS: we need to remove an replug so the new hardware can re-request the firmware
-#: ../plugins/updates/gsd-updates-firmware.c:277
+#: ../plugins/updates/gsd-updates-firmware.c:278
 msgid ""
 "You will need to remove and then reinsert the hardware before it will work "
 "correctly."
 msgstr "Du må fjerne og koble til maskinvaren før den vil fungere korrekt."
 
 #. TRANSLATORS: we need to remove an replug so the new hardware can re-request the firmware
-#: ../plugins/updates/gsd-updates-firmware.c:304
+#: ../plugins/updates/gsd-updates-firmware.c:306
 msgid "Your hardware has been set up and is now ready to use."
 msgstr "Maskinvaren er satt opp og klar til bruk."
 
 #. TRANSLATORS: we need another package to keep udev quiet
-#: ../plugins/updates/gsd-updates-firmware.c:584
+#: ../plugins/updates/gsd-updates-firmware.c:587
 msgid ""
 "Additional firmware is required to make hardware in this computer function "
 "correctly."
@@ -2808,17 +2888,17 @@
 "fungere korrekt."
 
 #. TRANSLATORS: title of libnotify bubble
-#: ../plugins/updates/gsd-updates-firmware.c:598
+#: ../plugins/updates/gsd-updates-firmware.c:601
 msgid "Additional firmware required"
 msgstr "Ekstra fastvare kreves"
 
 #. TRANSLATORS: button label
-#: ../plugins/updates/gsd-updates-firmware.c:604
+#: ../plugins/updates/gsd-updates-firmware.c:608
 msgid "Install firmware"
 msgstr "Installer fastvare"
 
 #. TRANSLATORS: we should ignore this device and not ask anymore
-#: ../plugins/updates/gsd-updates-firmware.c:607
+#: ../plugins/updates/gsd-updates-firmware.c:611
 msgid "Ignore devices"
 msgstr "Overse enheter"
 
@@ -2828,33 +2908,33 @@
 msgstr "Oppgradering for distribusjonen tilgjengelig"
 
 #. TRANSLATORS: provides more information about the upgrade
-#: ../plugins/updates/gsd-updates-manager.c:351
+#: ../plugins/updates/gsd-updates-manager.c:352
 msgid "More information"
 msgstr "Mer informasjon"
 
 #. TRANSLATORS: title in the libnotify popup
-#: ../plugins/updates/gsd-updates-manager.c:456
-#: ../plugins/updates/gsd-updates-manager.c:517
+#: ../plugins/updates/gsd-updates-manager.c:460
+#: ../plugins/updates/gsd-updates-manager.c:524
 msgid "Update"
 msgid_plural "Updates"
 msgstr[0] "Oppdatering"
 msgstr[1] "Oppdateringer"
 
 #. TRANSLATORS: message when there are security updates
-#: ../plugins/updates/gsd-updates-manager.c:459
+#: ../plugins/updates/gsd-updates-manager.c:463
 msgid "An important software update is available"
 msgid_plural "Important software updates are available"
 msgstr[0] "En viktig programvareoppdatering er tilgjengelig"
 msgstr[1] "Viktige programvareoppdateringer er tilgjengelige"
 
 #. TRANSLATORS: button: open the update viewer to install updates
-#: ../plugins/updates/gsd-updates-manager.c:478
-#: ../plugins/updates/gsd-updates-manager.c:539
+#: ../plugins/updates/gsd-updates-manager.c:483
+#: ../plugins/updates/gsd-updates-manager.c:547
 msgid "Install updates"
 msgstr "Installer oppdateringer"
 
 #. TRANSLATORS: message when there are non-security updates
-#: ../plugins/updates/gsd-updates-manager.c:520
+#: ../plugins/updates/gsd-updates-manager.c:527
 msgid "A software update is available."
 msgid_plural "Software updates are available."
 msgstr[0] "En programvareoppdatering er tilgjengelig."
@@ -2920,87 +3000,88 @@
 msgstr "Start datamaskinen på nytt nå"
 
 #. TRANSLATORS: the updates mechanism
-#: ../plugins/updates/gsd-updates-manager.c:575
+#: ../plugins/updates/gsd-updates-manager.c:585
+#: ../plugins/updates/updates.gnome-settings-plugin.in.h:1
 msgid "Updates"
 msgstr "Oppdateringer"
 
 #. TRANSLATORS: we failed to get the updates multiple times,
 #. * and now we need to inform the user that something might be wrong
-#: ../plugins/updates/gsd-updates-manager.c:579
+#: ../plugins/updates/gsd-updates-manager.c:589
 msgid "Unable to access software updates"
 msgstr "Kan ikke aksessere programvareoppdateringer"
 
 #. TRANSLATORS: try again, this time launching the update viewer
-#: ../plugins/updates/gsd-updates-manager.c:582
+#: ../plugins/updates/gsd-updates-manager.c:592
 msgid "Try again"
 msgstr "Prøv igjen"
 
 #. TRANSLATORS: the reason why we've inhibited it
-#: ../plugins/updates/gsd-updates-manager.c:960
+#: ../plugins/updates/gsd-updates-manager.c:977
 msgid "A transaction that cannot be interrupted is running"
 msgstr "En transaksjon som ikke kan avbytes kjører"
 
-#: ../plugins/wacom/gsd-wacom-device.c:1011
+#: ../plugins/wacom/gsd-wacom-device.c:1086
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr "Venstre ringmodus #%d"
 
-#: ../plugins/wacom/gsd-wacom-device.c:1021
+#: ../plugins/wacom/gsd-wacom-device.c:1115
 #, c-format
 msgid "Right Ring Mode #%d"
 msgstr "Høyre ringmodus #%d"
 
-#: ../plugins/wacom/gsd-wacom-device.c:1052
+#: ../plugins/wacom/gsd-wacom-device.c:1166
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr "Venstre berøringsstripe modus #%d"
 
-#: ../plugins/wacom/gsd-wacom-device.c:1062
+#: ../plugins/wacom/gsd-wacom-device.c:1195
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr "Høyre berøringsstripe modus #%d"
 
-#: ../plugins/wacom/gsd-wacom-device.c:1079
+#: ../plugins/wacom/gsd-wacom-device.c:1220
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr "Høyre berøringsrind modusbytte"
 
-#: ../plugins/wacom/gsd-wacom-device.c:1081
+#: ../plugins/wacom/gsd-wacom-device.c:1222
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr "Høyre berøringsring modusbytte"
 
-#: ../plugins/wacom/gsd-wacom-device.c:1084
+#: ../plugins/wacom/gsd-wacom-device.c:1225
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr "Bytte av modus for venstre berøringsstripe"
 
-#: ../plugins/wacom/gsd-wacom-device.c:1086
+#: ../plugins/wacom/gsd-wacom-device.c:1227
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr "Bytte av modus for høyre berøringsstripe"
 
-#: ../plugins/wacom/gsd-wacom-device.c:1091
+#: ../plugins/wacom/gsd-wacom-device.c:1232
 #, c-format
 msgid "Mode Switch #%d"
 msgstr "Modusbytte #%d"
 
-#: ../plugins/wacom/gsd-wacom-device.c:1162
+#: ../plugins/wacom/gsd-wacom-device.c:1336
 #, c-format
 msgid "Left Button #%d"
 msgstr "Venstre knapp #%d"
 
-#: ../plugins/wacom/gsd-wacom-device.c:1165
+#: ../plugins/wacom/gsd-wacom-device.c:1339
 #, c-format
 msgid "Right Button #%d"
 msgstr "Høyre knapp #%d"
 
-#: ../plugins/wacom/gsd-wacom-device.c:1168
+#: ../plugins/wacom/gsd-wacom-device.c:1342
 #, c-format
 msgid "Top Button #%d"
 msgstr "Øverste knapp #%d"
 
-#: ../plugins/wacom/gsd-wacom-device.c:1171
+#: ../plugins/wacom/gsd-wacom-device.c:1345
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "Nederste knapp #%d"
@@ -3017,19 +3098,19 @@
 msgid "Authentication is required to modify the lit LED for a Wacom tablet"
 msgstr "Autentisering kreves for å endre opplyst LED for et Wacom-tegnebrett"
 
-#: ../plugins/xrandr/gsd-xrandr-manager.c:508
+#: ../plugins/xrandr/gsd-xrandr-manager.c:509
 msgid "Could not switch the monitor configuration"
 msgstr "Kunne ikke bytte skjermkonfigurasjon"
 
-#: ../plugins/xrandr/gsd-xrandr-manager.c:532
+#: ../plugins/xrandr/gsd-xrandr-manager.c:533
 msgid "Could not restore the display's configuration"
 msgstr "Kunne ikke gjenopprette skjermkonfigurasjon"
 
-#: ../plugins/xrandr/gsd-xrandr-manager.c:557
+#: ../plugins/xrandr/gsd-xrandr-manager.c:558
 msgid "Could not restore the display's configuration from a backup"
 msgstr "Kunne ikke gjenopprette skjermkonfigurasjonen fra sikkerhetskopi"
 
-#: ../plugins/xrandr/gsd-xrandr-manager.c:578
+#: ../plugins/xrandr/gsd-xrandr-manager.c:579
 #, c-format
 msgid "The display will be reset to its previous configuration in %d second"
 msgid_plural ""
@@ -3039,32 +3120,32 @@
 msgstr[1] ""
 "Skjermen vil bli satt tilbake til forrige konfigurasjon om %d sekunder"
 
-#: ../plugins/xrandr/gsd-xrandr-manager.c:627
+#: ../plugins/xrandr/gsd-xrandr-manager.c:628
 msgid "Does the display look OK?"
 msgstr "Ser dette bra ut?"
 
-#: ../plugins/xrandr/gsd-xrandr-manager.c:634
+#: ../plugins/xrandr/gsd-xrandr-manager.c:635
 msgid "_Restore Previous Configuration"
 msgstr "Gjenopp_rett forrige konfigurasjon"
 
-#: ../plugins/xrandr/gsd-xrandr-manager.c:635
+#: ../plugins/xrandr/gsd-xrandr-manager.c:636
 msgid "_Keep This Configuration"
 msgstr "_Behold denne konfigurasjonen"
 
-#: ../plugins/xrandr/gsd-xrandr-manager.c:716
+#: ../plugins/xrandr/gsd-xrandr-manager.c:717
 msgid "The selected configuration for displays could not be applied"
 msgstr "Valgt konfigurasjon for skjermer kunne ikke brukes"
 
-#: ../plugins/xrandr/gsd-xrandr-manager.c:1374
+#: ../plugins/xrandr/gsd-xrandr-manager.c:1375
 #, c-format
 msgid "Could not refresh the screen information: %s"
 msgstr "Kunne ikke oppdatere informasjon om skjermen: %s"
 
-#: ../plugins/xrandr/gsd-xrandr-manager.c:1378
+#: ../plugins/xrandr/gsd-xrandr-manager.c:1379
 msgid "Trying to switch the monitor configuration anyway."
 msgstr "Prøver å bytte skjermkonfigurasjon likevel."
 
-#: ../plugins/xrandr/gsd-xrandr-manager.c:1848
+#: ../plugins/xrandr/gsd-xrandr-manager.c:1875
 msgid "Could not apply the stored configuration for monitors"
 msgstr "Kunne ikke bruke lagret konfigurasjon for skjermer"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-system-log.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-system-log.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-system-log.po	2013-01-29 09:33:54.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-system-log.po	2014-01-07 06:37:52.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:43+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 21:14+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../data/gnome-system-log.desktop.in.in.h:1
@@ -222,23 +222,23 @@
 msgid "Clear the search string"
 msgstr "Tøm søkestrengen"
 
-#: ../src/logview-log.c:593
+#: ../src/logview-log.c:596
 msgid "Error while uncompressing the GZipped log. The file might be corrupt."
 msgstr "Feil under dekomprimering av GZippet logg. Filen kan være korrupt."
 
-#: ../src/logview-log.c:640
+#: ../src/logview-log.c:643
 msgid "You don't have enough permissions to read the file."
 msgstr "Du har ikke nok rettigheter til å lese filen."
 
-#: ../src/logview-log.c:655
+#: ../src/logview-log.c:658
 msgid "The file is not a regular file or is not a text file."
 msgstr "Filen er ikke en vanlig fil eller tekstfil."
 
-#: ../src/logview-log.c:737
+#: ../src/logview-log.c:740
 msgid "This version of System Log does not support GZipped logs."
 msgstr "Denne versjonen av systemlogg støtter ikke komprimerte logger."
 
-#: ../src/logview-loglist.c:315
+#: ../src/logview-loglist.c:316
 msgid "Loading..."
 msgstr "Laster …"
 
@@ -272,7 +272,7 @@
 msgid "%d lines (%s) - %s"
 msgstr "%d linjer (%s) - %s"
 
-#: ../src/logview-window.c:1074
+#: ../src/logview-window.c:1108
 msgid "Open Log"
 msgstr "Åpne logg"
 
@@ -281,7 +281,7 @@
 msgid "There was an error displaying help: %s"
 msgstr "Det oppsto en feil under visning av hjelp: %s"
 
-#: ../src/logview-window.c:322
+#: ../src/logview-window.c:344
 msgid "Wrapped"
 msgstr "Brutt"
 
@@ -429,7 +429,7 @@
 msgid "Automatically scroll down when new lines appear"
 msgstr "Rull ned automatisk når nye linjer kommer til syne"
 
-#: ../src/logview-window.c:686
+#: ../src/logview-window.c:726
 #, c-format
 msgid "Can't read from \"%s\""
 msgstr "Kan ikke lese fra «%s»"
@@ -438,6 +438,6 @@
 msgid "Version: "
 msgstr "Versjon: "
 
-#: ../src/logview-window.c:1362
+#: ../src/logview-window.c:1400
 msgid "Could not open the following files:"
 msgstr "Kunne ikke åpne følgende filer:"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-system-monitor.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-system-monitor.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-system-monitor.po	2013-01-29 09:33:54.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-system-monitor.po	2014-01-07 06:37:04.000000000 +0000
@@ -16,16 +16,17 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:33+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:39+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../gnome-system-monitor.desktop.in.in.h:1 ../data/interface.ui.h:1
-#: ../src/callbacks.cpp:184 ../src/procman.cpp:721
+#: ../src/callbacks.cpp:184 ../src/procman-app.cpp:360
 msgid "System Monitor"
 msgstr "Systemmonitor"
 
-#: ../gnome-system-monitor.desktop.in.in.h:2 ../src/callbacks.cpp:185
+#: ../gnome-system-monitor.desktop.in.in.h:2
+#: ../gnome-system-monitor-kde.desktop.in.in.h:2 ../src/callbacks.cpp:185
 msgid "View current processes and monitor system state"
 msgstr "Vis aktive prosesser og overvåk systemets tilstand"
 
@@ -77,15 +78,15 @@
 msgid "_Show network speed in bits"
 msgstr "Vi_s nettverkstrafikk i bits"
 
-#: ../data/interface.ui.h:14 ../data/preferences.ui.h:12
+#: ../data/interface.ui.h:14 ../data/preferences.ui.h:13
 msgid "Resources"
 msgstr "Ressurser"
 
-#: ../data/preferences.ui.h:13
+#: ../data/preferences.ui.h:14
 msgid "Show _all file systems"
 msgstr "Vis _alle filsystemer"
 
-#: ../data/interface.ui.h:15 ../data/preferences.ui.h:14
+#: ../data/interface.ui.h:15 ../data/preferences.ui.h:16
 msgid "File Systems"
 msgstr "Filsystemer"
 
@@ -93,15 +94,15 @@
 msgid "Show the System tab"
 msgstr "Vis systemfanen"
 
-#: ../src/argv.cpp:26
+#: ../src/argv.cpp:20
 msgid "Show the Processes tab"
 msgstr "Vis fane med prosesser"
 
-#: ../src/argv.cpp:31
+#: ../src/argv.cpp:25
 msgid "Show the Resources tab"
 msgstr "Vis fane med ressurser"
 
-#: ../src/argv.cpp:36
+#: ../src/argv.cpp:30
 msgid "Show the File Systems tab"
 msgstr "Vis fane med filsystemer"
 
@@ -117,31 +118,31 @@
 "  Terance Edward Sola https://launchpad.net/~tedsola\n"
 "  Torstein A. W. https://launchpad.net/~kvikende"
 
-#: ../src/disks.cpp:298 ../src/memmaps.cpp:361
+#: ../src/disks.cpp:304 ../src/memmaps.cpp:361
 msgid "Device"
 msgstr "Enhet"
 
-#: ../src/disks.cpp:299
+#: ../src/disks.cpp:305
 msgid "Directory"
 msgstr "Katalog"
 
-#: ../src/disks.cpp:300 ../src/gsm_color_button.c:222 ../src/openfiles.cpp:251
+#: ../src/disks.cpp:306 ../src/gsm_color_button.c:223 ../src/openfiles.cpp:252
 msgid "Type"
 msgstr "Type"
 
-#: ../src/disks.cpp:301
+#: ../src/disks.cpp:307
 msgid "Total"
 msgstr "Totalt"
 
-#: ../src/disks.cpp:302
+#: ../src/disks.cpp:308
 msgid "Free"
 msgstr "Ledig"
 
-#: ../src/disks.cpp:303
+#: ../src/disks.cpp:309
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../src/disks.cpp:304
+#: ../src/disks.cpp:310
 msgid "Used"
 msgstr "Brukt"
 
@@ -170,44 +171,44 @@
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../src/gsm_color_button.c:198
+#: ../src/gsm_color_button.c:199
 msgid "Fraction"
 msgstr "Del"
 
 #. TRANSLATORS: description of the pie color picker's (mem, swap) filled percentage property
-#: ../src/gsm_color_button.c:200
+#: ../src/gsm_color_button.c:201
 msgid "Percentage full for pie color pickers"
 msgstr "Prosent full for fargevelgere for pai"
 
-#: ../src/gsm_color_button.c:207
+#: ../src/gsm_color_button.c:208
 msgid "Title"
 msgstr "Tittel"
 
-#: ../src/gsm_color_button.c:208
+#: ../src/gsm_color_button.c:209
 msgid "The title of the color selection dialog"
 msgstr "Tittel for fargevalg-dialogen"
 
-#: ../src/gsm_color_button.c:209 ../src/gsm_color_button.c:625
+#: ../src/gsm_color_button.c:210 ../src/gsm_color_button.c:628
 msgid "Pick a Color"
 msgstr "Velg en farge"
 
-#: ../src/gsm_color_button.c:215
+#: ../src/gsm_color_button.c:216
 msgid "Current Color"
 msgstr "Aktiv farge"
 
-#: ../src/gsm_color_button.c:216
+#: ../src/gsm_color_button.c:217
 msgid "The selected color"
 msgstr "Valgt farge"
 
-#: ../src/gsm_color_button.c:223
+#: ../src/gsm_color_button.c:224
 msgid "Type of color picker"
 msgstr "Type fargevelger"
 
-#: ../src/gsm_color_button.c:548
+#: ../src/gsm_color_button.c:550
 msgid "Received invalid color data\n"
 msgstr "Fargedata for ugyldig mottak\n"
 
-#: ../src/gsm_color_button.c:648
+#: ../src/gsm_color_button.c:651
 msgid "Click to set graph colors"
 msgstr "Klikk for å sette farger for grafen"
 
@@ -221,7 +222,7 @@
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../src/interface.cpp:53
+#: ../src/interface.cpp:47
 msgid "_View"
 msgstr "_Vis"
 
@@ -241,43 +242,43 @@
 msgid "Quit the program"
 msgstr "Avslutt programmet"
 
-#: ../src/interface.cpp:62
+#: ../src/interface.cpp:49
 msgid "_Stop Process"
 msgstr "_Stopp prosess"
 
-#: ../src/interface.cpp:63
+#: ../src/interface.cpp:50
 msgid "Stop process"
 msgstr "Stopp prosess"
 
-#: ../src/interface.cpp:64
+#: ../src/interface.cpp:51
 msgid "_Continue Process"
 msgstr "_Sett i gang prosess"
 
-#: ../src/interface.cpp:65
+#: ../src/interface.cpp:52
 msgid "Continue process if stopped"
 msgstr "Sett i gang prosess hvis stoppet"
 
-#: ../src/interface.cpp:67 ../src/procdialogs.cpp:95
+#: ../src/interface.cpp:54 ../src/procdialogs.cpp:92
 msgid "_End Process"
 msgstr "_Avslutt prosess"
 
-#: ../src/interface.cpp:68
+#: ../src/interface.cpp:55
 msgid "Force process to finish normally"
 msgstr "Tving en prosess til å avslutte normalt"
 
-#: ../src/interface.cpp:69 ../src/procdialogs.cpp:84
+#: ../src/interface.cpp:56 ../src/procdialogs.cpp:81
 msgid "_Kill Process"
 msgstr "_Drep prosess"
 
-#: ../src/interface.cpp:70
+#: ../src/interface.cpp:57
 msgid "Force process to finish immediately"
 msgstr "Tving en prosess til å avslutte med en gang"
 
-#: ../src/interface.cpp:71
+#: ../src/interface.cpp:58
 msgid "_Change Priority"
 msgstr "En_dre prioritet"
 
-#: ../src/interface.cpp:72
+#: ../src/interface.cpp:59
 msgid "Change the order of priority of process"
 msgstr "Endre prioritet for en prosess"
 
@@ -285,36 +286,36 @@
 msgid "Configure the application"
 msgstr "Konfigurer programmet"
 
-#: ../src/interface.cpp:76
+#: ../src/interface.cpp:61
 msgid "_Refresh"
 msgstr "Oppdate_r"
 
-#: ../src/interface.cpp:77
+#: ../src/interface.cpp:62
 msgid "Refresh the process list"
 msgstr "Oppdater prosesslisten"
 
-#: ../src/interface.cpp:79
+#: ../src/interface.cpp:64
 msgid "_Memory Maps"
 msgstr "_Minnekart"
 
-#: ../src/interface.cpp:80
+#: ../src/interface.cpp:65
 msgid "Open the memory maps associated with a process"
 msgstr "Åpne minnekart assosiert med prosessen"
 
 #. Translators: this means 'Files that are open' (open is no verb here)
-#: ../src/interface.cpp:82
+#: ../src/interface.cpp:67
 msgid "Open _Files"
 msgstr "Åpne _filer"
 
-#: ../src/interface.cpp:83
+#: ../src/interface.cpp:68
 msgid "View the files opened by a process"
 msgstr "Vis filer som er åpnet av en prosess"
 
-#: ../src/interface.cpp:84
+#: ../src/interface.cpp:69
 msgid "_Properties"
 msgstr "Egenska_per"
 
-#: ../src/interface.cpp:85
+#: ../src/interface.cpp:70
 msgid "View additional information about a process"
 msgstr "Vis mer informasjon om en prosess"
 
@@ -330,83 +331,83 @@
 msgid "About this application"
 msgstr "Om dette programmet"
 
-#: ../src/interface.cpp:96
+#: ../src/interface.cpp:75
 msgid "_Dependencies"
 msgstr "Av_hengigheter"
 
-#: ../src/interface.cpp:97
+#: ../src/interface.cpp:76
 msgid "Show parent/child relationship between processes"
 msgstr "Vis forhold for opphav/barn mellom prosesser"
 
-#: ../src/interface.cpp:104
+#: ../src/interface.cpp:83
 msgid "_Active Processes"
 msgstr "_Aktive prosesser"
 
-#: ../src/interface.cpp:105
+#: ../src/interface.cpp:84
 msgid "Show active processes"
 msgstr "Vis aktive prosesser"
 
-#: ../src/interface.cpp:106
+#: ../src/interface.cpp:85
 msgid "A_ll Processes"
 msgstr "A_lle prosesser"
 
-#: ../src/interface.cpp:107
+#: ../src/interface.cpp:86
 msgid "Show all processes"
 msgstr "Vis alle prosesser"
 
-#: ../src/interface.cpp:108
+#: ../src/interface.cpp:87
 msgid "M_y Processes"
 msgstr "M_ine prosesser"
 
-#: ../src/interface.cpp:109
+#: ../src/interface.cpp:88
 msgid "Show only user-owned processes"
 msgstr "Vis kun prosesser som eies av brukere"
 
-#: ../src/interface.cpp:114 ../src/util.cpp:217
+#: ../src/interface.cpp:93 ../src/util.cpp:217
 msgid "Very High"
 msgstr "Meget høy"
 
-#: ../src/interface.cpp:115
+#: ../src/interface.cpp:94
 msgid "Set process priority to very high"
 msgstr "Sett prosessens prioritet til meget høy"
 
-#: ../src/interface.cpp:116 ../src/util.cpp:219
+#: ../src/interface.cpp:95 ../src/util.cpp:219
 msgid "High"
 msgstr "Høy"
 
-#: ../src/interface.cpp:117
+#: ../src/interface.cpp:96
 msgid "Set process priority to high"
 msgstr "Sett prosessens prioritet til høy"
 
-#: ../src/interface.cpp:118 ../src/util.cpp:221
+#: ../src/interface.cpp:97 ../src/util.cpp:221
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/interface.cpp:119
+#: ../src/interface.cpp:98
 msgid "Set process priority to normal"
 msgstr "Sett prosessens prioritet til normal"
 
-#: ../src/interface.cpp:120 ../src/util.cpp:223
+#: ../src/interface.cpp:99 ../src/util.cpp:223
 msgid "Low"
 msgstr "Lav"
 
-#: ../src/interface.cpp:121
+#: ../src/interface.cpp:100
 msgid "Set process priority to low"
 msgstr "Sett prosessens prioritet til lav"
 
-#: ../src/interface.cpp:122 ../src/util.cpp:225
+#: ../src/interface.cpp:101 ../src/util.cpp:225
 msgid "Very Low"
 msgstr "Meget lav"
 
-#: ../src/interface.cpp:123
+#: ../src/interface.cpp:102
 msgid "Set process priority to very low"
 msgstr "Sett prosessens prioritet til meget lav"
 
-#: ../src/interface.cpp:124
+#: ../src/interface.cpp:103
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../src/interface.cpp:125
+#: ../src/interface.cpp:104
 msgid "Set process priority manually"
 msgstr "Sett prosessens prioritet manuelt"
 
@@ -415,7 +416,7 @@
 msgstr "Avslutt _prosess"
 
 #. Translators: color picker title, %s is CPU, Memory, Swap, Receiving, Sending
-#: ../src/interface.cpp:256
+#: ../src/interface.cpp:178
 #, c-format
 msgid "Pick a Color for '%s'"
 msgstr "Velg en farge for «%s»"
@@ -424,11 +425,11 @@
 msgid "CPU History"
 msgstr "Historikk for CPU-bruk"
 
-#: ../src/interface.cpp:292 ../src/procproperties.cpp:139
+#: ../src/interface.cpp:214 ../src/procproperties.cpp:139
 msgid "CPU"
 msgstr "CPU"
 
-#: ../src/interface.cpp:294
+#: ../src/interface.cpp:216
 #, c-format
 msgid "CPU%d"
 msgstr "CPU%d"
@@ -437,12 +438,12 @@
 msgid "Memory and Swap History"
 msgstr "Historikk for minne- og swap-bruk"
 
-#: ../data/interface.ui.h:7 ../src/interface.cpp:327
-#: ../src/procproperties.cpp:133 ../src/proctable.cpp:251
+#: ../data/interface.ui.h:7 ../src/interface.cpp:249
+#: ../src/procproperties.cpp:133 ../src/proctable.cpp:211
 msgid "Memory"
 msgstr "Minne"
 
-#: ../data/interface.ui.h:8 ../src/interface.cpp:338
+#: ../data/interface.ui.h:8 ../src/interface.cpp:261
 msgid "Swap"
 msgstr "Swap"
 
@@ -450,7 +451,7 @@
 msgid "Network History"
 msgstr "Nettverkshistorikk"
 
-#: ../data/interface.ui.h:10 ../src/interface.cpp:363
+#: ../data/interface.ui.h:10 ../src/interface.cpp:288
 msgid "Receiving"
 msgstr "Mottar"
 
@@ -458,7 +459,7 @@
 msgid "Total Received"
 msgstr "Totalt mottatt"
 
-#: ../src/interface.cpp:378
+#: ../src/interface.cpp:304
 msgid "Sending"
 msgstr "Sender"
 
@@ -470,19 +471,19 @@
 msgid "System"
 msgstr "System"
 
-#: ../src/load-graph.cpp:166
+#: ../src/load-graph.cpp:170
 #, c-format
 msgid "%u second"
 msgid_plural "%u seconds"
 msgstr[0] "%u sekund"
 msgstr[1] "%u sekunder"
 
-#: ../src/load-graph.cpp:345
+#: ../src/load-graph.cpp:379
 msgid "not available"
 msgstr "ikke tilgjengelig"
 
 #. xgettext: 540MiB (53 %) of 1.0 GiB
-#: ../src/load-graph.cpp:348
+#: ../src/load-graph.cpp:382
 #, c-format
 msgid "%s (%.1f%%) of %s"
 msgstr "%s (%.1f%%) av %s"
@@ -618,11 +619,11 @@
 #. Translators: "FD" here means "File Descriptor". Please use
 #. a very short translation if possible, and at most
 #. 2-3 characters for it to be able to fit in the UI.
-#: ../src/openfiles.cpp:250
+#: ../src/openfiles.cpp:251
 msgid "FD"
 msgstr "FD"
 
-#: ../src/openfiles.cpp:252
+#: ../src/openfiles.cpp:253
 msgid "Object"
 msgstr "Objekt"
 
@@ -630,7 +631,7 @@
 msgid "Open Files"
 msgstr "Åpne filer"
 
-#: ../src/openfiles.cpp:346
+#: ../src/openfiles.cpp:347
 #, c-format
 msgid "_Files opened by process \"%s\" (PID %u):"
 msgstr "_Filer som er åpnet av prosess «%s» (PID %u):"
@@ -643,23 +644,23 @@
 msgid "Main Window height"
 msgstr "Høyde på hovedvinduet"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:3
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:4
 msgid "Main Window X position"
 msgstr "X-posisjon for hovedvinduet"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:4
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:5
 msgid "Main Window Y position"
 msgstr "Y-posisjon for hovedvinduet"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:5
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:6
 msgid "Show process dependencies in tree form"
 msgstr "Vis prosessavhengigheter som et tre"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:6
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:7
 msgid "Solaris mode for CPU percentage"
 msgstr "Solaris-modus for CPU-prosent"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:7
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:8
 msgid ""
 "If TRUE, system-monitor operates in 'Solaris mode' where a task's CPU usage "
 "is divided by the total number of CPUs. Otherwise, it operates in 'Irix "
@@ -669,27 +670,27 @@
 "hvor en oppgaves CPU-bruk deles på totalt antall CPUer. Ellers benyttes "
 "«Irix-modus»."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:8
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:11
 msgid "Enable/Disable smooth refresh"
 msgstr "Aktiver/deaktiver myk oppfrisking"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:9
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:12
 msgid "Show warning dialog when killing processes"
 msgstr "Vis advarsel når prosesser termineres"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:10
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:13
 msgid "Time in milliseconds between updates of the process view"
 msgstr "Tid mellom oppdatering av prosessvisning i millisekunder"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:11
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:14
 msgid "Time in milliseconds between updates of the graphs"
 msgstr "Tid mellom oppdatering av grafene i millisekunder"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:12
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:15
 msgid "Whether information about all file systems should be displayed"
 msgstr "Vis informasjon om alle filsystemene"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:13
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:16
 msgid ""
 "Whether to display information about all file systems (including types like "
 "'autofs' and 'procfs'). Useful for getting a list of all currently mounted "
@@ -699,11 +700,11 @@
 "filsystemer som «autofs» og «procfs». Det kan være hendig å få en liste over "
 "alle monterte filsystemer."
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:14
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:17
 msgid "Time in milliseconds between updates of the devices list"
 msgstr "Tid mellom oppdatering av enhetslisten i millisekunder"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:15
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:18
 msgid ""
 "Determines which processes to show by default. 0 is All, 1 is user, and 2 is "
 "active"
@@ -711,11 +712,11 @@
 "Bestemmer hvilke prosesser som skal vises som forvalg. 0 er ALLE, 1 er "
 "brukers prosesser og 2 er aktive prosesser"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:16
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:19
 msgid "Saves the currently viewed tab"
 msgstr "Lagrer fane som vises nå"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:17
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:20
 msgid ""
 "0 for the System Info, 1 for the processes list, 2 for the resources and 3 "
 "for the disks list"
@@ -723,257 +724,257 @@
 "0 for systeminfo, 1 for liste over prossesser, 2 for ressurser og 3 for "
 "liste over disker"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:18
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:21
 msgid "CPU colors"
 msgstr "Farger for CPU"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:19
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:22
 msgid "Each entry is in the format (CPU#, Hexadecimal color value)"
 msgstr "Hver oppføring er på formatet (CPU#, heksadesimal fargeverdi)"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:20
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:23
 msgid "Default graph memory color"
 msgstr "Forvalgt farge for minne-graf"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:21
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:24
 msgid "Default graph swap color"
 msgstr "Forvalgt farge for swap-graf"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:22
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:25
 msgid "Default graph incoming network traffic color"
 msgstr "Forvalgt farge på graf for innkommende nettverkstrafikk"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:23
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:26
 msgid "Default graph outgoing network traffic color"
 msgstr "Forvalgt farge på graf for utgående nettverkstrafikk"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:24
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:27
 msgid "Show network traffic in bits"
 msgstr "Vis nettverkstrafikk i bits"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:25
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:28
 msgid "Process view sort column"
 msgstr "Sorteringskolonne for prosessvisning"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:26
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:29
 msgid "Process view columns order"
 msgstr "Rekkefølge på kolonnene for prosessvisning"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:27
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:30
 msgid "Process view sort order"
 msgstr "Sorteringsrekkefølge for prosessvisning"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:28
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:31
 msgid "Width of process 'Name' column"
 msgstr "Bredde på kolonne «Navn» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:29
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:32
 msgid "Show process 'Name' column on startup"
 msgstr "Vis kolonne «Navn» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:30
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:33
 msgid "Width of process 'User' column"
 msgstr "Bredde på kolonne «Bruker» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:31
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:34
 msgid "Show process 'User' column on startup"
 msgstr "Vis kolonne «Bruker» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:32
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:35
 msgid "Width of process 'Status' column"
 msgstr "Bredde på kolonne «Status» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:33
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:36
 msgid "Show process 'Status' column on startup"
 msgstr "Vis kolonne «Status» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:34
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:37
 msgid "Width of process 'Virtual Memory' column"
 msgstr "Bredde på kolonne «Virtuelt minne» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:35
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:38
 msgid "Show process 'Virtual Memory' column on startup"
 msgstr "Vis kolonne «Virtuelt minne» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:36
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:39
 msgid "Width of process 'Resident Memory' column"
 msgstr "Bredde på kolonne «Resident minne» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:37
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:40
 msgid "Show process 'Resident Memory' column on startup"
 msgstr "Vis kolonne «Resident minne» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:38
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:41
 msgid "Width of process 'Writable Memory' column"
 msgstr "Bredde på kolonne «Skrivbart minne» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:39
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:42
 msgid "Show process 'Writable Memory' column on startup"
 msgstr "Vis kolonne «Skrivbart minne» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:40
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:43
 msgid "Width of process 'Shared Memory' column"
 msgstr "Bredde på kolonne «Delt minne» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:41
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:44
 msgid "Show process 'Shared Memory' column on startup"
 msgstr "Vis kolonne «Delt minne» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:42
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:45
 msgid "Width of process 'X Server Memory' column"
 msgstr "Bredde på kolonne «X-tjener minne» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:43
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:46
 msgid "Show process 'X Server Memory' column on startup"
 msgstr "Vis kolonne «Minneforbruk i X-tjener» ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:45
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:48
 #, no-c-format
 msgid "Width of process 'CPU %' column"
 msgstr "Bredde på kolonne «CPU %»"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:47
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:50
 #, no-c-format
 msgid "Show process 'CPU %' column on startup"
 msgstr "Vis kolonne for CPU-bruk for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:48
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:51
 msgid "Width of process 'CPU Time' column"
 msgstr "Bredde på kolonne «CPU-tid» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:49
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:52
 msgid "Show process 'CPU Time' column on startup"
 msgstr "Vis kolonne «CPU-tid» per prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:50
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:53
 msgid "Width of process 'Started' column"
 msgstr "Bredde på kolonne «Starttid» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:51
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:54
 msgid "Show process 'Started' column on startup"
 msgstr "Vis kolonne «Starttid» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:52
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:55
 msgid "Width of process 'Nice' column"
 msgstr "Bredde på «Nice»-kolonne for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:53
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:56
 msgid "Show process 'Nice' column on startup"
 msgstr "Vis kolonne «Nice» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:54
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:57
 msgid "Width of process 'PID' column"
 msgstr "Bredde på kolonne «PID»"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:55
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:58
 msgid "Show process 'PID' column on startup"
 msgstr "Vis kolonne med PID for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:56
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:59
 msgid "Width of process 'SELinux Security Context' column"
 msgstr "Bredde for kolonne «SELinux sikkerhetssammenheng» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:57
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:60
 msgid "Show process 'SELinux Security Context' column on startup"
 msgstr "Vis kolonnen «SELinux sikkerhetssammenheng» ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:58
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:61
 msgid "Width of process 'Command Line' column"
 msgstr "Bredde på «Nice»-kolonne for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:59
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:62
 msgid "Show process 'Command Line' column on startup"
 msgstr "Vis kolonne for «Kommandolinje» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:60
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:63
 msgid "Width of process 'Memory' column"
 msgstr "Bredde på «Minne»-kolonne for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:61
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:64
 msgid "Show process 'Memory' column on startup"
 msgstr "Vis kolonne «Minne» per prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:62
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:65
 msgid "Width of process 'Waiting Channel' column"
 msgstr "Bredde på kolonne med «Ventende kanal»"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:63
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:66
 msgid "Show process 'Waiting Channel' column on startup"
 msgstr "Vis kolonne «Ventende kanal» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:64
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:67
 msgid "Width of process 'Control Group' column"
 msgstr "Bredde på kolonne «Kontrollgruppe» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:65
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:68
 msgid "Show process 'Control Group' column on startup"
 msgstr "Vis kolonne «Kontrollgruppe» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:66
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:69
 msgid "Width of process 'Unit' column"
 msgstr "Bredde på kolonne «Enhet» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:67
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:70
 msgid "Show process 'Unit' column on startup"
 msgstr "Vis kolonne «Enhet» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:68
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:71
 msgid "Width of process 'Session' column"
 msgstr "Bredde på kolonne «Økt» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:69
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:72
 msgid "Show process 'Session' column on startup"
 msgstr "Vis kolonne «Økt» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:70
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:73
 msgid "Width of process 'Seat' column"
 msgstr "Bredde på kolonne «Sete» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:71
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:74
 msgid "Show process 'Seat' column on startup"
 msgstr "Vis kolonne «Sete» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:72
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:75
 msgid "Width of process 'Owner' column"
 msgstr "Bredde på kolonne «Eier» for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:73
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:76
 msgid "Show process 'Owner' column on startup"
 msgstr "Vis kolonne «Eier» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:74
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:77
 msgid "Width of process 'Priority' column"
 msgstr "Bredde på «Prioritet»-kolonne for prosess"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:75
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:78
 msgid "Show process 'Priority' column on startup"
 msgstr "Vis kolonne «Prioritet» for prosess ved oppstart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:76
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:79
 msgid "Disk view sort column"
 msgstr "Sorteringskolonne for diskvisning"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:77
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:80
 msgid "Disk view sort order"
 msgstr "Sorteringsrekkefølge for diskvisning"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:78
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:81
 msgid "Disk view columns order"
 msgstr "Rekkefølge på kolonnene for diskvisning"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:79
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:96
 msgid "Memory map sort column"
 msgstr "Sorteringskolonne for minnekart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:80
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:97
 msgid "Memory map sort order"
 msgstr "Sorteringsrekkefølge for minnekart"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:81
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:98
 msgid "Open files sort column"
 msgstr "Sorteringskolonne for åpne filer"
 
-#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:82
+#: ../src/org.gnome.gnome-system-monitor.gschema.xml.in.h:99
 msgid "Open files sort order"
 msgstr "Sorteringsrekkefølge for åpne filer"
 
@@ -1002,7 +1003,7 @@
 msgstr "Terminer valgt prosess «%s» (PID: %u)?"
 
 #. xgettext: secondary alert message
-#: ../src/procdialogs.cpp:81
+#: ../src/procdialogs.cpp:78
 msgid ""
 "Killing a process may destroy data, break the session or introduce a "
 "security risk. Only unresponsive processes should be killed."
@@ -1018,7 +1019,7 @@
 msgstr "Avslutt valgt prosess «%s» (PID: %u)?"
 
 #. xgettext: secondary alert message
-#: ../src/procdialogs.cpp:92
+#: ../src/procdialogs.cpp:89
 msgid ""
 "Ending a process may destroy data, break the session or introduce a security "
 "risk. Only unresponsive processes should be ended."
@@ -1045,11 +1046,11 @@
 msgid "_Nice value:"
 msgstr "_Nice-verdi:"
 
-#: ../src/procdialogs.cpp:193
+#: ../src/procdialogs.cpp:189
 msgid "Note:"
 msgstr "Merk:"
 
-#: ../src/procdialogs.cpp:194
+#: ../src/procdialogs.cpp:190
 msgid ""
 "The priority of a process is given by its nice value. A lower nice value "
 "corresponds to a higher priority."
@@ -1057,112 +1058,112 @@
 "Prioriteten for en prosess gis av dens «nice»-verdi. En lavere verdi betyr "
 "høyere prioritet."
 
-#: ../src/procdialogs.cpp:418
+#: ../src/procdialogs.cpp:362 ../src/procman-app.cpp:462
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../src/procman.cpp:668
+#: ../src/procman-app.cpp:576
 msgid "A simple process and system monitor."
 msgstr "Et enkelt program for overvåking av systemet og dets prosesser."
 
-#: ../src/procproperties.cpp:130 ../src/proctable.cpp:236
+#: ../src/procproperties.cpp:130 ../src/proctable.cpp:196
 msgid "Process Name"
 msgstr "Prosessnavn"
 
-#: ../src/procproperties.cpp:131 ../src/proctable.cpp:237
+#: ../src/procproperties.cpp:131 ../src/proctable.cpp:197
 msgid "User"
 msgstr "Bruker"
 
-#: ../src/procproperties.cpp:132 ../src/proctable.cpp:238
+#: ../src/procproperties.cpp:132 ../src/proctable.cpp:198
 msgid "Status"
 msgstr "Status"
 
-#: ../src/procproperties.cpp:134 ../src/proctable.cpp:239
+#: ../src/procproperties.cpp:134 ../src/proctable.cpp:199
 msgid "Virtual Memory"
 msgstr "Virtuelt minne"
 
-#: ../src/procproperties.cpp:135 ../src/proctable.cpp:240
+#: ../src/procproperties.cpp:135 ../src/proctable.cpp:200
 msgid "Resident Memory"
 msgstr "Resident minne"
 
-#: ../src/procproperties.cpp:136 ../src/proctable.cpp:241
+#: ../src/procproperties.cpp:136 ../src/proctable.cpp:201
 msgid "Writable Memory"
 msgstr "Skrivbart minne"
 
-#: ../src/procproperties.cpp:137 ../src/proctable.cpp:242
+#: ../src/procproperties.cpp:137 ../src/proctable.cpp:202
 msgid "Shared Memory"
 msgstr "Delt minne"
 
-#: ../src/procproperties.cpp:138 ../src/proctable.cpp:243
+#: ../src/procproperties.cpp:138 ../src/proctable.cpp:203
 msgid "X Server Memory"
 msgstr "Minne for X-tjener"
 
-#: ../src/proctable.cpp:244
+#: ../src/proctable.cpp:204
 #, no-c-format
 msgid "% CPU"
 msgstr "% CPU"
 
-#: ../src/procproperties.cpp:140 ../src/proctable.cpp:245
+#: ../src/procproperties.cpp:140 ../src/proctable.cpp:205
 msgid "CPU Time"
 msgstr "CPU-tid"
 
-#: ../src/procproperties.cpp:141 ../src/proctable.cpp:246
+#: ../src/procproperties.cpp:141 ../src/proctable.cpp:206
 msgid "Started"
 msgstr "Startet"
 
-#: ../src/procproperties.cpp:142 ../src/proctable.cpp:247
+#: ../src/procproperties.cpp:142 ../src/proctable.cpp:207
 msgid "Nice"
 msgstr "Nice"
 
-#: ../src/procproperties.cpp:144 ../src/proctable.cpp:248
+#: ../src/procproperties.cpp:144 ../src/proctable.cpp:208
 msgid "ID"
 msgstr "ID"
 
-#: ../src/procproperties.cpp:145 ../src/proctable.cpp:249
+#: ../src/procproperties.cpp:145 ../src/proctable.cpp:209
 msgid "Security Context"
 msgstr "Sikkerhetskontekst"
 
-#: ../src/procproperties.cpp:146 ../src/proctable.cpp:250
+#: ../src/procproperties.cpp:146 ../src/proctable.cpp:210
 msgid "Command Line"
 msgstr "Kommandolinje"
 
 #. xgettext: combined noun, the function the process is waiting in, see wchan ps(1)
-#: ../src/procproperties.cpp:147 ../src/proctable.cpp:253
+#: ../src/procproperties.cpp:147 ../src/proctable.cpp:213
 msgid "Waiting Channel"
 msgstr "Ventende kanal"
 
-#: ../src/proctable.cpp:254
+#: ../src/procproperties.cpp:148 ../src/proctable.cpp:214
 msgid "Control Group"
 msgstr "Kontrollgruppe"
 
-#: ../src/proctable.cpp:255
+#: ../src/proctable.cpp:215
 msgid "Unit"
 msgstr "Enhet"
 
-#: ../src/proctable.cpp:256
+#: ../src/proctable.cpp:216
 msgid "Session"
 msgstr "Økt"
 
 #. TRANSLATORS: Seat = i.e. the physical seat the session of the process belongs to, only
 #. for multi-seat environments. See http://en.wikipedia.org/wiki/Multiseat_configuration
-#: ../src/proctable.cpp:259
+#: ../src/proctable.cpp:219
 msgid "Seat"
 msgstr "Sete"
 
-#: ../src/proctable.cpp:260
+#: ../src/proctable.cpp:220
 msgid "Owner"
 msgstr "Eier"
 
-#: ../src/procproperties.cpp:143 ../src/proctable.cpp:261
+#: ../src/procproperties.cpp:143 ../src/proctable.cpp:221
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../src/proctable.cpp:1076
+#: ../src/proctable.cpp:1032
 #, c-format
 msgid "Load averages for the last 1, 5, 15 minutes: %0.2f, %0.2f, %0.2f"
 msgstr "Snittbelastning for de siste 1, 5, 15 minutter: %0.2f, %0.2f, %0.2f"
 
-#: ../src/procproperties.cpp:104 ../src/util.cpp:420
+#: ../src/procproperties.cpp:104 ../src/util.cpp:434
 msgid "N/A"
 msgstr "I/T"
 
@@ -1337,7 +1338,7 @@
 msgstr "<i>I/T</i>"
 
 #. xgettext: rate, 10MiB/s or 10Mbit/s
-#: ../src/util.cpp:585
+#: ../src/util.cpp:632
 #, c-format
 msgid "%s/s"
 msgstr "%s/s"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-terminal.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-terminal.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-terminal.po	2013-01-29 09:33:56.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-terminal.po	2014-01-07 06:37:04.000000000 +0000
@@ -9,19 +9,19 @@
 "Project-Id-Version: gnome-terminal 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-04-17 09:04+0000\n"
-"PO-Revision-Date: 2012-02-23 18:42+0000\n"
-"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
+"PO-Revision-Date: 2013-07-25 19:18+0000\n"
+"Last-Translator: Åka Sikrom <Unknown>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:34+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:41+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../gnome-terminal.desktop.in.in.h:1 ../src/gnome-terminal.schemas.in.h:35
 #: ../src/terminal-accels.c:249 ../src/terminal.c:555
-#: ../src/terminal-profile.c:167 ../src/terminal-window.c:2010
+#: ../src/terminal-profile.c:165 ../src/terminal-window.c:2023
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -31,7 +31,7 @@
 
 #: ../gnome-terminal.desktop.in.in.h:3
 msgid "Run;"
-msgstr ""
+msgstr "Kjør;"
 
 #: ../gnome-terminal.desktop.in.in.h:4
 msgid "New Terminal"
@@ -650,11 +650,11 @@
 "Hvis satt til «true» vil temafargene brukt for skrivefelt bli brukt i "
 "terminalen i stede for farger definert av brukeren."
 
-#: ../src/gnome-terminal.schemas.in.h:98
+#: ../src/gnome-terminal.schemas.in.h:96
 msgid "Whether to use the system font"
 msgstr "Om systemskriften skal brukes"
 
-#: ../src/gnome-terminal.schemas.in.h:99
+#: ../src/gnome-terminal.schemas.in.h:97
 msgid ""
 "If true, the terminal will use the desktop-global standard font if it's "
 "monospace (and the most similar font it can come up with otherwise)."
@@ -662,15 +662,15 @@
 "Hvis satt til «true» vil terminalen bruke den forvalgte skrifttypen for "
 "skrivebordet hvis den er monospace (og hvis ikke den som er mest lik.)"
 
-#: ../src/gnome-terminal.schemas.in.h:100
+#: ../src/gnome-terminal.schemas.in.h:98
 msgid "current"
 msgstr "current"
 
-#: ../src/gnome-terminal.schemas.in.h:101
+#: ../src/gnome-terminal.schemas.in.h:99
 msgid "Default encoding"
 msgstr "Forvalgt koding"
 
-#: ../src/gnome-terminal.schemas.in.h:102
+#: ../src/gnome-terminal.schemas.in.h:100
 msgid ""
 "Default encoding. Can be either \"current\" to use the current locale's "
 "encoding, or else any of the known encodings."
@@ -678,11 +678,11 @@
 "Forvalgt koding. Kan være «current» for å bruke locales koding, eller en "
 "hvilken som helst annen av de kjente kodingene."
 
-#: ../src/gnome-terminal.schemas.in.h:103
+#: ../src/gnome-terminal.schemas.in.h:101
 msgid "Keyboard shortcut to open a new tab"
 msgstr "Tastatursnarvei som åpner en ny fane"
 
-#: ../src/gnome-terminal.schemas.in.h:104
+#: ../src/gnome-terminal.schemas.in.h:102
 msgid ""
 "Keyboard shortcut key for opening a new tab. Expressed as a string in the "
 "same format used for GTK+ resource files. If you set the option to the "
@@ -694,11 +694,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:105
+#: ../src/gnome-terminal.schemas.in.h:103
 msgid "Keyboard shortcut to open a new window"
 msgstr "Tastatursnarvei som åpner et nytt vindu"
 
-#: ../src/gnome-terminal.schemas.in.h:106
+#: ../src/gnome-terminal.schemas.in.h:104
 msgid ""
 "Keyboard shortcut key for opening a new window. Expressed as a string in the "
 "same format used for GTK+ resource files. If you set the option to the "
@@ -710,11 +710,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:107
+#: ../src/gnome-terminal.schemas.in.h:105
 msgid "Keyboard shortcut to create a new profile"
 msgstr "Tastatursnarvei for å lage en ny profil"
 
-#: ../src/gnome-terminal.schemas.in.h:108
+#: ../src/gnome-terminal.schemas.in.h:106
 msgid ""
 "Keyboard shortcut key for bringing up the dialog for profile creation. "
 "Expressed as a string in the same format used for GTK+ resource files. If "
@@ -726,11 +726,11 @@
 "Hvis du setter verdien til den spesielle strengen «disabled» vil "
 "tastatursnarvei for denne handlingen deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:109
+#: ../src/gnome-terminal.schemas.in.h:107
 msgid "Keyboard shortcut to save the current tab contents to file"
 msgstr "Tastatursnarvei for å lagre innhold i aktiv fane til en fil"
 
-#: ../src/gnome-terminal.schemas.in.h:110
+#: ../src/gnome-terminal.schemas.in.h:108
 msgid ""
 "Keyboard shortcut key to save the current tab contents to a file. Expressed "
 "as a string in the same format used for GTK+ resource files. If you set the "
@@ -742,11 +742,11 @@
 "verdien til den spesielle strengen «disabled» vil tastatursnarvei for denne "
 "handlingen deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:111
+#: ../src/gnome-terminal.schemas.in.h:109
 msgid "Keyboard shortcut to close a tab"
 msgstr "Tastatursnarvei for å lukke en fane"
 
-#: ../src/gnome-terminal.schemas.in.h:112
+#: ../src/gnome-terminal.schemas.in.h:110
 msgid ""
 "Keyboard shortcut key for closing a tab. Expressed as a string in the same "
 "format used for GTK+ resource files. If you set the option to the special "
@@ -756,11 +756,11 @@
 "som brukes i ressursfiler for GTK+. Hvis du setter verdien til den spesielle "
 "strengen «disabled» vil tastatursnarvei for denne handlingen deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:113
+#: ../src/gnome-terminal.schemas.in.h:111
 msgid "Keyboard shortcut to close a window"
 msgstr "Tastatursnarvei for å lukke et vindu"
 
-#: ../src/gnome-terminal.schemas.in.h:114
+#: ../src/gnome-terminal.schemas.in.h:112
 msgid ""
 "Keyboard shortcut key for closing a window. Expressed as a string in the "
 "same format used for GTK+ resource files. If you set the option to the "
@@ -772,11 +772,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:115
+#: ../src/gnome-terminal.schemas.in.h:113
 msgid "Keyboard shortcut to copy text"
 msgstr "Tastatursnarvei for å kopiere tekst"
 
-#: ../src/gnome-terminal.schemas.in.h:116
+#: ../src/gnome-terminal.schemas.in.h:114
 msgid ""
 "Keyboard shortcut key for copying selected text to the clipboard. Expressed "
 "as a string in the same format used for GTK+ resource files. If you set the "
@@ -788,11 +788,11 @@
 "verdien til den spesielle strengen «disabled» vil tastatursnarvei for denne "
 "handlingen deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:117
+#: ../src/gnome-terminal.schemas.in.h:115
 msgid "Keyboard shortcut to paste text"
 msgstr "Tastatursnarvei som limer inn kopiert tekst"
 
-#: ../src/gnome-terminal.schemas.in.h:118
+#: ../src/gnome-terminal.schemas.in.h:116
 msgid ""
 "Keyboard shortcut key for pasting the contents of the clipboard into the "
 "terminal. Expressed as a string in the same format used for GTK+ resource "
@@ -804,11 +804,11 @@
 "Hvis du setter verdien til den spesielle strengen «disabled» vil "
 "tastatursnarvei for denne handlingen deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:119
+#: ../src/gnome-terminal.schemas.in.h:117
 msgid "Keyboard shortcut to toggle full screen mode"
 msgstr "Tastatursnarvei som bytter til/fra fullskjermmodus"
 
-#: ../src/gnome-terminal.schemas.in.h:120
+#: ../src/gnome-terminal.schemas.in.h:118
 msgid ""
 "Keyboard shortcut key for toggling full screen mode. Expressed as a string "
 "in the same format used for GTK+ resource files. If you set the option to "
@@ -820,11 +820,11 @@
 "den spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:121
+#: ../src/gnome-terminal.schemas.in.h:119
 msgid "Keyboard shortcut to toggle the visibility of the menubar"
 msgstr "Tastatursnarvei som slår av/på visning av menylinjen."
 
-#: ../src/gnome-terminal.schemas.in.h:122
+#: ../src/gnome-terminal.schemas.in.h:120
 msgid ""
 "Keyboard shortcut key to toggle the visibility of the menubar. Expressed as "
 "a string in the same format used for GTK+ resource files. If you set the "
@@ -836,11 +836,11 @@
 "verdien til den spesielle strengen «disabled» vil tastatursnarvei for denne "
 "handlingen deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:123
+#: ../src/gnome-terminal.schemas.in.h:121
 msgid "Keyboard shortcut to set the terminal title"
 msgstr "Tastatursnarvei som setter tittelen for terminalen"
 
-#: ../src/gnome-terminal.schemas.in.h:124
+#: ../src/gnome-terminal.schemas.in.h:122
 msgid ""
 "Keyboard shortcut key to set the terminal title. Expressed as a string in "
 "the same format used for GTK+ resource files. If you set the option to the "
@@ -852,11 +852,11 @@
 "den spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:125
+#: ../src/gnome-terminal.schemas.in.h:123
 msgid "Keyboard shortcut to reset the terminal"
 msgstr "Tastatursnarvei som nullstiller terminalen"
 
-#: ../src/gnome-terminal.schemas.in.h:126
+#: ../src/gnome-terminal.schemas.in.h:124
 msgid ""
 "Keyboard shortcut key to reset the terminal. Expressed as a string in the "
 "same format used for GTK+ resource files. If you set the option to the "
@@ -868,11 +868,11 @@
 "den spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:127
+#: ../src/gnome-terminal.schemas.in.h:125
 msgid "Keyboard shortcut to reset and clear the terminal"
 msgstr "Tastatursnarvei som nullstiller og tømmer terminalen"
 
-#: ../src/gnome-terminal.schemas.in.h:128
+#: ../src/gnome-terminal.schemas.in.h:126
 msgid ""
 "Keyboard shortcut key to reset and clear the terminal. Expressed as a string "
 "in the same format used for GTK+ resource files. If you set the option to "
@@ -884,11 +884,11 @@
 "verdien til den spesielle strengen «disabled» vil tastatursnarvei for denne "
 "handlingen deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:129
+#: ../src/gnome-terminal.schemas.in.h:127
 msgid "Keyboard shortcut to switch to the previous tab"
 msgstr "Tastatursnarvei som bytter til forrige fane"
 
-#: ../src/gnome-terminal.schemas.in.h:130
+#: ../src/gnome-terminal.schemas.in.h:128
 msgid ""
 "Keyboard shortcut key to switch to the previous tab. Expressed as a string "
 "in the same format used for GTK+ resource files. If you set the option to "
@@ -900,11 +900,11 @@
 "den spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:131
+#: ../src/gnome-terminal.schemas.in.h:129
 msgid "Keyboard shortcut to switch to the next tab"
 msgstr "Tastatursnarvei som bytter til neste fane"
 
-#: ../src/gnome-terminal.schemas.in.h:132
+#: ../src/gnome-terminal.schemas.in.h:130
 msgid ""
 "Keyboard shortcut key to switch to the next tab. Expressed as a string in "
 "the same format used for GTK+ resource files. If you set the option to the "
@@ -916,11 +916,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:133
+#: ../src/gnome-terminal.schemas.in.h:131
 msgid "Accelerator to move the current tab to the left."
 msgstr "Hurtigtast som flytter aktiv fane til venstre."
 
-#: ../src/gnome-terminal.schemas.in.h:134
+#: ../src/gnome-terminal.schemas.in.h:132
 msgid ""
 "Accelerator key to move the current tab to the left. Expressed as a string "
 "in the same format used for GTK+ resource files. If you set the option to "
@@ -932,11 +932,11 @@
 "til den spesielle strengen «disabled» vil tastatursnarvei for denne "
 "handlingen deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:135
+#: ../src/gnome-terminal.schemas.in.h:133
 msgid "Accelerator to move the current tab to the right."
 msgstr "Hurtigtast som flytter aktiv fane til høyre."
 
-#: ../src/gnome-terminal.schemas.in.h:136
+#: ../src/gnome-terminal.schemas.in.h:134
 msgid ""
 "Accelerator key to move the current tab to the right. Expressed as a string "
 "in the same format used for GTK+ resource files. If you set the option to "
@@ -948,11 +948,11 @@
 "til den spesielle strengen «disabled» vil tastatursnarvei for denne "
 "handlingen deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:137
+#: ../src/gnome-terminal.schemas.in.h:135
 msgid "Accelerator to detach current tab."
 msgstr "Hurtigtast som løsriver aktiv fane."
 
-#: ../src/gnome-terminal.schemas.in.h:138
+#: ../src/gnome-terminal.schemas.in.h:136
 msgid ""
 "Accelerator key to detach current tab. Expressed as a string in the same "
 "format used for GTK+ resource files. If you set the option to the special "
@@ -963,11 +963,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:139
+#: ../src/gnome-terminal.schemas.in.h:137
 msgid "Keyboard shortcut to switch to tab 1"
 msgstr "Tastatursnarvei som bytter til fane 1"
 
-#: ../src/gnome-terminal.schemas.in.h:140
+#: ../src/gnome-terminal.schemas.in.h:138
 msgid ""
 "Keyboard shortcut key for switch to tab 1. Expressed as a string in the same "
 "format used for GTK+ resource files. If you set the option to the special "
@@ -978,11 +978,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:141
+#: ../src/gnome-terminal.schemas.in.h:139
 msgid "Keyboard shortcut to switch to tab 2"
 msgstr "Tastatursnarvei som bytter til fane 2"
 
-#: ../src/gnome-terminal.schemas.in.h:142
+#: ../src/gnome-terminal.schemas.in.h:140
 msgid ""
 "Keyboard shortcut key for switch to tab 2. Expressed as a string in the same "
 "format used for GTK+ resource files. If you set the option to the special "
@@ -993,11 +993,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:143
+#: ../src/gnome-terminal.schemas.in.h:141
 msgid "Keyboard shortcut to switch to tab 3"
 msgstr "Tastatursnarvei som bytter til fane 3"
 
-#: ../src/gnome-terminal.schemas.in.h:144
+#: ../src/gnome-terminal.schemas.in.h:142
 msgid ""
 "Keyboard shortcut key for switch to tab 3. Expressed as a string in the same "
 "format used for GTK+ resource files. If you set the option to the special "
@@ -1008,11 +1008,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:145
+#: ../src/gnome-terminal.schemas.in.h:143
 msgid "Keyboard shortcut to switch to tab 4"
 msgstr "Tastatursnarvei som bytter til fane 4"
 
-#: ../src/gnome-terminal.schemas.in.h:146
+#: ../src/gnome-terminal.schemas.in.h:144
 msgid ""
 "Keyboard shortcut key for switch to tab 4. Expressed as a string in the same "
 "format used for GTK+ resource files. If you set the option to the special "
@@ -1023,11 +1023,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:147
+#: ../src/gnome-terminal.schemas.in.h:145
 msgid "Keyboard shortcut to switch to tab 5"
 msgstr "Tastatursnarvei som bytter til fane 5"
 
-#: ../src/gnome-terminal.schemas.in.h:148
+#: ../src/gnome-terminal.schemas.in.h:146
 msgid ""
 "Keyboard shortcut key for switch to tab 5. Expressed as a string in the same "
 "format used for GTK+ resource files. If you set the option to the special "
@@ -1038,11 +1038,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:149
+#: ../src/gnome-terminal.schemas.in.h:147
 msgid "Keyboard shortcut to switch to tab 6"
 msgstr "Tastatursnarvei som bytter til fane 6"
 
-#: ../src/gnome-terminal.schemas.in.h:150
+#: ../src/gnome-terminal.schemas.in.h:148
 msgid ""
 "Keyboard shortcut key for switch to tab 6. Expressed as a string in the same "
 "format used for GTK+ resource files. If you set the option to the special "
@@ -1053,11 +1053,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:151
+#: ../src/gnome-terminal.schemas.in.h:149
 msgid "Keyboard shortcut to switch to tab 7"
 msgstr "Tastatursnarvei som bytter til fane 7"
 
-#: ../src/gnome-terminal.schemas.in.h:152
+#: ../src/gnome-terminal.schemas.in.h:150
 msgid ""
 "Keyboard shortcut key for switch to tab 7. Expressed as a string in the same "
 "format used for GTK+ resource files. If you set the option to the special "
@@ -1068,11 +1068,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:153
+#: ../src/gnome-terminal.schemas.in.h:151
 msgid "Keyboard shortcut to switch to tab 8"
 msgstr "Tastatursnarvei som bytter til fane 8"
 
-#: ../src/gnome-terminal.schemas.in.h:154
+#: ../src/gnome-terminal.schemas.in.h:152
 msgid ""
 "Keyboard shortcut key for switch to tab 8. Expressed as a string in the same "
 "format used for GTK+ resource files. If you set the option to the special "
@@ -1083,11 +1083,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:155
+#: ../src/gnome-terminal.schemas.in.h:153
 msgid "Keyboard shortcut to switch to tab 9"
 msgstr "Tastatursnarvei som bytter til fane 9"
 
-#: ../src/gnome-terminal.schemas.in.h:156
+#: ../src/gnome-terminal.schemas.in.h:154
 msgid ""
 "Keyboard shortcut key for switch to tab 9. Expressed as a string in the same "
 "format used for GTK+ resource files. If you set the option to the special "
@@ -1098,11 +1098,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:157
+#: ../src/gnome-terminal.schemas.in.h:155
 msgid "Keyboard shortcut to switch to tab 10"
 msgstr "Tastatursnarvei som bytter til fane 10"
 
-#: ../src/gnome-terminal.schemas.in.h:158
+#: ../src/gnome-terminal.schemas.in.h:156
 msgid ""
 "Keyboard shortcut key for switch to tab 10. Expressed as a string in the "
 "same format used for GTK+ resource files. If you set the option to the "
@@ -1114,11 +1114,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:159
+#: ../src/gnome-terminal.schemas.in.h:157
 msgid "Keyboard shortcut to switch to tab 11"
 msgstr "Tastatursnarvei som bytter til fane 11"
 
-#: ../src/gnome-terminal.schemas.in.h:160
+#: ../src/gnome-terminal.schemas.in.h:158
 msgid ""
 "Keyboard shortcut key for switch to tab 11. Expressed as a string in the "
 "same format used for GTK+ resource files. If you set the option to the "
@@ -1130,11 +1130,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:161
+#: ../src/gnome-terminal.schemas.in.h:159
 msgid "Keyboard shortcut to switch to tab 12"
 msgstr "Tastatursnarvei som bytter til fane 12"
 
-#: ../src/gnome-terminal.schemas.in.h:162
+#: ../src/gnome-terminal.schemas.in.h:160
 msgid ""
 "Keyboard shortcut key for switch to tab 12. Expressed as a string in the "
 "same format used for GTK+ resource files. If you set the option to the "
@@ -1146,11 +1146,11 @@
 "spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:163
+#: ../src/gnome-terminal.schemas.in.h:161
 msgid "Keyboard shortcut to launch help"
 msgstr "Tastatursnarvei for å åpne hjelp"
 
-#: ../src/gnome-terminal.schemas.in.h:164
+#: ../src/gnome-terminal.schemas.in.h:162
 msgid ""
 "Keyboard shortcut key for launching help. Expressed as a string in the same "
 "format used for GTK+ resource files. If you set the option to the special "
@@ -1160,11 +1160,11 @@
 "som brukes i ressursfiler for GTK+. Hvis du setter verdien til den spesielle "
 "strengen «disabled» vil tastatursnarvei for denne handlingen deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:165
+#: ../src/gnome-terminal.schemas.in.h:163
 msgid "Keyboard shortcut to make font larger"
 msgstr "Tastatursnarvei for å gjøre skriften større"
 
-#: ../src/gnome-terminal.schemas.in.h:166
+#: ../src/gnome-terminal.schemas.in.h:164
 msgid ""
 "Keyboard shortcut key for making font larger. Expressed as a string in the "
 "same format used for GTK+ resource files. If you set the option to the "
@@ -1176,11 +1176,11 @@
 "den spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:167
+#: ../src/gnome-terminal.schemas.in.h:165
 msgid "Keyboard shortcut to make font smaller"
 msgstr "Tastatursnarvei som gjør skriften mindre"
 
-#: ../src/gnome-terminal.schemas.in.h:168
+#: ../src/gnome-terminal.schemas.in.h:166
 msgid ""
 "Keyboard shortcut key for making font smaller. Expressed as a string in the "
 "same format used for GTK+ resource files. If you set the option to the "
@@ -1192,11 +1192,11 @@
 "den spesielle strengen «disabled» vil tastatursnarvei for denne handlingen "
 "deaktiveres."
 
-#: ../src/gnome-terminal.schemas.in.h:169
+#: ../src/gnome-terminal.schemas.in.h:167
 msgid "Keyboard shortcut to make font normal-size"
 msgstr "Tastatursnarvei som setter skriften til normal størrelse"
 
-#: ../src/gnome-terminal.schemas.in.h:170
+#: ../src/gnome-terminal.schemas.in.h:168
 msgid ""
 "Keyboard shortcut key for making font the normal size. Expressed as a string "
 "in the same format used for GTK+ resource files. If you set the option to "
@@ -1245,31 +1245,31 @@
 msgid "White on black"
 msgstr "Hvitt på sort"
 
-#: ../src/profile-editor.c:490
+#: ../src/profile-editor.c:480
 #, c-format
 msgid "Error parsing command: %s"
 msgstr "Feil under lesing av kommando: %s"
 
-#: ../src/profile-editor.c:508
+#: ../src/profile-editor.c:498
 #, c-format
 msgid "Editing Profile “%s”"
 msgstr "Redigerer profil «%s»"
 
 #. Translators: This is the name of a colour scheme
-#: ../src/profile-editor.c:539 ../src/extra-strings.c:73
+#: ../src/profile-editor.c:529 ../src/extra-strings.c:73
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../src/profile-editor.c:668
+#: ../src/profile-editor.c:658
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/profile-editor.c:840
+#: ../src/profile-editor.c:830
 #, c-format
 msgid "Choose Palette Color %d"
 msgstr "Velg palettfarge %d"
 
-#: ../src/profile-editor.c:844
+#: ../src/profile-editor.c:834
 #, c-format
 msgid "Palette entry %d"
 msgstr "Palettoppføring %d"
@@ -1508,71 +1508,71 @@
 msgid "Colors"
 msgstr "Farger"
 
-#: ../src/profile-preferences.glade.h:57
+#: ../src/profile-preferences.glade.h:56
 msgid "_Solid color"
 msgstr "_Helfylt farge)"
 
-#: ../src/profile-preferences.glade.h:58
+#: ../src/profile-preferences.glade.h:57
 msgid "_Background image"
 msgstr "_Bakgrunnsbilde"
 
-#: ../src/profile-preferences.glade.h:59
+#: ../src/profile-preferences.glade.h:58
 msgid "Image _file:"
 msgstr "B_ildefil:"
 
-#: ../src/profile-preferences.glade.h:60
+#: ../src/profile-preferences.glade.h:59
 msgid "Select Background Image"
 msgstr "Velg bakgrunnsbilde"
 
-#: ../src/profile-preferences.glade.h:61
+#: ../src/profile-preferences.glade.h:60
 msgid "Background image _scrolls"
 msgstr "Bakgrunnsbildet _ruller"
 
-#: ../src/profile-preferences.glade.h:62
+#: ../src/profile-preferences.glade.h:61
 msgid "_Transparent background"
 msgstr "_Gjennomsiktig bakgrunn"
 
-#: ../src/profile-preferences.glade.h:63
+#: ../src/profile-preferences.glade.h:62
 msgid "S_hade transparent or image background:"
 msgstr "S_kyggelegg gjennomsiktig bakgrunn eller bakgrunn med bilde:"
 
-#: ../src/profile-preferences.glade.h:64
+#: ../src/profile-preferences.glade.h:63
 msgid "<small><i>None</i></small>"
 msgstr "<small><i>Ingen</i></small>"
 
-#: ../src/profile-preferences.glade.h:65
+#: ../src/profile-preferences.glade.h:64
 msgid "<small><i>Maximum</i></small>"
 msgstr "<small><i>Maksimum</i></small>"
 
-#: ../src/profile-preferences.glade.h:66
+#: ../src/profile-preferences.glade.h:65
 msgid "Background"
 msgstr "Bakgrunn"
 
-#: ../src/profile-preferences.glade.h:67
+#: ../src/profile-preferences.glade.h:66
 msgid "_Scrollbar is:"
 msgstr "_Rullefeltet er:"
 
-#: ../src/profile-preferences.glade.h:68
+#: ../src/profile-preferences.glade.h:67
 msgid "Scroll_back:"
 msgstr "Til_bakerulling:"
 
-#: ../src/profile-preferences.glade.h:69
+#: ../src/profile-preferences.glade.h:68
 msgid "Use keystrokes to scroll on _alternate screen"
 msgstr "Bruk tastetrykk for å skrolle på _alternativ skjerm"
 
-#: ../src/profile-preferences.glade.h:70
+#: ../src/profile-preferences.glade.h:69
 msgid "Scroll on _keystroke"
 msgstr "Rull ned ved tastetry_kk"
 
-#: ../src/profile-preferences.glade.h:71
+#: ../src/profile-preferences.glade.h:70
 msgid "Scroll on _output"
 msgstr "Rull ned ved _utdata"
 
-#: ../src/profile-preferences.glade.h:72
+#: ../src/profile-preferences.glade.h:71
 msgid "_Unlimited"
 msgstr "_Ubegrenset"
 
-#: ../src/profile-preferences.glade.h:73
+#: ../src/profile-preferences.glade.h:72
 msgid ""
 "On the left side\n"
 "On the right side\n"
@@ -1582,15 +1582,15 @@
 "På høyre side\n"
 "Deaktivert"
 
-#: ../src/profile-preferences.glade.h:76
+#: ../src/profile-preferences.glade.h:75
 msgid "lines"
 msgstr "linjer"
 
-#: ../src/profile-preferences.glade.h:77
+#: ../src/profile-preferences.glade.h:76
 msgid "Scrolling"
 msgstr "Rulling"
 
-#: ../src/profile-preferences.glade.h:78
+#: ../src/profile-preferences.glade.h:77
 msgid ""
 "<small><i><b>Note:</b> These options may cause some applications to behave "
 "incorrectly.  They are only here to allow you to work around certain "
@@ -1602,15 +1602,15 @@
 "programmer og operativsystemer som forventer ulik "
 "terminaloppførsel.</i></small>"
 
-#: ../src/profile-preferences.glade.h:79
+#: ../src/profile-preferences.glade.h:78
 msgid "_Delete key generates:"
 msgstr "Delete-tasten genererer:"
 
-#: ../src/profile-preferences.glade.h:80
+#: ../src/profile-preferences.glade.h:79
 msgid "_Backspace key generates:"
 msgstr "_Slettetasten genererer:"
 
-#: ../src/profile-preferences.glade.h:81
+#: ../src/profile-preferences.glade.h:80
 msgid ""
 "Automatic\n"
 "Control-H\n"
@@ -1624,11 +1624,11 @@
 "Escape-sekvens\n"
 "TTY-slett"
 
-#: ../src/profile-preferences.glade.h:86
+#: ../src/profile-preferences.glade.h:85
 msgid "_Reset Compatibility Options to Defaults"
 msgstr "Sett alte_rnativer for kompatibilitet til forvalg"
 
-#: ../src/profile-preferences.glade.h:87
+#: ../src/profile-preferences.glade.h:86
 msgid "Compatibility"
 msgstr "Kompatibilitet"
 
@@ -1680,7 +1680,7 @@
 msgid "Normal Size"
 msgstr "Normal størrelse"
 
-#: ../src/terminal-accels.c:182 ../src/terminal-window.c:3843
+#: ../src/terminal-accels.c:182 ../src/terminal-window.c:3860
 msgid "Set Title"
 msgstr "Sett tittel"
 
@@ -2010,7 +2010,7 @@
 "opprette en profil med denne innstillingen og bruke det nye «--profile» "
 "flagget\n"
 
-#: ../src/terminal-options.c:188 ../src/terminal-window.c:4074
+#: ../src/terminal-options.c:188 ../src/terminal-window.c:4091
 msgid "GNOME Terminal"
 msgstr "GNOME-terminal"
 
@@ -2203,34 +2203,34 @@
 msgid "Show per-terminal options"
 msgstr "Vis flagg som gjelder for hver terminal"
 
-#: ../src/terminal-profile.c:174
+#: ../src/terminal-profile.c:171
 msgid "Unnamed"
 msgstr "Uten navn"
 
-#: ../src/terminal-screen.c:1535
+#: ../src/terminal-screen.c:1504
 msgid "_Profile Preferences"
 msgstr "Brukervalg for _profil"
 
-#: ../src/terminal-screen.c:1536 ../src/terminal-screen.c:1919
+#: ../src/terminal-screen.c:1505 ../src/terminal-screen.c:1888
 msgid "_Relaunch"
 msgstr "Sta_rt på nytt"
 
-#: ../src/terminal-screen.c:1539
+#: ../src/terminal-screen.c:1508
 msgid "There was an error creating the child process for this terminal"
 msgstr ""
 "Det oppsto en feil under oppretting av underprosess for denne terminalen"
 
-#: ../src/terminal-screen.c:1923
+#: ../src/terminal-screen.c:1892
 #, c-format
 msgid "The child process exited normally with status %d."
 msgstr "Underprosess avsluttet normalt med status %d."
 
-#: ../src/terminal-screen.c:1926
+#: ../src/terminal-screen.c:1895
 #, c-format
 msgid "The child process was terminated by signal %d."
 msgstr "Underprosess ble terminert med signal %d."
 
-#: ../src/terminal-screen.c:1929
+#: ../src/terminal-screen.c:1898
 msgid "The child process was terminated."
 msgstr "Underprosess ble terminert."
 
@@ -2246,12 +2246,12 @@
 msgid "There was an error displaying help"
 msgstr "Det oppsto en feil under visning av hjelp"
 
-#: ../src/terminal-util.c:230
+#: ../src/terminal-util.c:233
 #, c-format
 msgid "Could not open the address “%s”"
 msgstr "Kunne ikke åpne adressen «%s»"
 
-#: ../src/terminal-util.c:337
+#: ../src/terminal-util.c:354
 msgid ""
 "GNOME Terminal is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -2263,7 +2263,7 @@
 "av Free Software Foundation; enten versjon 3 av lisensen, eller (hvis du "
 "ønsker det) enhver senere versjon."
 
-#: ../src/terminal-util.c:341
+#: ../src/terminal-util.c:358
 msgid ""
 "GNOME Terminal is distributed in the hope that it will be useful, but "
 "WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY "
@@ -2274,7 +2274,7 @@
 "GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER ET "
 "BESTEMT FORMÅL. Se GNU General Public License for detaljer."
 
-#: ../src/terminal-util.c:345
+#: ../src/terminal-util.c:362
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "GNOME Terminal; if not, write to the Free Software Foundation, Inc., 51 "
@@ -2303,217 +2303,217 @@
 msgstr "_%c. %s"
 
 #. Toplevel
-#: ../src/terminal-window.c:1796
+#: ../src/terminal-window.c:1809
 msgid "_File"
 msgstr "_Fil"
 
 #. File menu
-#: ../src/terminal-window.c:1797 ../src/terminal-window.c:1809
-#: ../src/terminal-window.c:1956
+#: ../src/terminal-window.c:1810 ../src/terminal-window.c:1822
+#: ../src/terminal-window.c:1969
 msgid "Open _Terminal"
 msgstr "Åpne _terminal"
 
-#: ../src/terminal-window.c:1798 ../src/terminal-window.c:1812
-#: ../src/terminal-window.c:1959
+#: ../src/terminal-window.c:1811 ../src/terminal-window.c:1825
+#: ../src/terminal-window.c:1972
 msgid "Open Ta_b"
 msgstr "Åpne _fane"
 
-#: ../src/terminal-window.c:1799
+#: ../src/terminal-window.c:1812
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../src/terminal-window.c:1800
+#: ../src/terminal-window.c:1813
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/terminal-window.c:1801
+#: ../src/terminal-window.c:1814
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../src/terminal-window.c:1802
+#: ../src/terminal-window.c:1815
 msgid "_Terminal"
 msgstr "_Terminal"
 
-#: ../src/terminal-window.c:1803
+#: ../src/terminal-window.c:1816
 msgid "Ta_bs"
 msgstr "_Faner"
 
-#: ../src/terminal-window.c:1804
+#: ../src/terminal-window.c:1817
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/terminal-window.c:1815
+#: ../src/terminal-window.c:1828
 msgid "New _Profile…"
 msgstr "Ny profil …"
 
-#: ../src/terminal-window.c:1818
+#: ../src/terminal-window.c:1831
 msgid "_Save Contents"
 msgstr "_Lagre innhold"
 
-#: ../src/terminal-window.c:1821 ../src/terminal-window.c:1965
+#: ../src/terminal-window.c:1834 ../src/terminal-window.c:1978
 msgid "C_lose Tab"
 msgstr "_Lukk fane"
 
-#: ../src/terminal-window.c:1824
+#: ../src/terminal-window.c:1837
 msgid "_Close Window"
 msgstr "L_ukk vindu"
 
-#: ../src/terminal-window.c:1835 ../src/terminal-window.c:1953
+#: ../src/terminal-window.c:1848 ../src/terminal-window.c:1966
 msgid "Paste _Filenames"
 msgstr "Lim inn _filnavn"
 
-#: ../src/terminal-window.c:1841
+#: ../src/terminal-window.c:1854
 msgid "P_rofiles…"
 msgstr "P_rofiler …"
 
-#: ../src/terminal-window.c:1844
+#: ../src/terminal-window.c:1857
 msgid "_Keyboard Shortcuts…"
 msgstr "_Tastatursnarveier …"
 
-#: ../src/terminal-window.c:1847
+#: ../src/terminal-window.c:1860
 msgid "Pr_ofile Preferences"
 msgstr "Brukervalg for pr_ofil"
 
 #. Search menu
-#: ../src/terminal-window.c:1863
+#: ../src/terminal-window.c:1876
 msgid "_Find..."
 msgstr "_Finn …"
 
-#: ../src/terminal-window.c:1866
+#: ../src/terminal-window.c:1879
 msgid "Find Ne_xt"
 msgstr "Finn ne_ste"
 
-#: ../src/terminal-window.c:1869
+#: ../src/terminal-window.c:1882
 msgid "Find Pre_vious"
 msgstr "Finn forri_ge"
 
-#: ../src/terminal-window.c:1872
+#: ../src/terminal-window.c:1885
 msgid "_Clear Highlight"
 msgstr "_Tøm utheving"
 
-#: ../src/terminal-window.c:1876
+#: ../src/terminal-window.c:1889
 msgid "Go to _Line..."
 msgstr "Gå til _linje …"
 
-#: ../src/terminal-window.c:1879
+#: ../src/terminal-window.c:1892
 msgid "_Incremental Search..."
 msgstr "_Inkrementelt søk …"
 
 #. Terminal menu
-#: ../src/terminal-window.c:1885
+#: ../src/terminal-window.c:1898
 msgid "Change _Profile"
 msgstr "Bytt _profil"
 
-#: ../src/terminal-window.c:1886
+#: ../src/terminal-window.c:1899
 msgid "_Set Title…"
 msgstr "_Sett tittel …"
 
-#: ../src/terminal-window.c:1889
+#: ../src/terminal-window.c:1902
 msgid "Set _Character Encoding"
 msgstr "Sett _tegnkoding"
 
-#: ../src/terminal-window.c:1890
+#: ../src/terminal-window.c:1903
 msgid "_Reset"
 msgstr "_Nullstill"
 
-#: ../src/terminal-window.c:1893
+#: ../src/terminal-window.c:1906
 msgid "Reset and C_lear"
 msgstr "Nu_llstill og tøm"
 
 #. Terminal/Encodings menu
-#: ../src/terminal-window.c:1898
+#: ../src/terminal-window.c:1911
 msgid "_Add or Remove…"
 msgstr "_Legg til eller fjern …"
 
 #. Tabs menu
-#: ../src/terminal-window.c:1903
+#: ../src/terminal-window.c:1916
 msgid "_Previous Tab"
 msgstr "_Forrige fane"
 
-#: ../src/terminal-window.c:1906
+#: ../src/terminal-window.c:1919
 msgid "_Next Tab"
 msgstr "_Neste fane"
 
-#: ../src/terminal-window.c:1909
+#: ../src/terminal-window.c:1922
 msgid "Move Tab _Left"
 msgstr "Flytt fane til _venstre"
 
-#: ../src/terminal-window.c:1912
+#: ../src/terminal-window.c:1925
 msgid "Move Tab _Right"
 msgstr "Flytt fane til høy_re"
 
-#: ../src/terminal-window.c:1915
+#: ../src/terminal-window.c:1928
 msgid "_Detach tab"
 msgstr "_Riv løs fane"
 
 #. Help menu
-#: ../src/terminal-window.c:1920
+#: ../src/terminal-window.c:1933
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../src/terminal-window.c:1923
+#: ../src/terminal-window.c:1936
 msgid "_About"
 msgstr "_Om"
 
 #. Popup menu
-#: ../src/terminal-window.c:1928
+#: ../src/terminal-window.c:1941
 msgid "_Send Mail To…"
 msgstr "_Send e-post til …"
 
-#: ../src/terminal-window.c:1931
+#: ../src/terminal-window.c:1944
 msgid "_Copy E-mail Address"
 msgstr "_Kopier e-postadresse"
 
-#: ../src/terminal-window.c:1934
+#: ../src/terminal-window.c:1947
 msgid "C_all To…"
 msgstr "_Ring til …"
 
-#: ../src/terminal-window.c:1937
+#: ../src/terminal-window.c:1950
 msgid "_Copy Call Address"
 msgstr "_Kopier samtaleadresse"
 
-#: ../src/terminal-window.c:1940
+#: ../src/terminal-window.c:1953
 msgid "_Open Link"
 msgstr "_Åpne lenke"
 
-#: ../src/terminal-window.c:1943
+#: ../src/terminal-window.c:1956
 msgid "_Copy Link Address"
 msgstr "_Kopier lenkens adresse"
 
-#: ../src/terminal-window.c:1946
+#: ../src/terminal-window.c:1959
 msgid "P_rofiles"
 msgstr "P_rofiler"
 
-#: ../src/terminal-window.c:1962 ../src/terminal-window.c:3307
+#: ../src/terminal-window.c:1975 ../src/terminal-window.c:3324
 msgid "C_lose Window"
 msgstr "_Lukk vindu"
 
-#: ../src/terminal-window.c:1968
+#: ../src/terminal-window.c:1981
 msgid "L_eave Full Screen"
 msgstr "For_lat full skjerm"
 
-#: ../src/terminal-window.c:1971
+#: ../src/terminal-window.c:1984
 msgid "_Input Methods"
 msgstr "_Inndatametoder"
 
 #. View Menu
-#: ../src/terminal-window.c:1977
+#: ../src/terminal-window.c:1990
 msgid "Show _Menubar"
 msgstr "Vis _menylinje"
 
-#: ../src/terminal-window.c:1981
+#: ../src/terminal-window.c:1994
 msgid "_Full Screen"
 msgstr "_Full skjerm"
 
-#: ../src/terminal-window.c:3294
+#: ../src/terminal-window.c:3311
 msgid "Close this window?"
 msgstr "Lukk dette vinduet?"
 
-#: ../src/terminal-window.c:3294
+#: ../src/terminal-window.c:3311
 msgid "Close this terminal?"
 msgstr "Lukk denne terminalen?"
 
-#: ../src/terminal-window.c:3298
+#: ../src/terminal-window.c:3315
 msgid ""
 "There are still processes running in some terminals in this window. Closing "
 "the window will kill all of them."
@@ -2521,7 +2521,7 @@
 "Prosesser kjører fremdeles i noen terminaler i dette vinduet. Hvis du lukker "
 "vinduet vil de bli terminert."
 
-#: ../src/terminal-window.c:3302
+#: ../src/terminal-window.c:3319
 msgid ""
 "There is still a process running in this terminal. Closing the terminal will "
 "kill it."
@@ -2529,31 +2529,31 @@
 "En prosess kjører fremdeles i denne terminalen. Hvis du lukker terminalen "
 "vil denne termineres."
 
-#: ../src/terminal-window.c:3307
+#: ../src/terminal-window.c:3324
 msgid "C_lose Terminal"
 msgstr "_Lukk terminal"
 
-#: ../src/terminal-window.c:3380
+#: ../src/terminal-window.c:3397
 msgid "Could not save contents"
 msgstr "Kunne ikke lagre innhold"
 
-#: ../src/terminal-window.c:3404
+#: ../src/terminal-window.c:3421
 msgid "Save as..."
 msgstr "Lagre som …"
 
-#: ../src/terminal-window.c:3866
+#: ../src/terminal-window.c:3883
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: ../src/terminal-window.c:4057
+#: ../src/terminal-window.c:4074
 msgid "Contributors:"
 msgstr "Bidragsytere:"
 
-#: ../src/terminal-window.c:4076
+#: ../src/terminal-window.c:4093
 msgid "A terminal emulator for the GNOME desktop"
 msgstr "En terminalemulator for GNOME"
 
-#: ../src/terminal-window.c:4083
+#: ../src/terminal-window.c:4100
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -2565,7 +2565,8 @@
 "  Hans Joachim Desserud https://launchpad.net/~hjd\n"
 "  Kjartan Maraas https://launchpad.net/~kmaraas\n"
 "  Kjetil Birkeland Moe https://launchpad.net/~kjetilbmoe\n"
-"  Torstein A. W. https://launchpad.net/~kvikende"
+"  Torstein A. W. https://launchpad.net/~kvikende\n"
+"  Åka Sikrom https://launchpad.net/~akrosikam"
 
 #. 
 #. * Copyright © 2009 Christian Persch
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-themes-standard.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-themes-standard.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-themes-standard.po	2013-01-29 09:33:54.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-themes-standard.po	2014-01-07 06:37:38.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:29+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:27+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../themes/Adwaita/backgrounds/adwaita.xml.in.in.h:1
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-user-share.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-user-share.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-user-share.po	2013-01-29 09:33:53.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-user-share.po	2014-01-07 06:37:10.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:29+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:1
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-vfs-2.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-vfs-2.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gnome-vfs-2.0.po	2013-01-29 09:33:51.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gnome-vfs-2.0.po	2014-01-07 06:37:10.000000000 +0000
@@ -14,8 +14,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:31+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:48+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../libgnomevfs/gnome-vfs-cdrom.c:237
 msgid "ISO 9660 Volume"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gparted.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gparted.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gparted.po	2013-01-29 09:33:50.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gparted.po	2014-01-07 06:37:11.000000000 +0000
@@ -15,18 +15,18 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:32+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:49+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../data/com.ubuntu.pkexec.gparted.policy.in.h:1
 msgid "Authentication is required to run the GParted Partition Editor"
-msgstr ""
+msgstr "Du må autentisere deg for å kjøre GParted partisjonsredigering"
 
 #. ==== GUI =========================
-#: ../gparted.desktop.in.in.h:1 ../src/Dialog_Progress.cc:357
-#: ../src/Win_GParted.cc:72 ../src/Win_GParted.cc:1115
-#: ../src/Win_GParted.cc:1306
+#: ../gparted.desktop.in.in.h:1 ../src/Dialog_Progress.cc:360
+#: ../src/Win_GParted.cc:75 ../src/Win_GParted.cc:1282
+#: ../src/Win_GParted.cc:1473
 msgid "GParted"
 msgstr "GParted"
 
@@ -58,108 +58,108 @@
 
 #. add alignment
 #. TO TRANSLATORS: used as label for a list of choices.   Align to: <optionmenu with choices>
-#: ../src/Dialog_Base_Partition.cc:96
+#: ../src/Dialog_Base_Partition.cc:99
 msgid "Align to:"
 msgstr "Juster til:"
 
 #. fill partition alignment menu
 #. TO TRANSLATORS: Menu option for drop down menu "Align to:"
-#: ../src/Dialog_Base_Partition.cc:101
+#: ../src/Dialog_Base_Partition.cc:104
 msgid "Cylinder"
 msgstr "Sylinder"
 
 #. TO TRANSLATORS: Menu option for label "Align to:"
-#: ../src/Dialog_Base_Partition.cc:103
+#: ../src/Dialog_Base_Partition.cc:106
 msgid "MiB"
 msgstr "MiB"
 
 #. TO TRANSLATORS: Menu option for drop down menu "Align to:"
-#: ../src/Dialog_Base_Partition.cc:105
+#: ../src/Dialog_Base_Partition.cc:108
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/Dialog_Base_Partition.cc:217
+#: ../src/Dialog_Base_Partition.cc:243
 msgid "Resize"
 msgstr "Endre størrelse"
 
-#: ../src/Dialog_Base_Partition.cc:217 ../src/Win_GParted.cc:236
+#: ../src/Dialog_Base_Partition.cc:243 ../src/Win_GParted.cc:244
 msgid "Resize/Move"
 msgstr "Endre størrelse/Flytt"
 
-#: ../src/Dialog_Base_Partition.cc:234
+#: ../src/Dialog_Base_Partition.cc:261
 msgid "Minimum size: %1 MiB"
 msgstr "Minste størrelse: %1 MiB"
 
-#: ../src/Dialog_Base_Partition.cc:235
+#: ../src/Dialog_Base_Partition.cc:262
 msgid "Maximum size: %1 MiB"
 msgstr "Maksimal størrelse: %1 MiB"
 
 #. TO TRANSLATORS: dialogtitle, looks like Create partition table on /dev/hda
-#: ../src/Dialog_Disklabel.cc:27
+#: ../src/Dialog_Disklabel.cc:28
 msgid "Create partition table on %1"
 msgstr "Lag partisjonstabell på %1"
 
 #. TO TRANSLATORS: looks like WARNING:  This will ERASE ALL DATA on the ENTIRE DISK /dev/hda
-#: ../src/Dialog_Disklabel.cc:47
+#: ../src/Dialog_Disklabel.cc:52
 msgid "WARNING:  This will ERASE ALL DATA on the ENTIRE DISK %1"
 msgstr "ADVARSEL: Dette vil SLETTE ALLE DATA på HELE DISKEN %1"
 
-#: ../src/Dialog_Disklabel.cc:51
+#: ../src/Dialog_Disklabel.cc:56
 msgid "Default is to create an MS-DOS partition table."
-msgstr "Standard er å opprette en MS-DOS partisjonstabell."
+msgstr "Forvalg er å lage en MS-DOS partisjonstabell."
 
-#: ../src/Dialog_Disklabel.cc:58
+#: ../src/Dialog_Disklabel.cc:62
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../src/Dialog_Disklabel.cc:66
+#: ../src/Dialog_Disklabel.cc:71
 msgid "Select new partition table type:"
 msgstr "Velg ny type partisjonstabell:"
 
-#: ../src/Dialog_Partition_Copy.cc:36
+#: ../src/Dialog_Partition_Copy.cc:37
 msgid "Paste %1"
 msgstr "Lim inn %1"
 
 #. TO TRANSLATORS: dialogtitle, looks like Information about /dev/hda3
-#: ../src/Dialog_Partition_Info.cc:32
+#: ../src/Dialog_Partition_Info.cc:35
 msgid "Information about %1"
 msgstr "Informasjon om %1"
 
-#: ../src/Dialog_Partition_Info.cc:49
+#: ../src/Dialog_Partition_Info.cc:55
 msgid "Warning:"
 msgstr "Advarsel:"
 
 #. filesystem
 #. file systems to choose from
-#: ../src/Dialog_Partition_Info.cc:152 ../src/Dialog_Partition_New.cc:119
+#: ../src/Dialog_Partition_Info.cc:194 ../src/Dialog_Partition_New.cc:127
 msgid "File system:"
 msgstr "Filsystem:"
 
 #. size
-#: ../src/Dialog_Partition_Info.cc:162 ../src/Win_GParted.cc:458
+#: ../src/Dialog_Partition_Info.cc:204 ../src/Win_GParted.cc:479
 msgid "Size:"
 msgstr "Størrelse:"
 
-#. used
-#: ../src/Dialog_Partition_Info.cc:178
+#. Used
+#: ../src/Dialog_Partition_Info.cc:220
 msgid "Used:"
 msgstr "Brukt:"
 
 #. unused
-#: ../src/Dialog_Partition_Info.cc:192
+#: ../src/Dialog_Partition_Info.cc:234
 msgid "Unused:"
 msgstr "Ubrukt:"
 
-#: ../src/Dialog_Partition_Info.cc:209
+#: ../src/Dialog_Partition_Info.cc:273
 msgid "Flags:"
 msgstr "Flagg:"
 
 #. path
-#: ../src/Dialog_Partition_Info.cc:225 ../src/Win_GParted.cc:466
+#: ../src/Dialog_Partition_Info.cc:289 ../src/Win_GParted.cc:487
 msgid "Path:"
 msgstr "Sti:"
 
-#: ../src/Dialog_Partition_Info.cc:239
+#: ../src/Dialog_Partition_Info.cc:300
 msgid "Status:"
 msgstr "Status:"
 
@@ -167,20 +167,20 @@
 #. * means that this extended partition contains at least one logical
 #. * partition that is mounted or otherwise active.
 #. 
-#: ../src/Dialog_Partition_Info.cc:251
+#: ../src/Dialog_Partition_Info.cc:312
 msgid "Busy (At least one logical partition is mounted)"
-msgstr "Opptatt (minst en logisk partisjon er montert)"
+msgstr "Opptatt. Minst en logisk partisjon er montert"
 
 #. TO TRANSLATORS:  Active
-#. * means that this linux swap partition is enabled and being used by
-#. * the operating system.
+#. * means that this linux swap or linux software raid partition
+#. * is enabled and being used by the operating system.
 #. 
-#: ../src/Dialog_Partition_Info.cc:259
+#: ../src/Dialog_Partition_Info.cc:322
 msgid "Active"
 msgstr "Aktiv"
 
 #. TO TRANSLATORS: looks like   Mounted on /mnt/mymountpoint
-#: ../src/Dialog_Partition_Info.cc:265
+#: ../src/Dialog_Partition_Info.cc:336
 msgid "Mounted on %1"
 msgstr "Montert i %1"
 
@@ -188,52 +188,52 @@
 #. * means that this extended partition contains no mounted or otherwise
 #. * active partitions.
 #. 
-#: ../src/Dialog_Partition_Info.cc:275
+#: ../src/Dialog_Partition_Info.cc:346
 msgid "Not busy (There are no mounted logical partitions)"
-msgstr "Ikke opptatt (Det er ingen monterte logiske partisjoner)"
+msgstr "Ikke opptatt. Ingen monterte logiske partisjoner"
 
 #. TO TRANSLATORS:  Not active
-#. *  means that this linux swap partition is not enabled and is not
-#. *  in use by the operating system.
+#. *  means that this linux swap or linux software raid partition
+#. *  is not enabled and is not in use by the operating system.
 #. 
-#: ../src/Dialog_Partition_Info.cc:283
+#: ../src/Dialog_Partition_Info.cc:356
 msgid "Not active"
 msgstr "Ikke aktiv"
 
 #. TO TRANSLATORS:  Not mounted
 #. * means that this partition is not mounted.
 #. 
-#: ../src/Dialog_Partition_Info.cc:290
+#: ../src/Dialog_Partition_Info.cc:387
 msgid "Not mounted"
 msgstr "Ikke montert"
 
 #. Label
-#: ../src/Dialog_Partition_Info.cc:299 ../src/Dialog_Partition_Label.cc:43
-#: ../src/Dialog_Partition_New.cc:131
+#: ../src/Dialog_Partition_Info.cc:396 ../src/Dialog_Partition_Label.cc:41
+#: ../src/Dialog_Partition_New.cc:139
 msgid "Label:"
 msgstr "Etikett:"
 
-#: ../src/Dialog_Partition_Info.cc:312
+#: ../src/Dialog_Partition_Info.cc:409
 msgid "UUID:"
 msgstr "UUID:"
 
 #. first sector
-#: ../src/Dialog_Partition_Info.cc:326
+#: ../src/Dialog_Partition_Info.cc:423
 msgid "First sector:"
 msgstr "Første sektor:"
 
 #. last sector
-#: ../src/Dialog_Partition_Info.cc:336
+#: ../src/Dialog_Partition_Info.cc:433
 msgid "Last sector:"
 msgstr "Siste sektor:"
 
 #. total sectors
-#: ../src/Dialog_Partition_Info.cc:346 ../src/Win_GParted.cc:519
+#: ../src/Dialog_Partition_Info.cc:443 ../src/Win_GParted.cc:537
 msgid "Total sectors:"
 msgstr "Totalt antall sektorer:"
 
 #. TO TRANSLATORS: dialog title, looks like Set partition label on /dev/hda3
-#: ../src/Dialog_Partition_Label.cc:32
+#: ../src/Dialog_Partition_Label.cc:30
 msgid "Set partition label on %1"
 msgstr "Sett partisjonsetikett på %1"
 
@@ -243,37 +243,37 @@
 msgstr "Opprett ny partisjon"
 
 #. TO TRANSLATORS: used as label for a list of choices.   Create as: <optionmenu with choices>
-#: ../src/Dialog_Partition_New.cc:79
+#: ../src/Dialog_Partition_New.cc:87
 msgid "Create as:"
 msgstr "Opprett som:"
 
 #. fill partitiontype menu
-#: ../src/Dialog_Partition_New.cc:84 ../src/OperationCreate.cc:75
+#: ../src/Dialog_Partition_New.cc:92 ../src/OperationCreate.cc:75
 msgid "Primary Partition"
 msgstr "Primær partisjon"
 
-#: ../src/Dialog_Partition_New.cc:85 ../src/OperationCreate.cc:78
+#: ../src/Dialog_Partition_New.cc:93 ../src/OperationCreate.cc:78
 #: ../src/OperationDelete.cc:77
 msgid "Logical Partition"
 msgstr "Logisk partisjon"
 
-#: ../src/Dialog_Partition_New.cc:86 ../src/OperationCreate.cc:81
+#: ../src/Dialog_Partition_New.cc:94 ../src/OperationCreate.cc:81
 msgid "Extended Partition"
 msgstr "Utvidet partisjon"
 
-#: ../src/Dialog_Partition_New.cc:198
+#: ../src/Dialog_Partition_New.cc:205
 msgid "New Partition #%1"
 msgstr "Ny partisjon #%1"
 
-#: ../src/Dialog_Partition_Resize_Move.cc:74
+#: ../src/Dialog_Partition_Resize_Move.cc:83
 msgid "Resize/Move %1"
-msgstr "Endre størrelse/Flytt %1"
+msgstr "Endre størrelse/flytt %1"
 
-#: ../src/Dialog_Partition_Resize_Move.cc:79
+#: ../src/Dialog_Partition_Resize_Move.cc:88
 msgid "Resize %1"
 msgstr "Endre størrelse på %1"
 
-#: ../src/Dialog_Progress.cc:33
+#: ../src/Dialog_Progress.cc:32
 msgid "Applying pending operations"
 msgstr "Utfør ventende oppgaver"
 
@@ -283,7 +283,7 @@
 msgstr ""
 "Avhengig av antallet og type operasjoner kan dette ta veldig lang tid."
 
-#: ../src/Dialog_Progress.cc:61
+#: ../src/Dialog_Progress.cc:60
 msgid "Completed Operations:"
 msgstr "Fullførte operasjoner:"
 
@@ -291,75 +291,77 @@
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../src/Dialog_Progress.cc:199
+#: ../src/Dialog_Progress.cc:204
 msgid "%1 of %2 operations completed"
-msgstr "%1 av %2 operasjoner er fullført"
+msgstr "%1 av %2 operasjoner fullført"
 
 #. add save button
-#: ../src/Dialog_Progress.cc:230
+#: ../src/Dialog_Progress.cc:222
 msgid "_Save Details"
 msgstr "_Lagre detaljer"
 
-#: ../src/Dialog_Progress.cc:239
+#: ../src/Dialog_Progress.cc:234
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
 
-#: ../src/Dialog_Progress.cc:253
+#: ../src/Dialog_Progress.cc:248
 msgid "All operations successfully completed"
-msgstr "Alle handlinger vellykket utført"
+msgstr "Alle operasjoner er fullført"
 
-#: ../src/Dialog_Progress.cc:257
+#: ../src/Dialog_Progress.cc:252
 msgid "%1 warning"
 msgid_plural "%1 warnings"
 msgstr[0] "%1 advarsel"
 msgstr[1] "%1 advarsler:"
 
-#: ../src/Dialog_Progress.cc:270
+#: ../src/Dialog_Progress.cc:265
 msgid "An error occurred while applying the operations"
 msgstr "En feil oppsto under gjennomføring av operasjonene"
 
-#: ../src/Dialog_Progress.cc:275
+#: ../src/Dialog_Progress.cc:270
 msgid "See the details for more information."
-msgstr "Se på detaljene for mer informasjon"
+msgstr "Set detaljene for mer informasjon."
 
-#: ../src/Dialog_Progress.cc:276
+#: ../src/Dialog_Progress.cc:272
 msgid "IMPORTANT"
 msgstr "VIKTIG"
 
-#: ../src/Dialog_Progress.cc:277
+#: ../src/Dialog_Progress.cc:273
 msgid "If you want support, you need to provide the saved details!"
 msgstr "Dersom du trenger hjelp, må du ta vare på de lagrede detaljene."
 
 #. TO TRANSLATORS: looks like   See http://gparted.org/save-details.htm for more information.
-#: ../src/Dialog_Progress.cc:280
+#: ../src/Dialog_Progress.cc:276
 msgid "See %1 for more information."
 msgstr "Se %1 for mer informasjon."
 
-#: ../src/Dialog_Progress.cc:313
+#: ../src/Dialog_Progress.cc:308
 msgid "Are you sure you want to cancel the current operation?"
-msgstr "Er du sikker på at du vil avbryte den pågående operasjonen?"
+msgstr "Er du sikker på at du vil avbryte aktiv operasjon?"
 
-#: ../src/Dialog_Progress.cc:319
+#: ../src/Dialog_Progress.cc:314
 msgid "Canceling an operation might cause SEVERE file system damage."
-msgstr "Å avbryte en operasjon kan føre til ALVORLIGE skader på filsystemet."
+msgstr ""
+"Hvis du avbryter en operasjon kan dette forårsake ALVORLIG skade på "
+"filsystemet."
 
-#: ../src/Dialog_Progress.cc:321
+#: ../src/Dialog_Progress.cc:316
 msgid "Continue Operation"
 msgstr "Fortsett operasjon"
 
-#: ../src/Dialog_Progress.cc:322
+#: ../src/Dialog_Progress.cc:317
 msgid "Cancel Operation"
 msgstr "Avbryt operasjon"
 
-#: ../src/Dialog_Progress.cc:335
+#: ../src/Dialog_Progress.cc:338
 msgid "Save Details"
 msgstr "Lagre detaljer"
 
-#: ../src/Dialog_Progress.cc:354
+#: ../src/Dialog_Progress.cc:357
 msgid "GParted Details"
 msgstr "GParted detaljer"
 
-#: ../src/Dialog_Progress.cc:362
+#: ../src/Dialog_Progress.cc:368
 msgid "Libparted"
 msgstr "Libparted"
 
@@ -367,7 +369,7 @@
 #. * means that the status for this operation is
 #. * executing or currently in progress.
 #. 
-#: ../src/Dialog_Progress.cc:405
+#: ../src/Dialog_Progress.cc:411
 msgid "EXECUTING"
 msgstr "KJØRER"
 
@@ -375,7 +377,7 @@
 #. * means that the status for this operation is
 #. * completed successfully.
 #. 
-#: ../src/Dialog_Progress.cc:413
+#: ../src/Dialog_Progress.cc:419
 msgid "SUCCESS"
 msgstr "SUKSESS"
 
@@ -383,7 +385,7 @@
 #. * means that the status for this operation is
 #. * completed with errors.
 #. 
-#: ../src/Dialog_Progress.cc:421
+#: ../src/Dialog_Progress.cc:427
 msgid "ERROR"
 msgstr "FEIL"
 
@@ -392,7 +394,7 @@
 #. * for your information , or messages from the
 #. * libparted library.
 #. 
-#: ../src/Dialog_Progress.cc:430
+#: ../src/Dialog_Progress.cc:436
 msgid "INFO"
 msgstr "INFO"
 
@@ -401,7 +403,7 @@
 #. * not applicable because the operation is not
 #. * supported on the file system in the partition.
 #. 
-#: ../src/Dialog_Progress.cc:439
+#: ../src/Dialog_Progress.cc:445
 msgid "N/A"
 msgstr "I/T"
 
@@ -409,47 +411,47 @@
 msgid "File System Support"
 msgstr "Støtte for filsystem"
 
-#: ../src/DialogFeatures.cc:35 ../src/TreeView_Detail.cc:36
+#: ../src/DialogFeatures.cc:43 ../src/TreeView_Detail.cc:36
 msgid "File System"
 msgstr "Filsystem"
 
-#: ../src/DialogFeatures.cc:36
+#: ../src/DialogFeatures.cc:44
 msgid "Create"
 msgstr "Lag"
 
-#: ../src/DialogFeatures.cc:37
+#: ../src/DialogFeatures.cc:45
 msgid "Grow"
 msgstr "Øk"
 
-#: ../src/DialogFeatures.cc:38
+#: ../src/DialogFeatures.cc:49
 msgid "Shrink"
 msgstr "Krymp"
 
-#: ../src/DialogFeatures.cc:39
+#: ../src/DialogFeatures.cc:53
 msgid "Move"
 msgstr "Flytt"
 
-#: ../src/DialogFeatures.cc:40
+#: ../src/DialogFeatures.cc:54
 msgid "Copy"
 msgstr "Kopier"
 
-#: ../src/DialogFeatures.cc:41
+#: ../src/DialogFeatures.cc:55
 msgid "Check"
 msgstr "Sjekk"
 
-#: ../src/DialogFeatures.cc:42 ../src/TreeView_Detail.cc:38
+#: ../src/DialogFeatures.cc:56 ../src/TreeView_Detail.cc:38
 msgid "Label"
 msgstr "Etikett"
 
-#: ../src/DialogFeatures.cc:43
+#: ../src/DialogFeatures.cc:58
 msgid "Required Software"
 msgstr "Påkrevd programvare"
 
-#: ../src/DialogFeatures.cc:57
+#: ../src/DialogFeatures.cc:75
 msgid "This chart shows the actions supported on file systems."
 msgstr "Støttede handlinger på filsystemet."
 
-#: ../src/DialogFeatures.cc:59
+#: ../src/DialogFeatures.cc:77
 msgid ""
 "Not all actions are available on all file systems, in part due to the nature "
 "of file systems and limitations in the required software."
@@ -461,195 +463,201 @@
 #. TO TRANSLATORS:  Available
 #. * means that this action is valid for this file system.
 #. 
-#: ../src/DialogFeatures.cc:73
+#: ../src/DialogFeatures.cc:81
 msgid "Available"
 msgstr "Tilgjengelig"
 
 #. TO TRANSLATORS:  Not Available
 #. * means that this action is not valid for this file system.
 #. 
-#: ../src/DialogFeatures.cc:83
+#: ../src/DialogFeatures.cc:125
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: ../src/DialogFeatures.cc:89
+#: ../src/DialogFeatures.cc:131
 msgid "Legend"
-msgstr "Forklaring"
+msgstr "Historikk"
 
 #. TO TRANSLATORS: This is a button that will search for the software tools installed and then refresh the screen with the file system actions supported.
-#: ../src/DialogFeatures.cc:102
+#: ../src/DialogFeatures.cc:142
 msgid "Rescan For Supported Actions"
 msgstr "Søk på nytt etter støttede handlinger"
 
 #: ../src/DialogManageFlags.cc:31 ../src/DialogManageFlags.cc:36
 msgid "Manage flags on %1"
-msgstr "Behandle flagg på %1"
+msgstr "Håndter flagg på %1"
 
-#: ../src/Dialog_Rescue_Data.cc:34
+#: ../src/Dialog_Rescue_Data.cc:36
 msgid "Search disk for file systems"
-msgstr ""
+msgstr "Se etter filsystemer på disken"
 
 #. TO TRANSLATORS: looks like    File systems found on on /dev/sdb
 #: ../src/Dialog_Rescue_Data.cc:51
 msgid "File systems found on on %1"
-msgstr ""
+msgstr "Fant filsystemer på %1"
 
-#: ../src/Dialog_Rescue_Data.cc:56
+#: ../src/Dialog_Rescue_Data.cc:58
 msgid "Data found"
-msgstr ""
+msgstr "Data funnet"
 
-#: ../src/Dialog_Rescue_Data.cc:60
+#: ../src/Dialog_Rescue_Data.cc:62
 msgid "Data found with inconsistencies"
-msgstr ""
+msgstr "Fant inkonsistent data"
 
-#: ../src/Dialog_Rescue_Data.cc:62
+#: ../src/Dialog_Rescue_Data.cc:64
 msgid "WARNING!: The file systems marked with (!) are inconsistent."
-msgstr ""
+msgstr "ADVARSEL: filsystemer merket med «(!)» er inkonsistente."
 
-#: ../src/Dialog_Rescue_Data.cc:64
+#: ../src/Dialog_Rescue_Data.cc:66
 msgid "You might encounter errors trying to view these file systems."
-msgstr ""
+msgstr "Det kan oppstå feil hvis du prøver å vise disse filsystemene."
 
-#: ../src/Dialog_Rescue_Data.cc:80
+#: ../src/Dialog_Rescue_Data.cc:82
 msgid "The 'View' buttons create read-only views of each file system."
 msgstr ""
+"«Vis»-knappene oppretter skrivebeskyttede visninger for hvert filsystem."
 
-#: ../src/Dialog_Rescue_Data.cc:82
+#: ../src/Dialog_Rescue_Data.cc:84
 msgid "All mounted views will be unmounted when you close this dialog."
 msgstr ""
+"Alle monterte visninger vil bli avmontert når du lukker denne dialogen."
 
-#: ../src/Dialog_Rescue_Data.cc:105
+#: ../src/Dialog_Rescue_Data.cc:107
 msgid "File systems"
-msgstr ""
+msgstr "Filsystemer"
 
 #. TO TRANSLATORS: looks like    1: ntfs (10240 MiB)
-#: ../src/Dialog_Rescue_Data.cc:127
+#: ../src/Dialog_Rescue_Data.cc:129
 msgid "#%1: %2 (%3 MiB)"
-msgstr ""
+msgstr "#%1: %2 (%3 MiB)"
 
-#: ../src/Dialog_Rescue_Data.cc:135
+#: ../src/Dialog_Rescue_Data.cc:137
 msgid "View"
-msgstr ""
+msgstr "Vis"
 
-#: ../src/Dialog_Rescue_Data.cc:172
+#: ../src/Dialog_Rescue_Data.cc:192
 msgid "An error occurred while creating the read-only view."
-msgstr ""
+msgstr "Det oppstod en feil da skrivebeskyttet visning skulle opprettes."
 
-#: ../src/Dialog_Rescue_Data.cc:174
+#: ../src/Dialog_Rescue_Data.cc:194
 msgid ""
 "Either the file system can not be mounted (like swap), or there are "
 "inconsistencies or errors in the file system."
 msgstr ""
+"Filsystemet er enten umulig å montere (typisk vekselminne), inkonsistent, "
+"eller inneholder feil."
 
-#: ../src/Dialog_Rescue_Data.cc:178
+#: ../src/Dialog_Rescue_Data.cc:198
 msgid "Failed creating read-only view"
-msgstr ""
+msgstr "Klarer ikke å opprette skrivebeskyttet visning"
 
-#: ../src/Dialog_Rescue_Data.cc:208
+#: ../src/Dialog_Rescue_Data.cc:228
 msgid "Error:"
-msgstr ""
+msgstr "Feil:"
 
 #. TO TRANSLATORS: looks like
 #. * The file system is mounted on:
 #. * /tmp/gparted-roview-Nlhb3R.
-#: ../src/Dialog_Rescue_Data.cc:216
+#: ../src/Dialog_Rescue_Data.cc:236
 msgid "The file system is mounted on:"
-msgstr ""
+msgstr "Filsystemet er montert på:"
 
-#: ../src/Dialog_Rescue_Data.cc:221
+#: ../src/Dialog_Rescue_Data.cc:241
 msgid "Unable to open the default file manager"
-msgstr ""
+msgstr "Kan ikke åpne forvalgt filhåndterer"
 
-#: ../src/Dialog_Rescue_Data.cc:240
+#: ../src/Dialog_Rescue_Data.cc:260
 msgid ""
 "Warning: The detected file system area overlaps with at least one existing "
 "partition."
 msgstr ""
+"Advarsel: Filsystemområdet overlapper med minst én eksisterende partisjon."
 
-#: ../src/Dialog_Rescue_Data.cc:242
+#: ../src/Dialog_Rescue_Data.cc:262
 msgid ""
 "It is recommended that you do not use any overlapping file systems to avoid "
 "disturbing existing data."
 msgstr ""
+"Du frarådes å bruke overlappende filsystemer, fordi det kan forstyrre "
+"eksisterende data."
 
-#: ../src/Dialog_Rescue_Data.cc:244
+#: ../src/Dialog_Rescue_Data.cc:264
 msgid "Do you want to try to deactivate the following mount points?"
-msgstr ""
+msgstr "Vil du forsøke å deaktivere følgende monteringspunkter?"
 
 #. TO TRANSLATORS: looks like  create missing /dev/mapper entries
-#: ../src/DMRaid.cc:322
+#: ../src/DMRaid.cc:326
 msgid "create missing %1 entries"
 msgstr "opprett %1 manglende oppføring"
 
 #. TO TRANSLATORS: looks like  delete affected /dev/mapper entries
-#: ../src/DMRaid.cc:421
+#: ../src/DMRaid.cc:425
 msgid "delete affected %1 entries"
-msgstr "slett %1 berørte oppføringer"
+msgstr "sletting påvirket %1 oppføringer"
 
 #. TO TRANSLATORS: looks like  delete /dev/mapper entry
-#: ../src/DMRaid.cc:444
+#: ../src/DMRaid.cc:448
 msgid "delete %1 entry"
 msgstr "slett %1 oppføring"
 
 #. TO TRANSLATORS: looks like  update /dev/mapper entry
-#: ../src/DMRaid.cc:494
+#: ../src/DMRaid.cc:498
 msgid "update %1 entry"
 msgstr "oppdater %1 oppføring"
 
 #. TO TRANSLATORS: looks like Scanning /dev/sda
-#: ../src/GParted_Core.cc:186 ../src/GParted_Core.cc:195
-#: ../src/GParted_Core.cc:205
+#: ../src/GParted_Core.cc:193 ../src/GParted_Core.cc:202
 msgid "Scanning %1"
 msgstr "Søker gjennom %1"
 
 #. TO TRANSLATORS: looks like Confirming /dev/sda
-#: ../src/GParted_Core.cc:228
+#: ../src/GParted_Core.cc:225
 msgid "Confirming %1"
 msgstr "Bekrefter %1"
 
 #. TO TRANSLATORS: looks like  Ignoring device /dev/sde with logical sector size of 2048 bytes.
-#: ../src/GParted_Core.cc:240
+#: ../src/GParted_Core.cc:237
 msgid "Ignoring device %1 with logical sector size of %2 bytes."
-msgstr "Overser enhet %1 med logisk sektorstørrelse på %2 byte."
+msgstr "Ignorerer enhet %1 med logisk sektorstørrelse på %2 bytes."
 
-#: ../src/GParted_Core.cc:242
+#: ../src/GParted_Core.cc:239
 msgid ""
 "GParted requires libparted version 2.2 or higher to support devices with "
 "sector sizes larger than 512 bytes."
 msgstr ""
 "GParted krever libparted versjon 2.2 eller høyere for å støtte enheter med "
-"sektorstørrelser større enn 512 byte."
+"sektorstørrelser større enn 512 bytes."
 
 #. TO TRANSLATORS: looks like Searching /dev/sda partitions
-#: ../src/GParted_Core.cc:281
+#: ../src/GParted_Core.cc:277
 msgid "Searching %1 partitions"
-msgstr "Søker etter partisjoner i %1"
+msgstr "Søker etter partisjoner på %1"
 
 #. TO TRANSLATORS:  unrecognized
 #. * means that the partition table for this
 #. * disk device is unknown or not recognized.
 #. 
-#: ../src/GParted_Core.cc:328
+#: ../src/GParted_Core.cc:326
 msgid "unrecognized"
 msgstr "ugjenkjennelig"
 
 #. TO TRANSLATORS:  looks like   A partition cannot have a length of -1 sectors
-#: ../src/GParted_Core.cc:555
+#: ../src/GParted_Core.cc:645
 msgid "A partition cannot have a length of %1 sectors"
 msgstr "En partisjon kan ikke ha en lengde på %1 sektorer"
 
 #. TO TRANSLATORS: looks like   A partition with used sectors (2048) greater than its length (1536) is not valid
-#: ../src/GParted_Core.cc:564
+#: ../src/GParted_Core.cc:659
 msgid ""
 "A partition with used sectors (%1) greater than its length (%2) is not valid"
 msgstr ""
 "En partisjon som bruker sektorer (%1) større enn lengden (%2) er ikke gyldig."
 
-#: ../src/GParted_Core.cc:629
+#: ../src/GParted_Core.cc:729
 msgid "libparted messages"
 msgstr "libparted meldinger"
 
-#: ../src/GParted_Core.cc:1054
+#: ../src/GParted_Core.cc:1195
 msgid "Linux Unified Key Setup encryption is not yet supported."
 msgstr "Linux Unified Key Setup kryptering støttes ikke enda."
 
@@ -658,83 +666,83 @@
 msgstr "Logical Volume Management støttes ikke enda."
 
 #. no file system found....
-#: ../src/GParted_Core.cc:1200
+#: ../src/GParted_Core.cc:1352
 msgid "Unable to detect file system! Possible reasons are:"
-msgstr "Kunne ikke bestemme filsystem! Mulige årsaker er:"
+msgstr "Kan ikke finne filsystem! Mulige årsaker er:"
 
-#: ../src/GParted_Core.cc:1202
+#: ../src/GParted_Core.cc:1354
 msgid "The file system is damaged"
 msgstr "Filsystemet er skadet"
 
-#: ../src/GParted_Core.cc:1204
+#: ../src/GParted_Core.cc:1356
 msgid "The file system is unknown to GParted"
 msgstr "Filsystemet er ukjent for GParted"
 
-#: ../src/GParted_Core.cc:1206
+#: ../src/GParted_Core.cc:1358
 msgid "There is no file system available (unformatted)"
-msgstr "Ikke noe filsystem tilgjengelig (uformatert)"
+msgstr "Ingen filsystemer tilgjengelig (uformatert)"
 
 #. TO TRANSLATORS: looks like  The device entry /dev/sda5 is missing
-#: ../src/GParted_Core.cc:1209
+#: ../src/GParted_Core.cc:1361
 msgid "The device entry %1 is missing"
-msgstr ""
+msgstr "Enhetsoppføring %1 mangler"
 
-#: ../src/GParted_Core.cc:1348
+#: ../src/GParted_Core.cc:1526
 msgid "Unable to find mount point"
 msgstr "Kan ikke finne monteringspunkt"
 
-#: ../src/GParted_Core.cc:1410
+#: ../src/GParted_Core.cc:1600
 msgid "Unable to read the contents of this file system!"
-msgstr "Kunne ikke lese innholdet på dette filsystemet!"
+msgstr "Kan ikke lese innholdet av dette filsystemet!"
 
-#: ../src/GParted_Core.cc:1412
+#: ../src/GParted_Core.cc:1602
 msgid "Because of this some operations may be unavailable."
 msgstr "På grunn av dette kan noen operasjoner være utilgjengelige."
 
-#: ../src/GParted_Core.cc:1416
+#: ../src/GParted_Core.cc:1606
 msgid "The cause might be a missing software package."
-msgstr ""
+msgstr "Årsaken kan være en manglende programvarepakke."
 
 #. TO TRANSLATORS: looks like The following list of software packages is required for NTFS file system support:  ntfsprogs.
-#: ../src/GParted_Core.cc:1419
+#: ../src/GParted_Core.cc:1609
 msgid ""
 "The following list of software packages is required for %1 file system "
 "support:  %2."
 msgstr "Følgende programvarepakker kreves for å støtte %1-filsystemet: %2."
 
-#: ../src/GParted_Core.cc:1490
+#: ../src/GParted_Core.cc:1730
 msgid "create empty partition"
 msgstr "opprett tom partisjon"
 
-#: ../src/GParted_Core.cc:1558 ../src/GParted_Core.cc:2777
+#: ../src/GParted_Core.cc:1800 ../src/GParted_Core.cc:2976
 msgid "path: %1"
 msgstr "sti: %1"
 
-#: ../src/GParted_Core.cc:1559 ../src/GParted_Core.cc:2778
+#: ../src/GParted_Core.cc:1801 ../src/GParted_Core.cc:2977
 msgid "start: %1"
 msgstr "start: %1"
 
-#: ../src/GParted_Core.cc:1560 ../src/GParted_Core.cc:2779
+#: ../src/GParted_Core.cc:1802 ../src/GParted_Core.cc:2978
 msgid "end: %1"
 msgstr "slutt: %1"
 
-#: ../src/GParted_Core.cc:1561 ../src/GParted_Core.cc:2780
+#: ../src/GParted_Core.cc:1803 ../src/GParted_Core.cc:2979
 msgid "size: %1 (%2)"
 msgstr "størrelse: %1 (%2)"
 
-#: ../src/GParted_Core.cc:1593 ../src/linux_swap.cc:83 ../src/xfs.cc:245
+#: ../src/GParted_Core.cc:1835 ../src/linux_swap.cc:165
 msgid "create new %1 file system"
 msgstr "lag nytt %1 filsystem"
 
-#: ../src/GParted_Core.cc:1626
+#: ../src/GParted_Core.cc:1876
 msgid "delete partition"
 msgstr "slett partisjon"
 
-#: ../src/GParted_Core.cc:1668
+#: ../src/GParted_Core.cc:1948
 msgid "Clear partition label on %1"
 msgstr "Tøm partisjonsetikett på %1"
 
-#: ../src/GParted_Core.cc:1673
+#: ../src/GParted_Core.cc:1953
 msgid "Set partition label to \"%1\" on %2"
 msgstr "Sett partisjonsetikett til «%1» på %2"
 
@@ -743,311 +751,311 @@
 #. * must be the same.  If the sector sizes of the old partition and the
 #. * new partition are the same, then the length in sectors must be the same.
 #. 
-#: ../src/GParted_Core.cc:1759
+#: ../src/GParted_Core.cc:2077
 msgid "moving requires old and new length to be the same"
-msgstr "flytting krever at lengden er uendret"
+msgstr "flytting krever at gammel og ny lengde er den samme"
 
-#: ../src/GParted_Core.cc:1789
+#: ../src/GParted_Core.cc:2107
 msgid "rollback last change to the partition table"
-msgstr "gå tilbake til forrige endring på partisjonstabellen"
+msgstr "rull tilbake siste endring i partisjonstabellen"
 
-#: ../src/GParted_Core.cc:1819
+#: ../src/GParted_Core.cc:2149
 msgid "move file system to the left"
 msgstr "flytt filsystem til venstre"
 
-#: ../src/GParted_Core.cc:1821
+#: ../src/GParted_Core.cc:2151
 msgid "move file system to the right"
 msgstr "flytt filsystem til høyre"
 
-#: ../src/GParted_Core.cc:1824
+#: ../src/GParted_Core.cc:2154
 msgid "move file system"
 msgstr "flytt filsystem"
 
-#: ../src/GParted_Core.cc:1826
+#: ../src/GParted_Core.cc:2156
 msgid ""
 "new and old file system have the same position.  Hence skipping this "
 "operation"
 msgstr ""
-"nytt og gammelt filsystem har samme plassering. Hopper derfor over denne "
+"Nytt og gammelt filsystem har samme plassering. Hopper derfor over denne "
 "operasjonen"
 
-#: ../src/GParted_Core.cc:1845
+#: ../src/GParted_Core.cc:2001
 msgid "perform real move"
-msgstr "gjennomfør virkelig flytting"
+msgstr "utfør reell flytting"
 
-#: ../src/GParted_Core.cc:1892
+#: ../src/GParted_Core.cc:2224
 msgid "using libparted"
 msgstr "bruker libparted"
 
-#: ../src/GParted_Core.cc:1932
+#: ../src/GParted_Core.cc:2267
 msgid "resizing requires old and new start to be the same"
-msgstr "endring av størrelse krever at startpunktet er uendret"
+msgstr "endring av størrelse krever at gammel og ny start er den samme"
 
-#: ../src/GParted_Core.cc:1997
+#: ../src/GParted_Core.cc:2334
 msgid "resize/move partition"
-msgstr "endre/flytt partisjon"
+msgstr "endre størrelse/flytt partisjon"
 
-#: ../src/GParted_Core.cc:2000
+#: ../src/GParted_Core.cc:2337
 msgid "move partition to the right"
-msgstr "flytt partisjon mot høyre"
+msgstr "flytt partisjonen til høyre"
 
-#: ../src/GParted_Core.cc:2003
+#: ../src/GParted_Core.cc:2340
 msgid "move partition to the left"
-msgstr "flytt partisjon mot venstre"
+msgstr "flytt partisjonen til venstre"
 
-#: ../src/GParted_Core.cc:2006
+#: ../src/GParted_Core.cc:2343
 msgid "grow partition from %1 to %2"
-msgstr "øk partisjon fra %1 til %2"
+msgstr "øk partisjonen fra %1 til %2"
 
-#: ../src/GParted_Core.cc:2009
+#: ../src/GParted_Core.cc:2346
 msgid "shrink partition from %1 to %2"
-msgstr "reduser partisjon fra %1 til %2"
+msgstr "krymp partisjonen fra %1 til %2"
 
-#: ../src/GParted_Core.cc:2012
+#: ../src/GParted_Core.cc:2349
 msgid "move partition to the right and grow it from %1 to %2"
-msgstr "flytt partisjon mot høyre og øk den fra %1 til %2"
+msgstr "flytt partisjonen til høyre og øk den fra %1 til %2"
 
-#: ../src/GParted_Core.cc:2015
+#: ../src/GParted_Core.cc:2352
 msgid "move partition to the right and shrink it from %1 to %2"
 msgstr "flytt partisjonen til høyre og krymp den fra %1 til %2"
 
-#: ../src/GParted_Core.cc:2018
+#: ../src/GParted_Core.cc:2355
 msgid "move partition to the left and grow it from %1 to %2"
-msgstr "flytt partisjonen til venstre og utvid den fra %1 til %2"
+msgstr "flytt partisjonen til venstre og øk den fra %1 til %2"
 
-#: ../src/GParted_Core.cc:2021
+#: ../src/GParted_Core.cc:2358
 msgid "move partition to the left and shrink it from %1 to %2"
 msgstr "flytt partisjonen til venstre og krymp den fra %1 til %2"
 
-#: ../src/GParted_Core.cc:2036
+#: ../src/GParted_Core.cc:2373
 msgid ""
 "new and old partition have the same size and position.  Hence skipping this "
 "operation"
 msgstr ""
-"ny og gammel partisjon har samme størrelse og plassering. Hopper derfor over "
+"Ny og gammel partisjon har samme størrelse og plassering. Hopper derfor over "
 "denne operasjonen"
 
-#: ../src/GParted_Core.cc:2046
+#: ../src/GParted_Core.cc:2383
 msgid "old start: %1"
 msgstr "gammel start: %1"
 
-#: ../src/GParted_Core.cc:2047
+#: ../src/GParted_Core.cc:2384
 msgid "old end: %1"
-msgstr "gammel ende: %1"
+msgstr "gammel slutt: %1"
 
-#: ../src/GParted_Core.cc:2048
+#: ../src/GParted_Core.cc:2385
 msgid "old size: %1 (%2)"
 msgstr "gammel størrelse: %1 (%2)"
 
-#: ../src/GParted_Core.cc:2110 ../src/GParted_Core.cc:2858
+#: ../src/GParted_Core.cc:2450 ../src/GParted_Core.cc:3058
 msgid "new start: %1"
 msgstr "ny start: %1"
 
-#: ../src/GParted_Core.cc:2111 ../src/GParted_Core.cc:2859
+#: ../src/GParted_Core.cc:2451 ../src/GParted_Core.cc:3059
 msgid "new end: %1"
 msgstr "ny slutt: %1"
 
-#: ../src/GParted_Core.cc:2112 ../src/GParted_Core.cc:2860
+#: ../src/GParted_Core.cc:2452 ../src/GParted_Core.cc:3060
 msgid "new size: %1 (%2)"
 msgstr "ny størrelse: %1 (%2)"
 
-#: ../src/GParted_Core.cc:2150
+#: ../src/GParted_Core.cc:2506
 msgid "shrink file system"
 msgstr "krymp filsystem"
 
-#: ../src/GParted_Core.cc:2154
+#: ../src/GParted_Core.cc:2510
 msgid "grow file system"
 msgstr "øk filsystem"
 
-#: ../src/GParted_Core.cc:2157
+#: ../src/GParted_Core.cc:2513
 msgid "resize file system"
 msgstr "endre størrelse på filsystem"
 
-#: ../src/GParted_Core.cc:2160
+#: ../src/GParted_Core.cc:2516
 msgid ""
 "new and old file system have the same size.  Hence skipping this operation"
 msgstr ""
-"nytt og gammelt filsystem har samme størrelse. Hopper derfor over denne "
+"Nytt og gammelt filsystem har samme størrelse. Hopper derfor over denne "
 "operasjonen"
 
-#: ../src/GParted_Core.cc:2195
+#: ../src/GParted_Core.cc:2557
 msgid "grow file system to fill the partition"
-msgstr "øk filsystemet til å fylle hele partisjonen"
+msgstr "øk filsystemet slik at det fyller partisjonen"
 
-#: ../src/GParted_Core.cc:2200
+#: ../src/GParted_Core.cc:2562
 msgid "growing is not available for this file system"
 msgstr "har ikke mulighet til å øke dette filsystemet"
 
-#: ../src/GParted_Core.cc:2219
+#: ../src/GParted_Core.cc:2597
 msgid "the destination is smaller than the source partition"
-msgstr "målpartisjonen er mindre enn kildepartisjonen"
+msgstr "målet er mindre enn kildepartisjonen"
 
-#: ../src/GParted_Core.cc:2236
+#: ../src/GParted_Core.cc:2614
 msgid "copy file system of %1 to %2"
-msgstr "kopier filsystem %1 til %2"
+msgstr "kopier filsystem fra %1 til %2"
 
-#: ../src/GParted_Core.cc:2280
+#: ../src/GParted_Core.cc:2478
 msgid "perform read-only test"
 msgstr "utfør skrivebeskyttet test"
 
-#: ../src/GParted_Core.cc:2334
+#: ../src/GParted_Core.cc:2712
 msgid "using internal algorithm"
 msgstr "bruker intern algoritme"
 
 #. TO TRANSLATORS: looks like  read 1.00 MiB
-#: ../src/GParted_Core.cc:2338
+#: ../src/GParted_Core.cc:2536
 msgid "read %1"
 msgstr "lest %1"
 
 #. TO TRANSLATORS: looks like  copy 1.00 MiB
-#: ../src/GParted_Core.cc:2340
+#: ../src/GParted_Core.cc:2715
 msgid "copy %1"
 msgstr "kopiert %1"
 
-#: ../src/GParted_Core.cc:2344
+#: ../src/GParted_Core.cc:2718
 msgid "finding optimal block size"
 msgstr "finner optimal blokkstørrelse"
 
-#: ../src/GParted_Core.cc:2384
+#: ../src/GParted_Core.cc:2759
 msgid "%1 seconds"
 msgstr "%1 sekunder"
 
 #. TO TRANSLATORS: looks like  optimal block size is 1.00 MiB
-#: ../src/GParted_Core.cc:2402
+#: ../src/GParted_Core.cc:2777
 msgid "optimal block size is %1"
 msgstr "optimal blokkstørrelse er %1"
 
 #. TO TRANSLATORS: looks like  1.00 MiB (1048576 B) read
-#: ../src/GParted_Core.cc:2420
+#: ../src/GParted_Core.cc:2618
 msgid "%1 (%2 B) read"
 msgstr "%1 (%2 B) lest"
 
 #. TO TRANSLATORS: looks like  1.00 MiB (1048576 B) copied
-#: ../src/GParted_Core.cc:2422
+#: ../src/GParted_Core.cc:2794
 msgid "%1 (%2 B) copied"
 msgstr "%1 (%2 B) kopiert"
 
-#: ../src/GParted_Core.cc:2435
+#: ../src/GParted_Core.cc:2827
 msgid "roll back last transaction"
-msgstr "omgjør forrige handling"
+msgstr "rull tilbake forrige transaksjon"
 
 #. TO TRANSLATORS: looks like   check file system on /dev/sda5 for errors and (if possible) fix them
-#: ../src/GParted_Core.cc:2464
+#: ../src/GParted_Core.cc:2841
 msgid "check file system on %1 for errors and (if possible) fix them"
-msgstr "let etter feil på %1 og (om mulig) reparer dem"
+msgstr "sjekk filsystem på %1 for feil og (hvis mulig) rett dem"
 
-#: ../src/GParted_Core.cc:2472
+#: ../src/GParted_Core.cc:2850
 msgid "checking is not available for this file system"
-msgstr "kontroll er ikke tilgjengelig for dette filsystemet"
+msgstr "sjekk er ikke tilgjengelig for dette filsystemet"
 
-#: ../src/GParted_Core.cc:2498
+#: ../src/GParted_Core.cc:2881
 msgid "set partition type on %1"
 msgstr "sett partisjonstype på %1"
 
-#: ../src/GParted_Core.cc:2528
+#: ../src/GParted_Core.cc:2918
 msgid "new partition type: %1"
 msgstr "ny partisjonstype: %1"
 
 #. TO TRANSLATORS: looks like  1.00 MiB of 16.00 MiB read (00:01:59 remaining)
-#: ../src/GParted_Core.cc:2557
+#: ../src/GParted_Core.cc:2760
 msgid "%1 of %2 read (%3 remaining)"
 msgstr "%1 av %2 lest (%3 gjenstår)"
 
 #. TO TRANSLATORS: looks like  1.00 MiB of 16.00 MiB copied (00:01:59 remaining)
-#: ../src/GParted_Core.cc:2559
+#: ../src/Copy_Blocks.cc:68
 msgid "%1 of %2 copied (%3 remaining)"
 msgstr "%1 av %2 kopiert (%3 gjenstår)"
 
 #. TO TRANSLATORS: looks like  1.00 MiB of 16.00 MiB read
-#: ../src/GParted_Core.cc:2567 ../src/GParted_Core.cc:2684
+#: ../src/GParted_Core.cc:2770 ../src/GParted_Core.cc:2887
 msgid "%1 of %2 read"
 msgstr "%1 av %2 lest"
 
 #. TO TRANSLATORS: looks like  1.00 MiB of 16.00 MiB copied
-#: ../src/GParted_Core.cc:2569 ../src/GParted_Core.cc:2686
+#: ../src/Copy_Blocks.cc:75 ../src/Copy_Blocks.cc:185
 msgid "%1 of %2 copied"
 msgstr "%1 av %2 kopiert"
 
 #. TO TRANSLATORS: looks like  read 16.00 MiB using a block size of 1.00 MiB
-#: ../src/GParted_Core.cc:2590
+#: ../src/GParted_Core.cc:2793
 msgid "read %1 using a block size of %2"
-msgstr "les %1 med blokkstørrelse på %2"
+msgstr "les %1 med blokkstørrelse %2"
 
 #. TO TRANSLATORS: looks like  copy 16.00 MiB using a block size of 1.00 MiB
-#: ../src/GParted_Core.cc:2595
+#: ../src/Copy_Blocks.cc:161
 msgid "copy %1 using a block size of %2"
-msgstr "kopier fra %1 med blokkstørrelse på %2"
+msgstr "kopier %1 med blokkstørrelse %2"
 
-#: ../src/GParted_Core.cc:2745
+#: ../src/Copy_Blocks.cc:235
 msgid "Error while writing block at sector %1"
-msgstr "En feil oppstod under skriving av blokk på sektor %1"
+msgstr "Feil ved skriving av blokk ved sektor %1"
 
-#: ../src/GParted_Core.cc:2748
+#: ../src/Copy_Blocks.cc:240
 msgid "Error while reading block at sector %1"
-msgstr "En feil oppstod under lesing av blokk på sektor %1"
+msgstr "Feil ved lesing av blokk ved sektor %1"
 
-#: ../src/GParted_Core.cc:2758
+#: ../src/GParted_Core.cc:2954
 msgid "calibrate %1"
 msgstr "kalibrer %1"
 
-#: ../src/GParted_Core.cc:2803
+#: ../src/GParted_Core.cc:3002
 msgid "calculate new size and position of %1"
-msgstr "regn ut ny størrelse og posisjon for %1"
+msgstr "beregn ny størrelse og plassering av %1"
 
-#: ../src/GParted_Core.cc:2807
+#: ../src/GParted_Core.cc:2479 ../src/GParted_Core.cc:3006
 msgid "requested start: %1"
 msgstr "forespurt start: %1"
 
-#: ../src/GParted_Core.cc:2808
+#: ../src/GParted_Core.cc:2480 ../src/GParted_Core.cc:3007
 msgid "requested end: %1"
 msgstr "forespurt slutt: %1"
 
-#: ../src/GParted_Core.cc:2809
+#: ../src/GParted_Core.cc:2481 ../src/GParted_Core.cc:3008
 msgid "requested size: %1 (%2)"
 msgstr "forespurt størrelse: %1 (%2)"
 
 #. TO TRANSLATORS: update boot sector of ntfs file system on /dev/sdd1
-#: ../src/GParted_Core.cc:2953
+#: ../src/GParted_Core.cc:3310
 msgid "update boot sector of %1 file system on %2"
 msgstr "oppdater oppstartssektor på filsystem %1 på %2"
 
 #. TO TRANSLATORS: looks like Error trying to write to boot sector in /dev/sdd1
-#: ../src/GParted_Core.cc:2989
+#: ../src/GParted_Core.cc:3346
 msgid "Error trying to write to boot sector in %1"
-msgstr "Feil ved skriving til bootsektor i %1"
+msgstr "Feil ved forsøk på å skrive til oppstartssektor i %1"
 
 #. TO TRANSLATORS: looks like Error trying to seek to position 0x1C in /dev/sdd1
-#: ../src/GParted_Core.cc:2995
+#: ../src/GParted_Core.cc:3352
 msgid "Error trying to seek to position 0x1c in %1"
-msgstr "Feil ved lesing av posisjon 0x1c i %1"
+msgstr "Feil ved forsøk på å søke til posisjon 0x1c i %1"
 
 #. TO TRANSLATORS: looks like Error trying to open /dev/sdd1
-#: ../src/GParted_Core.cc:3002
+#: ../src/GParted_Core.cc:3359
 msgid "Error trying to open %1"
-msgstr "Feil ved åpning av %1"
+msgstr "Feil ved forsøk på å åpne %1"
 
 #. TO TRANSLATORS: looks like Failed to set the number of hidden sectors to 05ab4f00 in the ntfs boot record.
-#: ../src/GParted_Core.cc:3012
+#: ../src/GParted_Core.cc:3369
 msgid ""
 "Failed to set the number of hidden sectors to %1 in the NTFS boot record."
 msgstr ""
-"Klarte ikke å sette inn skjulte sektorer til %1 i NTFS-partisjonssektoren."
+"Klarte ikke å sette antall skjulte sektorer til %1 i NTFS-oppstartsposten."
 
-#: ../src/GParted_Core.cc:3014
+#: ../src/GParted_Core.cc:3371
 msgid "You might try the following command to correct the problem:"
-msgstr "Du kan forsøke følgende kommando for å rette på problemet:"
+msgstr "Du kan prøve følgende kommando for å rette opp problemet:"
 
-#: ../src/HBoxOperations.cc:45 ../src/Win_GParted.cc:155
+#: ../src/HBoxOperations.cc:45 ../src/Win_GParted.cc:162
 msgid "_Undo Last Operation"
 msgstr "A_ngre siste operasjon"
 
-#: ../src/HBoxOperations.cc:50 ../src/Win_GParted.cc:161
+#: ../src/HBoxOperations.cc:50 ../src/Win_GParted.cc:168
 msgid "_Clear All Operations"
-msgstr "Av_bryt alle operasjoner"
+msgstr "_Tøm alle operasjoner"
 
-#: ../src/HBoxOperations.cc:55 ../src/Win_GParted.cc:166
+#: ../src/HBoxOperations.cc:55 ../src/Win_GParted.cc:173
 msgid "_Apply All Operations"
-msgstr "_Godta alle operasjoner"
+msgstr "_Aktiver alle operasjoner"
 
 #: ../src/OperationCopy.cc:37
 msgid "copy of %1"
@@ -1056,7 +1064,7 @@
 #. TO TRANSLATORS: looks like  Copy /dev/hda4 to /dev/hdd (start at 250 MiB)
 #: ../src/OperationCopy.cc:80
 msgid "Copy %1 to %2 (start at %3)"
-msgstr "Kopier %1 til %2 (start på %3)"
+msgstr "Kopier %1 til %2 (start ved %3)"
 
 #. TO TRANSLATORS: looks like  Copy /dev/hda4 to /dev/hdd1
 #: ../src/OperationCopy.cc:88
@@ -1066,12 +1074,12 @@
 #. TO TRANSLATORS: looks like  Check and repair file system (ext3) on /dev/hda4
 #: ../src/OperationCheck.cc:38
 msgid "Check and repair file system (%1) on %2"
-msgstr "Undersøk og reparer filsystemet (%1) på %2"
+msgstr "Sjekk og reparer filsystem (%1) på %2"
 
 #. TO TRANSLATORS: looks like   Create Logical Partition #1 (ntfs, 345 MiB) on /dev/hda
 #: ../src/OperationCreate.cc:88
 msgid "Create %1 #%2 (%3, %4) on %5"
-msgstr "Opprett %1 #%2 (%3, %4) på %5"
+msgstr "Lag %1 #%2 (%3, %4) på %5"
 
 #. TO TRANSLATORS: looks like   Delete /dev/hda2 (ntfs, 345 MiB) from /dev/hda
 #: ../src/OperationDelete.cc:82
@@ -1086,12 +1094,12 @@
 #. TO TRANSLATORS: looks like   Clear Partition Label on /dev/hda3
 #: ../src/OperationLabelPartition.cc:59
 msgid "Clear Partition Label on %1"
-msgstr "Tøm partisjons-etikett på %1"
+msgstr "Tøm partisjonsetikett på %1"
 
 #. TO TRANSLATORS: looks like   Set Partition Label "My Label" on /dev/hda3
 #: ../src/OperationLabelPartition.cc:63
 msgid "Set Partition Label \"%1\" on %2"
-msgstr "Sett partisjons-etikett til «%1» på %2"
+msgstr "Sett partisjonsetikett «%1» på %2"
 
 #: ../src/OperationResizeMove.cc:86
 msgid "resize/move %1"
@@ -1102,7 +1110,7 @@
 "new and old partition have the same size and position.  Hence continuing "
 "anyway"
 msgstr ""
-"nytt og gammelt filsystem har samme størrelse og plassering. Fortsetter"
+"Ny og gammel partisjon har samme størrelse og plassering. Fortsetter likevel"
 
 #: ../src/OperationResizeMove.cc:92
 msgid "Move %1 to the right"
@@ -1110,11 +1118,11 @@
 
 #: ../src/OperationResizeMove.cc:95
 msgid "Move %1 to the left"
-msgstr "Flytt %1 til venstre"
+msgstr "Flytt  %1 til venstre"
 
 #: ../src/OperationResizeMove.cc:98
 msgid "Grow %1 from %2 to %3"
-msgstr "Utvid %1 fra %2 til %3"
+msgstr "Øk %1 fra %2 til %3"
 
 #: ../src/OperationResizeMove.cc:101
 msgid "Shrink %1 from %2 to %3"
@@ -1122,19 +1130,19 @@
 
 #: ../src/OperationResizeMove.cc:104
 msgid "Move %1 to the right and grow it from %2 to %3"
-msgstr "Flytt %1 til høyre og utvid den fra %2 til %3"
+msgstr "Flytt %1 til høyre og øk det fra %2 til %3"
 
 #: ../src/OperationResizeMove.cc:107
 msgid "Move %1 to the right and shrink it from %2 to %3"
-msgstr "Flytt %1 til høyre og krymp den fra %2 til %3"
+msgstr "Flytt %1 til høyre og krymp det fra %2 til %3"
 
 #: ../src/OperationResizeMove.cc:110
 msgid "Move %1 to the left and grow it from %2 to %3"
-msgstr "Flytt %1 til venstre og øk den fra %2 til %3"
+msgstr "Flytt %1 til venstre og øk det fra %2 til %3"
 
 #: ../src/OperationResizeMove.cc:113
 msgid "Move %1 to the left and shrink it from %2 to %3"
-msgstr "Flytt %1 til venstre og reduser den fra %2 til %3"
+msgstr "Flytt %1 til venstre og krymp det fra %2 til %3"
 
 #. append columns
 #: ../src/TreeView_Detail.cc:35
@@ -1166,7 +1174,7 @@
 #. * not contain a recognized file system, and is in
 #. * other words unallocated.
 #. 
-#: ../src/Utils.cc:125
+#: ../src/Utils.cc:195
 msgid "unallocated"
 msgstr "ikke allokert"
 
@@ -1175,7 +1183,7 @@
 #. * not contain a file system known to GParted, and
 #. * is in other words unknown.
 #. 
-#: ../src/Utils.cc:132
+#: ../src/Utils.cc:202
 msgid "unknown"
 msgstr "ukjent"
 
@@ -1183,35 +1191,35 @@
 #. * means that the space within this partition will not
 #. * be formatted with a known file system by GParted.
 #. 
-#: ../src/Utils.cc:138
+#: ../src/Utils.cc:208
 msgid "unformatted"
 msgstr "ikke formatert"
 
-#: ../src/Utils.cc:155
+#: ../src/Utils.cc:234
 msgid "used"
 msgstr "brukt"
 
-#: ../src/Utils.cc:156
+#: ../src/Utils.cc:235
 msgid "unused"
 msgstr "ubrukt"
 
-#: ../src/Utils.cc:196
+#: ../src/Utils.cc:368
 msgid "%1 B"
 msgstr "%1 B"
 
-#: ../src/Utils.cc:201
+#: ../src/Utils.cc:373
 msgid "%1 KiB"
 msgstr "%1 KiB"
 
-#: ../src/Utils.cc:206
+#: ../src/Utils.cc:378
 msgid "%1 MiB"
 msgstr "%1 MiB"
 
-#: ../src/Utils.cc:211
+#: ../src/Utils.cc:383
 msgid "%1 GiB"
 msgstr "%1 GiB"
 
-#: ../src/Utils.cc:216
+#: ../src/Utils.cc:388
 msgid "%1 TiB"
 msgstr "%1 TiB"
 
@@ -1223,14 +1231,14 @@
 #. * then deleted by gparted.  Under normal circumstances a user should never
 #. * see this file.
 #. 
-#: ../src/Utils.cc:374
+#: ../src/Utils.cc:438
 msgid "# Temporary file created by gparted.  It may be deleted.\n"
-msgstr "# Midlertidig fil opprettet av gparted. Denne filen kan slettes.\n"
+msgstr "Midlertidig laget av gparted. Den kan bli slettet.\n"
 
 #. TO TRANSLATORS: looks like
 #. * Label operation failed:  Unable to write to temporary file /tmp/Y56ZZ3M13LM.
 #. 
-#: ../src/Utils.cc:386
+#: ../src/Utils.cc:450
 msgid "Label operation failed:  Unable to write to temporary file %1.\n"
 msgstr ""
 "Etikett-handling mislykket («Label operation»):  Kan ikke skrive til den "
@@ -1239,111 +1247,111 @@
 #. TO TRANSLATORS: looks like
 #. * Label operation failed:  Unable to create temporary file /tmp/Y56ZZ3M13LM.
 #. 
-#: ../src/Utils.cc:398
+#: ../src/Utils.cc:462
 msgid "Label operation failed:  Unable to create temporary file %1.\n"
 msgstr ""
 "Etikett-handling mislykket («Label operation»):  kunne ikke opprette "
 "midlertidig fil %1.\n"
 
-#: ../src/Win_GParted.cc:139
+#: ../src/Win_GParted.cc:146
 msgid "_Refresh Devices"
 msgstr "Oppdate_r enheter"
 
-#: ../src/Win_GParted.cc:145
+#: ../src/Win_GParted.cc:152
 msgid "_Devices"
 msgstr "_Enheter"
 
-#: ../src/Win_GParted.cc:150
+#: ../src/Win_GParted.cc:157
 msgid "_GParted"
 msgstr "_GParted"
 
-#: ../src/Win_GParted.cc:169
+#: ../src/Win_GParted.cc:177
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../src/Win_GParted.cc:174
+#: ../src/Win_GParted.cc:182
 msgid "Device _Information"
 msgstr "_Informasjon om enhet"
 
-#: ../src/Win_GParted.cc:176
+#: ../src/Win_GParted.cc:184
 msgid "Pending _Operations"
 msgstr "Utestående _operasjoner"
 
-#: ../src/Win_GParted.cc:177
+#: ../src/Win_GParted.cc:185
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/Win_GParted.cc:181
+#: ../src/Win_GParted.cc:189
 msgid "_File System Support"
 msgstr "Støtte for _filsystem"
 
-#: ../src/Win_GParted.cc:185
+#: ../src/Win_GParted.cc:193
 msgid "_Create Partition Table"
 msgstr "_Lag partisjonstabell"
 
-#: ../src/Win_GParted.cc:188
+#: ../src/Win_GParted.cc:196
 msgid "_Attempt Data Rescue"
-msgstr ""
+msgstr "_Forsøk gjenoppretting av data"
 
-#: ../src/Win_GParted.cc:191
+#: ../src/Win_GParted.cc:199
 msgid "_Device"
 msgstr "_Enhet"
 
-#: ../src/Win_GParted.cc:195
+#: ../src/Win_GParted.cc:203
 msgid "_Partition"
 msgstr "_Partisjon"
 
-#: ../src/Win_GParted.cc:200
+#: ../src/Win_GParted.cc:208
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../src/Win_GParted.cc:208
+#: ../src/Win_GParted.cc:216
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. TO TRANSLATORS: "New" is a tool bar item for partition actions.
-#: ../src/Win_GParted.cc:220
+#: ../src/Win_GParted.cc:228
 msgid "New"
 msgstr "Ny"
 
-#: ../src/Win_GParted.cc:225
+#: ../src/Win_GParted.cc:233
 msgid "Create a new partition in the selected unallocated space"
-msgstr "Opprett en ny partisjon på det valgte upartisjonerte området"
+msgstr "Lag en ny partisjon i valgt ikke-allokert plass"
 
-#: ../src/Win_GParted.cc:230
+#: ../src/Win_GParted.cc:238
 msgid "Delete the selected partition"
 msgstr "Slett valgt partisjon"
 
-#: ../src/Win_GParted.cc:252
+#: ../src/Win_GParted.cc:260
 msgid "Resize/Move the selected partition"
 msgstr "Endre størrelse på / flytt valgt partisjon"
 
-#: ../src/Win_GParted.cc:261
+#: ../src/Win_GParted.cc:269
 msgid "Copy the selected partition to the clipboard"
 msgstr "Koipier valgt partisjon til utklippstavlen"
 
-#: ../src/Win_GParted.cc:266
+#: ../src/Win_GParted.cc:274
 msgid "Paste the partition from the clipboard"
 msgstr "Lim inn partisjon fra utklippstavlen"
 
-#: ../src/Win_GParted.cc:278
+#: ../src/Win_GParted.cc:286
 msgid "Undo Last Operation"
 msgstr "Angre siste operasjon"
 
-#: ../src/Win_GParted.cc:286
+#: ../src/Win_GParted.cc:294
 msgid "Apply All Operations"
-msgstr "Gjennomfør alle operasjoner"
+msgstr "Aktiver alle operasjoner"
 
 #. TO TRANSLATORS: "_New" is a sub menu item for the partition menu.
-#: ../src/Win_GParted.cc:308
+#: ../src/Win_GParted.cc:317
 msgid "_New"
 msgstr "_Ny"
 
-#: ../src/Win_GParted.cc:324
+#: ../src/Win_GParted.cc:334
 msgid "_Resize/Move"
 msgstr "End_re størrelse/flytt"
 
-#: ../src/Win_GParted.cc:348
+#: ../src/Win_GParted.cc:358
 msgid "_Format to"
 msgstr "_Formater til"
 
@@ -1351,141 +1359,142 @@
 msgid "Unmount"
 msgstr "Avmonter"
 
-#: ../src/Win_GParted.cc:363
+#: ../src/Win_GParted.cc:374
 msgid "_Mount on"
 msgstr "_Monter på"
 
-#: ../src/Win_GParted.cc:370
+#: ../src/Win_GParted.cc:381
 msgid "M_anage Flags"
-msgstr "Beh_andle flagg"
+msgstr "H_åndter flagg"
 
-#: ../src/Win_GParted.cc:375
+#: ../src/Win_GParted.cc:386
 msgid "C_heck"
 msgstr "S_jekk"
 
-#: ../src/Win_GParted.cc:380
+#: ../src/Win_GParted.cc:391
 msgid "_Label"
 msgstr "_Etikett"
 
-#: ../src/Win_GParted.cc:442
+#: ../src/Win_GParted.cc:463
 msgid "Device Information"
 msgstr "Informasjon om enhet"
 
 #. model
-#: ../src/Win_GParted.cc:450
+#: ../src/Win_GParted.cc:471
 msgid "Model:"
 msgstr "Modell:"
 
 #. disktype
-#: ../src/Win_GParted.cc:487
+#: ../src/Win_GParted.cc:505
 msgid "Partition table:"
 msgstr "Partisjonstabell:"
 
 #. heads
-#: ../src/Win_GParted.cc:495
+#: ../src/Win_GParted.cc:513
 msgid "Heads:"
 msgstr "Hoder:"
 
 #. sectors/track
-#: ../src/Win_GParted.cc:503
+#: ../src/Win_GParted.cc:521
 msgid "Sectors/track:"
 msgstr "Sektorer/spor:"
 
 #. cylinders
-#: ../src/Win_GParted.cc:511
+#: ../src/Win_GParted.cc:529
 msgid "Cylinders:"
 msgstr "Sylindre:"
 
 #. sector size
-#: ../src/Win_GParted.cc:527
+#: ../src/Win_GParted.cc:545
 msgid "Sector size:"
 msgstr "Sektorstørrelse:"
 
-#: ../src/Win_GParted.cc:711
+#: ../src/Win_GParted.cc:724
 msgid "Could not add this operation to the list."
 msgstr "Kunne ikke legge til denne operasjonen i listen."
 
-#: ../src/Win_GParted.cc:736
+#: ../src/Win_GParted.cc:813
 msgid "%1 operation pending"
 msgid_plural "%1 operations pending"
-msgstr[0] "%1 operasjon gjenstår"
-msgstr[1] "%1 operasjoner gjenstår"
+msgstr[0] "%1 operasjon utestående"
+msgstr[1] "%1 operasjoner utestående"
 
-#: ../src/Win_GParted.cc:790
+#: ../src/Win_GParted.cc:906
 msgid "Quit GParted?"
 msgstr "Vil du avslutte GParted?"
 
-#: ../src/Win_GParted.cc:796 ../src/Win_GParted.cc:2051
+#: ../src/Win_GParted.cc:912
 msgid "%1 operation is currently pending."
 msgid_plural "%1 operations are currently pending."
-msgstr[0] "%1 operasjon gjenstår."
-msgstr[1] "%1 operasjoner gjenstår."
+msgstr[0] "%1 operasjon er utestående nå."
+msgstr[1] "%1 operasjoner er utestående nå."
 
-#: ../src/Win_GParted.cc:822
+#: ../src/FileSystem.cc:44
 msgid "_Unmount"
 msgstr "_Avmonter"
 
-#: ../src/Win_GParted.cc:847
+#: ../src/linux_swap.cc:31
 msgid "_Swapoff"
 msgstr "_Swapoff"
 
-#: ../src/Win_GParted.cc:853
+#. TO TRANSLATORS: these labels will be used in the partition menu
+#: ../src/linux_swap.cc:30
 msgid "_Swapon"
 msgstr "_Swapon"
 
-#: ../src/Win_GParted.cc:1047
+#: ../src/Win_GParted.cc:1221
 msgid "%1 - GParted"
 msgstr "%1 - GParted"
 
-#: ../src/Win_GParted.cc:1093
+#: ../src/Win_GParted.cc:1258
 msgid "Scanning all devices..."
-msgstr "Søker gjennom alle enheter..."
+msgstr "Søker gjennom alle enheter …"
 
-#: ../src/Win_GParted.cc:1138
+#: ../src/Win_GParted.cc:1305
 msgid "No devices detected"
 msgstr "Ingen enheter ble funnet"
 
 #. TO TRANSLATORS: looks like   No partition table found on device /dev/sda
-#: ../src/Win_GParted.cc:1219
+#: ../src/Win_GParted.cc:1386
 msgid "No partition table found on device %1"
 msgstr "Ingen partisjonstabell ble funnet på enhet %1"
 
-#: ../src/Win_GParted.cc:1224
+#: ../src/Win_GParted.cc:1391
 msgid "A partition table is required before partitions can be added."
 msgstr "En partisjonstabell kreves før partisjoner kan legges til."
 
-#: ../src/Win_GParted.cc:1226
+#: ../src/Win_GParted.cc:1393
 msgid "To create a new partition table choose the menu item:"
 msgstr "Velg fra menyen for å opprette en ny partisjonstabell:"
 
 #. TO TRANSLATORS: this message represents the menu item Create Partition Table under the Device menu.
-#: ../src/Win_GParted.cc:1229
+#: ../src/Win_GParted.cc:1396
 msgid "Device --> Create Partition Table."
-msgstr "Enhet --> Opprett partisjonstabell"
+msgstr "Enhet → Lag partisjonstabell."
 
-#: ../src/Win_GParted.cc:1265
+#: ../src/Win_GParted.cc:1368
 msgid "Unable to open GParted Manual help file."
-msgstr "Mislyktes åpning av GParted fil for brukermanual."
+msgstr "Kan ikke åpne brukerhåndbok for GParted."
 
-#: ../src/Win_GParted.cc:1281
+#: ../src/Win_GParted.cc:1384
 msgid "Documentation is not available."
-msgstr "Dokumentasjon ikke tilgjengelig."
+msgstr "Dokumentasjonen er ikke tilgjengelig."
 
-#: ../src/Win_GParted.cc:1286
+#: ../src/Win_GParted.cc:1453
 msgid "This build of gparted is configured without documentation."
 msgstr "Denne versjonen av gparted er satt opp uten dokumentasjon."
 
-#: ../src/Win_GParted.cc:1288
+#: ../src/Win_GParted.cc:1455
 msgid "Documentation is available at the project web site."
 msgstr "Dokumentasjon er tilgjengelig på prosjektets nettside."
 
-#: ../src/Win_GParted.cc:1309
+#: ../src/Win_GParted.cc:1476
 msgid "GNOME Partition Editor"
 msgstr "GNOME partisjonsredigering"
 
 #. TO TRANSLATORS: your name(s) here please, if there are more translators put newlines (\n) between the names.
 #. It's a good idea to provide the url of your translation team as well. Thanks!
-#: ../src/Win_GParted.cc:1325
+#: ../src/Win_GParted.cc:1504
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -1500,15 +1509,16 @@
 "  Morten Mytting Wang https://launchpad.net/~mortenmw\n"
 "  Runar Ingebrigtsen https://launchpad.net/~ringe\n"
 "  Thomas Amland https://launchpad.net/~amland\n"
-"  Thor K. H https://launchpad.net/~nitrolinken"
+"  Thor K. H. https://launchpad.net/~nitrolinken\n"
+"  Åka Sikrom https://launchpad.net/~akrosikam"
 
-#: ../src/Win_GParted.cc:1367
+#: ../src/Win_GParted.cc:1546
 msgid "It is not possible to create more than %1 primary partition"
 msgid_plural "It is not possible to create more than %1 primary partitions"
 msgstr[0] "Det er ikke mulig å opprette mer enn %1 primærpartisjon"
 msgstr[1] "Det er ikke mulig å opprette mer enn %1 primærpartisjoner"
 
-#: ../src/Win_GParted.cc:1379
+#: ../src/Win_GParted.cc:1558
 msgid ""
 "If you want more partitions you should first create an extended partition. "
 "Such a partition can contain other partitions. Because an extended partition "
@@ -1520,80 +1530,82 @@
 "utvided partisjon også er en primær partisjon, kan det være nødvendig å "
 "fjerne en primær partisjon først."
 
-#: ../src/Win_GParted.cc:1460
+#: ../src/Win_GParted.cc:1565
 msgid "Moving a partition might cause your operating system to fail to boot."
 msgstr ""
+"Det kan hende at operativsystemet ditt ikke vil starte opp hvis du flytter "
+"en partisjon."
 
 #. TO TRANSLATORS: looks like   You queued an operation to move the start sector of partition /dev/sda3.
-#: ../src/Win_GParted.cc:1468
+#: ../src/Win_GParted.cc:1649
 msgid ""
 "You have queued an operation to move the start sector of partition %1."
 msgstr ""
+"Du har lagt til flytting av startsektor for partisjon %1 i arbeidskøen."
 
-#: ../src/Win_GParted.cc:1473
+#: ../src/Win_GParted.cc:1654
 msgid ""
 "You can learn how to repair the boot configuration in the GParted FAQ."
 msgstr ""
+"Se GParted-FAQ-en for å lære hvordan du reparerer oppstartskonfigurasjonen."
 
-#: ../src/Win_GParted.cc:1544
+#: ../src/Win_GParted.cc:1657
 msgid "You have pasted into an existing partition."
 msgstr "Du har limt inn i en eksisterende partisjon."
 
-#. TO TRANSLATORS: looks like   The data in /dev/sda3 will be lost if you apply this operation.
-#: ../src/Win_GParted.cc:1551
+#: ../src/Win_GParted.cc:1772
 msgid "The data in %1 will be lost if you apply this operation."
 msgstr "Data på %1 vil tapes vis du utfører denne operasjonen."
 
-#: ../src/Win_GParted.cc:1606
+#: ../src/Win_GParted.cc:1839
 msgid "Unable to delete %1!"
 msgstr "Kan ikke slette %1!"
 
-#: ../src/Win_GParted.cc:1613
+#: ../src/Win_GParted.cc:1846
 msgid "Please unmount any logical partitions having a number higher than %1"
-msgstr ""
-"Vennligst avmontèr alle logiske partisjoner som har et nummer større enn %1"
+msgstr "Avmonter alle logiske partisjoner som har et nummer større enn %1"
 
-#: ../src/Win_GParted.cc:1624
+#: ../src/Win_GParted.cc:1857
 msgid "Are you sure you want to delete %1?"
 msgstr "Er du sikker på at du vil slette %1?"
 
-#: ../src/Win_GParted.cc:1631
+#: ../src/Win_GParted.cc:1864
 msgid "After deletion this partition is no longer available for copying."
 msgstr ""
 "Etter slettingen av denne partisjonen vil den ikke lenge være tilgjenglig "
 "for kopiering."
 
 #. TO TRANSLATORS: dialogtitle, looks like   Delete /dev/hda2 (ntfs, 2345 MiB)
-#: ../src/Win_GParted.cc:1634
+#: ../src/Win_GParted.cc:1867
 msgid "Delete %1 (%2, %3)"
 msgstr "Slett %1 (%2, %3)"
 
 #. TO TRANSLATORS: looks like
 #. * Cannot format this file system to fat16.
 #. 
-#: ../src/Win_GParted.cc:1704
+#: ../src/Win_GParted.cc:1822
 msgid "Cannot format this file system to %1."
 msgstr "Kan ikke formatere dette filsystemet til %1."
 
 #. TO TRANSLATORS: looks like
 #. * A fat16 file system requires a partition of at least 16.00 MiB.
 #. 
-#: ../src/Win_GParted.cc:1716
+#: ../src/Win_GParted.cc:1964
 msgid "A %1 file system requires a partition of at least %2."
 msgstr "Et %1 filsystem krever en partisjon på minst %2."
 
 #. TO TRANSLATORS: looks like
 #. * A partition with a hfs file system has a maximum size of 2.00 GiB.
 #. 
-#: ../src/Win_GParted.cc:1724
+#: ../src/Win_GParted.cc:1972
 msgid "A partition with a %1 file system has a maximum size of %2."
 msgstr "En partisjon med et %1 filsystem har en maksimumsstørrelse på %2."
 
-#: ../src/Win_GParted.cc:1810
+#: ../src/Win_GParted.cc:2068
 msgid "The partition could not be unmounted from the following mount points:"
 msgstr "Partisjonen kunne ikke avmonteres fra følgende monteringspunkter:"
 
-#: ../src/Win_GParted.cc:1812
+#: ../src/Win_GParted.cc:2070
 msgid ""
 "Most likely other partitions are also mounted on these mount points. You are "
 "advised to unmount them manually."
@@ -1601,100 +1613,112 @@
 "Sannsynligvis er også andre partisjoner montert på disse monteringspunktene. "
 "Det anbefales at du avmonterer disse manuelt."
 
-#: ../src/Win_GParted.cc:1869 ../src/Win_GParted.cc:1953
+#: ../src/Win_GParted.cc:1995 ../src/Win_GParted.cc:2079
 msgid "%1 operation is currently pending for partition %2."
 msgid_plural "%1 operations are currently pending for partition %2."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%1 handling står i kø for partisjon %2."
+msgstr[1] "%1 handlinger står i kø for partisjon %2."
 
-#: ../src/Win_GParted.cc:1883
+#: ../src/Win_GParted.cc:2110
 msgid ""
 "The swapon action cannot be performed if an operation is pending for the "
 "partition."
 msgstr ""
+"Du kan ikke bruke swapon på en partisjon som er i ferd med å bli endret."
 
-#: ../src/Win_GParted.cc:1885
+#: ../src/Win_GParted.cc:2112
 msgid ""
 "Use the Edit menu to undo, clear, or apply operations before using swapon "
 "with this partition."
 msgstr ""
+"Bruk Rediger-menyen for å angre, tømme eller utføre operasjonskøen før du "
+"bruker swapon med denne partisjonen."
 
-#: ../src/Win_GParted.cc:1903
+#: ../src/Win_GParted.cc:2129
 msgid "Deactivating swap on %1"
 msgstr "Deaktiverer swap på %1"
 
-#: ../src/Win_GParted.cc:1903
+#: ../src/Win_GParted.cc:2129
 msgid "Activating swap on %1"
 msgstr "Aktiverer vekselminne (swap) på %1"
 
-#: ../src/Win_GParted.cc:1910
+#: ../src/Win_GParted.cc:2144
 msgid "Could not deactivate swap"
 msgstr "Kunne ikke deaktivere swap"
 
-#: ../src/Win_GParted.cc:1910
+#: ../src/Win_GParted.cc:2144
 msgid "Could not activate swap"
 msgstr "Kunne ikke aktivere vekselminne (swap)"
 
-#: ../src/Win_GParted.cc:1926
+#: ../src/Win_GParted.cc:2192
 msgid "Unmounting %1"
 msgstr "Avmonterer %1"
 
-#: ../src/Win_GParted.cc:1931
+#: ../src/Win_GParted.cc:2198
 msgid "Could not unmount %1"
 msgstr "Kunne ikke avmontere %1"
 
-#: ../src/Win_GParted.cc:1967
+#: ../src/Win_GParted.cc:2234
 msgid ""
 "The mount action cannot be performed if an operation is pending for the "
 "partition."
-msgstr ""
+msgstr "Du kan ikke montere en partisjon som er i ferd med å bli endret."
 
-#: ../src/Win_GParted.cc:1969
+#: ../src/Win_GParted.cc:2236
 msgid ""
 "Use the Edit menu to undo, clear, or apply operations before using mount "
 "with this partition."
 msgstr ""
+"Bruk Rediger-menyen for å angre, tømme eller utføre operasjonskøen før du "
+"monterer denne partisjonen."
 
-#: ../src/Win_GParted.cc:1987
+#: ../src/Win_GParted.cc:2246
 msgid "mounting %1 on %2"
 msgstr "monterer %1 på %2"
 
-#: ../src/Win_GParted.cc:1994
+#: ../src/Win_GParted.cc:2257
 msgid "Could not mount %1 on %2"
 msgstr "Kunne ikke montere %1 på %2"
 
 #. TO TRANSLATORS: Singular case looks like  1 partition is currently active on device /dev/sda.
-#: ../src/Win_GParted.cc:2020
+#: ../src/Win_GParted.cc:2146
 msgid "%1 partition is currently active on device %2."
 msgid_plural "%1 partitions are currently active on device %2."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%1 partisjon er aktiv på enheten %2"
+msgstr[1] "%1 partisjoner er aktive på enheten %2"
 
-#: ../src/Win_GParted.cc:2035
+#: ../src/Win_GParted.cc:2298
 msgid ""
 "A new partition table cannot be created when there are active partitions."
 msgstr ""
+"Du kan ikke opprette en ny partisjonstabell når det finnes aktive "
+"partisjoner."
 
-#: ../src/Win_GParted.cc:2037
+#: ../src/Win_GParted.cc:2300
 msgid ""
 "Active partitions are those that are in use, such as a mounted file system, "
 "or enabled swap space."
 msgstr ""
+"Aktive partisjoner vil si partisjoner som er i bruk, som for eksempel "
+"monterte filsystemer og/eller et aktivt vekselminneområde."
 
-#: ../src/Win_GParted.cc:2039
+#: ../src/Win_GParted.cc:2302
 msgid ""
 "Use Partition menu options, such as unmount or swapoff, to deactivate all "
 "partitions on this device before creating a new partition table."
 msgstr ""
+"Bruk valgene under Partisjon-menyen - som for eksempel avmonter eller "
+"swapoff - for å deaktivere alle partisjonene på enheten før du oppretter en "
+"ny partisjonstabell."
 
-#: ../src/Win_GParted.cc:2064
+#: ../src/Win_GParted.cc:2327
 msgid ""
 "A new partition table cannot be created when there are pending operations."
 msgstr ""
 "En ny partisjonstabell kan ikke opprettes når det er flere operasjoner som "
 "står i kø."
 
-#: ../src/Win_GParted.cc:2066
+#: ../src/Win_GParted.cc:2329
 msgid ""
 "Use the Edit menu to either clear or apply all operations before creating a "
 "new partition table."
@@ -1702,71 +1726,75 @@
 "Bruk Rediger-menyen for enten å fjerne eller utføre alle operasjoner før en "
 "ny partisjonstabell opprettes."
 
-#: ../src/Win_GParted.cc:2081
+#: ../src/Win_GParted.cc:2207
 msgid "Error while creating partition table."
-msgstr "Feil ved opprettelse av partisjonstabell."
+msgstr "Feil ved oppretting av partisjonstabell."
 
-#: ../src/Win_GParted.cc:2101
+#: ../src/Win_GParted.cc:2364
 msgid "Command gpart was not found"
-msgstr ""
+msgstr "Kommando gpart ble ikke funnet"
 
-#: ../src/Win_GParted.cc:2102
+#: ../src/Win_GParted.cc:2365
 msgid "This feature uses gpart. Please install gpart and try again."
 msgstr ""
+"Denne funksjonen krever at gpart er installert. Installer gpart og prøv "
+"igjen."
 
 #. Dialog information
-#: ../src/Win_GParted.cc:2110
+#: ../src/Win_GParted.cc:2373
 msgid "A full disk scan is needed to find file systems."
-msgstr ""
+msgstr "Du må søke gjennom hele disken for å finne filsystemene på den."
 
-#: ../src/Win_GParted.cc:2112
+#: ../src/Win_GParted.cc:2375
 msgid "The scan might take a very long time."
-msgstr ""
+msgstr "Søket kan ta veldig lang tid."
 
-#: ../src/Win_GParted.cc:2114
+#: ../src/Win_GParted.cc:2377
 msgid ""
 "After the scan you can mount any discovered file systems and copy the data "
 "to other media."
 msgstr ""
+"Etter søket kan du montere oppdagede filsystemer og kopiere dataene til "
+"andre medier."
 
-#: ../src/Win_GParted.cc:2116
+#: ../src/Win_GParted.cc:2379
 msgid "Do you want to continue?"
-msgstr ""
+msgstr "Vil du fortsette?"
 
 #. TO TRANSLATORS: looks like	Search for file systems on /deb/sdb
-#: ../src/Win_GParted.cc:2120
+#: ../src/Win_GParted.cc:2383
 msgid "Search for file systems on %1"
-msgstr ""
+msgstr "Søk etter filsystemer på %1"
 
 #. TO TRANSLATORS: looks like	Searching for file systems on /deb/sdb
-#: ../src/Win_GParted.cc:2134
+#: ../src/Win_GParted.cc:2394
 msgid "Searching for file systems on %1"
-msgstr ""
+msgstr "Søker etter filsystemer på %1"
 
 #. TO TRANSLATORS: looks like	No file systems found on /deb/sdb
-#: ../src/Win_GParted.cc:2148
+#: ../src/Win_GParted.cc:2410
 msgid "No file systems found on %1"
-msgstr ""
+msgstr "Ingen filsystemer funnet på %1"
 
-#: ../src/Win_GParted.cc:2149
+#: ../src/Win_GParted.cc:2411
 msgid ""
 "The disk scan by gpart did not find any recognizable file systems on this "
 "disk."
-msgstr ""
+msgstr "Fant ingen kjente filsystemer på denne disken ved å søke med gpart."
 
-#: ../src/Win_GParted.cc:2319
+#: ../src/Win_GParted.cc:2645
 msgid "Are you sure you want to apply the pending operations?"
-msgstr "Er du sikker på at du vil utføre de ventende oppgavene?"
+msgstr "Er du sikker på at du vil aktivere utestående operasjoner?"
 
-#: ../src/Win_GParted.cc:2325
+#: ../src/Win_GParted.cc:2651
 msgid "Editing partitions has the potential to cause LOSS of DATA."
 msgstr "Endre partisjonen medfører risiko for TAP AV DATA."
 
-#: ../src/Win_GParted.cc:2327
+#: ../src/Win_GParted.cc:2653
 msgid "You are advised to backup your data before proceeding."
 msgstr "Det anbefales å ta sikkerhetskopi av data før du fortsetter."
 
-#: ../src/Win_GParted.cc:2329
+#: ../src/Win_GParted.cc:2655
 msgid "Apply operations to device"
 msgstr "Utfør operasjoner på enhet"
 
@@ -1792,22 +1820,26 @@
 msgstr "fjern midlertidig monteringspunkt (%1)"
 
 #. TO TRANSLATORS: looks like   Partition move action skipped because linux-swap file system does not contain data
-#: ../src/linux_swap.cc:105
+#: ../src/linux_swap.cc:187
 msgid ""
 "Partition move action skipped because %1 file system does not contain data"
 msgstr ""
+"Partisjonen blir ikke flyttet, fordi filsystemet av typen %1 ikke inneholder "
+"data"
 
 #. TO TRANSLATORS: looks like   Partition copy action skipped because linux-swap file system does not contain data
-#: ../src/linux_swap.cc:124
+#: ../src/linux_swap.cc:206
 msgid ""
 "Partition copy action skipped because %1 file system does not contain data"
 msgstr ""
+"Partisjonen blir ikke kopiert, fordi filsystemet av typen %1 ikke inneholder "
+"data"
 
-#: ../src/main.cc:38
+#: ../src/main.cc:43
 msgid "Root privileges are required for running GParted"
 msgstr "Administrativer rettigheter er nødvendig for å kjøre GParted"
 
-#: ../src/main.cc:43
+#: ../src/main.cc:48
 msgid ""
 "Since GParted is a powerful tool capable of destroying partition tables and "
 "vast amounts of data, only root may run it."
@@ -1817,14 +1849,14 @@
 "administrator."
 
 #. simulation..
-#: ../src/ntfs.cc:125
+#: ../src/ntfs.cc:213
 msgid "run simulation"
 msgstr "kjør simulering"
 
 #. real resize
-#: ../src/ntfs.cc:132
+#: ../src/ntfs.cc:220
 msgid "real resize"
-msgstr "virkelig størrelse"
+msgstr "reell endring av størrelse"
 
 #. grow the mounted file system..
 #: ../src/xfs.cc:168
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gsettings-desktop-schemas.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gsettings-desktop-schemas.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gsettings-desktop-schemas.po	2013-01-29 09:33:53.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gsettings-desktop-schemas.po	2014-01-07 06:37:38.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:29+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:26+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../schemas/org.gnome.desktop.a11y.applications.gschema.xml.in.in.h:1
@@ -214,102 +214,102 @@
 "contents are scrolled into view."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:3
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:7
 msgid "Screen position"
 msgstr "Skjermposisjon"
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:4
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:8
 msgid ""
 "The magnified view either fills the entire screen, or occupies the top-half, "
 "bottom-half, left-half, or right-half of the screen."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:5
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:9
 msgid "Magnification factor"
 msgstr "Forstørrelsesfaktor"
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:6
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:10
 msgid ""
 "The power of the magnification. A value of 1.0 means no magnification. A "
 "value of 2.0 doubles the size."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:7
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:11
 msgid "Enable lens mode"
 msgstr "Slå på linsemodus"
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:8
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:12
 msgid ""
 "Whether the magnified view should be centered over the location of the "
 "system mouse and move with it."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:9
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:13
 msgid "Scroll magnified contents beyond the edges of the desktop"
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:10
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:14
 msgid ""
 "For centered mouse tracking, when the system pointer is at or near the edge "
 "of the screen, the magnified contents continue to scroll such that the "
 "screen edge moves into the magnified view."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:11
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:15
 msgid "Show or hide crosshairs"
-msgstr ""
+msgstr "Vis eller skjul trådkors"
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:12
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:16
 msgid ""
 "Enables/disables display of crosshairs centered on the magnified mouse "
 "sprite."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:13
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:17
 msgid "Thickness of the crosshairs in pixels"
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:14
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:18
 msgid ""
 "Width in pixels of the vertical and horizontal lines that make up the "
 "crosshairs."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:15
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:19
 msgid "Color of the crosshairs"
-msgstr ""
+msgstr "Farge på trådkors"
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:16
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:20
 msgid ""
 "The color of the the vertical and horizontal lines that make up the "
 "crosshairs."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:17
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:21
 msgid "Opacity of the crosshairs"
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:18
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:22
 msgid ""
 "Determines the transparency of the crosshairs, from fully opaque to fully "
 "transparent."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:19
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:23
 msgid "Length of the crosshairs in pixels"
-msgstr ""
+msgstr "Lengde på trådkors i piksler"
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:20
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:24
 msgid ""
 "Determines the length in pixels of the vertical and horizontal lines that "
 "make up the crosshairs."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:21
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:25
 msgid "Clip the crosshairs at the center"
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:22
+#: ../schemas/org.gnome.desktop.a11y.magnifier.gschema.xml.in.in.h:26
 msgid ""
 "Determines whether the crosshairs intersect the magnified mouse sprite, or "
 "are clipped such that the ends of the horizontal and vertical lines surround "
@@ -322,7 +322,7 @@
 
 #: ../schemas/org.gnome.desktop.a11y.mouse.gschema.xml.in.in.h:2
 msgid "Time in seconds before a click is triggered."
-msgstr ""
+msgstr "Tid i sekunder før et klikk utløses."
 
 #: ../schemas/org.gnome.desktop.a11y.mouse.gschema.xml.in.in.h:3
 msgid "Movement threshold"
@@ -415,10 +415,12 @@
 msgstr "La GNOME tegne skrivebordsbakgrunnen."
 
 #: ../schemas/org.gnome.desktop.background.gschema.xml.in.in.h:3
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:27
 msgid "Picture Options"
 msgstr "Alternativer for bilde"
 
 #: ../schemas/org.gnome.desktop.background.gschema.xml.in.in.h:4
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:28
 msgid ""
 "Determines how the image set by wallpaper_filename is rendered. Possible "
 "values are \"none\", \"wallpaper\", \"centered\", \"scaled\", \"stretched\", "
@@ -429,38 +431,45 @@
 "«spanned»."
 
 #: ../schemas/org.gnome.desktop.background.gschema.xml.in.in.h:5
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:29
 msgid "Picture URI"
 msgstr "URI for bildet"
 
-#: ../schemas/org.gnome.desktop.background.gschema.xml.in.in.h:6
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:30
 msgid ""
 "URI to use for the background image. Not that the backend only supports "
 "local (file://) URIs."
 msgstr ""
 
 #: ../schemas/org.gnome.desktop.background.gschema.xml.in.in.h:7
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:31
 msgid "Picture Opacity"
 msgstr "Ugjennomsiktighet for bildet"
 
 #: ../schemas/org.gnome.desktop.background.gschema.xml.in.in.h:8
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:32
 msgid "Opacity with which to draw the background picture."
 msgstr "Ugjennomsiktighet for tegning av bakgrunnsbildet."
 
 #: ../schemas/org.gnome.desktop.background.gschema.xml.in.in.h:9
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:33
 msgid "Primary Color"
 msgstr "Primærfarge"
 
 #: ../schemas/org.gnome.desktop.background.gschema.xml.in.in.h:10
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:34
 msgid "Left or Top color when drawing gradients, or the solid color."
 msgstr ""
 "Venstre eller øverste farge ved tegning av gradienter, eller den helfylte "
 "fargen."
 
 #: ../schemas/org.gnome.desktop.background.gschema.xml.in.in.h:11
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:35
 msgid "Secondary Color"
 msgstr "Sekundærfarge"
 
 #: ../schemas/org.gnome.desktop.background.gschema.xml.in.in.h:12
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:36
 msgid ""
 "Right or Bottom color when drawing gradients, not used for solid color."
 msgstr ""
@@ -468,10 +477,12 @@
 "farge."
 
 #: ../schemas/org.gnome.desktop.background.gschema.xml.in.in.h:13
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:37
 msgid "Color Shading Type"
 msgstr "Type skyggelegging av farger"
 
 #: ../schemas/org.gnome.desktop.background.gschema.xml.in.in.h:14
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:38
 msgid ""
 "How to shade the background color. Possible values are \"horizontal\", "
 "\"vertical\", and \"solid\"."
@@ -696,61 +707,61 @@
 "Factor used to enlarge or reduce text display, without changing font size."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:37
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:39
 msgid "GTK IM Preedit Style"
 msgstr "GTK IM forhåndsredigeringsstil"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:38
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:40
 msgid "Name of the GTK+ input method Preedit Style used by gtk+."
 msgstr ""
 "Navn på forhåndsredigeringsstil for inndatametode som brukes av gtk+."
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:39
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:41
 msgid "GTK IM Status Style"
 msgstr "GTK IM statusstil"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:40
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:42
 msgid "Name of the GTK+ input method Status Style used by gtk+."
 msgstr "Navn på statusstil for inndatametode som brukes av gtk+."
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:41
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:43
 msgid "GTK IM Module"
 msgstr "GTK IM-modul"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:42
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:44
 msgid "Name of the input method module used by GTK+."
 msgstr "Navn på modul for inndatametode som brukes av GTK+."
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:43
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:45
 msgid "Document font"
 msgstr "Skrift for dokument"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:44
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:46
 msgid "Name of the default font used for reading documents."
 msgstr "Navn på forvalgt skrift som brukes for visning av dokumenter."
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:45
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:47
 msgid "Monospace font"
 msgstr "Skrift med lik tegnavstand"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:46
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:48
 msgid ""
 "Name of a monospaced (fixed-width) font for use in locations like terminals."
 msgstr "Navn på en skrift med lik tegnavstand for bruk i f.eks. terminaler."
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:47
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:49
 msgid "Menubar accelerator"
 msgstr "Hurtigtast for menylinje"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:48
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:50
 msgid "Keyboard shortcut to open the menu bars."
 msgstr "Tastatursnarvei for å åpne menylinjene."
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:49
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:51
 msgid "Show the 'Input Methods' menu"
 msgstr "Vis menyen «Inndatametoder»"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:50
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:52
 msgid ""
 "Whether the context menus of entries and text views should offer to change "
 "the input method."
@@ -758,11 +769,11 @@
 "Om kontekstmeny for oppføringer og tekstvisninger skal vise alternativer for "
 "å bytte inndatametode."
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:51
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:53
 msgid "Show the 'Unicode Control Character' menu"
 msgstr "Vis menyen «Unicode kontrolltegn»"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:52
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:54
 msgid ""
 "Whether the context menus of entries and text views should offer to insert "
 "control characters."
@@ -770,89 +781,89 @@
 "Om kontekstmeny for oppføringer og tekstvisninger skal vise alternativer for "
 "å sette inn Unicode kontrolltegn."
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:53
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:55
 msgid "Cursor theme"
 msgstr "Tema for markør"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:54
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:56
 msgid ""
 "Cursor theme name. Used only by Xservers that support the Xcursor extension."
 msgstr ""
 "Navn på markørtema. Brukes kun av X-tjenere som støtter Xcursor-utvidelsen."
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:55
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:57
 msgid "Cursor size"
 msgstr "Markørstørrelse"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:56
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:58
 msgid "Size of the cursor used as cursor theme."
 msgstr "Størrelse på markøren referert til av markørtema."
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:57
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:59
 msgid "Timeout before click repeat"
 msgstr "Tidsavbrudd før gjentakelse av klikk"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:58
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:60
 msgid ""
 "Timeout in milliseconds before a click starts repeating (on spinner buttons "
 "for example)."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:59
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:61
 msgid "Timeout between click repeats"
 msgstr "Tidsavbrudd mellom gjentakelse av klikk"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:60
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:62
 msgid ""
 "Timeout in milliseconds between repeated clicks when a button is left "
 "pressed."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:61
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:63
 msgid "Palette used in the color selector"
 msgstr "Palett som brukes i fargevelger"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:62
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:64
 msgid ""
 "Palette used in the color selector as defined by the 'gtk-color-palette' "
 "setting"
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:63
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:65
 msgid "List of symbolic names and color equivalents"
 msgstr "Liste med symbolske navn og fargeekvivalenter"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:64
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:66
 msgid ""
 "A '\\n' separated list of \"name:color\" as defined by the 'gtk-color-"
 "scheme' setting"
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:65
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:67
 msgid "Whether the clock displays in 24h or 12h format"
 msgstr "Om klokken vises i 12-timers eller 24-timers format"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:66
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:68
 msgid "Whether the clock shows seconds"
 msgstr "Om klokken skal vise sekunder"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:67
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:69
 msgid "If true, display seconds in the clock."
 msgstr "Vis sekunder i klokken hvis «true»."
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:68
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:70
 msgid "Show date in clock"
 msgstr "Vis dato i klokken"
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:69
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:71
 msgid "If true, display date in the clock, in addition to time."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:70
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:74
 msgid "Only show mnemonics on when the Alt key is pressed"
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:71
+#: ../schemas/org.gnome.desktop.interface.gschema.xml.in.in.h:75
 msgid ""
 "Whether mnemonics should be automatically shown and hidden when the user "
 "presses the Alt key."
@@ -1043,15 +1054,15 @@
 "The number of seconds after screensaver activation before locking the screen."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:9
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:11
 msgid "Lock on suspend"
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:10
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:12
 msgid "Set this to TRUE to lock the screen when the system suspends."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:11
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:13
 msgid "Allow embedding a keyboard into the window"
 msgstr ""
 
@@ -1062,7 +1073,7 @@
 "command."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:13
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:15
 msgid "Embedded keyboard command"
 msgstr ""
 
@@ -1074,7 +1085,7 @@
 "output."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:15
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:17
 msgid "Allow logout"
 msgstr "Tillat utlogging"
 
@@ -1084,7 +1095,7 @@
 "out after a delay. The delay is specified in the \"logout_delay\" key."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:17
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:19
 msgid "Time before logout option"
 msgstr ""
 
@@ -1095,7 +1106,7 @@
 "\"logout_enable\" key is set to TRUE."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:19
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:21
 msgid "Logout command"
 msgstr "Kommando for utlogging"
 
@@ -1106,17 +1117,17 @@
 "the \"logout_enable\" key is set to TRUE."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:21
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:23
 msgid "Allow user switching"
 msgstr "Tillat brukerbytting"
 
-#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:22
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:24
 msgid ""
 "Set this to TRUE to offer an option in the unlock dialog to switch to a "
 "different user account."
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:23
+#: ../schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.h:25
 msgid "Allow the session status message to be displayed"
 msgstr ""
 
@@ -1127,7 +1138,7 @@
 
 #: ../schemas/org.gnome.desktop.session.gschema.xml.in.in.h:1
 msgid "Time before session is considered idle"
-msgstr ""
+msgstr "Tid før økten ses på som ikke i bruk"
 
 #: ../schemas/org.gnome.desktop.session.gschema.xml.in.in.h:2
 msgid ""
@@ -1277,47 +1288,47 @@
 msgid "Reverse switch applications"
 msgstr "Baklengs bytte av programmer"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:21
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:23
 msgid "Switch system controls"
 msgstr "Bytt systemkontroller"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:22
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:24
 msgid "Reverse switch system controls"
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:23
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:25
 msgid "Switch windows of an app directly"
 msgstr "Bytt vinduer i et program direkte"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:24
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:26
 msgid "Reverse switch windows of an app directly"
 msgstr "Bytt vinduer i et program baklengs direkte"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:25
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:27
 msgid "Switch windows directly"
 msgstr "Bytt vinduer direkte"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:26
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:28
 msgid "Reverse switch windows directly"
 msgstr "Bytt vinduer baklengs direkte"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:27
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:29
 msgid "Switch system controls directly"
 msgstr "Bytt systemkontroller direkte"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:28
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:30
 msgid "Reverse switch system controls directly"
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:29
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:31
 msgid "Hide all normal windows"
 msgstr "Skjul alle normale vinduer"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:30
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:32
 msgid "Show the activities overview"
 msgstr "Vis aktivitetsoversikten"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:31
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:33
 msgid "Show the run command prompt"
 msgstr "Vis kjør program"
 
@@ -1325,171 +1336,171 @@
 msgid "Don&apos;t use"
 msgstr "Ikke bruk"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:33
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:35
 msgid "Activate the window menu"
 msgstr "Aktiver vindusmenyen"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:34
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:36
 msgid "Toggle fullscreen mode"
 msgstr "Slå av/på fullskjermmodus"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:35
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:37
 msgid "Toggle maximization state"
-msgstr ""
+msgstr "Slå av/på maksimert tilstand"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:36
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:38
 msgid "Toggle window always appearing on top"
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:37
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:39
 msgid "Maximize window"
 msgstr "Maksimer vindu"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:38
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:40
 msgid "Restore window"
 msgstr "Gjenoprett vindu"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:39
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:41
 msgid "Toggle shaded state"
-msgstr ""
+msgstr "Slå av/på skyggelagt tilstand"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:40
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:42
 msgid "Minimize window"
 msgstr "Minimer vindu"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:41
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:43
 msgid "Close window"
 msgstr "Lukk vindu"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:42
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:44
 msgid "Move window"
 msgstr "Flytt vindu"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:43
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:45
 msgid "Resize window"
 msgstr "Endre størrelse på vindu"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:44
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:46
 msgid "Toggle window on all workspaces or one"
 msgstr ""
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:45
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:47
 msgid "Move window to workspace 1"
 msgstr "Flytt vindu til arbeidsområde 1"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:46
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:48
 msgid "Move window to workspace 2"
 msgstr "Flytt vindu til arbeidsområde 2"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:47
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:49
 msgid "Move window to workspace 3"
 msgstr "Flytt vindu til arbeidsområde 3"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:48
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:50
 msgid "Move window to workspace 4"
 msgstr "Flytt vindu til arbeidsområde 4"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:49
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:51
 msgid "Move window to workspace 5"
 msgstr "Flytt vindu til arbeidsområde 5"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:50
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:52
 msgid "Move window to workspace 6"
 msgstr "Flytt vindu til arbeidsområde 6"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:51
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:53
 msgid "Move window to workspace 7"
 msgstr "Flytt vindu til arbeidsområde 7"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:52
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:54
 msgid "Move window to workspace 8"
 msgstr "Flytt vindu til arbeidsområde 8"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:53
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:55
 msgid "Move window to workspace 9"
 msgstr "Flytt vindu til arbeidsområde 9"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:54
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:56
 msgid "Move window to workspace 10"
 msgstr "Flytt vindu til arbeidsområde 10"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:55
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:57
 msgid "Move window to workspace 11"
 msgstr "Flytt vindu til arbeidsområde 11"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:56
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:58
 msgid "Move window to workspace 12"
 msgstr "Flytt vindu til arbeidsområde 12"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:57
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:59
 msgid "Move window one workspace to the left"
 msgstr "Flytt vinduet ett arbeidsområde til venstre"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:58
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:60
 msgid "Move window one workspace to the right"
 msgstr "Flytt vinduet ett arbeidsområde til høyre"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:59
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:61
 msgid "Move window one workspace up"
 msgstr "Flytt vinduet ett arbeidsområde opp"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:60
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:62
 msgid "Move window one workspace down"
 msgstr "Flytt vinduet ett arbeidsområde ned"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:61
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:63
 msgid "Raise window if covered, otherwise lower it"
-msgstr ""
+msgstr "Hev vindu hvis dekket, ellers senk det"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:62
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:64
 msgid "Raise window above other windows"
 msgstr "Hev vinduet over andre vinduer"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:63
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:65
 msgid "Lower window below other windows"
 msgstr "Senk vinduet under andre vinduer"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:64
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:66
 msgid "Maximize window vertically"
 msgstr "Maksimer vinduet vertikalt"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:65
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:67
 msgid "Maximize window horizontally"
 msgstr "Maksimer vinduet horisontalt"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:66
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:68
 msgid "Move window to top left corner"
 msgstr "Flytt vinduet til øvre venstre hjørne"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:67
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:69
 msgid "Move window to top right corner"
 msgstr "Flytt vinduet til øvre høyre hjørne"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:68
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:70
 msgid "Move window to bottom left corner"
 msgstr "Flytt vinduet til nedre venstre hjørne"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:69
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:71
 msgid "Move window to bottom right corner"
 msgstr "Flytt vinduet til nedre høyre hjørne"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:70
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:72
 msgid "Move window to top edge of screen"
 msgstr "Flytt vinduet til øverste kant av skjermen"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:71
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:73
 msgid "Move window to bottom edge of screen"
 msgstr "Flytt vinduet til nederste kant av skjermen"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:72
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:74
 msgid "Move window to right side of screen"
 msgstr "Flytt vinduet til høyre side av skjermen"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:73
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:75
 msgid "Move window to left side of screen"
 msgstr "Flytt vinduet til venstre side av skjermen"
 
-#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:74
+#: ../schemas/org.gnome.desktop.wm.keybindings.gschema.xml.in.in.h:76
 msgid "Move window to center of screen"
 msgstr "Flytt vinduet til senter av skjermen"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gst-plugins-base-0.10.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gst-plugins-base-0.10.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gst-plugins-base-0.10.po	2013-01-29 09:33:57.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gst-plugins-base-0.10.po	2014-01-07 06:37:23.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 14:03+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:32+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ext/alsa/gstalsamixertrack.c:144
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gst-plugins-good-0.10.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gst-plugins-good-0.10.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gst-plugins-good-0.10.po	2013-01-29 09:33:55.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gst-plugins-good-0.10.po	2014-01-07 06:37:24.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 14:13+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:42+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ext/esd/esdsink.c:252 ext/esd/esdsink.c:357
@@ -23,7 +23,7 @@
 
 #: ext/esd/esdsink.c:259
 msgid "Failed to query sound server capabilities"
-msgstr ""
+msgstr "Klarte ikke å etterspørre funksjonalitetsliste for lydtjeneste"
 
 #. TRANSLATORS: 'song title' by 'artist name'
 #: ext/pulse/pulsesink.c:2889
@@ -65,6 +65,8 @@
 msgid ""
 "A network error occured, or the server closed the connection unexpectedly."
 msgstr ""
+"Du er nå frakoblet tjeneren, enten på grunn av en nettverksfeil eller at "
+"tjeneren lukket tilkoblingen uventet."
 
 #: ext/soup/gstsouphttpsrc.c:1102
 msgid "Server sent bad data."
@@ -97,7 +99,7 @@
 
 #: gst/isomp4/qtdemux.c:2672
 msgid "Invalid atom size."
-msgstr ""
+msgstr "Ugyldig atomstørrelse."
 
 #: gst/isomp4/qtdemux.c:2741
 msgid "This file is incomplete and cannot be played."
@@ -105,7 +107,7 @@
 
 #: gst/isomp4/qtdemux.c:5077
 msgid "The video in this file might not play correctly."
-msgstr ""
+msgstr "Videoen i denne filen spilles kanskje ikke av korrekt."
 
 #: gst/isomp4/qtdemux.c:7506
 #, c-format
@@ -126,10 +128,13 @@
 "protocols or may otherwise be missing the right GStreamer RTSP extension "
 "plugin."
 msgstr ""
+"Fant ingen støttet videostrøm. Du må kanskje tillate flere "
+"overføringsprotokoller. Det er også mulig at systemet ditt mangler et  "
+"GStreamer RTSP-tillegg."
 
 #: gst/wavparse/gstwavparse.c:2109
 msgid "Internal data flow error."
-msgstr ""
+msgstr "Intern feil med dataflyt."
 
 #: sys/oss/gstossmixertrack.c:98 sys/oss4/oss4-mixer.c:728
 #: sys/sunaudio/gstsunaudiomixertrack.c:69
@@ -182,11 +187,11 @@
 
 #: sys/oss/gstossmixertrack.c:110
 msgid "In-gain"
-msgstr ""
+msgstr "Forsterkning av inngangssignal"
 
 #: sys/oss/gstossmixertrack.c:111
 msgid "Out-gain"
-msgstr ""
+msgstr "Forsterkning av utgangssignal"
 
 #: sys/oss/gstossmixertrack.c:112
 msgid "Line-1"
@@ -239,6 +244,8 @@
 "Could not open audio device for playback. Device is being used by another "
 "application."
 msgstr ""
+"Klarte ikke å åpne lydenheten for avspilling. Enheten brukes av et annet "
+"program."
 
 #: sys/oss/gstosssink.c:406 sys/oss4/oss4-sink.c:505
 #: sys/oss4/oss4-source.c:372
@@ -246,6 +253,8 @@
 "Could not open audio device for playback. You don't have permission to open "
 "the device."
 msgstr ""
+"Klarte ikke å åpne lydenheten for avspilling. Du har ikke tillatelse til å "
+"åpne enheten."
 
 #: sys/oss/gstosssink.c:414 sys/oss4/oss4-sink.c:516
 #: sys/oss4/oss4-source.c:383
@@ -257,6 +266,8 @@
 "Could not open audio device for recording. You don't have permission to open "
 "the device."
 msgstr ""
+"Klarte ikke å åpne lydenheten for opptak. Du har ikke tillatelse til å åpne "
+"enheten."
 
 #: sys/oss/gstosssrc.c:378
 msgid "Could not open audio device for recording."
@@ -264,13 +275,15 @@
 
 #: sys/oss4/oss4-mixer.c:303
 msgid "Could not open audio device for mixer control handling."
-msgstr ""
+msgstr "Klarte ikke å åpne lydenheten for å kontrollere lydmikseren."
 
 #: sys/oss4/oss4-mixer.c:317
 msgid ""
 "Could not open audio device for mixer control handling. This version of the "
 "Open Sound System is not supported by this element."
 msgstr ""
+"Klarte ikke å åpne lydenheten for å kontrollere lydmikseren. Denne versjonen "
+"av Open Sound-systemet støttes ikke av dette elementet."
 
 #: sys/oss4/oss4-mixer.c:729
 msgid "Master"
@@ -294,7 +307,7 @@
 
 #: sys/oss4/oss4-mixer.c:734
 msgid "LFE"
-msgstr ""
+msgstr "LFE"
 
 #: sys/oss4/oss4-mixer.c:735
 msgid "Surround"
@@ -330,7 +343,7 @@
 
 #: sys/oss4/oss4-mixer.c:745
 msgid "3D Enhance"
-msgstr ""
+msgstr "3D-forbedring"
 
 #: sys/oss4/oss4-mixer.c:746
 msgid "Telephone"
@@ -366,51 +379,51 @@
 
 #: sys/oss4/oss4-mixer.c:757 sys/oss4/oss4-mixer.c:758
 msgid "Record Gain"
-msgstr ""
+msgstr "Opptaksforsterkning"
 
 #: sys/oss4/oss4-mixer.c:759
 msgid "Output Gain"
-msgstr ""
+msgstr "Forsterkning av utsignal"
 
 #: sys/oss4/oss4-mixer.c:760
 msgid "Microphone Boost"
-msgstr ""
+msgstr "Mikrofonforsterkning"
 
 #: sys/oss4/oss4-mixer.c:761
 msgid "Loopback"
-msgstr ""
+msgstr "Sløyfekobling"
 
 #: sys/oss4/oss4-mixer.c:762
 msgid "Diagnostic"
-msgstr ""
+msgstr "Diagnostikk"
 
 #: sys/oss4/oss4-mixer.c:763
 msgid "Bass Boost"
-msgstr ""
+msgstr "Bassforsterkning"
 
 #: sys/oss4/oss4-mixer.c:764
 msgid "Playback Ports"
-msgstr ""
+msgstr "Avspillingsporter"
 
 #: sys/oss4/oss4-mixer.c:765
 msgid "Input"
-msgstr ""
+msgstr "Inngang"
 
 #: sys/oss4/oss4-mixer.c:766 sys/oss4/oss4-mixer.c:767
 msgid "Record Source"
-msgstr ""
+msgstr "Opptakskilde"
 
 #: sys/oss4/oss4-mixer.c:768
 msgid "Monitor Source"
-msgstr ""
+msgstr "Lyttekilde"
 
 #: sys/oss4/oss4-mixer.c:769
 msgid "Keyboard Beep"
-msgstr ""
+msgstr "Tastatur-pip"
 
 #: sys/oss4/oss4-mixer.c:771
 msgid "Simulate Stereo"
-msgstr ""
+msgstr "Pseudo-stereoeffekt"
 
 #: sys/oss4/oss4-mixer.c:772 sys/oss4/oss4-mixer.c:792
 msgid "Stereo"
@@ -418,47 +431,47 @@
 
 #: sys/oss4/oss4-mixer.c:773
 msgid "Surround Sound"
-msgstr ""
+msgstr "Surround-lyd"
 
 #: sys/oss4/oss4-mixer.c:774
 msgid "Microphone Gain"
-msgstr ""
+msgstr "Mikrofonforsterkning"
 
 #: sys/oss4/oss4-mixer.c:775
 msgid "Speaker Source"
-msgstr ""
+msgstr "Høyttalerkilde"
 
 #: sys/oss4/oss4-mixer.c:776
 msgid "Microphone Source"
-msgstr ""
+msgstr "Mikrofonkilde"
 
 #: sys/oss4/oss4-mixer.c:777
 msgid "Jack"
-msgstr ""
+msgstr "Jack"
 
 #: sys/oss4/oss4-mixer.c:778
 msgid "Center / LFE"
-msgstr ""
+msgstr "Midten / LFE"
 
 #: sys/oss4/oss4-mixer.c:779
 msgid "Stereo Mix"
-msgstr ""
+msgstr "Stereomiks"
 
 #: sys/oss4/oss4-mixer.c:780
 msgid "Mono Mix"
-msgstr ""
+msgstr "Monomiks"
 
 #: sys/oss4/oss4-mixer.c:781
 msgid "Input Mix"
-msgstr ""
+msgstr "Miksing av inngangssignal"
 
 #: sys/oss4/oss4-mixer.c:782
 msgid "SPDIF In"
-msgstr ""
+msgstr "SPDIF-inngang"
 
 #: sys/oss4/oss4-mixer.c:783 sys/sunaudio/gstsunaudiomixertrack.c:75
 msgid "SPDIF Out"
-msgstr ""
+msgstr "SPDIF-utgang"
 
 #: sys/oss4/oss4-mixer.c:784
 msgid "Microphone 1"
@@ -544,91 +557,91 @@
 
 #: sys/oss4/oss4-mixer.c:811
 msgid "Front Panel Microphone"
-msgstr ""
+msgstr "Mikrofoninngang på frontpanel"
 
 #: sys/oss4/oss4-mixer.c:812
 msgid "Front Panel Line In"
-msgstr ""
+msgstr "Linjeinngang på frontpanel"
 
 #: sys/oss4/oss4-mixer.c:813
 msgid "Front Panel Headphones"
-msgstr ""
+msgstr "Hodetelefonutgang på frontpanel"
 
 #: sys/oss4/oss4-mixer.c:814
 msgid "Front Panel Line Out"
-msgstr ""
+msgstr "Linjeutgang på frontpanel"
 
 #: sys/oss4/oss4-mixer.c:815
 msgid "Green Connector"
-msgstr ""
+msgstr "Grønn kontakt"
 
 #: sys/oss4/oss4-mixer.c:816
 msgid "Pink Connector"
-msgstr ""
+msgstr "Rosa kontakt"
 
 #: sys/oss4/oss4-mixer.c:817
 msgid "Blue Connector"
-msgstr ""
+msgstr "Blå kontakt"
 
 #: sys/oss4/oss4-mixer.c:818
 msgid "White Connector"
-msgstr ""
+msgstr "Hvit kontakt"
 
 #: sys/oss4/oss4-mixer.c:819
 msgid "Black Connector"
-msgstr ""
+msgstr "Svart kontakt"
 
 #: sys/oss4/oss4-mixer.c:820
 msgid "Gray Connector"
-msgstr ""
+msgstr "Grå kontakt"
 
 #: sys/oss4/oss4-mixer.c:821
 msgid "Orange Connector"
-msgstr ""
+msgstr "Oransje kontakt"
 
 #: sys/oss4/oss4-mixer.c:822
 msgid "Red Connector"
-msgstr ""
+msgstr "Rød kontakt"
 
 #: sys/oss4/oss4-mixer.c:823
 msgid "Yellow Connector"
-msgstr ""
+msgstr "Gul kontakt"
 
 #: sys/oss4/oss4-mixer.c:824
 msgid "Green Front Panel Connector"
-msgstr ""
+msgstr "Grønn kontakt på frontpanel"
 
 #: sys/oss4/oss4-mixer.c:825
 msgid "Pink Front Panel Connector"
-msgstr ""
+msgstr "Rosa kontakt på frontpanel"
 
 #: sys/oss4/oss4-mixer.c:826
 msgid "Blue Front Panel Connector"
-msgstr ""
+msgstr "Blå kontakt på frontpanel"
 
 #: sys/oss4/oss4-mixer.c:827
 msgid "White Front Panel Connector"
-msgstr ""
+msgstr "Hvit kontakt på frontpanel"
 
 #: sys/oss4/oss4-mixer.c:828
 msgid "Black Front Panel Connector"
-msgstr ""
+msgstr "Svart kontakt på frontpanel"
 
 #: sys/oss4/oss4-mixer.c:829
 msgid "Gray Front Panel Connector"
-msgstr ""
+msgstr "Grå kontakt på frontpanel"
 
 #: sys/oss4/oss4-mixer.c:830
 msgid "Orange Front Panel Connector"
-msgstr ""
+msgstr "Oransje kontakt på frontpanel"
 
 #: sys/oss4/oss4-mixer.c:831
 msgid "Red Front Panel Connector"
-msgstr ""
+msgstr "Rød kontakt på frontpanel"
 
 #: sys/oss4/oss4-mixer.c:832
 msgid "Yellow Front Panel Connector"
-msgstr ""
+msgstr "Gul kontakt på frontpanel"
 
 #: sys/oss4/oss4-mixer.c:833
 msgid "Spread Output"
@@ -636,57 +649,59 @@
 
 #: sys/oss4/oss4-mixer.c:834
 msgid "Downmix"
-msgstr ""
+msgstr "Nedmiks"
 
 #: sys/oss4/oss4-mixer.c:878
 msgid "Virtual Mixer Input"
-msgstr ""
+msgstr "Inngang for virtuell mikser"
 
 #: sys/oss4/oss4-mixer.c:880
 msgid "Virtual Mixer Output"
-msgstr ""
+msgstr "Utgang til virtuell mikser"
 
 #: sys/oss4/oss4-mixer.c:882
 msgid "Virtual Mixer Channels"
-msgstr ""
+msgstr "Kanaler på virtuell mikser"
 
 #. TRANSLATORS: name + number of a volume mixer control
 #: sys/oss4/oss4-mixer.c:933
 #, c-format
 msgid "%s %d Function"
-msgstr ""
+msgstr "%s %d funksjon"
 
 #. TRANSLATORS: name of a volume mixer control
 #: sys/oss4/oss4-mixer.c:940
 #, c-format
 msgid "%s Function"
-msgstr ""
+msgstr "%s funksjon"
 
 #: sys/oss4/oss4-sink.c:525 sys/oss4/oss4-source.c:393
 msgid ""
 "Could not open audio device for playback. This version of the Open Sound "
 "System is not supported by this element."
 msgstr ""
+"Klarte ikke å åpne lydenheten for avspilling. Denne versjonen av Open Sound-"
+"systemet støttes ikke av dette elementet."
 
 #: sys/oss4/oss4-sink.c:641
 msgid "Playback is not supported by this audio device."
-msgstr ""
+msgstr "Denne enheten støtter ikke avspilling."
 
 #: sys/oss4/oss4-sink.c:648
 msgid "Audio playback error."
-msgstr ""
+msgstr "Feil med lydavspilling."
 
 #: sys/oss4/oss4-source.c:515
 msgid "Recording is not supported by this audio device."
-msgstr ""
+msgstr "Denne lydenheten støtter ikke innspilling."
 
 #: sys/oss4/oss4-source.c:522
 msgid "Error recording from audio device."
-msgstr ""
+msgstr "Feil ved opptak fra lydenheten."
 
 #: sys/sunaudio/gstsunaudiomixertrack.c:70
 msgid "Gain"
-msgstr ""
+msgstr "Forsterkning"
 
 #: sys/sunaudio/gstsunaudiomixertrack.c:73
 msgid "Headphone"
@@ -695,17 +710,17 @@
 #: sys/v4l2/gstv4l2src.c:892
 #, c-format
 msgid "Error reading %d bytes from device '%s'."
-msgstr ""
+msgstr "Feil ved lesing av %d byte fra enheten «%s»."
 
 #: sys/v4l2/gstv4l2src.c:918
 #, c-format
 msgid "Got unexpected frame size of %u instead of %u."
-msgstr ""
+msgstr "Fikk uventet rammestørrelse på %u, i stedet for %u."
 
 #: sys/v4l2/gstv4l2src.c:936
 #, c-format
 msgid "Error reading %d bytes on device '%s'."
-msgstr ""
+msgstr "Feil ved lesing av %d byte på enheten «%s»."
 
 #: sys/v4l2/v4l2_calls.c:99
 #, c-format
@@ -713,26 +728,28 @@
 "Error getting capabilities for device '%s': It isn't a v4l2 driver. Check if "
 "it is a v4l1 driver."
 msgstr ""
+"Feil ved henting av funksjonalitet for enheten «%s», som ikke er en v4l2-"
+"driver. Sjekk om det er en v4l1 driver."
 
 #: sys/v4l2/v4l2_calls.c:139
 #, c-format
 msgid "Failed to query attributes of input %d in device %s"
-msgstr ""
+msgstr "Feil ved henting av egenskaper for inndata «%d» på enheten «%s»"
 
 #: sys/v4l2/v4l2_calls.c:169
 #, c-format
 msgid "Failed to get setting of tuner %d on device '%s'."
-msgstr ""
+msgstr "Kunne ikke hente innstillingen av mottakeren «%d» på enheten «%s»."
 
 #: sys/v4l2/v4l2_calls.c:213
 #, c-format
 msgid "Failed to query norm on device '%s'."
-msgstr ""
+msgstr "Feil ved norm-spørring på enheten «%s»."
 
 #: sys/v4l2/v4l2_calls.c:347
 #, c-format
 msgid "Failed getting controls attributes on device '%s'."
-msgstr ""
+msgstr "Klarte ikke å hente kontrollegenskaper for enhet «%s»."
 
 #: sys/v4l2/v4l2_calls.c:492
 #, c-format
@@ -757,93 +774,100 @@
 #: sys/v4l2/v4l2_calls.c:522
 #, c-format
 msgid "Device '%s' is not a output device."
-msgstr ""
+msgstr "Enheten «%s» er ikke en utgangsenhet."
 
 #: sys/v4l2/v4l2_calls.c:622
 #, c-format
 msgid "Failed to set norm for device '%s'."
-msgstr ""
+msgstr "Klarte ikke å velge norm for enheten «%s»."
 
 #: sys/v4l2/v4l2_calls.c:660
 #, c-format
 msgid "Failed to get current tuner frequency for device '%s'."
-msgstr ""
+msgstr "Klarte ikke å hente gjeldende mottakerfrekvens for enheten «%s»."
 
 #: sys/v4l2/v4l2_calls.c:702
 #, c-format
 msgid "Failed to set current tuner frequency for device '%s' to %lu Hz."
 msgstr ""
+"Klarte ikke å stille inn mottakerfrekvens for enheten «%s» til %lu hz."
 
 #: sys/v4l2/v4l2_calls.c:736
 #, c-format
 msgid "Failed to get signal strength for device '%s'."
-msgstr ""
+msgstr "Klarte ikke å sjekke signalstyrke på enheten «%s»."
 
 #: sys/v4l2/v4l2_calls.c:772
 #, c-format
 msgid "Failed to get value for control %d on device '%s'."
 msgstr ""
+"Klarte ikke å hente verdi for kontrollparameteret «%d» på enheten «%s»."
 
 #: sys/v4l2/v4l2_calls.c:807
 #, c-format
 msgid "Failed to set value %d for control %d on device '%s'."
-msgstr ""
+msgstr "Klarte ikke å velge %d som kontrollverdi for «%d» på enheten «%s»."
 
 #: sys/v4l2/v4l2_calls.c:839
 #, c-format
 msgid ""
 "Failed to get current input on device '%s'. May be it is a radio device"
 msgstr ""
+"Klarte ikke å finne aktiv inngang på enheten «%s». Kanskje det er en "
+"radioenhet"
 
 #: sys/v4l2/v4l2_calls.c:864
 #, c-format
 msgid "Failed to set input %d on device %s."
-msgstr ""
+msgstr "Klarte ikke å velge «%d» som inngang på enheten «%s»."
 
 #: sys/v4l2/v4l2_calls.c:896
 #, c-format
 msgid ""
 "Failed to get current output on device '%s'. May be it is a radio device"
 msgstr ""
+"Klarte ikke å finne gjeldende utgang på enheten «%s». Kanskje det er en "
+"radioenhet"
 
 #: sys/v4l2/v4l2_calls.c:921
 #, c-format
 msgid "Failed to set output %d on device %s."
-msgstr ""
+msgstr "Klarte ikke å velge «%d» som utgang på enheten «%s»."
 
 #: sys/v4l2/v4l2src_calls.c:81
 #, c-format
 msgid "Could not enqueue buffers in device '%s'."
-msgstr ""
+msgstr "Klarte ikke å sette buffere i kø på enheten «%s»."
 
 #: sys/v4l2/v4l2src_calls.c:197
 #, c-format
 msgid "Failed trying to get video frames from device '%s'."
-msgstr ""
+msgstr "Klarte ikke å hente filmrammer fra enheten «%s»."
 
 #: sys/v4l2/v4l2src_calls.c:199
 #, c-format
 msgid "Failed after %d tries. device %s. system error: %s"
-msgstr ""
+msgstr "Mislykket etter %d forsøk. Enhet «%s». Systemfeil: %s"
 
 #: sys/v4l2/v4l2src_calls.c:234
 #, c-format
 msgid "Could not get parameters on device '%s'"
-msgstr ""
+msgstr "Klarte ikke å hente parametere fra enheten «%s»."
 
 #: sys/v4l2/v4l2src_calls.c:261
 msgid "Video input device did not accept new frame rate setting."
 msgstr ""
+"Video-opptaksenheten aksepterte ikke ny innstilling for rammefrekvens."
 
 #: sys/v4l2/v4l2src_calls.c:331
 #, c-format
 msgid "Could not map buffers from device '%s'"
-msgstr ""
+msgstr "Klarte ikke å få oversikt over buffere fra enheten «%s»."
 
 #: sys/v4l2/v4l2src_calls.c:339
 #, c-format
 msgid "The driver of device '%s' does not support any known capture method."
-msgstr ""
+msgstr "Driveren for enheten «%s» støtter ingen kjente opptaksmetoder."
 
 #: sys/ximage/gstximagesrc.c:796
 msgid "Changing resolution at runtime is not yet supported."
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gstreamer-0.10.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gstreamer-0.10.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gstreamer-0.10.po	2013-01-29 09:33:52.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gstreamer-0.10.po	2014-01-07 06:37:23.000000000 +0000
@@ -14,8 +14,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 14:03+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:32+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: gst/gst.c:310
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtk-engines.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtk-engines.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtk-engines.po	2013-01-29 09:34:04.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtk-engines.po	2014-01-07 06:37:04.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:39+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:47+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../schema/clearlooks.xml.in.in.h:1
 msgid "Style"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtk20-properties.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtk20-properties.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtk20-properties.po	2013-01-29 09:34:07.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtk20-properties.po	2014-01-07 06:37:04.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:38+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:46+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: gdk/gdkdisplaymanager.c:103
@@ -368,6 +368,7 @@
 #: gtk/gtkactivatable.c:309
 msgid "The action this activatable will activate and receive updates from"
 msgstr ""
+"Handlingen som denne utføreren skal aktivere, og motta oppdateringer fra"
 
 #: gtk/gtkactivatable.c:331
 msgid "Use Action Appearance"
@@ -522,7 +523,7 @@
 msgid "Appearance of the shadow surrounding the arrow"
 msgstr "Utseende for skyggen som omgir pilen"
 
-#: gtk/gtkarrow.c:112 gtk/gtkmenu.c:717 gtk/gtkmenuitem.c:368
+#: gtk/gtkarrow.c:112 gtk/gtkmenu.c:714 gtk/gtkmenuitem.c:368
 msgid "Arrow Scaling"
 msgstr "Skalering av piler"
 
@@ -659,6 +660,8 @@
 "How to lay out the buttons in the box. Possible values are: default, spread, "
 "edge, start and end"
 msgstr ""
+"Hvordan knapper kan plasseres i boksen. Mulige verdier er: «default», "
+"«spread», «edge», «start» og «end»"
 
 #: gtk/gtkbbox.c:146
 msgid "Secondary"
@@ -783,11 +786,11 @@
 "HVis satt brukes etiketten til å velge en standardoppføring i stedet for å "
 "vises"
 
-#: gtk/gtkbutton.c:243 gtk/gtkcombobox.c:851 gtk/gtkfilechooserbutton.c:393
+#: gtk/gtkbutton.c:243 gtk/gtkcombobox.c:851 gtk/gtkfilechooserbutton.c:401
 msgid "Focus on click"
 msgstr "Fokus ved klikk"
 
-#: gtk/gtkbutton.c:244 gtk/gtkfilechooserbutton.c:394
+#: gtk/gtkbutton.c:244 gtk/gtkfilechooserbutton.c:402
 msgid "Whether the button grabs focus when it is clicked with the mouse"
 msgstr "Om knappen tar fokus når den klikkes med musen"
 
@@ -888,11 +891,11 @@
 msgid "Spacing in pixels between the image and label"
 msgstr "Mellomrom i piksler mellom bildet og etiketten"
 
-#: gtk/gtkbutton.c:530
+#: gtk/gtksettings.c:1070
 msgid "Show button images"
 msgstr "Vis knappebilder"
 
-#: gtk/gtkbutton.c:531
+#: gtk/gtksettings.c:1071
 msgid "Whether images should be shown on buttons"
 msgstr "Om bilder skal vises på knapper"
 
@@ -993,7 +996,7 @@
 
 #: gtk/gtkcalendar.c:599
 msgid "Space between day headers and main area"
-msgstr ""
+msgstr "Luft mellom topptekst for dag og hovedområde"
 
 #: gtk/gtkcalendar.c:610
 msgid "Horizontal separation"
@@ -1327,22 +1330,23 @@
 msgstr "Antall desimalplasser som skal vises"
 
 #: gtk/gtkcellrendererspinner.c:124 gtk/gtkcheckmenuitem.c:98
-#: gtk/gtkmenu.c:507 gtk/gtkspinner.c:128 gtk/gtktoggleaction.c:119
+#: gtk/gtkmenu.c:504 gtk/gtkspinner.c:128 gtk/gtktoggleaction.c:119
 #: gtk/gtktogglebutton.c:115 gtk/gtktoggletoolbutton.c:114
 msgid "Active"
 msgstr "Aktiv"
 
 #: gtk/gtkcellrendererspinner.c:125
 msgid "Whether the spinner is active (ie. shown) in the cell"
-msgstr ""
+msgstr "Om spinneren skal vises i cellen"
 
 #: gtk/gtkcellrendererspinner.c:145
 msgid "Pulse of the spinner"
-msgstr ""
+msgstr "Spinnerens puls"
 
 #: gtk/gtkcellrendererspinner.c:159
 msgid "The GtkIconSize value that specifies the size of the rendered spinner"
 msgstr ""
+"«GtkIconSize»-verdien som angir størrelsen på den opptegnede spinneren"
 
 #: gtk/gtkcellrenderertext.c:196
 msgid "Text to render"
@@ -1527,7 +1531,7 @@
 "Det prioriterte stedet å forkorte strengen hvis celletegneren ikke har nok "
 "plass til å vise hele strengen"
 
-#: gtk/gtkcellrenderertext.c:431 gtk/gtkfilechooserbutton.c:421
+#: gtk/gtkcellrenderertext.c:431 gtk/gtkfilechooserbutton.c:429
 #: gtk/gtklabel.c:659
 msgid "Width In Characters"
 msgstr "Bredde i tegn"
@@ -1781,7 +1785,7 @@
 msgid "Whether or not to give the color an alpha value"
 msgstr "Om fargen skal få en alphaverdi eller ikke"
 
-#: gtk/gtkcolorbutton.c:176 gtk/gtkfilechooserbutton.c:407
+#: gtk/gtkcolorbutton.c:176 gtk/gtkfilechooserbutton.c:415
 #: gtk/gtkfontbutton.c:142 gtk/gtkprintjob.c:116 gtk/gtkstatusicon.c:432
 #: gtk/gtktreeviewcolumn.c:265
 msgid "Title"
@@ -1791,7 +1795,7 @@
 msgid "The title of the color selection dialog"
 msgstr "Tittel på dialogen for fargevalg"
 
-#: gtk/gtkcolorbutton.c:191 gtk/gtkcolorsel.c:302
+#: gtk/gtkcolorbutton.c:191 gtk/gtkcolorsel.c:303
 msgid "Current Color"
 msgstr "Aktiv farge"
 
@@ -1799,7 +1803,7 @@
 msgid "The selected color"
 msgstr "Valgt farge"
 
-#: gtk/gtkcolorbutton.c:206 gtk/gtkcolorsel.c:309
+#: gtk/gtkcolorbutton.c:206 gtk/gtkcolorsel.c:310
 msgid "Current Alpha"
 msgstr "Nåværende alpha"
 
@@ -1809,37 +1813,37 @@
 "Nåværende verdi for ugjennomsiktighet (0 helt gjennomsiktig, 65535 helt "
 "ugjennomsiktig)"
 
-#: gtk/gtkcolorsel.c:288
+#: gtk/gtkcolorsel.c:289
 msgid "Has Opacity Control"
 msgstr "Har kontroll for ugjennomsiktighet"
 
-#: gtk/gtkcolorsel.c:289
+#: gtk/gtkcolorsel.c:290
 msgid "Whether the color selector should allow setting opacity"
 msgstr "La fargevelgeren tillate å sette ugjennomsiktighet"
 
-#: gtk/gtkcolorsel.c:295
+#: gtk/gtkcolorsel.c:296
 msgid "Has palette"
 msgstr "Har palett"
 
-#: gtk/gtkcolorsel.c:296
+#: gtk/gtkcolorsel.c:297
 msgid "Whether a palette should be used"
 msgstr "Skal en palett brukes"
 
-#: gtk/gtkcolorsel.c:303
+#: gtk/gtkcolorsel.c:304
 msgid "The current color"
 msgstr "Den aktive fargen"
 
-#: gtk/gtkcolorsel.c:310
+#: gtk/gtkcolorsel.c:311
 msgid "The current opacity value (0 fully transparent, 65535 fully opaque)"
 msgstr ""
 "Nåværende verdi for ugjennomsiktighet (0 helt gjennomsiktig, 65535 helt "
 "ugjennomsiktig)"
 
-#: gtk/gtkcolorsel.c:324
+#: gtk/gtksettings.c:1182
 msgid "Custom palette"
 msgstr "Egendefinert palett"
 
-#: gtk/gtkcolorsel.c:325
+#: gtk/gtksettings.c:1183
 msgid "Palette to use in the color selector"
 msgstr "Palett som skal brukes i fargevelgeren"
 
@@ -1971,7 +1975,7 @@
 msgid "Whether the combo box grabs focus when it is clicked with the mouse"
 msgstr "Om kombinasjonsboksen tar fokus når den blir klikket på av musen"
 
-#: gtk/gtkcombobox.c:867 gtk/gtkmenu.c:562
+#: gtk/gtkcombobox.c:867 gtk/gtkmenu.c:559
 msgid "Tearoff Title"
 msgstr "Tittel for avrevet meny"
 
@@ -1996,21 +2000,24 @@
 
 #: gtk/gtkcombobox.c:903
 msgid "Whether the dropdown button is sensitive when the model is empty"
-msgstr ""
+msgstr "Om sprettoppknappen er følsom når modellen er tom"
 
 #: gtk/gtkcombobox.c:919
 msgid "Whether combo box has an entry"
-msgstr ""
+msgstr "Om kombinasjonsboksen har en oppføring"
 
 #: gtk/gtkcombobox.c:934
 msgid "Entry Text Column"
-msgstr ""
+msgstr "Kolonne for tekstoppføring"
 
 #: gtk/gtkcombobox.c:935
 msgid ""
 "The column in the combo box's model to associate with strings from the entry "
 "if the combo was created with #GtkComboBox:has-entry = %TRUE"
 msgstr ""
+"Kolonnen i kombinasjonsboksens modell som skal knyttes til tekststrengene "
+"fra oppføringen, gitt at kombinasjonen ble opprettet med #GtkComboBox:has-"
+"entry = %TRUE"
 
 #: gtk/gtkcombobox.c:943
 msgid "Appears as list"
@@ -2310,13 +2317,15 @@
 
 #: gtk/gtkentry.c:886
 msgid "Progress Pulse Step"
-msgstr ""
+msgstr "Pulssteg for framdriftsviser"
 
 #: gtk/gtkentry.c:887
 msgid ""
 "The fraction of total entry width to move the progress bouncing block for "
 "each call to gtk_entry_progress_pulse()"
 msgstr ""
+"Andelen av total bredde som framdriftsviseren skal bevege seg hver gang "
+"gtk_entry_progress_pulse() kalles på"
 
 #: gtk/gtkentry.c:903
 msgid "Primary pixbuf"
@@ -2448,11 +2457,11 @@
 
 #: gtk/gtkentry.c:1180
 msgid "Primary icon tooltip markup"
-msgstr ""
+msgstr "Markering av tips for primærikon"
 
 #: gtk/gtkentry.c:1199
 msgid "Secondary icon tooltip markup"
-msgstr ""
+msgstr "Markering av tips for sekundærikon"
 
 #: gtk/gtkentry.c:1219 gtk/gtktextview.c:684
 msgid "IM module"
@@ -2464,11 +2473,12 @@
 
 #: gtk/gtkentry.c:1234
 msgid "Icon Prelight"
-msgstr ""
+msgstr "Forhåndslys på ikoner"
 
 #: gtk/gtkentry.c:1235
 msgid "Whether activatable icons should prelight when hovered"
 msgstr ""
+"Om aktiverbare ikoner skal lyses opp når du beveger musepekeren over dem"
 
 #: gtk/gtkentry.c:1248
 msgid "Progress Border"
@@ -2490,19 +2500,19 @@
 msgid "Whether to pass a proper state when drawing shadow or background"
 msgstr ""
 
-#: gtk/gtkentry.c:1763 gtk/gtklabel.c:859
+#: gtk/gtksettings.c:1079 gtk/gtksettings.c:1173
 msgid "Select on focus"
 msgstr "Velg på fokus"
 
-#: gtk/gtkentry.c:1764
+#: gtk/gtksettings.c:1080
 msgid "Whether to select the contents of an entry when it is focused"
 msgstr "Om innholdet i oppføringen skal markeres når den får fokus"
 
-#: gtk/gtkentry.c:1778
+#: gtk/gtksettings.c:1097
 msgid "Password Hint Timeout"
 msgstr "Tidsavbrudd for passordhint"
 
-#: gtk/gtkentry.c:1779
+#: gtk/gtksettings.c:1098
 msgid "How long to show the last input character in hidden entries"
 msgstr "Hvor lenge skal siste tegn vises i skjulte oppføringer"
 
@@ -2637,11 +2647,13 @@
 
 #: gtk/gtkexpander.c:239
 msgid "Label fill"
-msgstr ""
+msgstr "Fyll for etikett"
 
 #: gtk/gtkexpander.c:240
 msgid "Whether the label widget should fill all available horizontal space"
 msgstr ""
+"Om etikettelementet skal bruke all horisontal plass som er tilgjengelig på "
+"skjermen"
 
 #: gtk/gtkexpander.c:246 gtk/gtktoolitemgroup.c:1578 gtk/gtktreeview.c:780
 msgid "Expander Size"
@@ -2761,19 +2773,19 @@
 msgstr ""
 "Om filvelger som ikke er i åpningsmodus vil la bruker opprette nye mapper."
 
-#: gtk/gtkfilechooserbutton.c:376
+#: gtk/gtkfilechooserbutton.c:384
 msgid "Dialog"
 msgstr "Dialog"
 
-#: gtk/gtkfilechooserbutton.c:377
+#: gtk/gtkfilechooserbutton.c:385
 msgid "The file chooser dialog to use."
 msgstr "Filvelgingsdialog som skal brukes."
 
-#: gtk/gtkfilechooserbutton.c:408
+#: gtk/gtkfilechooserbutton.c:416
 msgid "The title of the file chooser dialog."
 msgstr "Tittelen på dialogen for filvalg."
 
-#: gtk/gtkfilechooserbutton.c:422
+#: gtk/gtkfilechooserbutton.c:430
 msgid "The desired width of the button widget, in characters."
 msgstr "Den ønskede bredden på knappelementet, i tegn."
 
@@ -2947,7 +2959,7 @@
 
 #: gtk/gtkhandlebox.c:209
 msgid "Child Detached"
-msgstr ""
+msgstr "Dattervindu frakoblet"
 
 #: gtk/gtkhandlebox.c:210
 msgid ""
@@ -3178,7 +3190,7 @@
 msgid "Whether to use the label text to create a stock menu item"
 msgstr ""
 
-#: gtk/gtkimagemenuitem.c:184 gtk/gtkmenu.c:522
+#: gtk/gtkimagemenuitem.c:184 gtk/gtkmenu.c:519
 msgid "Accel Group"
 msgstr "Akselleratorgruppe"
 
@@ -3186,11 +3198,11 @@
 msgid "The Accel Group to use for stock accelerator keys"
 msgstr ""
 
-#: gtk/gtkimagemenuitem.c:190
+#: gtk/gtksettings.c:1107
 msgid "Show menu images"
 msgstr "Vis bilder i menyer"
 
-#: gtk/gtkimagemenuitem.c:191
+#: gtk/gtksettings.c:1108
 msgid "Whether images should be shown in menus"
 msgstr "Om bilder skal vises i menyer"
 
@@ -3332,7 +3344,7 @@
 msgid "Whether visited links should be tracked"
 msgstr "Om besøkte lenker skal spores"
 
-#: gtk/gtklabel.c:860
+#: gtk/gtksettings.c:1174
 msgid ""
 "Whether to select the contents of a selectable label when it is focused"
 msgstr "Om innholdet i valgbar etikett skal markeres når den får fokus"
@@ -3385,85 +3397,85 @@
 msgid "Whether this link has been visited."
 msgstr "Om denne lenken har vært besøkt.<"
 
-#: gtk/gtkmenu.c:508
+#: gtk/gtkmenu.c:505
 msgid "The currently selected menu item"
 msgstr "Valgt menyoppføring"
 
-#: gtk/gtkmenu.c:523
+#: gtk/gtkmenu.c:520
 msgid "The accel group holding accelerators for the menu"
 msgstr "Akselleratorgruppe som inneholder akselleratorer for menyen"
 
-#: gtk/gtkmenu.c:537 gtk/gtkmenuitem.c:290
+#: gtk/gtkmenu.c:534 gtk/gtkmenuitem.c:290
 msgid "Accel Path"
 msgstr "Akselleratorsti"
 
-#: gtk/gtkmenu.c:538
+#: gtk/gtkmenu.c:535
 msgid ""
 "An accel path used to conveniently construct accel paths of child items"
 msgstr ""
 
-#: gtk/gtkmenu.c:554
+#: gtk/gtkmenu.c:551
 msgid "Attach Widget"
 msgstr "Fest komponent"
 
-#: gtk/gtkmenu.c:555
+#: gtk/gtkmenu.c:552
 msgid "The widget the menu is attached to"
 msgstr "Komponenten menyen er festet til"
 
-#: gtk/gtkmenu.c:563
+#: gtk/gtkmenu.c:560
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
 msgstr ""
 "En tittel som skal vises av vindusbehandleren når denne menyen er avrevet"
 
-#: gtk/gtkmenu.c:577
+#: gtk/gtkmenu.c:574
 msgid "Tearoff State"
 msgstr "Avrevet tilstand"
 
-#: gtk/gtkmenu.c:578
+#: gtk/gtkmenu.c:575
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "En bolsk verdi som indikerer om menyen er avrevet"
 
-#: gtk/gtkmenu.c:592
+#: gtk/gtkmenu.c:589
 msgid "Monitor"
 msgstr "Skjerm"
 
-#: gtk/gtkmenu.c:593
+#: gtk/gtkmenu.c:590
 msgid "The monitor the menu will be popped up on"
 msgstr ""
 
-#: gtk/gtkmenu.c:599
+#: gtk/gtkmenu.c:596
 msgid "Vertical Padding"
 msgstr "Vertikalt fyll"
 
-#: gtk/gtkmenu.c:600
+#: gtk/gtkmenu.c:597
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Ekstra mellomrom på topp og bunn av menyen"
 
-#: gtk/gtkmenu.c:622
+#: gtk/gtkmenu.c:619
 msgid "Reserve Toggle Size"
 msgstr ""
 
-#: gtk/gtkmenu.c:623
+#: gtk/gtkmenu.c:620
 msgid ""
 "A boolean that indicates whether the menu reserves space for toggles and "
 "icons"
 msgstr ""
 
-#: gtk/gtkmenu.c:629
+#: gtk/gtkmenu.c:626
 msgid "Horizontal Padding"
 msgstr "Horisontalt fyll"
 
-#: gtk/gtkmenu.c:630
+#: gtk/gtkmenu.c:627
 msgid "Extra space at the left and right edges of the menu"
 msgstr "Ekstra plass på venstre og høyre side av menyen"
 
-#: gtk/gtkmenu.c:638
+#: gtk/gtkmenu.c:635
 msgid "Vertical Offset"
 msgstr "Vertikal avstand"
 
-#: gtk/gtkmenu.c:639
+#: gtk/gtkmenu.c:636
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
@@ -3471,11 +3483,11 @@
 "Plasser menyen med vertikal avstand lik dette antall piksler når den er en "
 "undermeny"
 
-#: gtk/gtkmenu.c:647
+#: gtk/gtkmenu.c:644
 msgid "Horizontal Offset"
 msgstr "Horisontal avstand"
 
-#: gtk/gtkmenu.c:648
+#: gtk/gtkmenu.c:645
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
@@ -3483,83 +3495,83 @@
 "Plasser menyen med horisontal avstand lik dette antall piksler når den er en "
 "undermeny."
 
-#: gtk/gtkmenu.c:656
+#: gtk/gtkmenu.c:653
 msgid "Double Arrows"
 msgstr "Doble piler"
 
-#: gtk/gtkmenu.c:657
+#: gtk/gtkmenu.c:654
 msgid "When scrolling, always show both arrows."
 msgstr ""
 
-#: gtk/gtkmenu.c:670
+#: gtk/gtkmenu.c:667
 msgid "Arrow Placement"
 msgstr "Plassering av pil"
 
-#: gtk/gtkmenu.c:671
+#: gtk/gtkmenu.c:668
 msgid "Indicates where scroll arrows should be placed"
 msgstr ""
 
-#: gtk/gtkmenu.c:679
+#: gtk/gtkmenu.c:676
 msgid "Left Attach"
 msgstr "Venstre feste"
 
-#: gtk/gtkmenu.c:680 gtk/gtktable.c:174
+#: gtk/gtkmenu.c:677 gtk/gtktable.c:174
 msgid "The column number to attach the left side of the child to"
 msgstr "Kolonnenummer som venstre side av etterkommer skal festes til"
 
-#: gtk/gtkmenu.c:687
+#: gtk/gtkmenu.c:684
 msgid "Right Attach"
 msgstr "Høyre feste"
 
-#: gtk/gtkmenu.c:688
+#: gtk/gtkmenu.c:685
 msgid "The column number to attach the right side of the child to"
 msgstr "Kolonnenummer som høyre side av etterkommer skal festes til"
 
-#: gtk/gtkmenu.c:695
+#: gtk/gtkmenu.c:692
 msgid "Top Attach"
 msgstr "Toppfeste"
 
-#: gtk/gtkmenu.c:696
+#: gtk/gtkmenu.c:693
 msgid "The row number to attach the top of the child to"
 msgstr "Radnummer som toppen av etterkommer skal festes til"
 
-#: gtk/gtkmenu.c:703
+#: gtk/gtkmenu.c:700
 msgid "Bottom Attach"
 msgstr "Bunnfeste"
 
-#: gtk/gtkmenu.c:704 gtk/gtktable.c:195
+#: gtk/gtkmenu.c:701 gtk/gtktable.c:195
 msgid "The row number to attach the bottom of the child to"
 msgstr "Radnummer som bunn av etterkommer skal festes til"
 
-#: gtk/gtkmenu.c:718
+#: gtk/gtkmenu.c:715
 msgid "Arbitrary constant to scale down the size of the scroll arrow"
 msgstr ""
 
-#: gtk/gtkmenu.c:805
+#: gtk/gtksettings.c:1144
 msgid "Can change accelerators"
 msgstr "Kan endre akselleratorer"
 
-#: gtk/gtkmenu.c:806
+#: gtk/gtksettings.c:1145
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""
 "Om menyakselleratorer kan endres ved å trykke en tast over menyoppføringen"
 
-#: gtk/gtkmenu.c:811
+#: gtk/gtksettings.c:1153
 msgid "Delay before submenus appear"
 msgstr "Pause før undermenyer vises"
 
-#: gtk/gtkmenu.c:812
+#: gtk/gtksettings.c:1154
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "Minste tid pekeren kan være over en menyoppføring før undermenyen vises"
 
-#: gtk/gtkmenu.c:819
+#: gtk/gtksettings.c:1163
 msgid "Delay before hiding a submenu"
 msgstr "Pause før en undermeny skjules"
 
-#: gtk/gtkmenu.c:820
+#: gtk/gtksettings.c:1164
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -3593,11 +3605,11 @@
 msgid "Amount of border space between the menubar shadow and the menu items"
 msgstr "Mengde med kantplass mellom menylinjens skygge og menyoppføringene"
 
-#: gtk/gtkmenubar.c:210
+#: gtk/gtksettings.c:1116
 msgid "Delay before drop down menus appear"
 msgstr "Pause før nedtrekksmenyer vises"
 
-#: gtk/gtkmenubar.c:211
+#: gtk/gtksettings.c:1117
 msgid "Delay before the submenus of a menu bar appear"
 msgstr "Pause før undermenyene i en menylinje vises"
 
@@ -3639,11 +3651,11 @@
 msgid "The minimum desired width of the menu item in characters"
 msgstr "Den minste ønskede bredden på menyoppføringen i antall tegn"
 
-#: gtk/gtkmenushell.c:379
+#: gtk/gtkmenushell.c:404
 msgid "Take Focus"
 msgstr "Ta fokus"
 
-#: gtk/gtkmenushell.c:380
+#: gtk/gtkmenushell.c:405
 msgid "A boolean that determines whether the menu grabs the keyboard focus"
 msgstr "Verdi som bestemmer om menyen tar tastaturfokuset"
 
@@ -5013,11 +5025,11 @@
 msgid "Number of pixels between the scrollbars and the scrolled window"
 msgstr "Antall piksler mellom rullefeltet og vinduet som rulles"
 
-#: gtk/gtkscrolledwindow.c:312
+#: gtk/gtksettings.c:1134
 msgid "Scrolled Window Placement"
 msgstr ""
 
-#: gtk/gtkscrolledwindow.c:313
+#: gtk/gtksettings.c:1135
 msgid ""
 "Where the contents of scrolled windows are located with respect to the "
 "scrollbars, if not overridden by the scrolled window's own placement."
@@ -5031,11 +5043,11 @@
 msgid "Whether the separator is drawn, or just blank"
 msgstr "Om  en skillelinje eller bare tomrom vises"
 
-#: gtk/gtksettings.c:225
+#: gtk/gtksettings.c:241
 msgid "Double Click Time"
 msgstr "Tid for dobbelklikk"
 
-#: gtk/gtksettings.c:226
+#: gtk/gtksettings.c:242
 msgid ""
 "Maximum time allowed between two clicks for them to be considered a double "
 "click (in milliseconds)"
@@ -5043,11 +5055,11 @@
 "Lengste tidsintervall mellom to klikk for at de skal betraktes som et "
 "dobbelklikk (i millisekunder)"
 
-#: gtk/gtksettings.c:233
+#: gtk/gtksettings.c:249
 msgid "Double Click Distance"
 msgstr "Avstand for dobbelklikk"
 
-#: gtk/gtksettings.c:234
+#: gtk/gtksettings.c:250
 msgid ""
 "Maximum distance allowed between two clicks for them to be considered a "
 "double click (in pixels)"
@@ -5055,35 +5067,35 @@
 "Lengste avstand mellom to klikk for at de skal betraktes som et dobbelklikk "
 "(i piksler)"
 
-#: gtk/gtksettings.c:250
+#: gtk/gtksettings.c:266
 msgid "Cursor Blink"
 msgstr "Markørblinking"
 
-#: gtk/gtksettings.c:251
+#: gtk/gtksettings.c:267
 msgid "Whether the cursor should blink"
 msgstr "La markøren blinke"
 
-#: gtk/gtksettings.c:258
+#: gtk/gtksettings.c:274
 msgid "Cursor Blink Time"
 msgstr "Tid for markørblink"
 
-#: gtk/gtksettings.c:259
+#: gtk/gtksettings.c:275
 msgid "Length of the cursor blink cycle, in milliseconds"
 msgstr "Lengde på markørblinking, i millisekunder"
 
-#: gtk/gtksettings.c:278
+#: gtk/gtksettings.c:294
 msgid "Cursor Blink Timeout"
 msgstr "Tidsavbrudd for markørblink"
 
-#: gtk/gtksettings.c:279
+#: gtk/gtksettings.c:295
 msgid "Time after which the cursor stops blinking, in seconds"
 msgstr ""
 
-#: gtk/gtksettings.c:286
+#: gtk/gtksettings.c:302
 msgid "Split Cursor"
 msgstr "Delt markør"
 
-#: gtk/gtksettings.c:287
+#: gtk/gtksettings.c:303
 msgid ""
 "Whether two cursors should be displayed for mixed left-to-right and right-to-"
 "left text"
@@ -5091,411 +5103,411 @@
 "Om to markører skal vises for blandet venstre-til-høyre og høyre-til-venstre "
 "tekst"
 
-#: gtk/gtksettings.c:294
+#: gtk/gtksettings.c:310
 msgid "Theme Name"
 msgstr "Temanavn"
 
-#: gtk/gtksettings.c:295
+#: gtk/gtksettings.c:311
 msgid "Name of theme RC file to load"
 msgstr "Navn på RC-fil som skal lastes"
 
-#: gtk/gtksettings.c:307
+#: gtk/gtksettings.c:323
 msgid "Icon Theme Name"
 msgstr "Navn på ikontema"
 
-#: gtk/gtksettings.c:308
+#: gtk/gtksettings.c:324
 msgid "Name of icon theme to use"
 msgstr "Navn på ikontema som skal brukes"
 
-#: gtk/gtksettings.c:316
+#: gtk/gtksettings.c:332
 msgid "Fallback Icon Theme Name"
 msgstr "Navn på reserveikontema"
 
-#: gtk/gtksettings.c:317
+#: gtk/gtksettings.c:333
 msgid "Name of a icon theme to fall back to"
 msgstr "Navn på ikontema som skal brukes som reserve"
 
-#: gtk/gtksettings.c:325
+#: gtk/gtksettings.c:341
 msgid "Key Theme Name"
 msgstr "Navn på nøkkeltema"
 
-#: gtk/gtksettings.c:326
+#: gtk/gtksettings.c:342
 msgid "Name of key theme RC file to load"
 msgstr "Navn på RC-fil for nøkkeltema som skal lastes"
 
-#: gtk/gtksettings.c:334
+#: gtk/gtksettings.c:350
 msgid "Menu bar accelerator"
 msgstr "Aksellerator for menylinje"
 
-#: gtk/gtksettings.c:335
+#: gtk/gtksettings.c:351
 msgid "Keybinding to activate the menu bar"
 msgstr "Tastaturbinding som aktiverer menylinjen"
 
-#: gtk/gtksettings.c:343
+#: gtk/gtksettings.c:359
 msgid "Drag threshold"
 msgstr "Terskel for dra-operasjon"
 
-#: gtk/gtksettings.c:344
+#: gtk/gtksettings.c:360
 msgid "Number of pixels the cursor can move before dragging"
 msgstr "Antall piklser markøren kan flyttes før en dra-operasjon startes"
 
-#: gtk/gtksettings.c:352
+#: gtk/gtksettings.c:368
 msgid "Font Name"
 msgstr "Skriftnavn"
 
-#: gtk/gtksettings.c:353
+#: gtk/gtksettings.c:369
 msgid "Name of default font to use"
 msgstr "Navn på forvalgt skrift"
 
-#: gtk/gtksettings.c:375
+#: gtk/gtksettings.c:391
 msgid "Icon Sizes"
 msgstr "Ikonstørrelser"
 
-#: gtk/gtksettings.c:376
+#: gtk/gtksettings.c:392
 msgid "List of icon sizes (gtk-menu=16,16:gtk-button=20,20..."
 msgstr "Liste over ikonstørrelser (gtk-menu=16,16;gtk-button=20,20..."
 
-#: gtk/gtksettings.c:384
+#: gtk/gtksettings.c:400
 msgid "GTK Modules"
 msgstr "GTK-moduler"
 
-#: gtk/gtksettings.c:385
+#: gtk/gtksettings.c:401
 msgid "List of currently active GTK modules"
 msgstr "Liste over aktive GTK-moduler"
 
-#: gtk/gtksettings.c:394
+#: gtk/gtksettings.c:410
 msgid "Xft Antialias"
 msgstr "Xft skriftutjevning"
 
-#: gtk/gtksettings.c:395
+#: gtk/gtksettings.c:411
 msgid "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"
 msgstr ""
 "Om skriftutjevning skal brukes for Xft-skrifter; 0=nei, 1=ja, -1=forvalg"
 
-#: gtk/gtksettings.c:404
+#: gtk/gtksettings.c:420
 msgid "Xft Hinting"
 msgstr "Xft-hint"
 
-#: gtk/gtksettings.c:405
+#: gtk/gtksettings.c:421
 msgid "Whether to hint Xft fonts; 0=no, 1=yes, -1=default"
 msgstr "Om hint skal brukes for Xft-skrifter"
 
-#: gtk/gtksettings.c:414
+#: gtk/gtksettings.c:430
 msgid "Xft Hint Style"
 msgstr "Xft-hintstil"
 
-#: gtk/gtksettings.c:415
+#: gtk/gtksettings.c:431
 msgid ""
 "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"
 msgstr ""
 "Grad av hint som skal brukes; hintnone, hintslight, hintmedium, eller "
 "hintfull"
 
-#: gtk/gtksettings.c:424
+#: gtk/gtksettings.c:440
 msgid "Xft RGBA"
 msgstr "Xft RGBA"
 
-#: gtk/gtksettings.c:425
+#: gtk/gtksettings.c:441
 msgid "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"
 msgstr "Type pikselutjevning: none, rgb, bgr, vrgb, vbgr"
 
-#: gtk/gtksettings.c:434
+#: gtk/gtksettings.c:450
 msgid "Xft DPI"
 msgstr "Xft DPI"
 
-#: gtk/gtksettings.c:435
+#: gtk/gtksettings.c:451
 msgid "Resolution for Xft, in 1024 * dots/inch. -1 to use default value"
 msgstr ""
 "Oppløsning for Xft i 1024 * punkter per tomme. -1 for å bruke forvalgt verdi"
 
-#: gtk/gtksettings.c:444
+#: gtk/gtksettings.c:460
 msgid "Cursor theme name"
 msgstr "Navn på pekertema"
 
-#: gtk/gtksettings.c:445
+#: gtk/gtksettings.c:461
 msgid "Name of the cursor theme to use, or NULL to use the default theme"
 msgstr ""
 "Navn på pekertema som skal brukes, eller NULL for å bruke forvalgt tema"
 
-#: gtk/gtksettings.c:453
+#: gtk/gtksettings.c:469
 msgid "Cursor theme size"
 msgstr "Størrelse på pekertema"
 
-#: gtk/gtksettings.c:454
+#: gtk/gtksettings.c:470
 msgid "Size to use for cursors, or 0 to use the default size"
 msgstr "Størrelse å bruke for peker, eller 0 for å bruke forvalgt størrelse"
 
-#: gtk/gtksettings.c:464
+#: gtk/gtksettings.c:480
 msgid "Alternative button order"
 msgstr "Alternativ knapperekkefølge"
 
-#: gtk/gtksettings.c:465
+#: gtk/gtksettings.c:481
 msgid "Whether buttons in dialogs should use the alternative button order"
 msgstr ""
 "Om knapper i dialoger skal bruke den alternative rekkefølgen for knapper"
 
-#: gtk/gtksettings.c:482
+#: gtk/gtksettings.c:498
 msgid "Alternative sort indicator direction"
 msgstr ""
 
-#: gtk/gtksettings.c:483
+#: gtk/gtksettings.c:499
 msgid ""
 "Whether the direction of the sort indicators in list and tree views is "
 "inverted compared to the default (where down means ascending)"
 msgstr ""
 
-#: gtk/gtksettings.c:491
+#: gtk/gtksettings.c:507
 msgid "Show the 'Input Methods' menu"
 msgstr "Vis menyen «Inndatametoder»"
 
-#: gtk/gtksettings.c:492
+#: gtk/gtksettings.c:508
 msgid ""
 "Whether the context menus of entries and text views should offer to change "
 "the input method"
 msgstr ""
 
-#: gtk/gtksettings.c:500
+#: gtk/gtksettings.c:516
 msgid "Show the 'Insert Unicode Control Character' menu"
 msgstr ""
 
-#: gtk/gtksettings.c:501
+#: gtk/gtksettings.c:517
 msgid ""
 "Whether the context menus of entries and text views should offer to insert "
 "control characters"
 msgstr ""
 
-#: gtk/gtksettings.c:509
+#: gtk/gtksettings.c:525
 msgid "Start timeout"
 msgstr "Tidsavbrudd for start"
 
-#: gtk/gtksettings.c:510
+#: gtk/gtksettings.c:526
 msgid "Starting value for timeouts, when button is pressed"
 msgstr ""
 
-#: gtk/gtksettings.c:519
+#: gtk/gtksettings.c:535
 msgid "Repeat timeout"
 msgstr "Tidsavbrudd for gjentakelse"
 
-#: gtk/gtksettings.c:520
+#: gtk/gtksettings.c:536
 msgid "Repeat value for timeouts, when button is pressed"
 msgstr ""
 
-#: gtk/gtksettings.c:529
+#: gtk/gtksettings.c:545
 msgid "Expand timeout"
 msgstr "Tidsavbrudd for utvidelse"
 
-#: gtk/gtksettings.c:530
+#: gtk/gtksettings.c:546
 msgid "Expand value for timeouts, when a widget is expanding a new region"
 msgstr ""
 
-#: gtk/gtksettings.c:565
+#: gtk/gtksettings.c:581
 msgid "Color scheme"
 msgstr "Fargetema"
 
-#: gtk/gtksettings.c:566
+#: gtk/gtksettings.c:582
 msgid "A palette of named colors for use in themes"
 msgstr "Palett med navngitte farger for bruk i tema"
 
-#: gtk/gtksettings.c:575
+#: gtk/gtksettings.c:591
 msgid "Enable Animations"
 msgstr "Aktiver animasjoner"
 
-#: gtk/gtksettings.c:576
+#: gtk/gtksettings.c:592
 msgid "Whether to enable toolkit-wide animations."
 msgstr ""
 
-#: gtk/gtksettings.c:594
+#: gtk/gtksettings.c:610
 msgid "Enable Touchscreen Mode"
 msgstr "Slå på berøringsskjermmodus"
 
-#: gtk/gtksettings.c:595
+#: gtk/gtksettings.c:611
 msgid "When TRUE, there are no motion notify events delivered on this screen"
 msgstr ""
 
-#: gtk/gtksettings.c:612
+#: gtk/gtksettings.c:628
 msgid "Tooltip timeout"
 msgstr "Tidsavbrudd for verktøytips"
 
-#: gtk/gtksettings.c:613
+#: gtk/gtksettings.c:629
 msgid "Timeout before tooltip is shown"
 msgstr "Tidsavbrudd før verktøytips vises"
 
-#: gtk/gtksettings.c:638
+#: gtk/gtksettings.c:654
 msgid "Tooltip browse timeout"
 msgstr ""
 
-#: gtk/gtksettings.c:639
+#: gtk/gtksettings.c:655
 msgid "Timeout before tooltip is shown when browse mode is enabled"
 msgstr ""
 
-#: gtk/gtksettings.c:660
+#: gtk/gtksettings.c:676
 msgid "Tooltip browse mode timeout"
 msgstr ""
 
-#: gtk/gtksettings.c:661
+#: gtk/gtksettings.c:677
 msgid "Timeout after which browse mode is disabled"
 msgstr ""
 
-#: gtk/gtksettings.c:680
+#: gtk/gtksettings.c:696
 msgid "Keynav Cursor Only"
 msgstr ""
 
-#: gtk/gtksettings.c:681
+#: gtk/gtksettings.c:697
 msgid "When TRUE, there are only cursor keys available to navigate widgets"
 msgstr ""
 
-#: gtk/gtksettings.c:698
+#: gtk/gtksettings.c:714
 msgid "Keynav Wrap Around"
 msgstr ""
 
-#: gtk/gtksettings.c:699
+#: gtk/gtksettings.c:715
 msgid "Whether to wrap around when keyboard-navigating widgets"
 msgstr ""
 
-#: gtk/gtksettings.c:719
+#: gtk/gtksettings.c:735
 msgid "Error Bell"
 msgstr ""
 
-#: gtk/gtksettings.c:720
+#: gtk/gtksettings.c:736
 msgid "When TRUE, keyboard navigation and other errors will cause a beep"
 msgstr ""
 
-#: gtk/gtksettings.c:737
+#: gtk/gtksettings.c:753
 msgid "Color Hash"
 msgstr ""
 
-#: gtk/gtksettings.c:738
+#: gtk/gtksettings.c:754
 msgid "A hash table representation of the color scheme."
 msgstr ""
 
-#: gtk/gtksettings.c:746
+#: gtk/gtksettings.c:762
 msgid "Default file chooser backend"
 msgstr "Forvalgt motor for filvelger"
 
-#: gtk/gtksettings.c:747
+#: gtk/gtksettings.c:763
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Navn på GtkFileChooser-motor som skal brukes som forvalg"
 
-#: gtk/gtksettings.c:764
+#: gtk/gtksettings.c:780
 msgid "Default print backend"
 msgstr "Forvalgt motor for utskrift"
 
-#: gtk/gtksettings.c:765
+#: gtk/gtksettings.c:781
 msgid "List of the GtkPrintBackend backends to use by default"
 msgstr "Liste med GtkFileChooser-motorer som skal brukes som forvalg"
 
-#: gtk/gtksettings.c:788
+#: gtk/gtksettings.c:804
 msgid "Default command to run when displaying a print preview"
 msgstr "Forvalgt kommando som skal kjøres ved forhåndsvisning av utskrift"
 
-#: gtk/gtksettings.c:789
+#: gtk/gtksettings.c:805
 msgid "Command to run when displaying a print preview"
 msgstr "Kommando som skal kjøres ved forhåndsvisning av utskrift"
 
-#: gtk/gtksettings.c:805
+#: gtk/gtksettings.c:821
 msgid "Enable Mnemonics"
 msgstr "Slå på hurtigtaster"
 
-#: gtk/gtksettings.c:806
+#: gtk/gtksettings.c:822
 msgid "Whether labels should have mnemonics"
 msgstr "Om etiketter skal ha hurtigtaster"
 
-#: gtk/gtksettings.c:822
+#: gtk/gtksettings.c:838
 msgid "Enable Accelerators"
 msgstr "Aktiver hurtigtaster"
 
-#: gtk/gtksettings.c:823
+#: gtk/gtksettings.c:839
 msgid "Whether menu items should have accelerators"
 msgstr "Om menyoppføringer skal ha akselleratorer"
 
-#: gtk/gtksettings.c:840
+#: gtk/gtksettings.c:856
 msgid "Recent Files Limit"
 msgstr "Grense for nylig brukte filer"
 
-#: gtk/gtksettings.c:841
+#: gtk/gtksettings.c:857
 msgid "Number of recently used files"
 msgstr "Antall nylig brukte filer"
 
-#: gtk/gtksettings.c:861
+#: gtk/gtksettings.c:877
 msgid "Default IM module"
 msgstr "Forvalgt IM-modul"
 
-#: gtk/gtksettings.c:862
+#: gtk/gtksettings.c:878
 msgid "Which IM module should be used by default"
 msgstr ""
 
-#: gtk/gtksettings.c:880
+#: gtk/gtksettings.c:896
 msgid "Recent Files Max Age"
 msgstr "Maksimal alder for nylig brukte filer"
 
-#: gtk/gtksettings.c:881
+#: gtk/gtksettings.c:897
 msgid "Maximum age of recently used files, in days"
 msgstr "Maksimal alder for nylig brukte filer, i dager"
 
-#: gtk/gtksettings.c:890
+#: gtk/gtksettings.c:906
 msgid "Fontconfig configuration timestamp"
 msgstr ""
 
-#: gtk/gtksettings.c:891
+#: gtk/gtksettings.c:907
 msgid "Timestamp of current fontconfig configuration"
 msgstr ""
 
-#: gtk/gtksettings.c:913
+#: gtk/gtksettings.c:929
 msgid "Sound Theme Name"
 msgstr "Navn på lydtema"
 
-#: gtk/gtksettings.c:914
+#: gtk/gtksettings.c:930
 msgid "XDG sound theme name"
 msgstr "Navn på XDG-lydtema"
 
 #. Translators: this means sounds that are played as feedback to user input
-#: gtk/gtksettings.c:936
+#: gtk/gtksettings.c:952
 msgid "Audible Input Feedback"
 msgstr ""
 
-#: gtk/gtksettings.c:937
+#: gtk/gtksettings.c:953
 msgid "Whether to play event sounds as feedback to user input"
 msgstr ""
 
-#: gtk/gtksettings.c:958
+#: gtk/gtksettings.c:974
 msgid "Enable Event Sounds"
 msgstr "Slå på lyder for hendelser"
 
-#: gtk/gtksettings.c:959
+#: gtk/gtksettings.c:975
 msgid "Whether to play any event sounds at all"
 msgstr "Om lyder skal spilles av for hendelser"
 
-#: gtk/gtksettings.c:974
+#: gtk/gtksettings.c:990
 msgid "Enable Tooltips"
 msgstr "Slå på verktøytips"
 
-#: gtk/gtksettings.c:975
+#: gtk/gtksettings.c:991
 msgid "Whether tooltips should be shown on widgets"
 msgstr "Om verktøytips skal vises på komponenter"
 
-#: gtk/gtksettings.c:988
+#: gtk/gtksettings.c:1004
 msgid "Toolbar style"
 msgstr "Verktøylinjestil"
 
-#: gtk/gtksettings.c:989
+#: gtk/gtksettings.c:1005
 msgid ""
 "Whether default toolbars have text only, text and icons, icons only, etc."
 msgstr ""
 "Om forvalgte verktøylinje har tekst, tekst og ikoner, kun ikoner, etc."
 
-#: gtk/gtksettings.c:1003
+#: gtk/gtksettings.c:1019
 msgid "Toolbar Icon Size"
 msgstr "Størrelse på verktøylinjeikon"
 
-#: gtk/gtksettings.c:1004
+#: gtk/gtksettings.c:1020
 msgid "The size of icons in default toolbars."
 msgstr "Størrelse på ikoner i standard verktøylinjer."
 
-#: gtk/gtksettings.c:1021
+#: gtk/gtksettings.c:1037
 msgid "Auto Mnemonics"
 msgstr "Automatisk visning av hurtigtaster"
 
-#: gtk/gtksettings.c:1022
+#: gtk/gtksettings.c:1038
 msgid ""
 "Whether mnemonics should be automatically shown and hidden when the user "
 "presses the mnemonic activator."
@@ -7365,18 +7377,18 @@
 msgid "The opacity of the window, from 0 to 1"
 msgstr "Ugjennomsiktighet for vindu fra 0 til 1"
 
-#: modules/input/gtkimcontextxim.c:334
+#: gtk/gtksettings.c:1191
 msgid "IM Preedit style"
 msgstr "Stil for IM-forhåndsredigering"
 
-#: modules/input/gtkimcontextxim.c:335
+#: gtk/gtksettings.c:1192
 msgid "How to draw the input method preedit string"
 msgstr "Hvordan forhåndsredigeringsstrengen for en inndatametode tegnes"
 
-#: modules/input/gtkimcontextxim.c:343
+#: gtk/gtksettings.c:1201
 msgid "IM Status style"
 msgstr "IM statusstil"
 
-#: modules/input/gtkimcontextxim.c:344
+#: gtk/gtksettings.c:1202
 msgid "How to draw the input method statusbar"
 msgstr "Hvordan statuslinjen for inndatametoden tegnes"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtk20.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtk20.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtk20.po	2013-01-29 09:34:07.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtk20.po	2014-01-07 06:37:04.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:37+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:43+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: gdk/gdk.c:103
@@ -579,7 +579,7 @@
 msgid "Received invalid color data\n"
 msgstr "Mottok ugyldige fargedata\n"
 
-#: gtk/gtkcolorsel.c:363
+#: gtk/gtkcolorsel.c:358
 msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
@@ -587,7 +587,7 @@
 "Velg fargen du ønsker fra den ytre ringen. Velg lysstyrke for denne fargen "
 "ved å bruke den indre trekanten."
 
-#: gtk/gtkcolorsel.c:387
+#: gtk/gtkcolorsel.c:382
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
@@ -595,67 +595,67 @@
 "Klikk på dråpetelleren og klikk så på en farge hvor som helst på skjermen "
 "for å velge denne fargen."
 
-#: gtk/gtkcolorsel.c:396
+#: gtk/gtkcolorsel.c:391
 msgid "_Hue:"
 msgstr "_Glød:"
 
-#: gtk/gtkcolorsel.c:397
+#: gtk/gtkcolorsel.c:392
 msgid "Position on the color wheel."
 msgstr "Posisjon på fargehjulet."
 
-#: gtk/gtkcolorsel.c:399
+#: gtk/gtkcolorsel.c:394
 msgid "_Saturation:"
 msgstr "_Metning:"
 
-#: gtk/gtkcolorsel.c:400
+#: gtk/gtkcolorsel.c:395
 msgid "\"Deepness\" of the color."
 msgstr "Fargens dybde."
 
-#: gtk/gtkcolorsel.c:401
+#: gtk/gtkcolorsel.c:396
 msgid "_Value:"
 msgstr "_Verdi:"
 
-#: gtk/gtkcolorsel.c:402
+#: gtk/gtkcolorsel.c:397
 msgid "Brightness of the color."
 msgstr "Lysstyrke for fargen."
 
-#: gtk/gtkcolorsel.c:403
+#: gtk/gtkcolorsel.c:398
 msgid "_Red:"
 msgstr "_Rød:"
 
-#: gtk/gtkcolorsel.c:404
+#: gtk/gtkcolorsel.c:399
 msgid "Amount of red light in the color."
 msgstr "Mende med rødt lys i fargen."
 
-#: gtk/gtkcolorsel.c:405
+#: gtk/gtkcolorsel.c:400
 msgid "_Green:"
 msgstr "_Grønn:"
 
-#: gtk/gtkcolorsel.c:406
+#: gtk/gtkcolorsel.c:401
 msgid "Amount of green light in the color."
 msgstr "Mengde med grønt lys i fargen."
 
-#: gtk/gtkcolorsel.c:407
+#: gtk/gtkcolorsel.c:402
 msgid "_Blue:"
 msgstr "_Blå:"
 
-#: gtk/gtkcolorsel.c:408
+#: gtk/gtkcolorsel.c:403
 msgid "Amount of blue light in the color."
 msgstr "Mengde med blått lys i fargen."
 
-#: gtk/gtkcolorsel.c:411
+#: gtk/gtkcolorsel.c:406
 msgid "Op_acity:"
 msgstr "_Ugjennomsiktighet:"
 
-#: gtk/gtkcolorsel.c:418 gtk/gtkcolorsel.c:428
+#: gtk/gtkcolorsel.c:413 gtk/gtkcolorsel.c:423
 msgid "Transparency of the color."
 msgstr "Gjennomsiktighet for fargen."
 
-#: gtk/gtkcolorsel.c:435
+#: gtk/gtkcolorsel.c:430
 msgid "Color _name:"
 msgstr "Farge_navn:"
 
-#: gtk/gtkcolorsel.c:449
+#: gtk/gtkcolorsel.c:444
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
@@ -663,15 +663,15 @@
 "Du kan skrive inn en heksadesimal fargeverdi i HTML-stil, eller bruke et "
 "fargenavn som f.eks. «oransje» i denne oppføringen."
 
-#: gtk/gtkcolorsel.c:479
+#: gtk/gtkcolorsel.c:474
 msgid "_Palette:"
 msgstr "_Palett:"
 
-#: gtk/gtkcolorsel.c:508
+#: gtk/gtkcolorsel.c:503
 msgid "Color Wheel"
 msgstr "Fargehjul"
 
-#: gtk/gtkcolorsel.c:967
+#: gtk/gtkcolorsel.c:962
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now. You can drag this color to a palette entry, or select this color as "
@@ -681,7 +681,7 @@
 "denne fargen til en palettoppføring, eller velge denne fargen som aktiv ved "
 "å dra den til den andre fargeprøven ved siden av."
 
-#: gtk/gtkcolorsel.c:970
+#: gtk/gtkcolorsel.c:965
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
@@ -689,21 +689,21 @@
 "Fargen du har valgt. Du kan dra denne fargen til en palettoppføring for å "
 "lagre den for senere bruk."
 
-#: gtk/gtkcolorsel.c:975
+#: gtk/gtkcolorsel.c:970
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now."
 msgstr "Tidligere valgt farge. For sammenligning med fargen du velger nå."
 
-#: gtk/gtkcolorsel.c:978
+#: gtk/gtkcolorsel.c:973
 msgid "The color you've chosen."
 msgstr "Fargen du har valgt."
 
-#: gtk/gtkcolorsel.c:1391
+#: gtk/gtkcolorsel.c:1389
 msgid "_Save color here"
 msgstr "_Lagre fargen her"
 
-#: gtk/gtkcolorsel.c:1595
+#: gtk/gtkcolorsel.c:1593
 msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
@@ -780,23 +780,23 @@
 msgid "Paper Margins"
 msgstr "Papirmarger"
 
-#: gtk/gtkentry.c:8748 gtk/gtktextview.c:7976
+#: gtk/gtkentry.c:8726 gtk/gtktextview.c:7976
 msgid "Input _Methods"
 msgstr "Inndata_metoder"
 
-#: gtk/gtkentry.c:8762 gtk/gtktextview.c:7990
+#: gtk/gtkentry.c:8740 gtk/gtktextview.c:7990
 msgid "_Insert Unicode Control Character"
 msgstr "Sett _inn Unicode kontrolltegn"
 
-#: gtk/gtkentry.c:10142
+#: gtk/gtkentry.c:10120
 msgid "Caps Lock is on"
 msgstr "Caps Lock er på"
 
 #: gtk/gtkfilechooserbutton.c:64
 msgid "Select a File"
-msgstr ""
+msgstr "Velg en fil"
 
-#: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1847
+#: gtk/gtkfilechooserbutton.c:65 gtk/gtkfilechooserdefault.c:1845
 msgid "Desktop"
 msgstr "Skrivebord"
 
@@ -804,7 +804,7 @@
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: gtk/gtkfilechooserbutton.c:2025
+#: gtk/gtkfilechooserbutton.c:2175
 msgid "Other..."
 msgstr "Annet..."
 
@@ -812,23 +812,23 @@
 msgid "Type name of new folder"
 msgstr "Skriv inn navn på ny mappe"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:950
 msgid "Could not retrieve information about the file"
 msgstr "Kunne ikke hente informasjon om filen"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:961
 msgid "Could not add a bookmark"
 msgstr "Kunne ikke legge til bokmerke"
 
-#: gtk/gtkfilechooserdefault.c:975
+#: gtk/gtkfilechooserdefault.c:972
 msgid "Could not remove bookmark"
 msgstr "Kunne ikke fjerne bokmerke"
 
-#: gtk/gtkfilechooserdefault.c:986
+#: gtk/gtkfilechooserdefault.c:983
 msgid "The folder could not be created"
 msgstr "Mappen kunne ikke opprettes"
 
-#: gtk/gtkfilechooserdefault.c:999
+#: gtk/gtkfilechooserdefault.c:996
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -836,16 +836,16 @@
 "Kunne ikke opprette mappen på grunn av at det allerede eksisterer en fil med "
 "samme navnet. Bruk et annet navn for mappen eller gi et nytt navn til filen."
 
-#: gtk/gtkfilechooserdefault.c:1013
+#: gtk/gtkfilechooserdefault.c:1010
 msgid "You need to choose a valid filename."
-msgstr ""
+msgstr "Du må velge et gyldig filnavn."
 
-#: gtk/gtkfilechooserdefault.c:1016
+#: gtk/gtkfilechooserdefault.c:1013
 #, c-format
 msgid "Cannot create a file under %s as it is not a folder"
-msgstr ""
+msgstr "Kan ikke lage en fil under %s fordi den ikke er en mappe"
 
-#: gtk/gtkfilechooserdefault.c:1028
+#: gtk/gtkfilechooserdefault.c:1025
 msgid ""
 "You may only select folders.  The item that you selected is not a folder; "
 "try using a different item."
@@ -853,11 +853,11 @@
 "Du kan kun velge mapper. Oppføringen du har valgt er ikke en mappe. Prøv å "
 "bruke en annen oppføring."
 
-#: gtk/gtkfilechooserdefault.c:1038
+#: gtk/gtkfilechooserdefault.c:1035
 msgid "Invalid file name"
 msgstr "Ugyldig filnavn"
 
-#: gtk/gtkfilechooserdefault.c:1048
+#: gtk/gtkfilechooserdefault.c:1045
 msgid "The folder contents could not be displayed"
 msgstr "Mappeinholdet kunne ikke vises"
 
@@ -865,186 +865,186 @@
 #. * is a hostname. Nautilus and the panel contain the same string
 #. * to translate.
 #. 
-#: gtk/gtkfilechooserdefault.c:1580
+#: gtk/gtkfilechooserdefault.c:1578
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 
-#: gtk/gtkfilechooserdefault.c:1729
+#: gtk/gtkfilechooserdefault.c:1727
 msgid "Search"
 msgstr "Søk"
 
-#: gtk/gtkfilechooserdefault.c:1753 gtk/gtkfilechooserdefault.c:4851
+#: gtk/gtkfilechooserdefault.c:1751 gtk/gtkfilechooserdefault.c:4849
 msgid "Recently Used"
 msgstr "Sist brukt"
 
-#: gtk/gtkfilechooserdefault.c:2383
+#: gtk/gtkfilechooserdefault.c:2381
 msgid "Select which types of files are shown"
 msgstr "Velg hvilke filtyper som skal vises"
 
-#: gtk/gtkfilechooserdefault.c:2742
+#: gtk/gtkfilechooserdefault.c:2740
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Legg til mappe «%s» i bokmerker"
 
-#: gtk/gtkfilechooserdefault.c:2786
+#: gtk/gtkfilechooserdefault.c:2784
 #, c-format
 msgid "Add the current folder to the bookmarks"
 msgstr "Legg til aktiv mappe i bokmerker"
 
-#: gtk/gtkfilechooserdefault.c:2788
+#: gtk/gtkfilechooserdefault.c:2786
 #, c-format
 msgid "Add the selected folders to the bookmarks"
 msgstr "Legg til valgte mapper i bokmerker"
 
-#: gtk/gtkfilechooserdefault.c:2826
+#: gtk/gtkfilechooserdefault.c:2824
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Fjern bokmerke «%s»"
 
-#: gtk/gtkfilechooserdefault.c:2828
+#: gtk/gtkfilechooserdefault.c:2826
 #, c-format
 msgid "Bookmark '%s' cannot be removed"
 msgstr "Bokmerke «%s» kan ikke fjernes"
 
-#: gtk/gtkfilechooserdefault.c:2835 gtk/gtkfilechooserdefault.c:3717
+#: gtk/gtkfilechooserdefault.c:2833 gtk/gtkfilechooserdefault.c:3715
 msgid "Remove the selected bookmark"
 msgstr "Fjern valgt bokmerke"
 
-#: gtk/gtkfilechooserdefault.c:3398
+#: gtk/gtkfilechooserdefault.c:3396
 msgid "Remove"
 msgstr "Fjern"
 
-#: gtk/gtkfilechooserdefault.c:3407
+#: gtk/gtkfilechooserdefault.c:3405
 msgid "Rename..."
 msgstr "Gi nytt navn..."
 
 #. Accessible object name for the file chooser's shortcuts pane
-#: gtk/gtkfilechooserdefault.c:3574
+#: gtk/gtkfilechooserdefault.c:3572
 msgid "Places"
 msgstr "Steder"
 
 #. Column header for the file chooser's shortcuts pane
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3629
 msgid "_Places"
 msgstr "_Steder"
 
-#: gtk/gtkfilechooserdefault.c:3705
+#: gtk/gtkfilechooserdefault.c:3703
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Legg til valgt mappe i bokmerker"
 
-#: gtk/gtkfilechooserdefault.c:3849
+#: gtk/gtkfilechooserdefault.c:3847
 msgid "Could not select file"
 msgstr "Kunne ikke velge fil"
 
-#: gtk/gtkfilechooserdefault.c:4022
+#: gtk/gtkfilechooserdefault.c:4020
 msgid "_Add to Bookmarks"
 msgstr "L_egg til i bokmerker"
 
-#: gtk/gtkfilechooserdefault.c:4035
+#: gtk/gtkfilechooserdefault.c:4033
 msgid "Show _Hidden Files"
 msgstr "Vis sk_julte filer"
 
-#: gtk/gtkfilechooserdefault.c:4042
+#: gtk/gtkfilechooserdefault.c:4040
 msgid "Show _Size Column"
 msgstr "Vis kolonne for _størrelse"
 
-#: gtk/gtkfilechooserdefault.c:4266 gtk/gtkfilesel.c:730
+#: gtk/gtkfilechooserdefault.c:4264 gtk/gtkfilesel.c:730
 msgid "Files"
 msgstr "Filer"
 
-#: gtk/gtkfilechooserdefault.c:4317
+#: gtk/gtkfilechooserdefault.c:4315
 msgid "Name"
 msgstr "Navn"
 
-#: gtk/gtkfilechooserdefault.c:4340
+#: gtk/gtkfilechooserdefault.c:4338
 msgid "Size"
 msgstr "Størrelse"
 
-#: gtk/gtkfilechooserdefault.c:4354
+#: gtk/gtkfilechooserdefault.c:4352
 msgid "Modified"
 msgstr "Endret"
 
 #. Label
-#: gtk/gtkfilechooserdefault.c:4449 gtk/gtkprinteroptionwidget.c:832
+#: gtk/gtkfilechooserdefault.c:4447 gtk/gtkprinteroptionwidget.c:832
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: gtk/gtkfilechooserdefault.c:4689
+#: gtk/gtkfilechooserdefault.c:4687
 msgid "Type a file name"
 msgstr "Skriv et filnavn"
 
-#: gtk/gtkfilechooserdefault.c:4736 gtk/gtkfilechooserdefault.c:4747
+#: gtk/gtkfilechooserdefault.c:4734 gtk/gtkfilechooserdefault.c:4745
 msgid "Please select a folder below"
-msgstr ""
+msgstr "Velg en mappe under"
 
-#: gtk/gtkfilechooserdefault.c:4742
+#: gtk/gtkfilechooserdefault.c:4740
 msgid "Please type a file name"
-msgstr ""
+msgstr "Skriv et filnavn"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:4813
+#: gtk/gtkfilechooserdefault.c:4811
 msgid "Create Fo_lder"
 msgstr "Opprett _mappe"
 
-#: gtk/gtkfilechooserdefault.c:4861
+#: gtk/gtkfilechooserdefault.c:4859
 msgid "Search:"
 msgstr "Søk:"
 
-#: gtk/gtkfilechooserdefault.c:4912
+#: gtk/gtkfilechooserdefault.c:4910
 msgid "_Location:"
 msgstr "_Lokasjon:"
 
-#: gtk/gtkfilechooserdefault.c:5362
+#: gtk/gtkfilechooserdefault.c:5360
 msgid "Save in _folder:"
 msgstr "Lagre i _mappe:"
 
-#: gtk/gtkfilechooserdefault.c:5364
+#: gtk/gtkfilechooserdefault.c:5362
 msgid "Create in _folder:"
 msgstr "Opprett i _mappe:"
 
-#: gtk/gtkfilechooserdefault.c:6503
+#: gtk/gtkfilechooserdefault.c:6456
 #, c-format
 msgid "Could not read the contents of %s"
 msgstr "Kunne ikke lese innholdet av %s"
 
-#: gtk/gtkfilechooserdefault.c:6507
+#: gtk/gtkfilechooserdefault.c:6460
 msgid "Could not read the contents of the folder"
 msgstr "Kunne ikke lese innholdet i mappen"
 
-#: gtk/gtkfilechooserdefault.c:6600 gtk/gtkfilechooserdefault.c:6668
-#: gtk/gtkfilechooserdefault.c:6824
+#: gtk/gtkfilechooserdefault.c:6553 gtk/gtkfilechooserdefault.c:6621
+#: gtk/gtkfilechooserdefault.c:6777
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6568
 msgid "%H:%M"
 msgstr "%H.%M"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6570
 msgid "Yesterday at %H:%M"
 msgstr "I går kl. %H.%M"
 
-#: gtk/gtkfilechooserdefault.c:7296
+#: gtk/gtkfilechooserdefault.c:7249
 msgid "Cannot change to folder because it is not local"
 msgstr "Kan ikke gå til mappen fordi den ikke er lokal."
 
-#: gtk/gtkfilechooserdefault.c:7899 gtk/gtkfilechooserdefault.c:7920
+#: gtk/gtkfilechooserdefault.c:7842 gtk/gtkfilechooserdefault.c:7863
 #, c-format
 msgid "Shortcut %s already exists"
 msgstr "Snarvei %s eksisterer allerede"
 
-#: gtk/gtkfilechooserdefault.c:8010
+#: gtk/gtkfilechooserdefault.c:7953
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Snarvei %s eksisterer ikke"
 
-#: gtk/gtkfilechooserdefault.c:8253 gtk/gtkprintunixdialog.c:480
+#: gtk/gtkfilechooserdefault.c:8194 gtk/gtkprintunixdialog.c:480
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "En fil med navn «%s» eksisterer allerede. Vil du erstatte den?"
 
-#: gtk/gtkfilechooserdefault.c:8256 gtk/gtkprintunixdialog.c:484
+#: gtk/gtkfilechooserdefault.c:8197 gtk/gtkprintunixdialog.c:484
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
@@ -1052,15 +1052,15 @@
 "Filen eksisterer allerede i «%s». Hvis du erstatter denne vil du overskrive "
 "innholdet."
 
-#: gtk/gtkfilechooserdefault.c:8261 gtk/gtkprintunixdialog.c:491
+#: gtk/gtkfilechooserdefault.c:8202 gtk/gtkprintunixdialog.c:491
 msgid "_Replace"
 msgstr "E_rstatt"
 
-#: gtk/gtkfilechooserdefault.c:9068
+#: gtk/gtkfilechooserdefault.c:9009
 msgid "Could not start the search process"
 msgstr "Kunne ikke starte søkeprosessen"
 
-#: gtk/gtkfilechooserdefault.c:9069
+#: gtk/gtkfilechooserdefault.c:9010
 msgid ""
 "The program was not able to create a connection to the indexer daemon.  "
 "Please make sure it is running."
@@ -1068,11 +1068,11 @@
 "Programmet kunne ikke opprette en tilkobling til indekseringstjenesten. "
 "Sjekk at denne kjører."
 
-#: gtk/gtkfilechooserdefault.c:9083
+#: gtk/gtkfilechooserdefault.c:9024
 msgid "Could not send the search request"
 msgstr "Kunne ikke sende søkeforespørselen"
 
-#: gtk/gtkfilechooserdefault.c:9684
+#: gtk/gtkfilechooserdefault.c:9625
 #, c-format
 msgid "Could not mount %s"
 msgstr "Kunne ikke montere %s"
@@ -1136,7 +1136,7 @@
 msgid "Path does not exist"
 msgstr "Stien eksisterer ikke"
 
-#: gtk/gtkfilechoosersettings.c:536 gtk/gtkfilesel.c:1349
+#: gtk/gtkfilechoosersettings.c:515 gtk/gtkfilesel.c:1349
 #: gtk/gtkfilesel.c:1360
 #, c-format
 msgid "Error creating folder '%s': %s"
@@ -1460,12 +1460,12 @@
 msgstr "_Tøm"
 
 #. Open Link
-#: gtk/gtklabel.c:5702
+#: gtk/gtklabel.c:5695
 msgid "_Open Link"
 msgstr "_Åpne lenke"
 
 #. Copy Link Address
-#: gtk/gtklabel.c:5714
+#: gtk/gtklabel.c:5707
 msgid "Copy _Link Address"
 msgstr "Kopier _lenkens adresse"
 
@@ -1606,7 +1606,7 @@
 msgid "Cannot end process with PID %d: %s"
 msgstr "Kan ikke avslutte prosess med PID %d: %s"
 
-#: gtk/gtknotebook.c:4744 gtk/gtknotebook.c:7350
+#: gtk/gtknotebook.c:4745 gtk/gtknotebook.c:7351
 #, c-format
 msgid "Page %u"
 msgstr "Side %u"
@@ -1666,7 +1666,7 @@
 msgid "Down Path"
 msgstr "Ned sti"
 
-#: gtk/gtkpathbar.c:1469
+#: gtk/gtkpathbar.c:1467
 msgid "File System Root"
 msgstr "Filsystemrot"
 
@@ -1787,7 +1787,7 @@
 
 #. Translators: this is a printer status.
 #: gtk/gtkprintoperation-win32.c:616
-#: modules/printbackends/cups/gtkprintbackendcups.c:2153
+#: modules/printbackends/cups/gtkprintbackendcups.c:2317
 msgid "Paused"
 msgstr "Pause"
 
@@ -1914,42 +1914,42 @@
 #. * multiple pages on a sheet when printing
 #. 
 #: gtk/gtkprintunixdialog.c:3019
-#: modules/printbackends/cups/gtkprintbackendcups.c:3707
+#: modules/printbackends/cups/gtkprintbackendcups.c:4655
 msgid "Left to right, top to bottom"
 msgstr "Venstre til høyre, topp til bunn"
 
 #: gtk/gtkprintunixdialog.c:3019
-#: modules/printbackends/cups/gtkprintbackendcups.c:3707
+#: modules/printbackends/cups/gtkprintbackendcups.c:4655
 msgid "Left to right, bottom to top"
 msgstr "Venstre til høyre, bunn til topp"
 
 #: gtk/gtkprintunixdialog.c:3020
-#: modules/printbackends/cups/gtkprintbackendcups.c:3708
+#: modules/printbackends/cups/gtkprintbackendcups.c:4656
 msgid "Right to left, top to bottom"
 msgstr "Høyre til venstre, topp til bunn"
 
 #: gtk/gtkprintunixdialog.c:3020
-#: modules/printbackends/cups/gtkprintbackendcups.c:3708
+#: modules/printbackends/cups/gtkprintbackendcups.c:4656
 msgid "Right to left, bottom to top"
 msgstr "Høyre til venstre, bunn til topp"
 
 #: gtk/gtkprintunixdialog.c:3021
-#: modules/printbackends/cups/gtkprintbackendcups.c:3709
+#: modules/printbackends/cups/gtkprintbackendcups.c:4657
 msgid "Top to bottom, left to right"
 msgstr "Topp til bunn, venstre til høyre"
 
 #: gtk/gtkprintunixdialog.c:3021
-#: modules/printbackends/cups/gtkprintbackendcups.c:3709
+#: modules/printbackends/cups/gtkprintbackendcups.c:4657
 msgid "Top to bottom, right to left"
 msgstr "Topp til bunn, høyre til venstre"
 
 #: gtk/gtkprintunixdialog.c:3022
-#: modules/printbackends/cups/gtkprintbackendcups.c:3710
+#: modules/printbackends/cups/gtkprintbackendcups.c:4658
 msgid "Bottom to top, left to right"
 msgstr "Bunn til topp, venstre til høyre"
 
 #: gtk/gtkprintunixdialog.c:3022
-#: modules/printbackends/cups/gtkprintbackendcups.c:3710
+#: modules/printbackends/cups/gtkprintbackendcups.c:4658
 msgid "Bottom to top, right to left"
 msgstr "Bunn til topp, høyre til venstre"
 
@@ -1957,7 +1957,7 @@
 #. * dialog that controls in what order multiple pages are arranged
 #. 
 #: gtk/gtkprintunixdialog.c:3026 gtk/gtkprintunixdialog.c:3039
-#: modules/printbackends/cups/gtkprintbackendcups.c:3742
+#: modules/printbackends/cups/gtkprintbackendcups.c:4690
 msgid "Page Ordering"
 msgstr "Siderekkefølge"
 
@@ -2155,12 +2155,12 @@
 msgid "Print"
 msgstr "Skriv ut"
 
-#: gtk/gtkrc.c:2886
+#: gtk/gtkrc.c:2900
 #, c-format
 msgid "Unable to find include file: \"%s\""
 msgstr "Kan ikke finne include-fil: «%s»"
 
-#: gtk/gtkrc.c:3516 gtk/gtkrc.c:3519
+#: gtk/gtkrc.c:3530 gtk/gtkrc.c:3533
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "Kunne ikke finne bildefil i pixmap_path: «%s»"
@@ -3825,101 +3825,101 @@
 msgid "different idatas found for symlinked '%s' and '%s'\n"
 msgstr "forskjellige idata funnet for symbolske lenker «%s» og «%s»\n"
 
-#: gtk/updateiconcache.c:1374
+#: gtk/updateiconcache.c:1392
 #, c-format
 msgid "Failed to write header\n"
 msgstr "Klarte ikke å skrive hode\n"
 
-#: gtk/updateiconcache.c:1380
+#: gtk/updateiconcache.c:1398
 #, c-format
 msgid "Failed to write hash table\n"
 msgstr "Klarte ikke å skrive hash-tabell\n"
 
-#: gtk/updateiconcache.c:1386
+#: gtk/updateiconcache.c:1404
 #, c-format
 msgid "Failed to write folder index\n"
 msgstr "Klarte ikke å skrive mappeindeks\n"
 
-#: gtk/updateiconcache.c:1394
+#: gtk/updateiconcache.c:1412
 #, c-format
 msgid "Failed to rewrite header\n"
 msgstr "Klarte ikke skrive om hode\n"
 
-#: gtk/updateiconcache.c:1488
+#: gtk/updateiconcache.c:1506
 #, c-format
 msgid "Failed to open file %s : %s\n"
 msgstr "Klarte ikke å åpne fil %s: %s\n"
 
-#: gtk/updateiconcache.c:1496 gtk/updateiconcache.c:1526
+#: gtk/updateiconcache.c:1514 gtk/updateiconcache.c:1544
 #, c-format
 msgid "Failed to write cache file: %s\n"
 msgstr "Klarte ikke å skrive bufferfil: %s\n"
 
-#: gtk/updateiconcache.c:1537
+#: gtk/updateiconcache.c:1555
 #, c-format
 msgid "The generated cache was invalid.\n"
 msgstr "Generert buffer var ugyldig.\n"
 
-#: gtk/updateiconcache.c:1551
+#: gtk/updateiconcache.c:1569
 #, c-format
 msgid "Could not rename %s to %s: %s, removing %s then.\n"
 msgstr "Kunne ikke endre navn på %s til %s: %s, fjerner %s.\n"
 
-#: gtk/updateiconcache.c:1565
+#: gtk/updateiconcache.c:1583
 #, c-format
 msgid "Could not rename %s to %s: %s\n"
 msgstr "Kunne ikke endre navn på %s til %s: %s\n"
 
-#: gtk/updateiconcache.c:1575
+#: gtk/updateiconcache.c:1593
 #, c-format
 msgid "Could not rename %s back to %s: %s.\n"
 msgstr "Kunne ikke endre navn på %s tilbake til %s: %s\n"
 
-#: gtk/updateiconcache.c:1602
+#: gtk/updateiconcache.c:1620
 #, c-format
 msgid "Cache file created successfully.\n"
 msgstr "Oppretting av bufferfil fullført.\n"
 
-#: gtk/updateiconcache.c:1641
+#: gtk/updateiconcache.c:1659
 msgid "Overwrite an existing cache, even if up to date"
 msgstr "Overskriv en eksisterende buffer, selv om den er oppdatert"
 
-#: gtk/updateiconcache.c:1642
+#: gtk/updateiconcache.c:1660
 msgid "Don't check for the existence of index.theme"
 msgstr "Ikke sjekk om index.theme eksisterer"
 
-#: gtk/updateiconcache.c:1643
+#: gtk/updateiconcache.c:1661
 msgid "Don't include image data in the cache"
 msgstr "Ikke ta med bildedata i bufferen"
 
-#: gtk/updateiconcache.c:1644
+#: gtk/updateiconcache.c:1662
 msgid "Output a C header file"
 msgstr "Skriv ut en C-headerfil"
 
-#: gtk/updateiconcache.c:1645
+#: gtk/updateiconcache.c:1663
 msgid "Turn off verbose output"
 msgstr "Slå av ekstra utdata"
 
-#: gtk/updateiconcache.c:1646
+#: gtk/updateiconcache.c:1664
 msgid "Validate existing icon cache"
 msgstr "Valider eksisterende ikonbuffer"
 
-#: gtk/updateiconcache.c:1713
+#: gtk/updateiconcache.c:1731
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Fil ikke funnet %s\n"
 
-#: gtk/updateiconcache.c:1719
+#: gtk/updateiconcache.c:1737
 #, c-format
 msgid "Not a valid icon cache: %s\n"
 msgstr "Ikke en gyldig ikonbuffer: %s\n"
 
-#: gtk/updateiconcache.c:1732
+#: gtk/updateiconcache.c:1750
 #, c-format
 msgid "No theme index file.\n"
 msgstr "Ingen indeksfil for tema.\n"
 
-#: gtk/updateiconcache.c:1736
+#: gtk/updateiconcache.c:1754
 #, c-format
 msgid ""
 "No theme index file in '%s'.\n"
@@ -3983,143 +3983,143 @@
 msgid "X Input Method"
 msgstr "X-inndatametode"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:889
-#: modules/printbackends/cups/gtkprintbackendcups.c:1108
+#: modules/printbackends/cups/gtkprintbackendcups.c:1042
+#: modules/printbackends/cups/gtkprintbackendcups.c:1261
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:890
-#: modules/printbackends/cups/gtkprintbackendcups.c:1117
+#: modules/printbackends/cups/gtkprintbackendcups.c:1043
+#: modules/printbackends/cups/gtkprintbackendcups.c:1270
 msgid "Password:"
 msgstr "Passord:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:929
-#: modules/printbackends/cups/gtkprintbackendcups.c:1130
+#: modules/printbackends/cups/gtkprintbackendcups.c:1082
+#: modules/printbackends/cups/gtkprintbackendcups.c:1283
 #, c-format
 msgid "Authentication is required to print document '%s' on printer %s"
 msgstr "Autentisering kreves for å skrive ut dokument «%s» på skriver %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:931
+#: modules/printbackends/cups/gtkprintbackendcups.c:1084
 #, c-format
 msgid "Authentication is required to print a document on %s"
 msgstr "Autentisering kreves for å skrive ut et dokument på %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:935
+#: modules/printbackends/cups/gtkprintbackendcups.c:1088
 #, c-format
 msgid "Authentication is required to get attributes of job '%s'"
 msgstr "Autentisering kreves for å hente attributter for jobb «%s»"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:937
+#: modules/printbackends/cups/gtkprintbackendcups.c:1090
 msgid "Authentication is required to get attributes of a job"
 msgstr "Autentisering kreves for å hente attributter for en jobb"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:941
+#: modules/printbackends/cups/gtkprintbackendcups.c:1094
 #, c-format
 msgid "Authentication is required to get attributes of printer %s"
 msgstr "Autentisering kreves for å hente attributter for skriver %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:943
+#: modules/printbackends/cups/gtkprintbackendcups.c:1096
 msgid "Authentication is required to get attributes of a printer"
 msgstr "Autentisering kreves for å hente attributter for en skriver"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:946
+#: modules/printbackends/cups/gtkprintbackendcups.c:1099
 #, c-format
 msgid "Authentication is required to get default printer of %s"
 msgstr "Autentisering kreves for å hente forvalgt skriver for %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:949
+#: modules/printbackends/cups/gtkprintbackendcups.c:1102
 #, c-format
 msgid "Authentication is required to get printers from %s"
 msgstr "Autentisering kreves for å hente skrivere fra %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:954
+#: modules/printbackends/cups/gtkprintbackendcups.c:1107
 #, c-format
 msgid "Authentication is required to get a file from %s"
 msgstr "Autentisering kreves for å hente en fil fra %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:956
+#: modules/printbackends/cups/gtkprintbackendcups.c:1109
 #, c-format
 msgid "Authentication is required on %s"
 msgstr "Autentisering kreves på %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1102
+#: modules/printbackends/cups/gtkprintbackendcups.c:1255
 msgid "Domain:"
 msgstr "Domene:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1132
+#: modules/printbackends/cups/gtkprintbackendcups.c:1285
 #, c-format
 msgid "Authentication is required to print document '%s'"
 msgstr "Autentisering kreves for å skrive ut dokument «%s»"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1137
+#: modules/printbackends/cups/gtkprintbackendcups.c:1290
 #, c-format
 msgid "Authentication is required to print this document on printer %s"
 msgstr "Autentisering kreves for å skrive ut dette dokumentet på skriver %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1139
+#: modules/printbackends/cups/gtkprintbackendcups.c:1292
 msgid "Authentication is required to print this document"
 msgstr "Autentisering kreves for å skrive ut dette dokumentet"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1701
+#: modules/printbackends/cups/gtkprintbackendcups.c:1854
 #, c-format
 msgid "Printer '%s' is low on toner."
 msgstr "Skriver «%s» har lite toner."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1702
+#: modules/printbackends/cups/gtkprintbackendcups.c:1855
 #, c-format
 msgid "Printer '%s' has no toner left."
 msgstr "Skriver «%s» er tom for toner."
 
 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:1704
+#: modules/printbackends/cups/gtkprintbackendcups.c:1857
 #, c-format
 msgid "Printer '%s' is low on developer."
 msgstr "Skriver «%s» har lite framkallingsmiddel."
 
 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:1706
+#: modules/printbackends/cups/gtkprintbackendcups.c:1859
 #, c-format
 msgid "Printer '%s' is out of developer."
 msgstr "Skriver «%s» er tom for framkallingsmiddel."
 
 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:1708
+#: modules/printbackends/cups/gtkprintbackendcups.c:1861
 #, c-format
 msgid "Printer '%s' is low on at least one marker supply."
 msgstr "Skriver «%s» har minst en tonerkassett som snart er tom."
 
 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:1710
+#: modules/printbackends/cups/gtkprintbackendcups.c:1863
 #, c-format
 msgid "Printer '%s' is out of at least one marker supply."
 msgstr "Skriver «%s» har minst en tom tonerkassett."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1711
+#: modules/printbackends/cups/gtkprintbackendcups.c:1864
 #, c-format
 msgid "The cover is open on printer '%s'."
 msgstr "Lokket er åpent på skriver «%s»."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1712
+#: modules/printbackends/cups/gtkprintbackendcups.c:1865
 #, c-format
 msgid "The door is open on printer '%s'."
 msgstr "Døren er åpen på skriver «%s»."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1713
+#: modules/printbackends/cups/gtkprintbackendcups.c:1866
 #, c-format
 msgid "Printer '%s' is low on paper."
 msgstr "Skriver «%s» har lite papir."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1714
+#: modules/printbackends/cups/gtkprintbackendcups.c:1867
 #, c-format
 msgid "Printer '%s' is out of paper."
 msgstr "Skriver «%s» er tom for papir."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1715
+#: modules/printbackends/cups/gtkprintbackendcups.c:1868
 #, c-format
 msgid "Printer '%s' is currently offline."
 msgstr "Skriver «%s» er frakoblet for tiden."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1716
+#: modules/printbackends/cups/gtkprintbackendcups.c:1869
 #, c-format
 msgid "There is a problem on printer '%s'."
 msgstr "Det er et problem med skriver «%s»."
@@ -4130,107 +4130,107 @@
 msgstr "Satt på pause. Avviser jobber"
 
 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:2156
+#: modules/printbackends/cups/gtkprintbackendcups.c:2320
 msgid "Rejecting Jobs"
 msgstr "Avviser jobber"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2939
+#: modules/printbackends/cups/gtkprintbackendcups.c:3887
 msgid "Two Sided"
 msgstr "Tosidig"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2940
+#: modules/printbackends/cups/gtkprintbackendcups.c:3888
 msgid "Paper Type"
 msgstr "Papirtype"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2941
+#: modules/printbackends/cups/gtkprintbackendcups.c:3889
 msgid "Paper Source"
 msgstr "Papirkilde"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2942
+#: modules/printbackends/cups/gtkprintbackendcups.c:3890
 msgid "Output Tray"
 msgstr "Utskuff"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2943
+#: modules/printbackends/cups/gtkprintbackendcups.c:3891
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2944
+#: modules/printbackends/cups/gtkprintbackendcups.c:3892
 msgid "GhostScript pre-filtering"
 msgstr "Forhåndsfiltrering med GhostScript"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2953
+#: modules/printbackends/cups/gtkprintbackendcups.c:3901
 msgid "One Sided"
 msgstr "Ensidig"
 
 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2955
+#: modules/printbackends/cups/gtkprintbackendcups.c:3903
 msgid "Long Edge (Standard)"
 msgstr "Lang kant (standard)"
 
 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2957
+#: modules/printbackends/cups/gtkprintbackendcups.c:3905
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (vend)"
 
 #. Translators: this is an option of "Paper Source"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2959
-#: modules/printbackends/cups/gtkprintbackendcups.c:2961
-#: modules/printbackends/cups/gtkprintbackendcups.c:2969
+#: modules/printbackends/cups/gtkprintbackendcups.c:3907
+#: modules/printbackends/cups/gtkprintbackendcups.c:3909
+#: modules/printbackends/cups/gtkprintbackendcups.c:3917
 msgid "Auto Select"
 msgstr "Velg automatisk"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2963
-#: modules/printbackends/cups/gtkprintbackendcups.c:2965
-#: modules/printbackends/cups/gtkprintbackendcups.c:2967
-#: modules/printbackends/cups/gtkprintbackendcups.c:2971
-#: modules/printbackends/cups/gtkprintbackendcups.c:3467
+#: modules/printbackends/cups/gtkprintbackendcups.c:3911
+#: modules/printbackends/cups/gtkprintbackendcups.c:3913
+#: modules/printbackends/cups/gtkprintbackendcups.c:3915
+#: modules/printbackends/cups/gtkprintbackendcups.c:3919
+#: modules/printbackends/cups/gtkprintbackendcups.c:4415
 msgid "Printer Default"
 msgstr "Forvalg for skriver"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2973
+#: modules/printbackends/cups/gtkprintbackendcups.c:3921
 msgid "Embed GhostScript fonts only"
 msgstr "Bygg kun inn GhostScript-skrifter"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2975
+#: modules/printbackends/cups/gtkprintbackendcups.c:3923
 msgid "Convert to PS level 1"
 msgstr "Konverter til PS nivå 1"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2977
+#: modules/printbackends/cups/gtkprintbackendcups.c:3925
 msgid "Convert to PS level 2"
 msgstr "Konverter til PS nivå 2"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2979
+#: modules/printbackends/cups/gtkprintbackendcups.c:3927
 msgid "No pre-filtering"
 msgstr "Ingen forhåndsfiltrering"
 
 #. Translators: "Miscellaneous" is the label for a button, that opens
 #. up an extra panel of settings in a print dialog.
-#: modules/printbackends/cups/gtkprintbackendcups.c:2988
+#: modules/printbackends/cups/gtkprintbackendcups.c:3936
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
 #. Translators: These strings name the possible values of the
 #. * job priority option in the print dialog
 #. 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3702
+#: modules/printbackends/cups/gtkprintbackendcups.c:4650
 msgid "Urgent"
 msgstr "Haster"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3702
+#: modules/printbackends/cups/gtkprintbackendcups.c:4650
 msgid "High"
 msgstr "Høy"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3702
+#: modules/printbackends/cups/gtkprintbackendcups.c:4650
 msgid "Medium"
 msgstr "Middels"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3702
+#: modules/printbackends/cups/gtkprintbackendcups.c:4650
 msgid "Low"
 msgstr "Lav"
 
@@ -4238,66 +4238,66 @@
 #. Translators, this string is used to label the pages-per-sheet option
 #. * in the print dialog
 #. 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3726
+#: modules/printbackends/cups/gtkprintbackendcups.c:4674
 msgid "Pages per Sheet"
 msgstr "Sider per ark"
 
 #. Translators, this string is used to label the job priority option
 #. * in the print dialog
 #. 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3763
+#: modules/printbackends/cups/gtkprintbackendcups.c:4711
 msgid "Job Priority"
 msgstr "Prioritet for jobb"
 
 #. Translators, this string is used to label the billing info entry
 #. * in the print dialog
 #. 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3774
+#: modules/printbackends/cups/gtkprintbackendcups.c:4722
 msgid "Billing Info"
 msgstr "Faktureringsinformasjon:"
 
 #. Translators, these strings are names for various 'standard' cover
 #. * pages that the printing system may support.
 #. 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3789
+#: modules/printbackends/cups/gtkprintbackendcups.c:4737
 msgid "None"
 msgstr "Ingen"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3789
+#: modules/printbackends/cups/gtkprintbackendcups.c:4737
 msgid "Classified"
 msgstr "Klassifisert"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3789
+#: modules/printbackends/cups/gtkprintbackendcups.c:4737
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3789
+#: modules/printbackends/cups/gtkprintbackendcups.c:4737
 msgid "Secret"
 msgstr "Hemmelig"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3789
+#: modules/printbackends/cups/gtkprintbackendcups.c:4737
 msgid "Standard"
 msgstr "Vanlig"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3789
+#: modules/printbackends/cups/gtkprintbackendcups.c:4737
 msgid "Top Secret"
 msgstr "Topphemmelig"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3789
+#: modules/printbackends/cups/gtkprintbackendcups.c:4737
 msgid "Unclassified"
 msgstr "Ikke klassifisert"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #. 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3824
+#: modules/printbackends/cups/gtkprintbackendcups.c:4772
 msgid "Before"
 msgstr "Før"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #. 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3839
+#: modules/printbackends/cups/gtkprintbackendcups.c:4787
 msgid "After"
 msgstr "Etter"
 
@@ -4305,14 +4305,14 @@
 #. * a print job is printed. Possible values are 'now', a specified time,
 #. * or 'on hold'
 #. 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3859
+#: modules/printbackends/cups/gtkprintbackendcups.c:4807
 msgid "Print at"
 msgstr "Tidspunkt for utskrift"
 
 #. Translators: this is the name of the option that allows the user
 #. * to specify a time when a print job will be printed.
 #. 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3870
+#: modules/printbackends/cups/gtkprintbackendcups.c:4818
 msgid "Print at time"
 msgstr "Tidspunkt for utskrift"
 
@@ -4320,7 +4320,7 @@
 #. * size. The two placeholders are replaced with the width and height
 #. * in points. E.g: "Custom 230.4x142.9"
 #. 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3905
+#: modules/printbackends/cups/gtkprintbackendcups.c:4853
 #, c-format
 msgid "Custom %sx%s"
 msgstr "Egendefinert %sx%s"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtk30-properties.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtk30-properties.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtk30-properties.po	2013-01-29 09:34:00.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtk30-properties.po	2014-01-07 06:37:37.000000000 +0000
@@ -15,84 +15,84 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:23+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:18+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
-#: ../gdk/gdkapplaunchcontext.c:129 ../gdk/gdkcursor.c:134
+#: ../gdk/gdkapplaunchcontext.c:129 ../gdk/gdkcursor.c:139
 #: ../gdk/gdkdevicemanager.c:170
 msgid "Display"
 msgstr "Skjerm"
 
-#: ../gdk/gdkcursor.c:126
+#: ../gdk/gdkcursor.c:131
 msgid "Cursor type"
 msgstr "Type markør"
 
-#: ../gdk/gdkcursor.c:127
+#: ../gdk/gdkcursor.c:132
 msgid "Standard cursor type"
 msgstr "Forvalgt type markør"
 
-#: ../gdk/gdkcursor.c:135
+#: ../gdk/gdkcursor.c:140
 msgid "Display of this cursor"
 msgstr "Visning av denne markøren"
 
-#: ../gdk/gdkdevice.c:109
+#: ../gdk/gdkdevice.c:112
 msgid "Device Display"
 msgstr "Skjerm for enhet"
 
-#: ../gdk/gdkdevice.c:110
+#: ../gdk/gdkdevice.c:113
 msgid "Display which the device belongs to"
 msgstr "Skjerm denne enheten tilhører"
 
-#: ../gdk/gdkdevice.c:124
+#: ../gdk/gdkdevice.c:127
 msgid "Device manager"
 msgstr "Enhetshåndtering"
 
-#: ../gdk/gdkdevice.c:125
+#: ../gdk/gdkdevice.c:128
 msgid "Device manager which the device belongs to"
 msgstr "Enhetshåndterer denne enheten tilhører"
 
-#: ../gdk/gdkdevice.c:139 ../gdk/gdkdevice.c:140
+#: ../gdk/gdkdevice.c:142 ../gdk/gdkdevice.c:143
 msgid "Device name"
 msgstr "Navn på enhet"
 
-#: ../gdk/gdkdevice.c:154
+#: ../gdk/gdkdevice.c:157
 msgid "Device type"
 msgstr "Type enhet"
 
-#: ../gdk/gdkdevice.c:155
+#: ../gdk/gdkdevice.c:158
 msgid "Device role in the device manager"
 msgstr "Rolle for enhet i enhetshåndterer"
 
-#: ../gdk/gdkdevice.c:171
+#: ../gdk/gdkdevice.c:174
 msgid "Associated device"
 msgstr "Assosiert enhet"
 
-#: ../gdk/gdkdevice.c:172
+#: ../gdk/gdkdevice.c:175
 msgid "Associated pointer or keyboard with this device"
-msgstr ""
+msgstr "Peker eller tastatur som hører til denne enheten"
 
-#: ../gdk/gdkdevice.c:185
+#: ../gdk/gdkdevice.c:188
 msgid "Input source"
 msgstr "Inndatakilde"
 
-#: ../gdk/gdkdevice.c:186
+#: ../gdk/gdkdevice.c:189
 msgid "Source type for the device"
 msgstr "Kildetype for enheten"
 
-#: ../gdk/gdkdevice.c:201 ../gdk/gdkdevice.c:202
+#: ../gdk/gdkdevice.c:204 ../gdk/gdkdevice.c:205
 msgid "Input mode for the device"
 msgstr "Inndatamodus for enheten"
 
-#: ../gdk/gdkdevice.c:217
+#: ../gdk/gdkdevice.c:220
 msgid "Whether the device has a cursor"
 msgstr "Hvorvidt enheten har en markør"
 
-#: ../gdk/gdkdevice.c:218
+#: ../gdk/gdkdevice.c:221
 msgid "Whether there is a visible cursor following device motion"
 msgstr "Om en synlig markør følger bevegelse av enheten"
 
-#: ../gdk/gdkdevice.c:232 ../gdk/gdkdevice.c:233
+#: ../gdk/gdkdevice.c:235 ../gdk/gdkdevice.c:236
 msgid "Number of axes in the device"
 msgstr "Antall akser i enheten"
 
@@ -100,11 +100,11 @@
 msgid "Display for the device manager"
 msgstr "Skjerm for enhetshåndterer"
 
-#: ../gdk/gdkdisplaymanager.c:163
+#: ../gdk/gdkdisplaymanager.c:166
 msgid "Default Display"
 msgstr "Forvalgt skjerm"
 
-#: ../gdk/gdkdisplaymanager.c:164
+#: ../gdk/gdkdisplaymanager.c:167
 msgid "The default display for GDK"
 msgstr "Forvalgt skjerm for GDK"
 
@@ -124,39 +124,39 @@
 msgid "The resolution for fonts on the screen"
 msgstr "Oppløsning for skrifter på skjermen"
 
-#: ../gdk/gdkwindow.c:385 ../gdk/gdkwindow.c:386
+#: ../gdk/gdkwindow.c:322 ../gdk/gdkwindow.c:323
 msgid "Cursor"
 msgstr "Markør"
 
-#: ../gdk/x11/gdkdevicemanager-xi2.c:116
+#: ../gdk/x11/gdkdevicemanager-xi2.c:112
 msgid "Opcode"
 msgstr "Opcode"
 
-#: ../gdk/x11/gdkdevicemanager-xi2.c:117
+#: ../gdk/x11/gdkdevicemanager-xi2.c:113
 msgid "Opcode for XInput2 requests"
 msgstr "Opcode for XInput2-forespørsler"
 
-#: ../gdk/x11/gdkdevicemanager-xi2.c:123
+#: ../gdk/x11/gdkdevicemanager-xi2.c:119
 msgid "Major"
 msgstr "Større"
 
-#: ../gdk/x11/gdkdevicemanager-xi2.c:124
+#: ../gdk/x11/gdkdevicemanager-xi2.c:120
 msgid "Major version number"
 msgstr "Større versjonsnummer"
 
-#: ../gdk/x11/gdkdevicemanager-xi2.c:130
+#: ../gdk/x11/gdkdevicemanager-xi2.c:126
 msgid "Minor"
 msgstr "Mindre"
 
-#: ../gdk/x11/gdkdevicemanager-xi2.c:131
+#: ../gdk/x11/gdkdevicemanager-xi2.c:127
 msgid "Minor version number"
 msgstr "Mindre versjonsnummer"
 
-#: ../gdk/x11/gdkdevice-xi2.c:138
+#: ../gdk/x11/gdkdevice-xi2.c:142
 msgid "Device ID"
 msgstr "Enhets-ID"
 
-#: ../gdk/x11/gdkdevice-xi2.c:139
+#: ../gdk/x11/gdkdevice-xi2.c:143
 msgid "Device identifier"
 msgstr "Enhetsidentifikator"
 
@@ -184,7 +184,7 @@
 msgid "Whether a palette should be used"
 msgstr "Skal en palett brukes"
 
-#: ../gtk/deprecated/gtkcolorsel.c:345 ../gtk/gtkcolorbutton.c:203
+#: ../gtk/deprecated/gtkcolorsel.c:345 ../gtk/gtkcolorbutton.c:204
 msgid "Current Color"
 msgstr "Aktiv farge"
 
@@ -192,7 +192,7 @@
 msgid "The current color"
 msgstr "Den aktive fargen"
 
-#: ../gtk/deprecated/gtkcolorsel.c:352 ../gtk/gtkcolorbutton.c:218
+#: ../gtk/deprecated/gtkcolorsel.c:352 ../gtk/gtkcolorbutton.c:219
 msgid "Current Alpha"
 msgstr "Nåværende alpha"
 
@@ -210,57 +210,57 @@
 msgid "The current RGBA color"
 msgstr "Den aktive RGBA-fargen"
 
-#: ../gtk/deprecated/gtkcolorseldialog.c:138
+#: ../gtk/deprecated/gtkcolorseldialog.c:137
 msgid "Color Selection"
 msgstr "Fargeutvalg"
 
-#: ../gtk/deprecated/gtkcolorseldialog.c:139
+#: ../gtk/deprecated/gtkcolorseldialog.c:138
 msgid "The color selection embedded in the dialog."
 msgstr "Fargevalg innebygget i dialogen."
 
-#: ../gtk/deprecated/gtkcolorseldialog.c:145
+#: ../gtk/deprecated/gtkcolorseldialog.c:144
 msgid "OK Button"
 msgstr "OK-knapp"
 
-#: ../gtk/deprecated/gtkcolorseldialog.c:146
+#: ../gtk/deprecated/gtkcolorseldialog.c:145
 msgid "The OK button of the dialog."
 msgstr "OK-knappen i dialogen."
 
-#: ../gtk/deprecated/gtkcolorseldialog.c:152
+#: ../gtk/deprecated/gtkcolorseldialog.c:151
 msgid "Cancel Button"
 msgstr "Avbryt-knapp"
 
-#: ../gtk/deprecated/gtkcolorseldialog.c:153
+#: ../gtk/deprecated/gtkcolorseldialog.c:152
 msgid "The cancel button of the dialog."
 msgstr "Avbryt-knapp i dialogen"
 
-#: ../gtk/deprecated/gtkcolorseldialog.c:159
+#: ../gtk/deprecated/gtkcolorseldialog.c:158
 msgid "Help Button"
 msgstr "Hjelp-knapp"
 
-#: ../gtk/deprecated/gtkcolorseldialog.c:160
+#: ../gtk/deprecated/gtkcolorseldialog.c:159
 msgid "The help button of the dialog."
 msgstr "Hjelp-knapp i dialogen."
 
-#: ../gtk/deprecated/gtkfontsel.c:243 ../gtk/gtkfontbutton.c:450
+#: ../gtk/deprecated/gtkfontsel.c:240 ../gtk/gtkfontbutton.c:452
 msgid "Font name"
 msgstr "Skriftnavn"
 
-#: ../gtk/deprecated/gtkfontsel.c:244
+#: ../gtk/deprecated/gtkfontsel.c:241
 msgid "The string that represents this font"
 msgstr "Strengen som representerer denne skriften"
 
-#: ../gtk/deprecated/gtkfontsel.c:250 ../gtk/gtkfontchooser.c:91
+#: ../gtk/deprecated/gtkfontsel.c:247 ../gtk/gtkfontchooser.c:91
 msgid "Preview text"
 msgstr "Forhåndsvisningstekst"
 
-#: ../gtk/deprecated/gtkfontsel.c:251 ../gtk/gtkfontchooser.c:92
+#: ../gtk/deprecated/gtkfontsel.c:248 ../gtk/gtkfontchooser.c:92
 msgid "The text to display in order to demonstrate the selected font"
 msgstr "Tekst som skal vises for å demonstrere valgt skrift"
 
-#: ../gtk/deprecated/gtkhandlebox.c:224 ../gtk/gtkcombobox.c:1064
-#: ../gtk/gtkentry.c:890 ../gtk/gtkmenubar.c:213 ../gtk/gtkstatusbar.c:182
-#: ../gtk/gtktoolbar.c:628 ../gtk/gtkviewport.c:155
+#: ../gtk/deprecated/gtkhandlebox.c:224 ../gtk/gtkcombobox.c:1072
+#: ../gtk/gtkentry.c:909 ../gtk/gtkmenubar.c:216 ../gtk/gtkstatusbar.c:174
+#: ../gtk/gtktoolbar.c:632 ../gtk/gtkviewport.c:163
 msgid "Shadow type"
 msgstr "Skyggetype"
 
@@ -308,14 +308,16 @@
 "A boolean value indicating whether the handlebox's child is attached or "
 "detached."
 msgstr ""
+"En boolsk verdi som viser hvorvidt håndtakboksens dattervindu er tilkoblet "
+"eller frakoblet."
 
-#: ../gtk/deprecated/gtkstyle.c:474
+#: ../gtk/deprecated/gtkstyle.c:470
 msgid "Style context"
-msgstr ""
+msgstr "Stilkontekst"
 
-#: ../gtk/deprecated/gtkstyle.c:475
+#: ../gtk/deprecated/gtkstyle.c:471
 msgid "GtkStyleContext to get style from"
-msgstr ""
+msgstr "Hvilken GtkStyleContext som stilen skal hentes fra"
 
 #: ../gtk/deprecated/gtktable.c:191
 msgid "Rows"
@@ -333,24 +335,25 @@
 msgid "The number of columns in the table"
 msgstr "Antall kolonner i tabellen"
 
-#: ../gtk/deprecated/gtktable.c:209 ../gtk/gtkgrid.c:1392
+#: ../gtk/deprecated/gtktable.c:209 ../gtk/gtkgrid.c:1732
 msgid "Row spacing"
 msgstr "Avstand mellom rader"
 
-#: ../gtk/deprecated/gtktable.c:210 ../gtk/gtkgrid.c:1393
+#: ../gtk/deprecated/gtktable.c:210 ../gtk/gtkgrid.c:1733
 msgid "The amount of space between two consecutive rows"
 msgstr "Avstand mellom to etterfølgende rader"
 
-#: ../gtk/deprecated/gtktable.c:218 ../gtk/gtkgrid.c:1399
+#: ../gtk/deprecated/gtktable.c:218 ../gtk/gtkgrid.c:1739
 msgid "Column spacing"
 msgstr "Avstand mellom kolonner"
 
-#: ../gtk/deprecated/gtktable.c:219 ../gtk/gtkgrid.c:1400
+#: ../gtk/deprecated/gtktable.c:219 ../gtk/gtkgrid.c:1740
 msgid "The amount of space between two consecutive columns"
 msgstr "Avstand mellom to etterfølgende kolonner"
 
-#: ../gtk/deprecated/gtktable.c:227 ../gtk/gtkbox.c:250
-#: ../gtk/gtktoolbar.c:560 ../gtk/gtktoolitemgroup.c:1650
+#: ../gtk/deprecated/gtktable.c:227 ../gtk/gtkbox.c:261
+#: ../gtk/gtkflowbox.c:3683 ../gtk/gtkstack.c:375 ../gtk/gtktoolbar.c:564
+#: ../gtk/gtktoolitemgroup.c:1646
 msgid "Homogeneous"
 msgstr "Homogen"
 
@@ -358,11 +361,11 @@
 msgid "If TRUE, the table cells are all the same width/height"
 msgstr "Hvis TRUE betyr dette at alle tabellcellene har samme bredde/høyde"
 
-#: ../gtk/deprecated/gtktable.c:235 ../gtk/gtkgrid.c:1420
+#: ../gtk/deprecated/gtktable.c:235 ../gtk/gtkgrid.c:1767
 msgid "Left attachment"
 msgstr "Venstre feste"
 
-#: ../gtk/deprecated/gtktable.c:236 ../gtk/gtkgrid.c:1421 ../gtk/gtkmenu.c:747
+#: ../gtk/deprecated/gtktable.c:236 ../gtk/gtkgrid.c:1768 ../gtk/gtkmenu.c:760
 msgid "The column number to attach the left side of the child to"
 msgstr "Kolonnenummer som venstre side av etterkommer skal festes til"
 
@@ -374,7 +377,7 @@
 msgid "The column number to attach the right side of a child widget to"
 msgstr "Kolonnenummer som høyre side av etterkommer skal festes til"
 
-#: ../gtk/deprecated/gtktable.c:249 ../gtk/gtkgrid.c:1427
+#: ../gtk/deprecated/gtktable.c:249 ../gtk/gtkgrid.c:1774
 msgid "Top attachment"
 msgstr "Toppfeste"
 
@@ -386,7 +389,7 @@
 msgid "Bottom attachment"
 msgstr "Bunnfeste"
 
-#: ../gtk/deprecated/gtktable.c:257 ../gtk/gtkmenu.c:771
+#: ../gtk/deprecated/gtktable.c:257 ../gtk/gtkmenu.c:784
 msgid "The row number to attach the bottom of the child to"
 msgstr "Radnummer som bunn av etterkommer skal festes til"
 
@@ -429,11 +432,11 @@
 msgstr ""
 "Ekstra mellomrom mellom etterkommer og dens øvre og nedre naboer, i piksler"
 
-#: ../gtk/gtkaboutdialog.c:287
+#: ../gtk/gtkaboutdialog.c:305
 msgid "Program name"
 msgstr "Navn på program"
 
-#: ../gtk/gtkaboutdialog.c:288
+#: ../gtk/gtkaboutdialog.c:306
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
@@ -441,93 +444,93 @@
 "Navn på programmet. Hvis dette ikke er satt vil forvalgt verdi komme fra "
 "g_get_application_name()"
 
-#: ../gtk/gtkaboutdialog.c:302
+#: ../gtk/gtkaboutdialog.c:320
 msgid "Program version"
 msgstr "Programversjon"
 
-#: ../gtk/gtkaboutdialog.c:303
+#: ../gtk/gtkaboutdialog.c:321
 msgid "The version of the program"
 msgstr "Programmets versjon"
 
-#: ../gtk/gtkaboutdialog.c:317
+#: ../gtk/gtkaboutdialog.c:335
 msgid "Copyright string"
 msgstr "Opphavsrett"
 
-#: ../gtk/gtkaboutdialog.c:318
+#: ../gtk/gtkaboutdialog.c:336
 msgid "Copyright information for the program"
 msgstr "Informasjon om opphavsrett for programmet"
 
-#: ../gtk/gtkaboutdialog.c:335
+#: ../gtk/gtkaboutdialog.c:353
 msgid "Comments string"
 msgstr "Kommentar"
 
-#: ../gtk/gtkaboutdialog.c:336
+#: ../gtk/gtkaboutdialog.c:354
 msgid "Comments about the program"
 msgstr "Kommentar om programmet"
 
-#: ../gtk/gtkaboutdialog.c:386
+#: ../gtk/gtkaboutdialog.c:404
 msgid "License Type"
 msgstr "Type lisens"
 
-#: ../gtk/gtkaboutdialog.c:387
+#: ../gtk/gtkaboutdialog.c:405
 msgid "The license type of the program"
 msgstr "Programmets lisenstype"
 
-#: ../gtk/gtkaboutdialog.c:403
+#: ../gtk/gtkaboutdialog.c:421
 msgid "Website URL"
 msgstr "URL til nettsted"
 
-#: ../gtk/gtkaboutdialog.c:404
+#: ../gtk/gtkaboutdialog.c:422
 msgid "The URL for the link to the website of the program"
 msgstr "URL for programmets nettsted"
 
-#: ../gtk/gtkaboutdialog.c:418
+#: ../gtk/gtkaboutdialog.c:436
 msgid "Website label"
 msgstr "Etikett for nettsted"
 
-#: ../gtk/gtkaboutdialog.c:419
+#: ../gtk/gtkaboutdialog.c:437
 msgid "The label for the link to the website of the program"
 msgstr "Etikett for lenken til programmets nettsted"
 
-#: ../gtk/gtkaboutdialog.c:435
+#: ../gtk/gtkaboutdialog.c:453
 msgid "Authors"
 msgstr "Forfattere"
 
-#: ../gtk/gtkaboutdialog.c:436
+#: ../gtk/gtkaboutdialog.c:454
 msgid "List of authors of the program"
 msgstr "Liste over programmets utviklere"
 
-#: ../gtk/gtkaboutdialog.c:452
+#: ../gtk/gtkaboutdialog.c:470
 msgid "Documenters"
 msgstr "Dokumentasjon"
 
-#: ../gtk/gtkaboutdialog.c:453
+#: ../gtk/gtkaboutdialog.c:471
 msgid "List of people documenting the program"
 msgstr "Liste med personer som har dokumentert programmet"
 
-#: ../gtk/gtkaboutdialog.c:469
+#: ../gtk/gtkaboutdialog.c:487
 msgid "Artists"
 msgstr "Artister"
 
-#: ../gtk/gtkaboutdialog.c:470
+#: ../gtk/gtkaboutdialog.c:488
 msgid "List of people who have contributed artwork to the program"
 msgstr "Liste med personer som har bidratt med grafikk til programmet"
 
-#: ../gtk/gtkaboutdialog.c:487
+#: ../gtk/gtkaboutdialog.c:505
 msgid "Translator credits"
 msgstr "Oversettere"
 
-#: ../gtk/gtkaboutdialog.c:488
+#: ../gtk/gtkaboutdialog.c:506
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr ""
 "Takk til oversetterne. Denne strengen skal være markert som oversettbar"
 
-#: ../gtk/gtkaboutdialog.c:503
+#: ../gtk/gtkaboutdialog.c:521
 msgid "Logo"
 msgstr "Logo"
 
-#: ../gtk/gtkaboutdialog.c:504
+#: ../gtk/gtkaboutdialog.c:522
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
@@ -535,19 +538,19 @@
 "En logo for «Om»-boksen. Hvis dette ikke er satt brukes "
 "gtk_window_get_default_icon_list()"
 
-#: ../gtk/gtkaboutdialog.c:519
+#: ../gtk/gtkaboutdialog.c:537
 msgid "Logo Icon Name"
 msgstr "Navn på ikon for logo"
 
-#: ../gtk/gtkaboutdialog.c:520
+#: ../gtk/gtkaboutdialog.c:538
 msgid "A named icon to use as the logo for the about box."
 msgstr "Et navngitt ikon å bruke som logoen for «Om»-boksen."
 
-#: ../gtk/gtkaboutdialog.c:533
+#: ../gtk/gtkaboutdialog.c:551
 msgid "Wrap license"
 msgstr "Brytningslisens"
 
-#: ../gtk/gtkaboutdialog.c:534
+#: ../gtk/gtkaboutdialog.c:552
 msgid "Whether to wrap the license text."
 msgstr "Om lisensteksten skal brytes."
 
@@ -567,13 +570,13 @@
 msgid "The widget to be monitored for accelerator changes"
 msgstr "Widgetet som skal overvåkes for akselleratorendringer"
 
-#: ../gtk/gtkaccessible.c:158 ../gtk/gtktreeviewcolumn.c:353
+#: ../gtk/gtkaccessible.c:156 ../gtk/gtktreeviewcolumn.c:354
 msgid "Widget"
 msgstr "Widget"
 
-#: ../gtk/gtkaccessible.c:159
+#: ../gtk/gtkaccessible.c:157
 msgid "The widget referenced by this accessible."
-msgstr ""
+msgstr "Skjermelementet som denne refererer til."
 
 #: ../gtk/gtkactionable.c:70
 msgid "action name"
@@ -585,83 +588,85 @@
 
 #: ../gtk/gtkactionable.c:75
 msgid "action target value"
-msgstr ""
+msgstr "målverdi for handling"
 
 #: ../gtk/gtkactionable.c:76
 msgid "The parameter for action invocations"
-msgstr ""
+msgstr "Parameteren som kaller på handlinger"
 
-#: ../gtk/gtkaction.c:220 ../gtk/gtkactiongroup.c:228 ../gtk/gtkprinter.c:123
-#: ../gtk/gtktextmark.c:126 ../gtk/gtkthemingengine.c:258
+#: ../gtk/deprecated/gtkaction.c:238 ../gtk/deprecated/gtkactiongroup.c:203
+#: ../gtk/gtkprinter.c:121 ../gtk/gtkstack.c:411 ../gtk/gtktextmark.c:126
+#: ../gtk/gtkthemingengine.c:262
 msgid "Name"
 msgstr "Navn"
 
-#: ../gtk/gtkaction.c:221
+#: ../gtk/deprecated/gtkaction.c:239
 msgid "A unique name for the action."
 msgstr "Et unikt navn for handlingen."
 
-#: ../gtk/gtkaction.c:239 ../gtk/gtkbutton.c:232 ../gtk/gtkexpander.c:288
-#: ../gtk/gtkframe.c:170 ../gtk/gtklabel.c:721 ../gtk/gtkmenuitem.c:430
-#: ../gtk/gtktoolbutton.c:239 ../gtk/gtktoolitemgroup.c:1597
+#: ../gtk/deprecated/gtkaction.c:259 ../gtk/gtkbutton.c:252
+#: ../gtk/gtkexpander.c:288 ../gtk/gtkframe.c:171 ../gtk/gtklabel.c:724
+#: ../gtk/gtkmenuitem.c:448 ../gtk/gtktoolbutton.c:239
+#: ../gtk/gtktoolitemgroup.c:1593
 msgid "Label"
 msgstr "Etikett"
 
-#: ../gtk/gtkaction.c:240
+#: ../gtk/deprecated/gtkaction.c:260
 msgid "The label used for menu items and buttons that activate this action."
 msgstr ""
 "Etikett som brukes for menyoppføringer og knapper som aktiverer denne "
 "handlingen."
 
-#: ../gtk/gtkaction.c:256
+#: ../gtk/deprecated/gtkaction.c:279
 msgid "Short label"
 msgstr "Kort etikett"
 
-#: ../gtk/gtkaction.c:257
+#: ../gtk/deprecated/gtkaction.c:280
 msgid "A shorter label that may be used on toolbar buttons."
 msgstr "En kortere etikett som kan brukes på verktøylinjeknapper."
 
-#: ../gtk/gtkaction.c:265
+#: ../gtk/deprecated/gtkaction.c:295
 msgid "Tooltip"
 msgstr "Verktøytips"
 
-#: ../gtk/gtkaction.c:266
+#: ../gtk/deprecated/gtkaction.c:296
 msgid "A tooltip for this action."
 msgstr "Et verktøytips for denne handlingen."
 
-#: ../gtk/gtkaction.c:281
+#: ../gtk/deprecated/gtkaction.c:314
 msgid "Stock Icon"
 msgstr "Standard ikon"
 
-#: ../gtk/gtkaction.c:282
+#: ../gtk/deprecated/gtkaction.c:315
 msgid "The stock icon displayed in widgets representing this action."
 msgstr ""
 "Standard ikon som vises i komponenter som representerer denne handlingen."
 
-#: ../gtk/gtkaction.c:302 ../gtk/gtkstatusicon.c:263
+#: ../gtk/deprecated/gtkaction.c:337 ../gtk/gtkstatusicon.c:267
 msgid "GIcon"
 msgstr "GIcon"
 
-#: ../gtk/gtkaction.c:303 ../gtk/gtkcellrendererpixbuf.c:246
-#: ../gtk/gtkimage.c:311 ../gtk/gtkstatusicon.c:264
+#: ../gtk/deprecated/gtkaction.c:338 ../gtk/gtkcellrendererpixbuf.c:257
+#: ../gtk/gtkimage.c:344 ../gtk/gtkstatusicon.c:268
 msgid "The GIcon being displayed"
 msgstr "GIcon som skal vises"
 
-#: ../gtk/gtkaction.c:323 ../gtk/gtkcellrendererpixbuf.c:211
-#: ../gtk/gtkimage.c:293 ../gtk/gtkprinter.c:172 ../gtk/gtkstatusicon.c:247
-#: ../gtk/gtkwindow.c:773
+#: ../gtk/deprecated/gtkaction.c:360 ../gtk/gtkcellrendererpixbuf.c:222
+#: ../gtk/gtkimage.c:326 ../gtk/gtkprinter.c:170 ../gtk/gtkstatusicon.c:251
+#: ../gtk/gtkwindow.c:856
 msgid "Icon Name"
 msgstr "Navn på ikon"
 
-#: ../gtk/gtkaction.c:324 ../gtk/gtkcellrendererpixbuf.c:212
-#: ../gtk/gtkimage.c:294 ../gtk/gtkstatusicon.c:248
+#: ../gtk/deprecated/gtkaction.c:361 ../gtk/gtkcellrendererpixbuf.c:223
+#: ../gtk/gtkimage.c:327 ../gtk/gtkstatusicon.c:252
 msgid "The name of the icon from the icon theme"
 msgstr "Navn på ikonet fra ikontemaet"
 
-#: ../gtk/gtkaction.c:331 ../gtk/gtktoolitem.c:191
+#: ../gtk/deprecated/gtkaction.c:376 ../gtk/gtktoolitem.c:194
 msgid "Visible when horizontal"
 msgstr "Synlig når horisontal"
 
-#: ../gtk/gtkaction.c:332 ../gtk/gtktoolitem.c:192
+#: ../gtk/deprecated/gtkaction.c:377 ../gtk/gtktoolitem.c:195
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a horizontal "
 "orientation."
@@ -669,21 +674,23 @@
 "Om verktøylinjeoppføringen er synlig når verktøylinjen har horisontal "
 "orientering."
 
-#: ../gtk/gtkaction.c:347
+#: ../gtk/deprecated/gtkaction.c:395
 msgid "Visible when overflown"
 msgstr "Synlig når full"
 
-#: ../gtk/gtkaction.c:348
+#: ../gtk/deprecated/gtkaction.c:396
 msgid ""
 "When TRUE, toolitem proxies for this action are represented in the toolbar "
 "overflow menu."
 msgstr ""
+"Når verdien er «TRUE», vil toolitem-proxier til denne handlingen vises i "
+"utvidingsmenyen til verktøylinja."
 
-#: ../gtk/gtkaction.c:355 ../gtk/gtktoolitem.c:198
+#: ../gtk/deprecated/gtkaction.c:412 ../gtk/gtktoolitem.c:201
 msgid "Visible when vertical"
 msgstr "Synlig når vertikal"
 
-#: ../gtk/gtkaction.c:356 ../gtk/gtktoolitem.c:199
+#: ../gtk/deprecated/gtkaction.c:413 ../gtk/gtktoolitem.c:202
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a vertical "
 "orientation."
@@ -691,11 +698,11 @@
 "Om verktøylinjeoppføringen er synlig når verktøylinjen har vertikal "
 "orientering."
 
-#: ../gtk/gtkaction.c:363 ../gtk/gtktoolitem.c:205
+#: ../gtk/deprecated/gtkaction.c:429 ../gtk/gtktoolitem.c:208
 msgid "Is important"
 msgstr "Er viktig"
 
-#: ../gtk/gtkaction.c:364
+#: ../gtk/deprecated/gtkaction.c:430
 msgid ""
 "Whether the action is considered important. When TRUE, toolitem proxies for "
 "this action show text in GTK_TOOLBAR_BOTH_HORIZ mode."
@@ -703,38 +710,38 @@
 "Om handlingen ses på som viktig. Når denne er satt til TRUE viser proxyer "
 "for verktøylinjeoppføringene tekst i GTK_TOOLBAR_BOTH_HORIZ-modus."
 
-#: ../gtk/gtkaction.c:372
+#: ../gtk/deprecated/gtkaction.c:446
 msgid "Hide if empty"
 msgstr "Skjul hvis tom"
 
-#: ../gtk/gtkaction.c:373
+#: ../gtk/deprecated/gtkaction.c:447
 msgid "When TRUE, empty menu proxies for this action are hidden."
 msgstr "Når TRUE vil tomme menyproxyer for denne handlingen skjules."
 
-#: ../gtk/gtkaction.c:379 ../gtk/gtkactiongroup.c:235
-#: ../gtk/gtkcellrenderer.c:296 ../gtk/gtkwidget.c:1018
+#: ../gtk/deprecated/gtkaction.c:461 ../gtk/deprecated/gtkactiongroup.c:217
+#: ../gtk/gtkcellrenderer.c:301 ../gtk/gtkwidget.c:1192
 msgid "Sensitive"
 msgstr "Følsomt"
 
-#: ../gtk/gtkaction.c:380
+#: ../gtk/deprecated/gtkaction.c:462
 msgid "Whether the action is enabled."
 msgstr "Om handlingen er aktivert."
 
-#: ../gtk/gtkaction.c:386 ../gtk/gtkactiongroup.c:242
-#: ../gtk/gtkstatusicon.c:298 ../gtk/gtktreeviewcolumn.c:245
-#: ../gtk/gtkwidget.c:1011
+#: ../gtk/deprecated/gtkaction.c:476 ../gtk/deprecated/gtkactiongroup.c:231
+#: ../gtk/gtkstatusicon.c:302 ../gtk/gtktreeviewcolumn.c:246
+#: ../gtk/gtkwidget.c:1185
 msgid "Visible"
 msgstr "Synlig"
 
-#: ../gtk/gtkaction.c:387
+#: ../gtk/deprecated/gtkaction.c:477
 msgid "Whether the action is visible."
 msgstr "Om handlingen er synlig"
 
-#: ../gtk/gtkaction.c:393
+#: ../gtk/deprecated/gtkaction.c:492
 msgid "Action Group"
 msgstr "Handlingsgruppe"
 
-#: ../gtk/gtkaction.c:394
+#: ../gtk/deprecated/gtkaction.c:493
 msgid ""
 "The GtkActionGroup this GtkAction is associated with, or NULL (for internal "
 "use)."
@@ -742,44 +749,47 @@
 "GtkActionGroup denne GtkAction er assosiert med, eller NULL (for intern "
 "bruk)."
 
-#: ../gtk/gtkaction.c:412 ../gtk/gtkbutton.c:353 ../gtk/gtkimagemenuitem.c:192
+#: ../gtk/deprecated/gtkaction.c:514 ../gtk/deprecated/gtkimagemenuitem.c:205
+#: ../gtk/gtkbutton.c:378
 msgid "Always show image"
 msgstr "Alltid vis bilde"
 
-#: ../gtk/gtkaction.c:413 ../gtk/gtkbutton.c:354 ../gtk/gtkimagemenuitem.c:193
+#: ../gtk/deprecated/gtkaction.c:515 ../gtk/deprecated/gtkimagemenuitem.c:206
+#: ../gtk/gtkbutton.c:379
 msgid "Whether the image will always be shown"
 msgstr "Om bildet alltid skal være synlig"
 
-#: ../gtk/gtkactiongroup.c:229
+#: ../gtk/deprecated/gtkactiongroup.c:204
 msgid "A name for the action group."
 msgstr "Et navn for handlingsgruppen."
 
-#: ../gtk/gtkactiongroup.c:236
+#: ../gtk/deprecated/gtkactiongroup.c:218
 msgid "Whether the action group is enabled."
 msgstr "Om handlingsgruppen er aktivert."
 
-#: ../gtk/gtkactiongroup.c:243
+#: ../gtk/deprecated/gtkactiongroup.c:232
 msgid "Whether the action group is visible."
 msgstr "Om handlingsgruppen er synlig"
 
-#: ../gtk/gtkactivatable.c:287
+#: ../gtk/deprecated/gtkactivatable.c:292
 msgid "Related Action"
 msgstr "Relatert handling"
 
-#: ../gtk/gtkactivatable.c:288
+#: ../gtk/deprecated/gtkactivatable.c:293
 msgid "The action this activatable will activate and receive updates from"
 msgstr ""
+"Handlingen som denne utføreren skal aktivere, og motta oppdateringer fra"
 
-#: ../gtk/gtkactivatable.c:310
+#: ../gtk/deprecated/gtkactivatable.c:317
 msgid "Use Action Appearance"
 msgstr "Bruk utseende for handling"
 
-#: ../gtk/gtkactivatable.c:311
+#: ../gtk/deprecated/gtkactivatable.c:318
 msgid "Whether to use the related actions appearance properties"
-msgstr ""
+msgstr "Hvorvidt de relaterte egenskapene for handlingsutseendet skal brukes"
 
-#: ../gtk/gtkadjustment.c:121 ../gtk/gtkcellrendererprogress.c:136
-#: ../gtk/gtkscalebutton.c:218 ../gtk/gtkspinbutton.c:397
+#: ../gtk/gtkadjustment.c:121 ../gtk/gtkcellrendererprogress.c:137
+#: ../gtk/gtkscalebutton.c:228 ../gtk/gtkspinbutton.c:410
 msgid "Value"
 msgstr "Verdi"
 
@@ -827,11 +837,11 @@
 msgid "The page size of the adjustment"
 msgstr "Sidestørrelse for justeringen"
 
-#: ../gtk/gtkalignment.c:135
+#: ../gtk/gtkalignment.c:142
 msgid "Horizontal alignment"
 msgstr "Horisontal justering"
 
-#: ../gtk/gtkalignment.c:136 ../gtk/gtkbutton.c:283
+#: ../gtk/gtkalignment.c:143 ../gtk/gtkbutton.c:308
 msgid ""
 "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is "
 "right aligned"
@@ -839,11 +849,11 @@
 "Horisontal posisjon for barn i tilgjengelig område. 0.0 er venstrejustert, "
 "1.0 er høyrejustert"
 
-#: ../gtk/gtkalignment.c:145
+#: ../gtk/gtkalignment.c:152
 msgid "Vertical alignment"
 msgstr "Vertikal justering"
 
-#: ../gtk/gtkalignment.c:146 ../gtk/gtkbutton.c:302
+#: ../gtk/gtkalignment.c:153 ../gtk/gtkbutton.c:327
 msgid ""
 "Vertical position of child in available space. 0.0 is top aligned, 1.0 is "
 "bottom aligned"
@@ -851,11 +861,11 @@
 "Vertikal plassering av barn i tilgjengelig område. 0.0 er øverst, 1.0 er "
 "nederst"
 
-#: ../gtk/gtkalignment.c:154
+#: ../gtk/gtkalignment.c:161
 msgid "Horizontal scale"
 msgstr "Horisontal skalering"
 
-#: ../gtk/gtkalignment.c:155
+#: ../gtk/gtkalignment.c:162
 msgid ""
 "If available horizontal space is bigger than needed for the child, how much "
 "of it to use for the child. 0.0 means none, 1.0 means all"
@@ -863,11 +873,11 @@
 "Hvor mye av det horisontale området som brukes for barnet hvis det er plass "
 "til overs. 0.0 betyr ingenting, 1.0 betyr hele"
 
-#: ../gtk/gtkalignment.c:163
+#: ../gtk/gtkalignment.c:170
 msgid "Vertical scale"
 msgstr "Vertikal skalering"
 
-#: ../gtk/gtkalignment.c:164
+#: ../gtk/gtkalignment.c:171
 msgid ""
 "If available vertical space is bigger than needed for the child, how much of "
 "it to use for the child. 0.0 means none, 1.0 means all"
@@ -875,35 +885,35 @@
 "Hvor mye av det vertikale området som brukes for barnet hvis det er plass "
 "til overs. 0.0 betyr ingenting, 1.0 betyr hele"
 
-#: ../gtk/gtkalignment.c:181
+#: ../gtk/gtkalignment.c:188
 msgid "Top Padding"
 msgstr "Toppfyll"
 
-#: ../gtk/gtkalignment.c:182
+#: ../gtk/gtkalignment.c:189
 msgid "The padding to insert at the top of the widget."
 msgstr "Fyll som plasseres øverst i komponenten."
 
-#: ../gtk/gtkalignment.c:198
+#: ../gtk/gtkalignment.c:205
 msgid "Bottom Padding"
 msgstr "Bunnfyll"
 
-#: ../gtk/gtkalignment.c:199
+#: ../gtk/gtkalignment.c:206
 msgid "The padding to insert at the bottom of the widget."
 msgstr "Fyll som plasseres nederst i komponenten."
 
-#: ../gtk/gtkalignment.c:215
+#: ../gtk/gtkalignment.c:222
 msgid "Left Padding"
 msgstr "Venstrefyll"
 
-#: ../gtk/gtkalignment.c:216
+#: ../gtk/gtkalignment.c:223
 msgid "The padding to insert at the left of the widget."
 msgstr "Fyll som plasseres til venstre i komponenten."
 
-#: ../gtk/gtkalignment.c:232
+#: ../gtk/gtkalignment.c:239
 msgid "Right Padding"
 msgstr "Høyrefyll"
 
-#: ../gtk/gtkalignment.c:233
+#: ../gtk/gtkalignment.c:240
 msgid "The padding to insert at the right of the widget."
 msgstr "Fyll som plasseres til høyre i komponenten."
 
@@ -911,25 +921,27 @@
 msgid "Include an 'Other...' item"
 msgstr ""
 
-#: ../gtk/gtkappchooserbutton.c:615
+#: ../gtk/gtkappchooserbutton.c:616
 msgid ""
 "Whether the combobox should include an item that triggers a "
 "GtkAppChooserDialog"
 msgstr ""
+"Om kombinasjonsboksen skal inneholde et objekt som utløser en "
+"GtkAppChooserDialog"
 
-#: ../gtk/gtkappchooserbutton.c:631
+#: ../gtk/gtkappchooserbutton.c:632
 msgid "Show default item"
 msgstr "Vis forvalgt oppføring"
 
-#: ../gtk/gtkappchooserbutton.c:632
+#: ../gtk/gtkappchooserbutton.c:633
 msgid "Whether the combobox should show the default application on top"
-msgstr ""
+msgstr "Om kombinasjonsboksen skal plassere standardprogrammet øverst"
 
-#: ../gtk/gtkappchooserbutton.c:645 ../gtk/gtkappchooserdialog.c:757
+#: ../gtk/gtkappchooserbutton.c:646 ../gtk/gtkappchooserdialog.c:587
 msgid "Heading"
 msgstr "Topptekst"
 
-#: ../gtk/gtkappchooserbutton.c:646 ../gtk/gtkappchooserdialog.c:758
+#: ../gtk/gtkappchooserbutton.c:647 ../gtk/gtkappchooserdialog.c:588
 msgid "The text to show at the top of the dialog"
 msgstr "Tekst som vises øverst i dialogen"
 
@@ -941,120 +953,120 @@
 msgid "The content type used by the open with object"
 msgstr "Type innhold som brukes av objekt for åpne med"
 
-#: ../gtk/gtkappchooserdialog.c:743
+#: ../gtk/gtkappchooserdialog.c:573
 msgid "GFile"
 msgstr "GFile"
 
-#: ../gtk/gtkappchooserdialog.c:744
+#: ../gtk/gtkappchooserdialog.c:574
 msgid "The GFile used by the app chooser dialog"
 msgstr "GFile som brukes av dialog for programvalg"
 
-#: ../gtk/gtkappchooserwidget.c:1026
+#: ../gtk/gtkappchooserwidget.c:966
 msgid "Show default app"
 msgstr "Vis forvalgt program"
 
-#: ../gtk/gtkappchooserwidget.c:1027
+#: ../gtk/gtkappchooserwidget.c:967
 msgid "Whether the widget should show the default application"
-msgstr ""
+msgstr "Om skjermelementet skal vise standardprogrammet"
 
-#: ../gtk/gtkappchooserwidget.c:1041
+#: ../gtk/gtkappchooserwidget.c:981
 msgid "Show recommended apps"
 msgstr "Vis anbefalte programmer"
 
-#: ../gtk/gtkappchooserwidget.c:1042
+#: ../gtk/gtkappchooserwidget.c:982
 msgid "Whether the widget should show recommended applications"
-msgstr ""
+msgstr "Om skjermelementet skal vise anbefalte programmer"
 
-#: ../gtk/gtkappchooserwidget.c:1056
+#: ../gtk/gtkappchooserwidget.c:996
 msgid "Show fallback apps"
 msgstr "Vis reserveprogrammer"
 
-#: ../gtk/gtkappchooserwidget.c:1057
+#: ../gtk/gtkappchooserwidget.c:997
 msgid "Whether the widget should show fallback applications"
-msgstr ""
+msgstr "Om skjermelementet skal vise reserveprogrammer"
 
-#: ../gtk/gtkappchooserwidget.c:1069
+#: ../gtk/gtkappchooserwidget.c:1009
 msgid "Show other apps"
 msgstr "Vis andre programmer"
 
-#: ../gtk/gtkappchooserwidget.c:1070
+#: ../gtk/gtkappchooserwidget.c:1010
 msgid "Whether the widget should show other applications"
-msgstr ""
+msgstr "Om skjermelementet skal vise andre programmer"
 
-#: ../gtk/gtkappchooserwidget.c:1083
+#: ../gtk/gtkappchooserwidget.c:1023
 msgid "Show all apps"
 msgstr "Vis alle programmer"
 
-#: ../gtk/gtkappchooserwidget.c:1084
+#: ../gtk/gtkappchooserwidget.c:1024
 msgid "Whether the widget should show all applications"
-msgstr ""
+msgstr "Om skjermelementet skal vise alle programmer"
 
-#: ../gtk/gtkappchooserwidget.c:1098
+#: ../gtk/gtkappchooserwidget.c:1038
 msgid "Widget's default text"
 msgstr "Forvalgt tekst for en komponent"
 
-#: ../gtk/gtkappchooserwidget.c:1099
+#: ../gtk/gtkappchooserwidget.c:1039
 msgid "The default text appearing when there are no applications"
 msgstr "Forvalgt tekst som vises når det ikke finnes noen programmer"
 
-#: ../gtk/gtkapplication.c:738
+#: ../gtk/gtkapplication.c:840
 msgid "Register session"
 msgstr "Registrer økt"
 
-#: ../gtk/gtkapplication.c:739
+#: ../gtk/gtkapplication.c:841
 msgid "Register with the session manager"
 msgstr "Registrer hos økthåndterer"
 
-#: ../gtk/gtkapplication.c:744
+#: ../gtk/gtkapplication.c:846
 msgid "Application menu"
 msgstr "Programmeny"
 
-#: ../gtk/gtkapplication.c:745
+#: ../gtk/gtkapplication.c:847
 msgid "The GMenuModel for the application menu"
 msgstr "GMenuModel for programmenyen"
 
-#: ../gtk/gtkapplication.c:751
+#: ../gtk/gtkapplication.c:853
 msgid "Menubar"
 msgstr "Menylinje"
 
-#: ../gtk/gtkapplication.c:752
+#: ../gtk/gtkapplication.c:854
 msgid "The GMenuModel for the menubar"
 msgstr "GMenuModel for menylinjen"
 
-#: ../gtk/gtkapplicationwindow.c:993
+#: ../gtk/gtkapplicationwindow.c:806
 msgid "Show a menubar"
 msgstr "Vis en menylinje"
 
-#: ../gtk/gtkapplicationwindow.c:994
+#: ../gtk/gtkapplicationwindow.c:807
 msgid "TRUE if the window should show a menubar at the top of the window"
-msgstr ""
+msgstr "«TRUE» (sant) hvis ei menylinje skal vises i toppen av vinduet"
 
-#: ../gtk/gtkarrow.c:110
+#: ../gtk/gtkarrow.c:109
 msgid "Arrow direction"
 msgstr "Pilretning"
 
-#: ../gtk/gtkarrow.c:111
+#: ../gtk/gtkarrow.c:110
 msgid "The direction the arrow should point"
 msgstr "Pekeretning for pilen"
 
-#: ../gtk/gtkarrow.c:119
+#: ../gtk/gtkarrow.c:118
 msgid "Arrow shadow"
 msgstr "Pilens skygge"
 
-#: ../gtk/gtkarrow.c:120
+#: ../gtk/gtkarrow.c:119
 msgid "Appearance of the shadow surrounding the arrow"
 msgstr "Utseende for skyggen som omgir pilen"
 
-#: ../gtk/gtkarrow.c:127 ../gtk/gtkcombobox.c:1048 ../gtk/gtkmenu.c:784
-#: ../gtk/gtkmenuitem.c:506
+#: ../gtk/gtkarrow.c:126 ../gtk/gtkcombobox.c:1056 ../gtk/gtkmenu.c:797
+#: ../gtk/gtkmenuitem.c:524
 msgid "Arrow Scaling"
 msgstr "Skalering av piler"
 
-#: ../gtk/gtkarrow.c:128
+#: ../gtk/gtkarrow.c:127
 msgid "Amount of space used up by arrow"
 msgstr "Mengde plass som brukes av pilen"
 
-#: ../gtk/gtkaspectframe.c:107 ../gtk/gtkwidget.c:1206
+#: ../gtk/gtkaspectframe.c:107 ../gtk/gtkwidget.c:1386
 msgid "Horizontal Alignment"
 msgstr "Horisontal justering"
 
@@ -1062,7 +1074,7 @@
 msgid "X alignment of the child"
 msgstr "X-justering for barn"
 
-#: ../gtk/gtkaspectframe.c:114 ../gtk/gtkwidget.c:1222
+#: ../gtk/gtkaspectframe.c:114 ../gtk/gtkwidget.c:1402
 msgid "Vertical Alignment"
 msgstr "Vertikal justering"
 
@@ -1086,99 +1098,99 @@
 msgid "Force aspect ratio to match that of the frame's child"
 msgstr "Tving aspektraten til å passe til rammens barn"
 
-#: ../gtk/gtkassistant.c:315
+#: ../gtk/gtkassistant.c:332
 msgid "Header Padding"
 msgstr "Fyll for topptekst"
 
-#: ../gtk/gtkassistant.c:316
+#: ../gtk/gtkassistant.c:333
 msgid "Number of pixels around the header."
 msgstr "Antall piksler rundt toppteksten."
 
-#: ../gtk/gtkassistant.c:323
+#: ../gtk/gtkassistant.c:340
 msgid "Content Padding"
 msgstr "Innholdsfyll"
 
-#: ../gtk/gtkassistant.c:324
+#: ../gtk/gtkassistant.c:341
 msgid "Number of pixels around the content pages."
 msgstr "Antall piksler rundt innholdssidene."
 
-#: ../gtk/gtkassistant.c:340
+#: ../gtk/gtkassistant.c:357
 msgid "Page type"
 msgstr "Sidetype"
 
-#: ../gtk/gtkassistant.c:341
+#: ../gtk/gtkassistant.c:358
 msgid "The type of the assistant page"
 msgstr "Type assistentside"
 
-#: ../gtk/gtkassistant.c:356
+#: ../gtk/gtkassistant.c:373
 msgid "Page title"
 msgstr "Sidetittel"
 
-#: ../gtk/gtkassistant.c:357
+#: ../gtk/gtkassistant.c:374
 msgid "The title of the assistant page"
 msgstr "Tittelen på assistentsiden"
 
-#: ../gtk/gtkassistant.c:374
+#: ../gtk/gtkassistant.c:391
 msgid "Header image"
 msgstr "Bilde for topptekst"
 
-#: ../gtk/gtkassistant.c:375
+#: ../gtk/gtkassistant.c:392
 msgid "Header image for the assistant page"
 msgstr "Bilde til toppteksten på en assistentside"
 
-#: ../gtk/gtkassistant.c:391
+#: ../gtk/gtkassistant.c:408
 msgid "Sidebar image"
 msgstr "Bilde for sidelinje"
 
-#: ../gtk/gtkassistant.c:392
+#: ../gtk/gtkassistant.c:409
 msgid "Sidebar image for the assistant page"
 msgstr "Bilde for sidelinje på en assistentside"
 
-#: ../gtk/gtkassistant.c:408
+#: ../gtk/gtkassistant.c:425
 msgid "Page complete"
 msgstr "Side fullført"
 
-#: ../gtk/gtkassistant.c:409
+#: ../gtk/gtkassistant.c:426
 msgid "Whether all required fields on the page have been filled out"
 msgstr "Om alle felt som kreves på siden er fylt ut"
 
-#: ../gtk/gtkbbox.c:158
+#: ../gtk/gtkbbox.c:166
 msgid "Minimum child width"
 msgstr "Minimal bredde for barn"
 
-#: ../gtk/gtkbbox.c:159
+#: ../gtk/gtkbbox.c:167
 msgid "Minimum width of buttons inside the box"
 msgstr "Minimum bredde på knappene inne i boksen"
 
-#: ../gtk/gtkbbox.c:167
+#: ../gtk/gtkbbox.c:175
 msgid "Minimum child height"
 msgstr "Minimal høyde for barn"
 
-#: ../gtk/gtkbbox.c:168
+#: ../gtk/gtkbbox.c:176
 msgid "Minimum height of buttons inside the box"
 msgstr "Minimum høyde på knappene inne i boksen"
 
-#: ../gtk/gtkbbox.c:176
+#: ../gtk/gtkbbox.c:184
 msgid "Child internal width padding"
 msgstr "Internt breddefyll for barn"
 
-#: ../gtk/gtkbbox.c:177
+#: ../gtk/gtkbbox.c:185
 msgid "Amount to increase child's size on either side"
 msgstr "Økning av størrelse på barn på hver side"
 
-#: ../gtk/gtkbbox.c:185
+#: ../gtk/gtkbbox.c:193
 msgid "Child internal height padding"
 msgstr "Fyll for barns interne høyde"
 
-#: ../gtk/gtkbbox.c:186
+#: ../gtk/gtkbbox.c:194
 msgid "Amount to increase child's size on the top and bottom"
 msgstr "Hvor mye barnets størrelse skal økes på topp og bunn"
 
-#: ../gtk/gtkbbox.c:194
+#: ../gtk/gtkbbox.c:202
 msgid "Layout style"
 msgstr "Stil for plassering"
 
-#: ../gtk/gtkbbox.c:195
+#: ../gtk/gtkbbox.c:203
 msgid ""
 "How to lay out the buttons in the box. Possible values are: spread, edge, "
 "start and end"
@@ -1186,11 +1198,11 @@
 "Hvordan knappene skal plasseres i boksen. Mulige verdier er: spread, edge, "
 "start og end"
 
-#: ../gtk/gtkbbox.c:203
+#: ../gtk/gtkbbox.c:211
 msgid "Secondary"
 msgstr "Sekundær"
 
-#: ../gtk/gtkbbox.c:204
+#: ../gtk/gtkbbox.c:212
 msgid ""
 "If TRUE, the child appears in a secondary group of children, suitable for, "
 "e.g., help buttons"
@@ -1198,42 +1210,45 @@
 "Hvis SANN vil barnet vises i en sekundær gruppe av barn, passer for eksempel "
 "til hjelp-knapper"
 
-#: ../gtk/gtkbbox.c:211
+#: ../gtk/gtkbbox.c:219
 msgid "Non-Homogeneous"
 msgstr "Ikke-homogen"
 
-#: ../gtk/gtkbbox.c:212
+#: ../gtk/gtkbbox.c:220
 msgid "If TRUE, the child will not be subject to homogeneous sizing"
 msgstr ""
+"Hvis verdien er «TRUE», vil underprosessen ikke være underordnet homogen "
+"størrelsesordning"
 
-#: ../gtk/gtkbox.c:240 ../gtk/gtkcellareabox.c:315 ../gtk/gtkexpander.c:312
-#: ../gtk/gtkiconview.c:511 ../gtk/gtktreeviewcolumn.c:280
+#: ../gtk/gtkbox.c:251 ../gtk/gtkcellareabox.c:310 ../gtk/gtkexpander.c:312
+#: ../gtk/gtkheaderbar.c:1813 ../gtk/gtkiconview.c:515
+#: ../gtk/gtktreeviewcolumn.c:281
 msgid "Spacing"
 msgstr "Mellomrom"
 
-#: ../gtk/gtkbox.c:241
+#: ../gtk/gtkbox.c:252 ../gtk/gtkheaderbar.c:1814
 msgid "The amount of space between children"
 msgstr "Mengde mellomrom mellom barn."
 
-#: ../gtk/gtkbox.c:251
+#: ../gtk/gtkbox.c:262 ../gtk/gtkflowbox.c:3684
 msgid "Whether the children should all be the same size"
 msgstr "Om alle barn skal være av samme størrelse."
 
-#: ../gtk/gtkbox.c:271 ../gtk/gtkcellareabox.c:335 ../gtk/gtktoolbar.c:552
-#: ../gtk/gtktoolitemgroup.c:1657 ../gtk/gtktoolpalette.c:1075
-#: ../gtk/gtktreeviewcolumn.c:336
+#: ../gtk/gtkbox.c:294 ../gtk/gtkcellareabox.c:330 ../gtk/gtktoolbar.c:556
+#: ../gtk/gtktoolitemgroup.c:1653 ../gtk/gtktoolpalette.c:1004
+#: ../gtk/gtktreeviewcolumn.c:337
 msgid "Expand"
 msgstr "Utvid"
 
-#: ../gtk/gtkbox.c:272
+#: ../gtk/gtkbox.c:295
 msgid "Whether the child should receive extra space when the parent grows"
 msgstr "La etterkommeren få mer plass når opphavet vokser"
 
-#: ../gtk/gtkbox.c:288 ../gtk/gtktoolitemgroup.c:1664
+#: ../gtk/gtkbox.c:311 ../gtk/gtktoolitemgroup.c:1660
 msgid "Fill"
 msgstr "Fyll"
 
-#: ../gtk/gtkbox.c:289
+#: ../gtk/gtkbox.c:312
 msgid ""
 "Whether extra space given to the child should be allocated to the child or "
 "used as padding"
@@ -1241,21 +1256,21 @@
 "Om ekstra mellomrom som gis til etterkommeren skal allokeres til "
 "etterkommeren eller brukes som fyll"
 
-#: ../gtk/gtkbox.c:296 ../gtk/gtktrayicon-x11.c:167
+#: ../gtk/gtkbox.c:319 ../gtk/gtktrayicon-x11.c:167
 msgid "Padding"
 msgstr "Fyll"
 
-#: ../gtk/gtkbox.c:297
+#: ../gtk/gtkbox.c:320
 msgid "Extra space to put between the child and its neighbors, in pixels"
 msgstr ""
 "Ekstra mellomrom som skal plasseres mellom en etterkommer og dens naboer i "
 "piksler"
 
-#: ../gtk/gtkbox.c:303
+#: ../gtk/gtkbox.c:326 ../gtk/gtkheaderbar.c:1772
 msgid "Pack type"
 msgstr "Type pakking"
 
-#: ../gtk/gtkbox.c:304
+#: ../gtk/gtkbox.c:327 ../gtk/gtkheaderbar.c:1773
 msgid ""
 "A GtkPackType indicating whether the child is packed with reference to the "
 "start or end of the parent"
@@ -1263,37 +1278,39 @@
 "En GtkPackType viser om etterkommeren er pakket med referanse til start "
 "eller slutt av opphavet"
 
-#: ../gtk/gtkbox.c:310 ../gtk/gtknotebook.c:768 ../gtk/gtkpaned.c:348
-#: ../gtk/gtktoolitemgroup.c:1678
+#: ../gtk/gtkbox.c:333 ../gtk/gtkbubblewindow.c:864 ../gtk/gtkheaderbar.c:1779
+#: ../gtk/gtknotebook.c:774 ../gtk/gtkpaned.c:350 ../gtk/gtkstack.c:432
+#: ../gtk/gtktoolitemgroup.c:1674
 msgid "Position"
 msgstr "Posisjon"
 
-#: ../gtk/gtkbox.c:311 ../gtk/gtknotebook.c:769
+#: ../gtk/gtkbox.c:334 ../gtk/gtkheaderbar.c:1780 ../gtk/gtknotebook.c:775
+#: ../gtk/gtkstack.c:433
 msgid "The index of the child in the parent"
 msgstr "Indeks for etterkommer i opphav"
 
-#: ../gtk/gtkbuilder.c:307
+#: ../gtk/gtkbuilder.c:316
 msgid "Translation Domain"
 msgstr "Oversettelsesdomene"
 
-#: ../gtk/gtkbuilder.c:308
+#: ../gtk/gtkbuilder.c:317
 msgid "The translation domain used by gettext"
 msgstr "Oversettelsesdomene som brukes av gettext"
 
-#: ../gtk/gtkbutton.c:233
+#: ../gtk/gtkbutton.c:253
 msgid ""
 "Text of the label widget inside the button, if the button contains a label "
 "widget"
 msgstr ""
 "Tekst for etiketten inne i knappen, hvis knappen inneholder en etikett."
 
-#: ../gtk/gtkbutton.c:240 ../gtk/gtkexpander.c:296 ../gtk/gtklabel.c:742
-#: ../gtk/gtkmenuitem.c:445 ../gtk/gtktoolbutton.c:246
+#: ../gtk/gtkbutton.c:260 ../gtk/gtkexpander.c:296 ../gtk/gtklabel.c:745
+#: ../gtk/gtkmenuitem.c:463 ../gtk/gtktoolbutton.c:246
 msgid "Use underline"
 msgstr "Bruk understreking"
 
-#: ../gtk/gtkbutton.c:241 ../gtk/gtkexpander.c:297 ../gtk/gtklabel.c:743
-#: ../gtk/gtkmenuitem.c:446
+#: ../gtk/gtkbutton.c:261 ../gtk/gtkexpander.c:297 ../gtk/gtklabel.c:746
+#: ../gtk/gtkmenuitem.c:464
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -1301,71 +1318,71 @@
 "Hvis satt vil en underscore i teksten indikere at neste tegn skal brukes som "
 "akselleratorhint"
 
-#: ../gtk/gtkbutton.c:248 ../gtk/gtkimagemenuitem.c:173
+#: ../gtk/deprecated/gtkimagemenuitem.c:185 ../gtk/gtkbutton.c:273
 msgid "Use stock"
 msgstr "Bruk lager"
 
-#: ../gtk/gtkbutton.c:249
+#: ../gtk/gtkbutton.c:274
 msgid ""
 "If set, the label is used to pick a stock item instead of being displayed"
 msgstr ""
 "HVis satt brukes etiketten til å velge en standardoppføring i stedet for å "
 "vises"
 
-#: ../gtk/gtkbutton.c:256 ../gtk/gtkcombobox.c:854
-#: ../gtk/gtkfilechooserbutton.c:425
+#: ../gtk/gtkbutton.c:281 ../gtk/gtkcombobox.c:860
+#: ../gtk/gtkfilechooserbutton.c:435
 msgid "Focus on click"
 msgstr "Fokus ved klikk"
 
-#: ../gtk/gtkbutton.c:257 ../gtk/gtkfilechooserbutton.c:426
+#: ../gtk/gtkbutton.c:282 ../gtk/gtkfilechooserbutton.c:436
 msgid "Whether the button grabs focus when it is clicked with the mouse"
 msgstr "Om knappen tar fokus når den klikkes med musen"
 
-#: ../gtk/gtkbutton.c:264
+#: ../gtk/gtkbutton.c:289
 msgid "Border relief"
 msgstr "Kantrelief"
 
-#: ../gtk/gtkbutton.c:265
+#: ../gtk/gtkbutton.c:290
 msgid "The border relief style"
 msgstr "Stil for kantrelief"
 
-#: ../gtk/gtkbutton.c:282
+#: ../gtk/gtkbutton.c:307
 msgid "Horizontal alignment for child"
 msgstr "Horisontal justering for barnet"
 
-#: ../gtk/gtkbutton.c:301
+#: ../gtk/gtkbutton.c:326
 msgid "Vertical alignment for child"
 msgstr "Vertikal justering for barnet"
 
-#: ../gtk/gtkbutton.c:318 ../gtk/gtkimagemenuitem.c:158
+#: ../gtk/deprecated/gtkimagemenuitem.c:168 ../gtk/gtkbutton.c:343
 msgid "Image widget"
 msgstr "Bildewidget"
 
-#: ../gtk/gtkbutton.c:319
+#: ../gtk/gtkbutton.c:344
 msgid "Child widget to appear next to the button text"
 msgstr "Underelement som skal vises ved siden av knappteksten"
 
-#: ../gtk/gtkbutton.c:333
+#: ../gtk/gtkbutton.c:358
 msgid "Image position"
 msgstr "Plassering av bilde"
 
-#: ../gtk/gtkbutton.c:334
+#: ../gtk/gtkbutton.c:359
 msgid "The position of the image relative to the text"
 msgstr "Posisjon for bildet i forhold til teksten"
 
-#: ../gtk/gtkbutton.c:476
+#: ../gtk/gtkbutton.c:503
 msgid "Default Spacing"
 msgstr "Standard avstand"
 
-#: ../gtk/gtkbutton.c:477
+#: ../gtk/gtkbutton.c:504
 msgid "Extra space to add for GTK_CAN_DEFAULT buttons"
 msgstr "Ekstra plass som skal legges til for GTK_CAN_DEFAULT-knapper"
 
-#: ../gtk/gtkbutton.c:491
+#: ../gtk/gtkbutton.c:518
 msgid "Default Outside Spacing"
 msgstr "Forvalgt utvendig mellomrom"
 
-#: ../gtk/gtkbutton.c:492
+#: ../gtk/gtkbutton.c:519
 msgid ""
 "Extra space to add for GTK_CAN_DEFAULT buttons that is always drawn outside "
 "the border"
@@ -1373,186 +1390,187 @@
 "Ekstra plass som skal legges til for GTK_CAN_DEFAULT-knapper som alltid "
 "tegnes utenfor kanten"
 
-#: ../gtk/gtkbutton.c:497
+#: ../gtk/gtkbutton.c:524
 msgid "Child X Displacement"
 msgstr "X-forskyvning for barn"
 
-#: ../gtk/gtkbutton.c:498
+#: ../gtk/gtkbutton.c:525
 msgid ""
 "How far in the x direction to move the child when the button is depressed"
 msgstr "Hvor langt barnet flyttes i x-retning når knappen er nedtrykt"
 
-#: ../gtk/gtkbutton.c:505
+#: ../gtk/gtkbutton.c:532
 msgid "Child Y Displacement"
 msgstr "Y-forskyvning for barn"
 
-#: ../gtk/gtkbutton.c:506
+#: ../gtk/gtkbutton.c:533
 msgid ""
 "How far in the y direction to move the child when the button is depressed"
 msgstr "Hvor langt barnet flyttes i y-retning når knappen er nedtrykt"
 
-#: ../gtk/gtkbutton.c:522
+#: ../gtk/gtkbutton.c:549
 msgid "Displace focus"
 msgstr "Omplasser fokus"
 
-#: ../gtk/gtkbutton.c:523
+#: ../gtk/gtkbutton.c:550
 msgid ""
 "Whether the child_displacement_x/_y properties should also affect the focus "
 "rectangle"
 msgstr ""
+"Om egenskapene child_displacement_x/_y også skal påvirke fokusrektangelet"
 
-#: ../gtk/gtkbutton.c:539 ../gtk/gtkentry.c:797 ../gtk/gtkentry.c:1941
+#: ../gtk/gtkbutton.c:566 ../gtk/gtkentry.c:816 ../gtk/gtkentry.c:2001
 msgid "Inner Border"
 msgstr "Indre kant"
 
-#: ../gtk/gtkbutton.c:540
+#: ../gtk/gtkbutton.c:567
 msgid "Border between button edges and child."
 msgstr "Kant mellom knappekanter og barn."
 
-#: ../gtk/gtkbutton.c:553
+#: ../gtk/gtkbutton.c:580
 msgid "Image spacing"
 msgstr "Mellomrom for bilde"
 
-#: ../gtk/gtkbutton.c:554
+#: ../gtk/gtkbutton.c:581
 msgid "Spacing in pixels between the image and label"
 msgstr "Mellomrom i piksler mellom bildet og etiketten"
 
-#: ../gtk/gtkcalendar.c:469
+#: ../gtk/gtkcalendar.c:470
 msgid "Year"
 msgstr "År"
 
-#: ../gtk/gtkcalendar.c:470
+#: ../gtk/gtkcalendar.c:471
 msgid "The selected year"
 msgstr "Valgt år"
 
-#: ../gtk/gtkcalendar.c:483
+#: ../gtk/gtkcalendar.c:484
 msgid "Month"
 msgstr "Måned"
 
-#: ../gtk/gtkcalendar.c:484
+#: ../gtk/gtkcalendar.c:485
 msgid "The selected month (as a number between 0 and 11)"
 msgstr "Valgt måned (som et tall mellom 0 og 11)"
 
-#: ../gtk/gtkcalendar.c:498
+#: ../gtk/gtkcalendar.c:499
 msgid "Day"
 msgstr "Dag"
 
-#: ../gtk/gtkcalendar.c:499
+#: ../gtk/gtkcalendar.c:500
 msgid ""
 "The selected day (as a number between 1 and 31, or 0 to unselect the "
 "currently selected day)"
 msgstr ""
 "Valgt dag (som et tall mellom 1 og 31, eller 0 for å velge bort valgt dag)"
 
-#: ../gtk/gtkcalendar.c:513
+#: ../gtk/gtkcalendar.c:514
 msgid "Show Heading"
 msgstr "Vis topptekst"
 
-#: ../gtk/gtkcalendar.c:514
+#: ../gtk/gtkcalendar.c:515
 msgid "If TRUE, a heading is displayed"
 msgstr "En topptekst vises hvis denne settes til TRUE"
 
-#: ../gtk/gtkcalendar.c:528
+#: ../gtk/gtkcalendar.c:529
 msgid "Show Day Names"
 msgstr "Vis navn på dager"
 
-#: ../gtk/gtkcalendar.c:529
+#: ../gtk/gtkcalendar.c:530
 msgid "If TRUE, day names are displayed"
 msgstr "Dagnavn vises hvis denne settes til TRUE"
 
-#: ../gtk/gtkcalendar.c:542
+#: ../gtk/gtkcalendar.c:543
 msgid "No Month Change"
 msgstr "Ingen endring i måned"
 
-#: ../gtk/gtkcalendar.c:543
+#: ../gtk/gtkcalendar.c:544
 msgid "If TRUE, the selected month cannot be changed"
 msgstr "Måned kan ikke endres hvis denne er satt til TRUE"
 
-#: ../gtk/gtkcalendar.c:557
+#: ../gtk/gtkcalendar.c:558
 msgid "Show Week Numbers"
 msgstr "Vis ukenummer"
 
-#: ../gtk/gtkcalendar.c:558
+#: ../gtk/gtkcalendar.c:559
 msgid "If TRUE, week numbers are displayed"
 msgstr "Ukenummer vises hvis denne er satt til TRUE"
 
-#: ../gtk/gtkcalendar.c:573
+#: ../gtk/gtkcalendar.c:574
 msgid "Details Width"
 msgstr "Bredde for detaljer"
 
-#: ../gtk/gtkcalendar.c:574
+#: ../gtk/gtkcalendar.c:575
 msgid "Details width in characters"
 msgstr "Bredde for detaljer i tegn"
 
-#: ../gtk/gtkcalendar.c:589
+#: ../gtk/gtkcalendar.c:590
 msgid "Details Height"
 msgstr "Høyde for detaljer"
 
-#: ../gtk/gtkcalendar.c:590
+#: ../gtk/gtkcalendar.c:591
 msgid "Details height in rows"
 msgstr "Høyde for detaljer i rader"
 
-#: ../gtk/gtkcalendar.c:606
+#: ../gtk/gtkcalendar.c:607
 msgid "Show Details"
 msgstr "Vis detaljer"
 
-#: ../gtk/gtkcalendar.c:607
+#: ../gtk/gtkcalendar.c:608
 msgid "If TRUE, details are shown"
 msgstr "Detaljer vises hvis denne settes til TRUE"
 
-#: ../gtk/gtkcalendar.c:619
+#: ../gtk/gtkcalendar.c:620
 msgid "Inner border"
 msgstr "Indre kant"
 
-#: ../gtk/gtkcalendar.c:620
+#: ../gtk/gtkcalendar.c:621
 msgid "Inner border space"
 msgstr "Mellomrom for indre kant"
 
-#: ../gtk/gtkcalendar.c:631
+#: ../gtk/gtkcalendar.c:632
 msgid "Vertical separation"
 msgstr "Vertikal deling"
 
-#: ../gtk/gtkcalendar.c:632
+#: ../gtk/gtkcalendar.c:633
 msgid "Space between day headers and main area"
 msgstr "Mellomrom mellom topptekst for dag og hovedområde"
 
-#: ../gtk/gtkcalendar.c:643
+#: ../gtk/gtkcalendar.c:644
 msgid "Horizontal separation"
 msgstr "Horisontal deling"
 
-#: ../gtk/gtkcalendar.c:644
+#: ../gtk/gtkcalendar.c:645
 msgid "Space between week headers and main area"
 msgstr "Mellomrom mellom topptekst for uke og hovedområdet"
 
-#: ../gtk/gtkcellareabox.c:316 ../gtk/gtktreeviewcolumn.c:281
+#: ../gtk/gtkcellareabox.c:311 ../gtk/gtktreeviewcolumn.c:282
 msgid "Space which is inserted between cells"
 msgstr "Plass som er satt inn mellom celler"
 
-#: ../gtk/gtkcellareabox.c:336
+#: ../gtk/gtkcellareabox.c:331
 msgid "Whether the cell expands"
 msgstr "Om cellen kan utvides"
 
-#: ../gtk/gtkcellareabox.c:351
+#: ../gtk/gtkcellareabox.c:346
 msgid "Align"
 msgstr "Juster"
 
-#: ../gtk/gtkcellareabox.c:352
+#: ../gtk/gtkcellareabox.c:347
 msgid "Whether cell should align with adjacent rows"
-msgstr ""
+msgstr "Om cellen skal justeres i henhold til tilstøtende rader"
 
-#: ../gtk/gtkcellareabox.c:368
+#: ../gtk/gtkcellareabox.c:363
 msgid "Fixed Size"
 msgstr "Fast størrelse"
 
-#: ../gtk/gtkcellareabox.c:369
+#: ../gtk/gtkcellareabox.c:364
 msgid "Whether cells should be the same size in all rows"
 msgstr "Om celler skal være samme størrelse i alle rader"
 
-#: ../gtk/gtkcellareabox.c:385
+#: ../gtk/gtkcellareabox.c:380
 msgid "Pack Type"
 msgstr "Type pakking"
 
-#: ../gtk/gtkcellareabox.c:386
+#: ../gtk/gtkcellareabox.c:381
 msgid ""
 "A GtkPackType indicating whether the cell is packed with reference to the "
 "start or end of the cell area"
@@ -1560,54 +1578,54 @@
 "En GtkPackType som viser om cellen er pakket med referanse til start eller "
 "slutt av celleområdet"
 
-#: ../gtk/gtkcellarea.c:803
+#: ../gtk/gtkcellarea.c:802
 msgid "Focus Cell"
 msgstr "Fokusert celle"
 
-#: ../gtk/gtkcellarea.c:804
+#: ../gtk/gtkcellarea.c:803
 msgid "The cell which currently has focus"
 msgstr "Cellen som har fokus"
 
-#: ../gtk/gtkcellarea.c:822
+#: ../gtk/gtkcellarea.c:821
 msgid "Edited Cell"
 msgstr "Redigert celle"
 
-#: ../gtk/gtkcellarea.c:823
+#: ../gtk/gtkcellarea.c:822
 msgid "The cell which is currently being edited"
 msgstr "Cellen som blir redigert"
 
-#: ../gtk/gtkcellarea.c:841
+#: ../gtk/gtkcellarea.c:840
 msgid "Edit Widget"
 msgstr "Redigeringskomponent"
 
-#: ../gtk/gtkcellarea.c:842
+#: ../gtk/gtkcellarea.c:841
 msgid "The widget currently editing the edited cell"
-msgstr ""
+msgstr "Skjermelementet som redigerer cellen nå"
 
-#: ../gtk/gtkcellareacontext.c:117
+#: ../gtk/gtkcellareacontext.c:115
 msgid "Area"
 msgstr "Område"
 
-#: ../gtk/gtkcellareacontext.c:118
+#: ../gtk/gtkcellareacontext.c:116
 msgid "The Cell Area this context was created for"
 msgstr "Celleområdet denne konteksten ble laget for"
 
-#: ../gtk/gtkcellareacontext.c:134 ../gtk/gtkcellareacontext.c:153
-#: ../gtk/gtktreeviewcolumn.c:308
+#: ../gtk/gtkcellareacontext.c:132 ../gtk/gtkcellareacontext.c:151
+#: ../gtk/gtktreeviewcolumn.c:309
 msgid "Minimum Width"
 msgstr "Minimal bredde"
 
-#: ../gtk/gtkcellareacontext.c:135 ../gtk/gtkcellareacontext.c:154
+#: ../gtk/gtkcellareacontext.c:133 ../gtk/gtkcellareacontext.c:152
 msgid "Minimum cached width"
-msgstr ""
+msgstr "Minimum bredde i hurtiglager"
 
-#: ../gtk/gtkcellareacontext.c:172 ../gtk/gtkcellareacontext.c:191
+#: ../gtk/gtkcellareacontext.c:170 ../gtk/gtkcellareacontext.c:189
 msgid "Minimum Height"
 msgstr "Minimumshøyde"
 
-#: ../gtk/gtkcellareacontext.c:173 ../gtk/gtkcellareacontext.c:192
+#: ../gtk/gtkcellareacontext.c:171 ../gtk/gtkcellareacontext.c:190
 msgid "Minimum cached height"
-msgstr ""
+msgstr "Minimum høyde i hurtiglager"
 
 #: ../gtk/gtkcelleditable.c:51
 msgid "Editing Canceled"
@@ -1617,155 +1635,155 @@
 msgid "Indicates that editing has been canceled"
 msgstr "Indikerer at redigering er avbrutt"
 
-#: ../gtk/gtkcellrendereraccel.c:148
+#: ../gtk/gtkcellrendereraccel.c:146
 msgid "Accelerator key"
 msgstr "Akselleratortast"
 
-#: ../gtk/gtkcellrendereraccel.c:149
+#: ../gtk/gtkcellrendereraccel.c:147
 msgid "The keyval of the accelerator"
 msgstr "Tastaturverdien for hurtigtasten"
 
-#: ../gtk/gtkcellrendereraccel.c:165
+#: ../gtk/gtkcellrendereraccel.c:163
 msgid "Accelerator modifiers"
 msgstr "Endringstaster for hurtigtast"
 
-#: ../gtk/gtkcellrendereraccel.c:166
+#: ../gtk/gtkcellrendereraccel.c:164
 msgid "The modifier mask of the accelerator"
 msgstr "Maske for endringstaster for hurtigtasten"
 
-#: ../gtk/gtkcellrendereraccel.c:183
+#: ../gtk/gtkcellrendereraccel.c:181
 msgid "Accelerator keycode"
 msgstr "Tastekode for hurtigtast"
 
-#: ../gtk/gtkcellrendereraccel.c:184
+#: ../gtk/gtkcellrendereraccel.c:182
 msgid "The hardware keycode of the accelerator"
 msgstr "Maskinvaretastekode for hurtigtast"
 
-#: ../gtk/gtkcellrendereraccel.c:203
+#: ../gtk/gtkcellrendereraccel.c:201
 msgid "Accelerator Mode"
 msgstr "Akselleratormodus"
 
-#: ../gtk/gtkcellrendereraccel.c:204
+#: ../gtk/gtkcellrendereraccel.c:202
 msgid "The type of accelerators"
 msgstr "Type akselleratorer"
 
-#: ../gtk/gtkcellrenderer.c:280
+#: ../gtk/gtkcellrenderer.c:285
 msgid "mode"
 msgstr "modus"
 
-#: ../gtk/gtkcellrenderer.c:281
+#: ../gtk/gtkcellrenderer.c:286
 msgid "Editable mode of the CellRenderer"
 msgstr "Redigerbart modus for CellRenderer"
 
-#: ../gtk/gtkcellrenderer.c:289
+#: ../gtk/gtkcellrenderer.c:294
 msgid "visible"
 msgstr "synlig"
 
-#: ../gtk/gtkcellrenderer.c:290
+#: ../gtk/gtkcellrenderer.c:295
 msgid "Display the cell"
 msgstr "Vis cellen"
 
-#: ../gtk/gtkcellrenderer.c:297
+#: ../gtk/gtkcellrenderer.c:302
 msgid "Display the cell sensitive"
 msgstr "Vis cellen sensitiv"
 
-#: ../gtk/gtkcellrenderer.c:304
+#: ../gtk/gtkcellrenderer.c:309
 msgid "xalign"
 msgstr "xalign"
 
-#: ../gtk/gtkcellrenderer.c:305
+#: ../gtk/gtkcellrenderer.c:310
 msgid "The x-align"
 msgstr "X-justering"
 
-#: ../gtk/gtkcellrenderer.c:314
+#: ../gtk/gtkcellrenderer.c:319
 msgid "yalign"
 msgstr "yalign"
 
-#: ../gtk/gtkcellrenderer.c:315
+#: ../gtk/gtkcellrenderer.c:320
 msgid "The y-align"
 msgstr "Y-justering"
 
-#: ../gtk/gtkcellrenderer.c:324
+#: ../gtk/gtkcellrenderer.c:329
 msgid "xpad"
 msgstr "x-fyll"
 
-#: ../gtk/gtkcellrenderer.c:325
+#: ../gtk/gtkcellrenderer.c:330
 msgid "The xpad"
 msgstr "X-fyll"
 
-#: ../gtk/gtkcellrenderer.c:334
+#: ../gtk/gtkcellrenderer.c:339
 msgid "ypad"
 msgstr "y-fyll"
 
-#: ../gtk/gtkcellrenderer.c:335
+#: ../gtk/gtkcellrenderer.c:340
 msgid "The ypad"
 msgstr "Y-fyll"
 
-#: ../gtk/gtkcellrenderer.c:344
+#: ../gtk/gtkcellrenderer.c:349
 msgid "width"
 msgstr "bredde"
 
-#: ../gtk/gtkcellrenderer.c:345
+#: ../gtk/gtkcellrenderer.c:350
 msgid "The fixed width"
 msgstr "Den faste bredden"
 
-#: ../gtk/gtkcellrenderer.c:354
+#: ../gtk/gtkcellrenderer.c:359
 msgid "height"
 msgstr "høyde"
 
-#: ../gtk/gtkcellrenderer.c:355
+#: ../gtk/gtkcellrenderer.c:360
 msgid "The fixed height"
 msgstr "Den faste høyden"
 
-#: ../gtk/gtkcellrenderer.c:364
+#: ../gtk/gtkcellrenderer.c:369
 msgid "Is Expander"
 msgstr "Er utvider"
 
-#: ../gtk/gtkcellrenderer.c:365
+#: ../gtk/gtkcellrenderer.c:370
 msgid "Row has children"
 msgstr "Rad har etterkommere"
 
-#: ../gtk/gtkcellrenderer.c:373
+#: ../gtk/gtkcellrenderer.c:378
 msgid "Is Expanded"
 msgstr "Er utvidet"
 
-#: ../gtk/gtkcellrenderer.c:374
+#: ../gtk/gtkcellrenderer.c:379
 msgid "Row is an expander row, and is expanded"
 msgstr "Raden er en utvider-rad, og er utvidet"
 
-#: ../gtk/gtkcellrenderer.c:381
+#: ../gtk/gtkcellrenderer.c:386
 msgid "Cell background color name"
 msgstr "Navn på bakgrunnsfarge for celle"
 
-#: ../gtk/gtkcellrenderer.c:382
+#: ../gtk/gtkcellrenderer.c:387
 msgid "Cell background color as a string"
 msgstr "Bakgrunnsfarge for celle som en streng"
 
-#: ../gtk/gtkcellrenderer.c:396
+#: ../gtk/gtkcellrenderer.c:401
 msgid "Cell background color"
 msgstr "Bakgrunnsfarge for celle"
 
-#: ../gtk/gtkcellrenderer.c:397
+#: ../gtk/gtkcellrenderer.c:402
 msgid "Cell background color as a GdkColor"
 msgstr "Bakgrunnsfarge for celle som en GdkColor"
 
-#: ../gtk/gtkcellrenderer.c:410
+#: ../gtk/gtkcellrenderer.c:415
 msgid "Cell background RGBA color"
 msgstr "RGBA-bakgrunnsfarge for celle"
 
-#: ../gtk/gtkcellrenderer.c:411
+#: ../gtk/gtkcellrenderer.c:416
 msgid "Cell background color as a GdkRGBA"
 msgstr "Bakgrunnsfarge for celle som GdkRGBA"
 
-#: ../gtk/gtkcellrenderer.c:418
+#: ../gtk/gtkcellrenderer.c:423
 msgid "Editing"
 msgstr "Redigerer"
 
-#: ../gtk/gtkcellrenderer.c:419
+#: ../gtk/gtkcellrenderer.c:424
 msgid "Whether the cell renderer is currently in editing mode"
-msgstr ""
+msgstr "Om celletegneren er i redigeringsmodus"
 
-#: ../gtk/gtkcellrenderer.c:427
+#: ../gtk/gtkcellrenderer.c:432
 msgid "Cell background set"
 msgstr "Bakgrunn for celle satt"
 
@@ -1789,7 +1807,7 @@
 msgid "A column in the data source model to get the strings from"
 msgstr "En kolonne i datakildemodellen hvor man kan hente strenger"
 
-#: ../gtk/gtkcellrenderercombo.c:169 ../gtk/gtkcombobox.c:921
+#: ../gtk/gtkcellrenderercombo.c:169 ../gtk/gtkcombobox.c:929
 msgid "Has Entry"
 msgstr "Har inntastingsfelt"
 
@@ -1797,100 +1815,102 @@
 msgid "If FALSE, don't allow to enter strings other than the chosen ones"
 msgstr "Hvis «FALSE», ikke tillat å skrive inn strenger utenom de valgte"
 
-#: ../gtk/gtkcellrendererpixbuf.c:151
+#: ../gtk/gtkcellrendererpixbuf.c:150
 msgid "Pixbuf Object"
 msgstr "Pixbuf-objekt"
 
-#: ../gtk/gtkcellrendererpixbuf.c:152
+#: ../gtk/gtkcellrendererpixbuf.c:151
 msgid "The pixbuf to render"
 msgstr "Pixbuf som skal rendres"
 
-#: ../gtk/gtkcellrendererpixbuf.c:159
+#: ../gtk/gtkcellrendererpixbuf.c:158
 msgid "Pixbuf Expander Open"
 msgstr "Pixbuf for åpen utvider"
 
-#: ../gtk/gtkcellrendererpixbuf.c:160
+#: ../gtk/gtkcellrendererpixbuf.c:159
 msgid "Pixbuf for open expander"
 msgstr "Pixbuf for åpen utvider"
 
-#: ../gtk/gtkcellrendererpixbuf.c:167
+#: ../gtk/gtkcellrendererpixbuf.c:166
 msgid "Pixbuf Expander Closed"
 msgstr "Pixbuf for lukket utvider"
 
-#: ../gtk/gtkcellrendererpixbuf.c:168
+#: ../gtk/gtkcellrendererpixbuf.c:167
 msgid "Pixbuf for closed expander"
 msgstr "Pixbuf for lukket utvider"
 
-#: ../gtk/gtkcellrendererpixbuf.c:175 ../gtk/gtkimage.c:235
-#: ../gtk/gtkstatusicon.c:239
+#: ../gtk/gtkcellrendererpixbuf.c:186 ../gtk/gtkimage.c:261
+#: ../gtk/gtkstatusicon.c:243
 msgid "Stock ID"
 msgstr "Standard ID"
 
-#: ../gtk/gtkcellrendererpixbuf.c:176
+#: ../gtk/gtkcellrendererpixbuf.c:187
 msgid "The stock ID of the stock icon to render"
 msgstr "Standard-ID for standardikon som skal rendres"
 
-#: ../gtk/gtkcellrendererpixbuf.c:183 ../gtk/gtkcellrendererspinner.c:157
-#: ../gtk/gtkrecentmanager.c:308 ../gtk/gtkstatusicon.c:280
+#: ../gtk/gtkcellrendererpixbuf.c:194 ../gtk/gtkcellrendererspinner.c:157
+#: ../gtk/gtkrecentmanager.c:308 ../gtk/gtkstatusicon.c:284
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../gtk/gtkcellrendererpixbuf.c:184
+#: ../gtk/gtkcellrendererpixbuf.c:195
 msgid "The GtkIconSize value that specifies the size of the rendered icon"
 msgstr "Verdien for GtkIconSize som spesifiserer størrelsen for rendret ikon"
 
-#: ../gtk/gtkcellrendererpixbuf.c:193
+#: ../gtk/gtkcellrendererpixbuf.c:204
 msgid "Detail"
 msgstr "Detalj"
 
-#: ../gtk/gtkcellrendererpixbuf.c:194
+#: ../gtk/gtkcellrendererpixbuf.c:205
 msgid "Render detail to pass to the theme engine"
 msgstr "Rendringsdetalj som skal sendes til temamotor"
 
-#: ../gtk/gtkcellrendererpixbuf.c:227
+#: ../gtk/gtkcellrendererpixbuf.c:238
 msgid "Follow State"
 msgstr "Følg tilstand"
 
-#: ../gtk/gtkcellrendererpixbuf.c:228
+#: ../gtk/gtkcellrendererpixbuf.c:239
 msgid ""
 "Whether the rendered pixbuf should be colorized according to the state"
 msgstr "Om den tegnede «pixbuf»-en skal bli farget i samsvar med tilstanden"
 
-#: ../gtk/gtkcellrendererpixbuf.c:245 ../gtk/gtkimage.c:310
-#: ../gtk/gtkwindow.c:719
+#: ../gtk/gtkcellrendererpixbuf.c:256 ../gtk/gtkimage.c:343
+#: ../gtk/gtkwindow.c:804
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../gtk/gtkcellrendererprogress.c:137
+#: ../gtk/gtkcellrendererprogress.c:138
 msgid "Value of the progress bar"
-msgstr "Verdi for fremgangsmåleren"
+msgstr "Verdi for framdriftsviseren"
 
-#: ../gtk/gtkcellrendererprogress.c:154 ../gtk/gtkcellrenderertext.c:255
-#: ../gtk/gtkentrybuffer.c:350 ../gtk/gtkentry.c:841
-#: ../gtk/gtkmessagedialog.c:230 ../gtk/gtkprogressbar.c:173
+#: ../gtk/gtkcellrendererprogress.c:155 ../gtk/gtkcellrenderertext.c:253
+#: ../gtk/gtkentrybuffer.c:348 ../gtk/gtkentry.c:860
+#: ../gtk/gtkmessagedialog.c:212 ../gtk/gtkprogressbar.c:179
 #: ../gtk/gtktextbuffer.c:219
 msgid "Text"
 msgstr "Tekst"
 
-#: ../gtk/gtkcellrendererprogress.c:155
+#: ../gtk/gtkcellrendererprogress.c:156
 msgid "Text on the progress bar"
-msgstr "Tekst på fremgangsmåleren"
+msgstr "Tekst på framdriftsviseren"
 
-#: ../gtk/gtkcellrendererprogress.c:178 ../gtk/gtkcellrendererspinner.c:143
+#: ../gtk/gtkcellrendererprogress.c:179 ../gtk/gtkcellrendererspinner.c:143
 msgid "Pulse"
 msgstr "Puls"
 
-#: ../gtk/gtkcellrendererprogress.c:179
+#: ../gtk/gtkcellrendererprogress.c:180
 msgid ""
 "Set this to positive values to indicate that some progress is made, but you "
 "don't know how much."
 msgstr ""
+"Velg en positiv verdi for å vise at det er framdrift, men at du vet ikke "
+"hvor mye."
 
-#: ../gtk/gtkcellrendererprogress.c:195
+#: ../gtk/gtkcellrendererprogress.c:196
 msgid "Text x alignment"
 msgstr "X-justering for tekst"
 
-#: ../gtk/gtkcellrendererprogress.c:196
+#: ../gtk/gtkcellrendererprogress.c:197
 msgid ""
 "The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL "
 "layouts."
@@ -1898,256 +1918,257 @@
 "Horisontal tekstjustering, fra 0 (venstre) til 1 (høyre). Omvendt for RTL-"
 "utforminger."
 
-#: ../gtk/gtkcellrendererprogress.c:212
+#: ../gtk/gtkcellrendererprogress.c:213
 msgid "Text y alignment"
 msgstr "Y-justering for tekst"
 
-#: ../gtk/gtkcellrendererprogress.c:213
+#: ../gtk/gtkcellrendererprogress.c:214
 msgid "The vertical text alignment, from 0 (top) to 1 (bottom)."
 msgstr "Vertikal tekstjustering, fra 0 (øverst) til 1 (nederst)."
 
-#: ../gtk/gtkcellrendererprogress.c:224 ../gtk/gtklevelbar.c:991
-#: ../gtk/gtkprogressbar.c:149 ../gtk/gtkrange.c:432
+#: ../gtk/gtkcellrendererprogress.c:225 ../gtk/gtklevelbar.c:994
+#: ../gtk/gtkprogressbar.c:155 ../gtk/gtkrange.c:443
 msgid "Inverted"
 msgstr "Invertert"
 
-#: ../gtk/gtkcellrendererprogress.c:225 ../gtk/gtkprogressbar.c:150
+#: ../gtk/gtkcellrendererprogress.c:226 ../gtk/gtkprogressbar.c:156
 msgid "Invert the direction in which the progress bar grows"
-msgstr ""
+msgstr "Bytt retningen som framdriftsviseren beveger seg i"
 
-#: ../gtk/gtkcellrendererspin.c:113 ../gtk/gtkrange.c:424
-#: ../gtk/gtkscalebutton.c:237 ../gtk/gtkspinbutton.c:336
+#: ../gtk/gtkcellrendererspin.c:113 ../gtk/gtkrange.c:435
+#: ../gtk/gtkscalebutton.c:247 ../gtk/gtkspinbutton.c:349
 msgid "Adjustment"
 msgstr "Justering"
 
-#: ../gtk/gtkcellrendererspin.c:114 ../gtk/gtkspinbutton.c:337
+#: ../gtk/gtkcellrendererspin.c:114 ../gtk/gtkspinbutton.c:350
 msgid "The adjustment that holds the value of the spin button"
-msgstr ""
+msgstr "Justeringen som inneholder spinneknappens verdi"
 
 #: ../gtk/gtkcellrendererspin.c:129
 msgid "Climb rate"
 msgstr "Klatrerate"
 
-#: ../gtk/gtkcellrendererspin.c:130 ../gtk/gtkspinbutton.c:345
+#: ../gtk/gtkcellrendererspin.c:130 ../gtk/gtkspinbutton.c:358
 msgid "The acceleration rate when you hold down a button"
 msgstr "Akselleratorrate når du holder nede en knapp"
 
 #: ../gtk/gtkcellrendererspin.c:143 ../gtk/gtkscale.c:309
-#: ../gtk/gtkspinbutton.c:354
+#: ../gtk/gtkspinbutton.c:367
 msgid "Digits"
 msgstr "Tall"
 
-#: ../gtk/gtkcellrendererspin.c:144 ../gtk/gtkspinbutton.c:355
+#: ../gtk/gtkcellrendererspin.c:144 ../gtk/gtkspinbutton.c:368
 msgid "The number of decimal places to display"
 msgstr "Antall desimalplasser som skal vises"
 
-#: ../gtk/gtkcellrendererspinner.c:125 ../gtk/gtkcheckmenuitem.c:120
-#: ../gtk/gtkmenu.c:554 ../gtk/gtkspinner.c:114 ../gtk/gtkswitch.c:814
-#: ../gtk/gtktoggleaction.c:131 ../gtk/gtktogglebutton.c:173
-#: ../gtk/gtktoggletoolbutton.c:125
+#: ../gtk/deprecated/gtktoggleaction.c:137 ../gtk/gtkcellrendererspinner.c:125
+#: ../gtk/gtkcheckmenuitem.c:122 ../gtk/gtkmenu.c:557 ../gtk/gtkspinner.c:113
+#: ../gtk/gtkswitch.c:834 ../gtk/gtktogglebutton.c:176
+#: ../gtk/gtktoggletoolbutton.c:127
 msgid "Active"
 msgstr "Aktiv"
 
 #: ../gtk/gtkcellrendererspinner.c:126
 msgid "Whether the spinner is active (ie. shown) in the cell"
-msgstr ""
+msgstr "Om spinneren skal vises i cellen"
 
 #: ../gtk/gtkcellrendererspinner.c:144
 msgid "Pulse of the spinner"
-msgstr ""
+msgstr "Spinnerens pulshastighet"
 
 #: ../gtk/gtkcellrendererspinner.c:158
 msgid "The GtkIconSize value that specifies the size of the rendered spinner"
 msgstr ""
+"«GtkIconSize»-verdien som angir størrelsen på den opptegnede spinneren"
 
-#: ../gtk/gtkcellrenderertext.c:256
+#: ../gtk/gtkcellrenderertext.c:254
 msgid "Text to render"
 msgstr "Tekst som skal rendres"
 
-#: ../gtk/gtkcellrenderertext.c:263
+#: ../gtk/gtkcellrenderertext.c:261
 msgid "Markup"
 msgstr "Tagging"
 
-#: ../gtk/gtkcellrenderertext.c:264
+#: ../gtk/gtkcellrenderertext.c:262
 msgid "Marked up text to render"
 msgstr "Tagget tekst som skal rendres"
 
-#: ../gtk/gtkcellrenderertext.c:271 ../gtk/gtkentry.c:1410
-#: ../gtk/gtklabel.c:728
+#: ../gtk/gtkcellrenderertext.c:269 ../gtk/gtkentry.c:1433
+#: ../gtk/gtklabel.c:731
 msgid "Attributes"
 msgstr "Attributter"
 
-#: ../gtk/gtkcellrenderertext.c:272
+#: ../gtk/gtkcellrenderertext.c:270
 msgid "A list of style attributes to apply to the text of the renderer"
 msgstr "En liste med stilattributter som skal brukes på teksten som rendres"
 
-#: ../gtk/gtkcellrenderertext.c:279
+#: ../gtk/gtkcellrenderertext.c:277
 msgid "Single Paragraph Mode"
 msgstr "Modus for enkelt avsnitt"
 
-#: ../gtk/gtkcellrenderertext.c:280
+#: ../gtk/gtkcellrenderertext.c:278
 msgid "Whether to keep all text in a single paragraph"
 msgstr "Hvorvidt all tekst skal holdes i et enkelt avsnitt"
 
-#: ../gtk/gtkcellrenderertext.c:288 ../gtk/gtkcellview.c:189
+#: ../gtk/gtkcellrenderertext.c:286 ../gtk/gtkcellview.c:190
 #: ../gtk/gtktexttag.c:203
 msgid "Background color name"
 msgstr "Navn på bakgrunnsfarge"
 
-#: ../gtk/gtkcellrenderertext.c:289 ../gtk/gtkcellview.c:190
+#: ../gtk/gtkcellrenderertext.c:287 ../gtk/gtkcellview.c:191
 #: ../gtk/gtktexttag.c:204
 msgid "Background color as a string"
 msgstr "Bakgrunnsfarge som en streng"
 
-#: ../gtk/gtkcellrenderertext.c:303 ../gtk/gtkcellview.c:204
+#: ../gtk/gtkcellrenderertext.c:301 ../gtk/gtkcellview.c:205
 #: ../gtk/gtktexttag.c:218
 msgid "Background color"
 msgstr "Bakgrunnsfarge"
 
-#: ../gtk/gtkcellrenderertext.c:304 ../gtk/gtkcellview.c:205
+#: ../gtk/gtkcellrenderertext.c:302 ../gtk/gtkcellview.c:206
 #: ../gtk/gtktexttag.c:219
 msgid "Background color as a GdkColor"
 msgstr "Bakgrunnsfarge som en GdkColor"
 
-#: ../gtk/gtkcellrenderertext.c:318
+#: ../gtk/gtkcellrenderertext.c:316
 msgid "Background color as RGBA"
 msgstr "Bakgrunnsfarge som RGBA"
 
-#: ../gtk/gtkcellrenderertext.c:319 ../gtk/gtkcellview.c:219
+#: ../gtk/gtkcellrenderertext.c:317 ../gtk/gtkcellview.c:220
 #: ../gtk/gtktexttag.c:234
 msgid "Background color as a GdkRGBA"
 msgstr "Bakgrunnsfarge som en GdkRGBA"
 
-#: ../gtk/gtkcellrenderertext.c:325 ../gtk/gtktexttag.c:249
+#: ../gtk/gtkcellrenderertext.c:323 ../gtk/gtktexttag.c:249
 msgid "Foreground color name"
 msgstr "Navn på forgrunnsfarge"
 
-#: ../gtk/gtkcellrenderertext.c:326 ../gtk/gtktexttag.c:250
+#: ../gtk/gtkcellrenderertext.c:324 ../gtk/gtktexttag.c:250
 msgid "Foreground color as a string"
 msgstr "Forgrunnsfarge som en streng"
 
-#: ../gtk/gtkcellrenderertext.c:340 ../gtk/gtktexttag.c:264
+#: ../gtk/gtkcellrenderertext.c:338 ../gtk/gtktexttag.c:264
 #: ../gtk/gtktrayicon-x11.c:135
 msgid "Foreground color"
 msgstr "Forgrunnsfarge"
 
-#: ../gtk/gtkcellrenderertext.c:341 ../gtk/gtktexttag.c:265
+#: ../gtk/gtkcellrenderertext.c:339 ../gtk/gtktexttag.c:265
 msgid "Foreground color as a GdkColor"
 msgstr "Forgrunnsfarge som en GdkColor"
 
-#: ../gtk/gtkcellrenderertext.c:355
+#: ../gtk/gtkcellrenderertext.c:353
 msgid "Foreground color as RGBA"
 msgstr "Forgrunnsfarge som RGBA"
 
-#: ../gtk/gtkcellrenderertext.c:356 ../gtk/gtktexttag.c:280
+#: ../gtk/gtkcellrenderertext.c:354 ../gtk/gtktexttag.c:280
 msgid "Foreground color as a GdkRGBA"
 msgstr "Forgrunnsfarge som en GdkRGBA"
 
-#: ../gtk/gtkcellrenderertext.c:364 ../gtk/gtkentry.c:755
-#: ../gtk/gtktexttag.c:296 ../gtk/gtktextview.c:704
+#: ../gtk/gtkcellrenderertext.c:362 ../gtk/gtkentry.c:774
+#: ../gtk/gtktexttag.c:296 ../gtk/gtktextview.c:732
 msgid "Editable"
 msgstr "Redigerbar"
 
-#: ../gtk/gtkcellrenderertext.c:365 ../gtk/gtktexttag.c:297
-#: ../gtk/gtktextview.c:705
+#: ../gtk/gtkcellrenderertext.c:363 ../gtk/gtktexttag.c:297
+#: ../gtk/gtktextview.c:733
 msgid "Whether the text can be modified by the user"
 msgstr "Om teksten kan endres av brukeren"
 
-#: ../gtk/gtkcellrenderertext.c:372 ../gtk/gtkcellrenderertext.c:380
+#: ../gtk/gtkcellrenderertext.c:370 ../gtk/gtkcellrenderertext.c:378
 #: ../gtk/gtkfontchooser.c:65 ../gtk/gtktexttag.c:312 ../gtk/gtktexttag.c:320
 msgid "Font"
 msgstr "Skrift"
 
-#: ../gtk/gtkcellrenderertext.c:373 ../gtk/gtkfontchooser.c:66
+#: ../gtk/gtkcellrenderertext.c:371 ../gtk/gtkfontchooser.c:66
 #: ../gtk/gtktexttag.c:313
 msgid "Font description as a string, e.g. \"Sans Italic 12\""
 msgstr "Beskrivelse av skriften som en streng, f.eks «Sans Italic 12»"
 
-#: ../gtk/gtkcellrenderertext.c:381 ../gtk/gtkfontchooser.c:79
+#: ../gtk/gtkcellrenderertext.c:379 ../gtk/gtkfontchooser.c:79
 #: ../gtk/gtktexttag.c:321
 msgid "Font description as a PangoFontDescription struct"
 msgstr "Skriftbeskrivelse som en PangoFontDescription struct"
 
-#: ../gtk/gtkcellrenderertext.c:389 ../gtk/gtktexttag.c:328
+#: ../gtk/gtkcellrenderertext.c:387 ../gtk/gtktexttag.c:328
 msgid "Font family"
 msgstr "Skriftfamilie"
 
-#: ../gtk/gtkcellrenderertext.c:390 ../gtk/gtktexttag.c:329
+#: ../gtk/gtkcellrenderertext.c:388 ../gtk/gtktexttag.c:329
 msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
 msgstr "Navn på skriftfamilien, f.eks Sans, Helvetica, Times, Monospace"
 
-#: ../gtk/gtkcellrenderertext.c:397 ../gtk/gtkcellrenderertext.c:398
+#: ../gtk/gtkcellrenderertext.c:395 ../gtk/gtkcellrenderertext.c:396
 #: ../gtk/gtktexttag.c:336
 msgid "Font style"
 msgstr "Skriftstil"
 
-#: ../gtk/gtkcellrenderertext.c:406 ../gtk/gtkcellrenderertext.c:407
+#: ../gtk/gtkcellrenderertext.c:404 ../gtk/gtkcellrenderertext.c:405
 #: ../gtk/gtktexttag.c:345
 msgid "Font variant"
 msgstr "Skriftvariant"
 
-#: ../gtk/gtkcellrenderertext.c:415 ../gtk/gtkcellrenderertext.c:416
+#: ../gtk/gtkcellrenderertext.c:413 ../gtk/gtkcellrenderertext.c:414
 #: ../gtk/gtktexttag.c:354
 msgid "Font weight"
 msgstr "Skriftens vekt"
 
-#: ../gtk/gtkcellrenderertext.c:425 ../gtk/gtkcellrenderertext.c:426
+#: ../gtk/gtkcellrenderertext.c:423 ../gtk/gtkcellrenderertext.c:424
 #: ../gtk/gtktexttag.c:365
 msgid "Font stretch"
 msgstr "Skriftens \"strekk\""
 
-#: ../gtk/gtkcellrenderertext.c:434 ../gtk/gtkcellrenderertext.c:435
+#: ../gtk/gtkcellrenderertext.c:432 ../gtk/gtkcellrenderertext.c:433
 #: ../gtk/gtktexttag.c:374
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
-#: ../gtk/gtkcellrenderertext.c:444 ../gtk/gtktexttag.c:394
+#: ../gtk/gtkcellrenderertext.c:442 ../gtk/gtktexttag.c:394
 msgid "Font points"
 msgstr "Skriftpunkter"
 
-#: ../gtk/gtkcellrenderertext.c:445 ../gtk/gtktexttag.c:395
+#: ../gtk/gtkcellrenderertext.c:443 ../gtk/gtktexttag.c:395
 msgid "Font size in points"
 msgstr "Størrelse på skrift i punkter"
 
-#: ../gtk/gtkcellrenderertext.c:454 ../gtk/gtktexttag.c:384
+#: ../gtk/gtkcellrenderertext.c:452 ../gtk/gtktexttag.c:384
 msgid "Font scale"
 msgstr "Skriftskalering"
 
-#: ../gtk/gtkcellrenderertext.c:455
+#: ../gtk/gtkcellrenderertext.c:453
 msgid "Font scaling factor"
 msgstr "Skaleringsfaktor for skrift"
 
-#: ../gtk/gtkcellrenderertext.c:464 ../gtk/gtktexttag.c:463
+#: ../gtk/gtkcellrenderertext.c:462 ../gtk/gtktexttag.c:463
 msgid "Rise"
 msgstr "Hev"
 
-#: ../gtk/gtkcellrenderertext.c:465
+#: ../gtk/gtkcellrenderertext.c:463
 msgid ""
 "Offset of text above the baseline (below the baseline if rise is negative)"
 msgstr ""
 "Tekstavstand over grunnlinjen (under grunnlinjen hvis hevingen er negativ)"
 
-#: ../gtk/gtkcellrenderertext.c:476 ../gtk/gtktexttag.c:503
+#: ../gtk/gtkcellrenderertext.c:474 ../gtk/gtktexttag.c:503
 msgid "Strikethrough"
 msgstr "Gjennomstreking"
 
-#: ../gtk/gtkcellrenderertext.c:477 ../gtk/gtktexttag.c:504
+#: ../gtk/gtkcellrenderertext.c:475 ../gtk/gtktexttag.c:504
 msgid "Whether to strike through the text"
 msgstr "Bruk gjennomstreking av teksten"
 
-#: ../gtk/gtkcellrenderertext.c:484 ../gtk/gtktexttag.c:511
+#: ../gtk/gtkcellrenderertext.c:482 ../gtk/gtktexttag.c:511
 msgid "Underline"
 msgstr "Understrek"
 
-#: ../gtk/gtkcellrenderertext.c:485 ../gtk/gtktexttag.c:512
+#: ../gtk/gtkcellrenderertext.c:483 ../gtk/gtktexttag.c:512
 msgid "Style of underline for this text"
 msgstr "Stil for understreking av denne teksten."
 
-#: ../gtk/gtkcellrenderertext.c:493 ../gtk/gtktexttag.c:423
+#: ../gtk/gtkcellrenderertext.c:491 ../gtk/gtktexttag.c:423
 msgid "Language"
 msgstr "Språk"
 
-#: ../gtk/gtkcellrenderertext.c:494
+#: ../gtk/gtkcellrenderertext.c:492
 msgid ""
 "The language this text is in, as an ISO code. Pango can use this as a hint "
 "when rendering the text. If you don't understand this parameter, you "
@@ -2157,12 +2178,12 @@
 "som et hint når teksten rendres. Hvis du ikke forstår denne parameteren "
 "trenger du den sannsynligvis ikke"
 
-#: ../gtk/gtkcellrenderertext.c:514 ../gtk/gtklabel.c:853
-#: ../gtk/gtkprogressbar.c:217
+#: ../gtk/gtkcellrenderertext.c:512 ../gtk/gtklabel.c:856
+#: ../gtk/gtkprogressbar.c:223
 msgid "Ellipsize"
 msgstr "Forkort"
 
-#: ../gtk/gtkcellrenderertext.c:515
+#: ../gtk/gtkcellrenderertext.c:513
 msgid ""
 "The preferred place to ellipsize the string, if the cell renderer does not "
 "have enough room to display the entire string"
@@ -2170,28 +2191,28 @@
 "Det prioriterte stedet å forkorte strengen hvis celletegneren ikke har nok "
 "plass til å vise hele strengen"
 
-#: ../gtk/gtkcellrenderertext.c:534 ../gtk/gtkfilechooserbutton.c:453
-#: ../gtk/gtklabel.c:874
+#: ../gtk/gtkcellrenderertext.c:532 ../gtk/gtkfilechooserbutton.c:463
+#: ../gtk/gtklabel.c:877
 msgid "Width In Characters"
 msgstr "Bredde i tegn"
 
-#: ../gtk/gtkcellrenderertext.c:535 ../gtk/gtklabel.c:875
+#: ../gtk/gtkcellrenderertext.c:533 ../gtk/gtklabel.c:878
 msgid "The desired width of the label, in characters"
 msgstr "Den ønskede bredden på merkelappen, i tegn"
 
-#: ../gtk/gtkcellrenderertext.c:559 ../gtk/gtklabel.c:935
+#: ../gtk/gtkcellrenderertext.c:557 ../gtk/gtklabel.c:938
 msgid "Maximum Width In Characters"
 msgstr "Maksimal bredde i tegn"
 
-#: ../gtk/gtkcellrenderertext.c:560
+#: ../gtk/gtkcellrenderertext.c:558
 msgid "The maximum width of the cell, in characters"
-msgstr ""
+msgstr "Maksimal cellebredde, angitt i bokstaver"
 
-#: ../gtk/gtkcellrenderertext.c:578 ../gtk/gtktexttag.c:520
+#: ../gtk/gtkcellrenderertext.c:576 ../gtk/gtktexttag.c:520
 msgid "Wrap mode"
 msgstr "Brytningsmodus"
 
-#: ../gtk/gtkcellrenderertext.c:579
+#: ../gtk/gtkcellrenderertext.c:577
 msgid ""
 "How to break the string into multiple lines, if the cell renderer does not "
 "have enough room to display the entire string"
@@ -2199,306 +2220,309 @@
 "Hvordan strenger skal splittes på flere linjer hvis celletegneren ikke har "
 "nok plass til å vise hele strengen"
 
-#: ../gtk/gtkcellrenderertext.c:598 ../gtk/gtkcombobox.c:743
+#: ../gtk/gtkcellrenderertext.c:596 ../gtk/gtkcombobox.c:747
 msgid "Wrap width"
 msgstr "Bredde for bryting"
 
-#: ../gtk/gtkcellrenderertext.c:599
+#: ../gtk/gtkcellrenderertext.c:597
 msgid "The width at which the text is wrapped"
 msgstr "Bredden som teksten blir pakket inn i"
 
-#: ../gtk/gtkcellrenderertext.c:619 ../gtk/gtktreeviewcolumn.c:361
+#: ../gtk/gtkcellrenderertext.c:617 ../gtk/gtktreeviewcolumn.c:362
 msgid "Alignment"
 msgstr "Justering"
 
-#: ../gtk/gtkcellrenderertext.c:620
+#: ../gtk/gtkcellrenderertext.c:618
 msgid "How to align the lines"
 msgstr "Hvordan linjene justeres"
 
-#: ../gtk/gtkcellrenderertext.c:647 ../gtk/gtkcellview.c:323
+#: ../gtk/gtkcellrenderertext.c:645 ../gtk/gtkcellview.c:324
 #: ../gtk/gtktexttag.c:625
 msgid "Background set"
 msgstr "Bakgrunn satt"
 
-#: ../gtk/gtkcellrenderertext.c:648 ../gtk/gtkcellview.c:324
+#: ../gtk/gtkcellrenderertext.c:646 ../gtk/gtkcellview.c:325
 #: ../gtk/gtktexttag.c:626
 msgid "Whether this tag affects the background color"
 msgstr "Om denne merkingen påvirker bakgrunnsfargen"
 
-#: ../gtk/gtkcellrenderertext.c:651 ../gtk/gtktexttag.c:633
+#: ../gtk/gtkcellrenderertext.c:649 ../gtk/gtktexttag.c:633
 msgid "Foreground set"
 msgstr "Forgrunn satt"
 
-#: ../gtk/gtkcellrenderertext.c:652 ../gtk/gtktexttag.c:634
+#: ../gtk/gtkcellrenderertext.c:650 ../gtk/gtktexttag.c:634
 msgid "Whether this tag affects the foreground color"
 msgstr "Om denne merkingen påvirker forgrunnsfargen"
 
-#: ../gtk/gtkcellrenderertext.c:655 ../gtk/gtktexttag.c:637
+#: ../gtk/gtkcellrenderertext.c:653 ../gtk/gtktexttag.c:637
 msgid "Editability set"
 msgstr "Redigerbarhet satt"
 
-#: ../gtk/gtkcellrenderertext.c:656 ../gtk/gtktexttag.c:638
+#: ../gtk/gtkcellrenderertext.c:654 ../gtk/gtktexttag.c:638
 msgid "Whether this tag affects text editability"
 msgstr "Om denne merkingen påvirker redigerbarhet for teksten"
 
-#: ../gtk/gtkcellrenderertext.c:659 ../gtk/gtktexttag.c:641
+#: ../gtk/gtkcellrenderertext.c:657 ../gtk/gtktexttag.c:641
 msgid "Font family set"
 msgstr "Skriftfamilie satt"
 
-#: ../gtk/gtkcellrenderertext.c:660 ../gtk/gtktexttag.c:642
+#: ../gtk/gtkcellrenderertext.c:658 ../gtk/gtktexttag.c:642
 msgid "Whether this tag affects the font family"
 msgstr "Om denne merkingen påvirker skriftfamilien"
 
-#: ../gtk/gtkcellrenderertext.c:663 ../gtk/gtktexttag.c:645
+#: ../gtk/gtkcellrenderertext.c:661 ../gtk/gtktexttag.c:645
 msgid "Font style set"
 msgstr "Skriftstil satt"
 
-#: ../gtk/gtkcellrenderertext.c:664 ../gtk/gtktexttag.c:646
+#: ../gtk/gtkcellrenderertext.c:662 ../gtk/gtktexttag.c:646
 msgid "Whether this tag affects the font style"
 msgstr "Om denne merkingen påvirker skriftstil"
 
-#: ../gtk/gtkcellrenderertext.c:667 ../gtk/gtktexttag.c:649
+#: ../gtk/gtkcellrenderertext.c:665 ../gtk/gtktexttag.c:649
 msgid "Font variant set"
 msgstr "Skrifttypevariant satt"
 
-#: ../gtk/gtkcellrenderertext.c:668 ../gtk/gtktexttag.c:650
+#: ../gtk/gtkcellrenderertext.c:666 ../gtk/gtktexttag.c:650
 msgid "Whether this tag affects the font variant"
 msgstr "Om denne merkingen påvirker skriftvarianten"
 
-#: ../gtk/gtkcellrenderertext.c:671 ../gtk/gtktexttag.c:653
+#: ../gtk/gtkcellrenderertext.c:669 ../gtk/gtktexttag.c:653
 msgid "Font weight set"
 msgstr "Skrifttyngde satt"
 
-#: ../gtk/gtkcellrenderertext.c:672 ../gtk/gtktexttag.c:654
+#: ../gtk/gtkcellrenderertext.c:670 ../gtk/gtktexttag.c:654
 msgid "Whether this tag affects the font weight"
 msgstr "Om denne merkingen påvirker skrifttyngden"
 
-#: ../gtk/gtkcellrenderertext.c:675 ../gtk/gtktexttag.c:657
+#: ../gtk/gtkcellrenderertext.c:673 ../gtk/gtktexttag.c:657
 msgid "Font stretch set"
 msgstr "Skriftstrekk satt"
 
-#: ../gtk/gtkcellrenderertext.c:676 ../gtk/gtktexttag.c:658
+#: ../gtk/gtkcellrenderertext.c:674 ../gtk/gtktexttag.c:658
 msgid "Whether this tag affects the font stretch"
 msgstr "Om denne merkingen påvirker strekking av skriften"
 
-#: ../gtk/gtkcellrenderertext.c:679 ../gtk/gtktexttag.c:661
+#: ../gtk/gtkcellrenderertext.c:677 ../gtk/gtktexttag.c:661
 msgid "Font size set"
 msgstr "Skriftstørrelse satt"
 
-#: ../gtk/gtkcellrenderertext.c:680 ../gtk/gtktexttag.c:662
+#: ../gtk/gtkcellrenderertext.c:678 ../gtk/gtktexttag.c:662
 msgid "Whether this tag affects the font size"
 msgstr "Om denne merkingen påvirker skriftstørrelsen"
 
-#: ../gtk/gtkcellrenderertext.c:683 ../gtk/gtktexttag.c:665
+#: ../gtk/gtkcellrenderertext.c:681 ../gtk/gtktexttag.c:665
 msgid "Font scale set"
 msgstr "Skriftskalering satt"
 
-#: ../gtk/gtkcellrenderertext.c:684 ../gtk/gtktexttag.c:666
+#: ../gtk/gtkcellrenderertext.c:682 ../gtk/gtktexttag.c:666
 msgid "Whether this tag scales the font size by a factor"
 msgstr "Om denne merkingen skalerer skriftstørrelsen med en gitt faktor"
 
-#: ../gtk/gtkcellrenderertext.c:687 ../gtk/gtktexttag.c:685
+#: ../gtk/gtkcellrenderertext.c:685 ../gtk/gtktexttag.c:685
 msgid "Rise set"
 msgstr "Heving satt"
 
-#: ../gtk/gtkcellrenderertext.c:688 ../gtk/gtktexttag.c:686
+#: ../gtk/gtkcellrenderertext.c:686 ../gtk/gtktexttag.c:686
 msgid "Whether this tag affects the rise"
 msgstr "Om denne merkingen påvirker heving"
 
-#: ../gtk/gtkcellrenderertext.c:691 ../gtk/gtktexttag.c:701
+#: ../gtk/gtkcellrenderertext.c:689 ../gtk/gtktexttag.c:701
 msgid "Strikethrough set"
 msgstr "Gjennomstreking satt"
 
-#: ../gtk/gtkcellrenderertext.c:692 ../gtk/gtktexttag.c:702
+#: ../gtk/gtkcellrenderertext.c:690 ../gtk/gtktexttag.c:702
 msgid "Whether this tag affects strikethrough"
 msgstr "Om denne merkingen påvirker gjennomstreking"
 
-#: ../gtk/gtkcellrenderertext.c:695 ../gtk/gtktexttag.c:709
+#: ../gtk/gtkcellrenderertext.c:693 ../gtk/gtktexttag.c:709
 msgid "Underline set"
 msgstr "Understreking satt"
 
-#: ../gtk/gtkcellrenderertext.c:696 ../gtk/gtktexttag.c:710
+#: ../gtk/gtkcellrenderertext.c:694 ../gtk/gtktexttag.c:710
 msgid "Whether this tag affects underlining"
 msgstr "Om denne merkingen påvirker understreking"
 
-#: ../gtk/gtkcellrenderertext.c:699 ../gtk/gtktexttag.c:673
+#: ../gtk/gtkcellrenderertext.c:697 ../gtk/gtktexttag.c:673
 msgid "Language set"
 msgstr "Språk satt"
 
-#: ../gtk/gtkcellrenderertext.c:700 ../gtk/gtktexttag.c:674
+#: ../gtk/gtkcellrenderertext.c:698 ../gtk/gtktexttag.c:674
 msgid "Whether this tag affects the language the text is rendered as"
 msgstr "Om denne merkingen påvirker språket teksten skal rendres som"
 
-#: ../gtk/gtkcellrenderertext.c:703
+#: ../gtk/gtkcellrenderertext.c:701
 msgid "Ellipsize set"
 msgstr "Forkort sett"
 
-#: ../gtk/gtkcellrenderertext.c:704
+#: ../gtk/gtkcellrenderertext.c:702
 msgid "Whether this tag affects the ellipsize mode"
 msgstr "Om denne merkingen påvirker avkortingsmodus"
 
-#: ../gtk/gtkcellrenderertext.c:707
+#: ../gtk/gtkcellrenderertext.c:705
 msgid "Align set"
 msgstr "Justering satt"
 
-#: ../gtk/gtkcellrenderertext.c:708
+#: ../gtk/gtkcellrenderertext.c:706
 msgid "Whether this tag affects the alignment mode"
 msgstr "Om denne merkingen påvirker justeringsmodus"
 
-#: ../gtk/gtkcellrenderertoggle.c:139
+#: ../gtk/gtkcellrenderertoggle.c:137
 msgid "Toggle state"
 msgstr "Knappetilstand"
 
-#: ../gtk/gtkcellrenderertoggle.c:140
+#: ../gtk/gtkcellrenderertoggle.c:138
 msgid "The toggle state of the button"
 msgstr "Tilstand for knapp (vending)"
 
-#: ../gtk/gtkcellrenderertoggle.c:147
+#: ../gtk/gtkcellrenderertoggle.c:145
 msgid "Inconsistent state"
 msgstr "Ukonsistent tilstand"
 
-#: ../gtk/gtkcellrenderertoggle.c:148
+#: ../gtk/gtkcellrenderertoggle.c:146
 msgid "The inconsistent state of the button"
 msgstr "Den ukonsistente tilstanden for knappen"
 
-#: ../gtk/gtkcellrenderertoggle.c:155
+#: ../gtk/gtkcellrenderertoggle.c:153
 msgid "Activatable"
 msgstr "Aktiverbar"
 
-#: ../gtk/gtkcellrenderertoggle.c:156
+#: ../gtk/gtkcellrenderertoggle.c:154
 msgid "The toggle button can be activated"
 msgstr "Venderknappen kan aktiveres"
 
-#: ../gtk/gtkcellrenderertoggle.c:163
+#: ../gtk/gtkcellrenderertoggle.c:161
 msgid "Radio state"
 msgstr "Radiotilstand"
 
-#: ../gtk/gtkcellrenderertoggle.c:164
+#: ../gtk/gtkcellrenderertoggle.c:162
 msgid "Draw the toggle button as a radio button"
 msgstr "Tegn knapp for vending som en radioknapp"
 
-#: ../gtk/gtkcellrenderertoggle.c:171
+#: ../gtk/gtkcellrenderertoggle.c:169
 msgid "Indicator size"
 msgstr "Indikatorstørrelse"
 
-#: ../gtk/gtkcellrenderertoggle.c:172 ../gtk/gtkcheckbutton.c:93
-#: ../gtk/gtkcheckmenuitem.c:144
+#: ../gtk/gtkcellrenderertoggle.c:170 ../gtk/gtkcheckbutton.c:111
+#: ../gtk/gtkcheckmenuitem.c:146
 msgid "Size of check or radio indicator"
 msgstr "Størrelse på avkrysnings- eller radioindikator"
 
-#: ../gtk/gtkcellview.c:218
+#: ../gtk/gtkcellview.c:219
 msgid "Background RGBA color"
 msgstr "RGBA-bakgrunnsfarge"
 
-#: ../gtk/gtkcellview.c:233
+#: ../gtk/gtkcellview.c:234
 msgid "CellView model"
 msgstr "CellView-modell"
 
-#: ../gtk/gtkcellview.c:234
+#: ../gtk/gtkcellview.c:235
 msgid "The model for cell view"
 msgstr "Modellen for cellevisning"
 
-#: ../gtk/gtkcellview.c:252 ../gtk/gtkcombobox.c:1007
-#: ../gtk/gtkentrycompletion.c:451 ../gtk/gtkiconview.c:636
-#: ../gtk/gtktreemenu.c:332 ../gtk/gtktreeviewcolumn.c:424
+#: ../gtk/gtkcellview.c:253 ../gtk/gtkcombobox.c:1015
+#: ../gtk/gtkentrycompletion.c:460 ../gtk/gtkiconview.c:640
+#: ../gtk/gtktreemenu.c:314 ../gtk/gtktreeviewcolumn.c:425
 msgid "Cell Area"
 msgstr "Celleområde"
 
-#: ../gtk/gtkcellview.c:253 ../gtk/gtkcombobox.c:1008
-#: ../gtk/gtkentrycompletion.c:452 ../gtk/gtkiconview.c:637
-#: ../gtk/gtktreemenu.c:333 ../gtk/gtktreeviewcolumn.c:425
+#: ../gtk/gtkcellview.c:254 ../gtk/gtkcombobox.c:1016
+#: ../gtk/gtkentrycompletion.c:461 ../gtk/gtkiconview.c:641
+#: ../gtk/gtktreemenu.c:315 ../gtk/gtktreeviewcolumn.c:426
 msgid "The GtkCellArea used to layout cells"
-msgstr ""
+msgstr "Hvilken «GtkCellArea» som brukes for å utforme celler"
 
-#: ../gtk/gtkcellview.c:276
+#: ../gtk/gtkcellview.c:277
 msgid "Cell Area Context"
 msgstr "Kontekst for celleområde"
 
-#: ../gtk/gtkcellview.c:277
+#: ../gtk/gtkcellview.c:278
 msgid "The GtkCellAreaContext used to compute the geometry of the cell view"
 msgstr ""
+"Hvilken «GtkCellAreaContext» som brukes for å regne ut cellevisningens "
+"geometri"
 
-#: ../gtk/gtkcellview.c:294
+#: ../gtk/gtkcellview.c:295
 msgid "Draw Sensitive"
 msgstr ""
 
-#: ../gtk/gtkcellview.c:295
+#: ../gtk/gtkcellview.c:296
 msgid "Whether to force cells to be drawn in a sensitive state"
 msgstr ""
 
-#: ../gtk/gtkcellview.c:313
+#: ../gtk/gtkcellview.c:314
 msgid "Fit Model"
 msgstr "Tilpassingsmodell"
 
-#: ../gtk/gtkcellview.c:314
+#: ../gtk/gtkcellview.c:315
 msgid "Whether to request enough space for every row in the model"
-msgstr ""
+msgstr "Om hver rad skal be om tilstrekkelig plass i modellen"
 
-#: ../gtk/gtkcheckbutton.c:92 ../gtk/gtkcheckmenuitem.c:143
+#: ../gtk/gtkcheckbutton.c:110 ../gtk/gtkcheckmenuitem.c:145
 msgid "Indicator Size"
 msgstr "Indikatorstørrelse"
 
-#: ../gtk/gtkcheckbutton.c:100 ../gtk/gtkexpander.c:362
+#: ../gtk/gtkcheckbutton.c:118 ../gtk/gtkexpander.c:362
 msgid "Indicator Spacing"
 msgstr "Mellomrom for indikator"
 
-#: ../gtk/gtkcheckbutton.c:101
+#: ../gtk/gtkcheckbutton.c:119
 msgid "Spacing around check or radio indicator"
 msgstr "Mellomrom rundt avkrysnings- eller radioindikator"
 
-#: ../gtk/gtkcheckmenuitem.c:121
+#: ../gtk/gtkcheckmenuitem.c:123
 msgid "Whether the menu item is checked"
 msgstr "Om menyoppføringen er avkrysset"
 
-#: ../gtk/gtkcheckmenuitem.c:128 ../gtk/gtktogglebutton.c:181
+#: ../gtk/gtkcheckmenuitem.c:130 ../gtk/gtktogglebutton.c:184
 msgid "Inconsistent"
 msgstr "Inkonsistent"
 
-#: ../gtk/gtkcheckmenuitem.c:129
+#: ../gtk/gtkcheckmenuitem.c:131
 msgid "Whether to display an \"inconsistent\" state"
 msgstr "Om inkonsistent tilstand skal anvises"
 
-#: ../gtk/gtkcheckmenuitem.c:136
+#: ../gtk/gtkcheckmenuitem.c:138
 msgid "Draw as radio menu item"
 msgstr "Tegn som radiomenyoppføring"
 
-#: ../gtk/gtkcheckmenuitem.c:137
+#: ../gtk/gtkcheckmenuitem.c:139
 msgid "Whether the menu item looks like a radio menu item"
 msgstr "Om menyoppføringen ser ut som en radiomenyoppføring"
 
-#: ../gtk/gtkcolorbutton.c:171 ../gtk/gtkcolorchooser.c:87
+#: ../gtk/gtkcolorbutton.c:172 ../gtk/gtkcolorchooser.c:87
 msgid "Use alpha"
 msgstr "Bruk alpha"
 
-#: ../gtk/gtkcolorbutton.c:172
+#: ../gtk/gtkcolorbutton.c:173
 msgid "Whether to give the color an alpha value"
 msgstr "Om fargen skal få en alphaverdi eller ikke"
 
-#: ../gtk/gtkcolorbutton.c:186 ../gtk/gtkfilechooserbutton.c:439
-#: ../gtk/gtkfontbutton.c:434 ../gtk/gtkprintjob.c:139
-#: ../gtk/gtkstatusicon.c:426 ../gtk/gtktreeviewcolumn.c:328
+#: ../gtk/gtkcolorbutton.c:187 ../gtk/gtkfilechooserbutton.c:449
+#: ../gtk/gtkfontbutton.c:436 ../gtk/gtkheaderbar.c:1787
+#: ../gtk/gtkprintjob.c:134 ../gtk/gtkstack.c:418 ../gtk/gtkstatusicon.c:430
+#: ../gtk/gtktreeviewcolumn.c:329
 msgid "Title"
 msgstr "Tittel"
 
-#: ../gtk/gtkcolorbutton.c:187
+#: ../gtk/gtkcolorbutton.c:188
 msgid "The title of the color selection dialog"
 msgstr "Tittel på dialogen for fargevalg"
 
-#: ../gtk/gtkcolorbutton.c:204
+#: ../gtk/gtkcolorbutton.c:205
 msgid "The selected color"
 msgstr "Valgt farge"
 
-#: ../gtk/gtkcolorbutton.c:219
+#: ../gtk/gtkcolorbutton.c:220
 msgid "The selected opacity value (0 fully transparent, 65535 fully opaque)"
 msgstr ""
 "Nåværende verdi for ugjennomsiktighet (0 helt gjennomsiktig, 65535 helt "
 "ugjennomsiktig)"
 
-#: ../gtk/gtkcolorbutton.c:233
+#: ../gtk/gtkcolorbutton.c:234
 msgid "Current RGBA Color"
 msgstr "Aktiv RGBA-farge"
 
-#: ../gtk/gtkcolorbutton.c:234
+#: ../gtk/gtkcolorbutton.c:235
 msgid "The selected RGBA color"
 msgstr "Valgt RGBA-farge"
 
@@ -2512,212 +2536,219 @@
 
 #: ../gtk/gtkcolorchooser.c:88
 msgid "Whether alpha should be shown"
-msgstr ""
+msgstr "Om alfa skal vises"
 
-#: ../gtk/gtkcolorchooserdialog.c:258 ../gtk/gtkcolorchooserwidget.c:674
+#: ../gtk/gtkcolorchooserdialog.c:198 ../gtk/gtkcolorchooserwidget.c:680
 msgid "Show editor"
 msgstr "Vis redigering"
 
-#: ../gtk/gtkcolorscale.c:383
+#: ../gtk/gtkcolorscale.c:382
 msgid "Scale type"
-msgstr ""
+msgstr "Skaleringstype"
 
-#: ../gtk/gtkcolorswatch.c:775
+#: ../gtk/gtkcolorswatch.c:779
 msgid "RGBA Color"
 msgstr "RGBA-farge"
 
-#: ../gtk/gtkcolorswatch.c:775
+#: ../gtk/gtkcolorswatch.c:779
 msgid "Color as RGBA"
 msgstr "Farge som RGBA"
 
-#: ../gtk/gtkcolorswatch.c:778 ../gtk/gtklabel.c:791
+#: ../gtk/gtkcolorswatch.c:782 ../gtk/gtklabel.c:794
 msgid "Selectable"
 msgstr "Velgbar"
 
-#: ../gtk/gtkcolorswatch.c:778
+#: ../gtk/gtkcolorswatch.c:782
 msgid "Whether the swatch is selectable"
 msgstr ""
 
-#: ../gtk/gtkcombobox.c:726
+#: ../gtk/gtkcombobox.c:730
 msgid "ComboBox model"
 msgstr "Modell for ComboBox"
 
-#: ../gtk/gtkcombobox.c:727
+#: ../gtk/gtkcombobox.c:731
 msgid "The model for the combo box"
 msgstr "Modell for komboboksen"
 
-#: ../gtk/gtkcombobox.c:744
+#: ../gtk/gtkcombobox.c:748
 msgid "Wrap width for laying out the items in a grid"
-msgstr ""
+msgstr "Brytningsbredde for utplassering av oppføringer i et rutenett"
 
-#: ../gtk/gtkcombobox.c:766 ../gtk/gtktreemenu.c:386
+#: ../gtk/gtkcombobox.c:770 ../gtk/gtktreemenu.c:368
 msgid "Row span column"
 msgstr "Kolonne for radutbredelse"
 
-#: ../gtk/gtkcombobox.c:767 ../gtk/gtktreemenu.c:387
+#: ../gtk/gtkcombobox.c:771 ../gtk/gtktreemenu.c:369
 msgid "TreeModel column containing the row span values"
 msgstr "TreeModel-kolonne som inneholder verdier for radutbredelse"
 
-#: ../gtk/gtkcombobox.c:788 ../gtk/gtktreemenu.c:407
+#: ../gtk/gtkcombobox.c:792 ../gtk/gtktreemenu.c:389
 msgid "Column span column"
 msgstr "Kolonne for kolonneutbredelse"
 
-#: ../gtk/gtkcombobox.c:789 ../gtk/gtktreemenu.c:408
+#: ../gtk/gtkcombobox.c:793 ../gtk/gtktreemenu.c:390
 msgid "TreeModel column containing the column span values"
 msgstr "TreeModel-kolonne som inneholder verdier for kolonneutbredelse"
 
-#: ../gtk/gtkcombobox.c:810
+#: ../gtk/gtkcombobox.c:814
 msgid "Active item"
 msgstr "Aktiv oppføring"
 
-#: ../gtk/gtkcombobox.c:811
+#: ../gtk/gtkcombobox.c:815
 msgid "The item which is currently active"
 msgstr "Oppføringen som er aktiv"
 
-#: ../gtk/gtkcombobox.c:830 ../gtk/gtkuimanager.c:487
+#: ../gtk/deprecated/gtkuimanager.c:485 ../gtk/gtkcombobox.c:836
 msgid "Add tearoffs to menus"
 msgstr "Legg til avrivningsfelt til menyer"
 
-#: ../gtk/gtkcombobox.c:831
+#: ../gtk/gtkcombobox.c:837
 msgid "Whether dropdowns should have a tearoff menu item"
 msgstr "Om nedtrekksmenyer skal ha et element som kan dras av"
 
-#: ../gtk/gtkcombobox.c:846 ../gtk/gtkentry.c:780
+#: ../gtk/gtkcombobox.c:852 ../gtk/gtkentry.c:799
 msgid "Has Frame"
 msgstr "Har ramme"
 
-#: ../gtk/gtkcombobox.c:847
+#: ../gtk/gtkcombobox.c:853
 msgid "Whether the combo box draws a frame around the child"
 msgstr "Om kombinasjonsboksen tegner en ramme rundt barnet"
 
-#: ../gtk/gtkcombobox.c:855
+#: ../gtk/gtkcombobox.c:861
 msgid "Whether the combo box grabs focus when it is clicked with the mouse"
 msgstr "Om kombinasjonsboksen tar fokus når den blir klikket på av musen"
 
-#: ../gtk/gtkcombobox.c:870 ../gtk/gtkmenu.c:609
+#: ../gtk/gtkcombobox.c:878 ../gtk/gtkmenu.c:620
 msgid "Tearoff Title"
 msgstr "Tittel for avrevet meny"
 
-#: ../gtk/gtkcombobox.c:871
+#: ../gtk/gtkcombobox.c:879
 msgid ""
 "A title that may be displayed by the window manager when the popup is torn-"
 "off"
 msgstr ""
 "En tittel som skal vises av vindushåndtereren når denne menyen er avrevet"
 
-#: ../gtk/gtkcombobox.c:888
+#: ../gtk/gtkcombobox.c:896
 msgid "Popup shown"
 msgstr "Oppsprettmeny vises"
 
-#: ../gtk/gtkcombobox.c:889
+#: ../gtk/gtkcombobox.c:897
 msgid "Whether the combo's dropdown is shown"
 msgstr "Om komboboksens nedtrekksmeny vises"
 
-#: ../gtk/gtkcombobox.c:905
+#: ../gtk/gtkcombobox.c:913
 msgid "Button Sensitivity"
 msgstr "Sensitivitet for knapp"
 
-#: ../gtk/gtkcombobox.c:906
+#: ../gtk/gtkcombobox.c:914
 msgid "Whether the dropdown button is sensitive when the model is empty"
-msgstr ""
+msgstr "Om sprettoppknappen er følsom når modellen er tom"
 
-#: ../gtk/gtkcombobox.c:922
+#: ../gtk/gtkcombobox.c:930
 msgid "Whether combo box has an entry"
-msgstr ""
+msgstr "Om kombinasjonsboksen har en oppføring"
 
-#: ../gtk/gtkcombobox.c:937
+#: ../gtk/gtkcombobox.c:945
 msgid "Entry Text Column"
-msgstr ""
+msgstr "Kolonne for tekstoppføring"
 
-#: ../gtk/gtkcombobox.c:938
+#: ../gtk/gtkcombobox.c:946
 msgid ""
 "The column in the combo box's model to associate with strings from the entry "
 "if the combo was created with #GtkComboBox:has-entry = %TRUE"
 msgstr ""
+"Kolonnen i kombinasjonsboksens modell som skal knyttes til tekststrengene "
+"fra oppføringen, gitt at kombinasjonen ble opprettet med #GtkComboBox:has-"
+"entry = %TRUE"
 
-#: ../gtk/gtkcombobox.c:955
+#: ../gtk/gtkcombobox.c:963
 msgid "ID Column"
 msgstr "ID-kolonne"
 
-#: ../gtk/gtkcombobox.c:956
+#: ../gtk/gtkcombobox.c:964
 msgid ""
 "The column in the combo box's model that provides string IDs for the values "
 "in the model"
 msgstr ""
+"Kolonnen i kombinasjonsboksens modell som gir ID-er til modellens "
+"verdistrenger"
 
-#: ../gtk/gtkcombobox.c:971
+#: ../gtk/gtkcombobox.c:979
 msgid "Active id"
 msgstr "Aktiv ID"
 
-#: ../gtk/gtkcombobox.c:972
+#: ../gtk/gtkcombobox.c:980
 msgid "The value of the id column for the active row"
-msgstr ""
+msgstr "Verdien for id-kolonnen på aktiv rad"
 
-#: ../gtk/gtkcombobox.c:987
+#: ../gtk/gtkcombobox.c:995
 msgid "Popup Fixed Width"
-msgstr ""
+msgstr "Fast bredde på sprettoppvindu"
 
-#: ../gtk/gtkcombobox.c:988
+#: ../gtk/gtkcombobox.c:996
 msgid ""
 "Whether the popup's width should be a fixed width matching the allocated "
 "width of the combo box"
 msgstr ""
+"Om sprettoppvinduets bredde skal være låst til å samsvare med "
+"kombinasjonsboksens tildelte bredde"
 
-#: ../gtk/gtkcombobox.c:1014
+#: ../gtk/gtkcombobox.c:1022
 msgid "Appears as list"
 msgstr "Vises som liste"
 
-#: ../gtk/gtkcombobox.c:1015
+#: ../gtk/gtkcombobox.c:1023
 msgid "Whether dropdowns should look like lists rather than menus"
 msgstr "Om nedtrekksmenyer skal se ut som lister i stedet for menyer"
 
-#: ../gtk/gtkcombobox.c:1031
+#: ../gtk/gtkcombobox.c:1039
 msgid "Arrow Size"
 msgstr "Pilstørrelse"
 
-#: ../gtk/gtkcombobox.c:1032
+#: ../gtk/gtkcombobox.c:1040
 msgid "The minimum size of the arrow in the combo box"
 msgstr "Minste størrelse på pilen i komboboksen"
 
-#: ../gtk/gtkcombobox.c:1049
+#: ../gtk/gtkcombobox.c:1057
 msgid "The amount of space used by the arrow"
 msgstr "Mengde plass som brukes av pilen"
 
-#: ../gtk/gtkcombobox.c:1065
+#: ../gtk/gtkcombobox.c:1073
 msgid "Which kind of shadow to draw around the combo box"
 msgstr "Type skygge som skal tegnes rundt komboboksen"
 
-#: ../gtk/gtkcontainer.c:461
+#: ../gtk/gtkcontainer.c:482
 msgid "Resize mode"
 msgstr "Modus for endring av størrelse"
 
-#: ../gtk/gtkcontainer.c:462
+#: ../gtk/gtkcontainer.c:483
 msgid "Specify how resize events are handled"
 msgstr "Spesifiser hvordan hendelser for endring av størrelse håndteres"
 
-#: ../gtk/gtkcontainer.c:469
+#: ../gtk/gtkcontainer.c:490
 msgid "Border width"
 msgstr "Kantbredde"
 
-#: ../gtk/gtkcontainer.c:470
+#: ../gtk/gtkcontainer.c:491
 msgid "The width of the empty border outside the containers children"
 msgstr "Bredde på den tomme kanten utenfor kontainerens etterkommere"
 
-#: ../gtk/gtkcontainer.c:478
+#: ../gtk/gtkcontainer.c:499
 msgid "Child"
 msgstr "Etterkommer"
 
-#: ../gtk/gtkcontainer.c:479
+#: ../gtk/gtkcontainer.c:500
 msgid "Can be used to add a new child to the container"
 msgstr "Kan brukes for å legge til en ny etterkommer i kontaineren"
 
 #: ../gtk/gtkcssshorthandproperty.c:158
 msgid "Subproperties"
-msgstr ""
+msgstr "Underliggende egenskaper"
 
 #: ../gtk/gtkcssshorthandproperty.c:159
 msgid "The list of subproperties"
-msgstr ""
+msgstr "Lista over underliggende egenskaper"
 
 #: ../gtk/gtkcssstyleproperty.c:296
 msgid "ID"
@@ -2725,7 +2756,7 @@
 
 #: ../gtk/gtkcssstyleproperty.c:297
 msgid "The numeric id for quick access"
-msgstr ""
+msgstr "Numerisk ID for rask tilgang"
 
 #: gtk/gtkcssstyleproperty.c:243
 msgid "Specified type"
@@ -2749,7 +2780,7 @@
 
 #: ../gtk/gtkcssstyleproperty.c:304
 msgid "Set if the value is inherited by default"
-msgstr ""
+msgstr "Velg om verdien skal arves fra overordnet variabel som standard"
 
 #: ../gtk/gtkcssstyleproperty.c:310
 msgid "Initial value"
@@ -2757,127 +2788,127 @@
 
 #: ../gtk/gtkcssstyleproperty.c:311
 msgid "The initial specified value used for this property"
-msgstr ""
+msgstr "Verdien som skal brukes for denne egenskapen i utgangspunktet"
 
-#: ../gtk/gtkdialog.c:291 ../gtk/gtkinfobar.c:470
+#: ../gtk/gtkdialog.c:287 ../gtk/gtkinfobar.c:517
 msgid "Content area border"
 msgstr "Kant for innholdsområde"
 
-#: ../gtk/gtkdialog.c:292
+#: ../gtk/gtkdialog.c:288
 msgid "Width of border around the main dialog area"
 msgstr "Bredde på kanten rundt hoveddialogområdet"
 
-#: ../gtk/gtkdialog.c:309 ../gtk/gtkinfobar.c:488
+#: ../gtk/gtkdialog.c:305 ../gtk/gtkinfobar.c:535
 msgid "Content area spacing"
 msgstr "Utforming av innholdsområde"
 
-#: ../gtk/gtkdialog.c:310
+#: ../gtk/gtkdialog.c:306
 msgid "Spacing between elements of the main dialog area"
 msgstr "Mellomrom mellom elementene i hovedområdet i dialogen"
 
-#: ../gtk/gtkdialog.c:317 ../gtk/gtkinfobar.c:505
+#: ../gtk/gtkdialog.c:313 ../gtk/gtkinfobar.c:552
 msgid "Button spacing"
 msgstr "Knappeavstand"
 
-#: ../gtk/gtkdialog.c:318 ../gtk/gtkinfobar.c:506
+#: ../gtk/gtkdialog.c:314 ../gtk/gtkinfobar.c:553
 msgid "Spacing between buttons"
 msgstr "Avstand mellom knapper"
 
-#: ../gtk/gtkdialog.c:326 ../gtk/gtkinfobar.c:522
+#: ../gtk/gtkdialog.c:322 ../gtk/gtkinfobar.c:569
 msgid "Action area border"
 msgstr "Kant for handlingsområde"
 
-#: ../gtk/gtkdialog.c:327
+#: ../gtk/gtkdialog.c:323
 msgid "Width of border around the button area at the bottom of the dialog"
 msgstr "Bredde på kanten rundt knappeområdet nederst i dialogen"
 
-#: ../gtk/gtkentrybuffer.c:351
+#: ../gtk/gtkentrybuffer.c:349
 msgid "The contents of the buffer"
 msgstr "Innhold i bufferen"
 
-#: ../gtk/gtkentrybuffer.c:365 ../gtk/gtkentry.c:921
+#: ../gtk/gtkentrybuffer.c:363 ../gtk/gtkentry.c:940
 msgid "Text length"
 msgstr "Lengde på tekst"
 
-#: ../gtk/gtkentrybuffer.c:366
+#: ../gtk/gtkentrybuffer.c:364
 msgid "Length of the text currently in the buffer"
 msgstr "Lengde på tekst som er i bufferen"
 
-#: ../gtk/gtkentrybuffer.c:380 ../gtk/gtkentry.c:763
+#: ../gtk/gtkentrybuffer.c:378 ../gtk/gtkentry.c:782
 msgid "Maximum length"
 msgstr "Maksimal lengde"
 
-#: ../gtk/gtkentrybuffer.c:381 ../gtk/gtkentry.c:764
+#: ../gtk/gtkentrybuffer.c:379 ../gtk/gtkentry.c:783
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr ""
 "Maksimalt antall tegn for denne oppføringen. Null hvis ingen maksimalverdi "
 "er satt"
 
-#: ../gtk/gtkentry.c:727
+#: ../gtk/gtkentry.c:746
 msgid "Text Buffer"
 msgstr "Tekstbuffer"
 
-#: ../gtk/gtkentry.c:728
+#: ../gtk/gtkentry.c:747
 msgid "Text buffer object which actually stores entry text"
-msgstr ""
+msgstr "Mellomlagerobjekt som lagrer tekst."
 
-#: ../gtk/gtkentry.c:735 ../gtk/gtklabel.c:816
+#: ../gtk/gtkentry.c:754 ../gtk/gtklabel.c:819
 msgid "Cursor Position"
 msgstr "Markørposisjon"
 
-#: ../gtk/gtkentry.c:736 ../gtk/gtklabel.c:817
+#: ../gtk/gtkentry.c:755 ../gtk/gtklabel.c:820
 msgid "The current position of the insertion cursor in chars"
 msgstr "Nåværende posisjon for innsettingsmarkør i tegn"
 
-#: ../gtk/gtkentry.c:745 ../gtk/gtklabel.c:826
+#: ../gtk/gtkentry.c:764 ../gtk/gtklabel.c:829
 msgid "Selection Bound"
 msgstr "Utvalg bundet"
 
-#: ../gtk/gtkentry.c:746 ../gtk/gtklabel.c:827
+#: ../gtk/gtkentry.c:765 ../gtk/gtklabel.c:830
 msgid ""
 "The position of the opposite end of the selection from the cursor in chars"
 msgstr "Posisjon for motsatt ende av utvalget fra markøren i tegn"
 
-#: ../gtk/gtkentry.c:756
+#: ../gtk/gtkentry.c:775
 msgid "Whether the entry contents can be edited"
 msgstr "Innhold i oppføringen kan redigeres"
 
-#: ../gtk/gtkentry.c:772
+#: ../gtk/gtkentry.c:791
 msgid "Visibility"
 msgstr "Synlighet"
 
-#: ../gtk/gtkentry.c:773
+#: ../gtk/gtkentry.c:792
 msgid ""
 "FALSE displays the \"invisible char\" instead of the actual text (password "
 "mode)"
 msgstr ""
 "USANN viser «usynlige tegn» i stedet for faktisk tekst (passordmodus)"
 
-#: ../gtk/gtkentry.c:781
+#: ../gtk/gtkentry.c:800
 msgid "FALSE removes outside bevel from entry"
 msgstr "USANN fjerner ytre kant fra oppføringen"
 
-#: ../gtk/gtkentry.c:798
+#: ../gtk/gtkentry.c:817
 msgid ""
 "Border between text and frame. Overrides the inner-border style property"
-msgstr ""
+msgstr "Kant mellom tekst og ramme. Overstyrer stil til innerkant"
 
-#: ../gtk/gtkentry.c:806 ../gtk/gtkentry.c:1465
+#: ../gtk/gtkentry.c:825 ../gtk/gtkentry.c:1518
 msgid "Invisible character"
 msgstr "Usynlig tegn"
 
-#: ../gtk/gtkentry.c:807 ../gtk/gtkentry.c:1466
+#: ../gtk/gtkentry.c:826 ../gtk/gtkentry.c:1519
 msgid ""
 "The character to use when masking entry contents (in \"password mode\")"
 msgstr ""
 "Tegnet som skal brukes når man masker ut innhold i oppføringen (i «passord "
 "modus»)"
 
-#: ../gtk/gtkentry.c:814
+#: ../gtk/gtkentry.c:833
 msgid "Activates default"
 msgstr "Aktiverer forvalg"
 
-#: ../gtk/gtkentry.c:815
+#: ../gtk/gtkentry.c:834
 msgid ""
 "Whether to activate the default widget (such as the default button in a "
 "dialog) when Enter is pressed"
@@ -2885,31 +2916,31 @@
 "Om forvalgt widget skal aktiveres (f.eks forvalgt knapp i en dialog) når man "
 "trykker linjeskift"
 
-#: ../gtk/gtkentry.c:821
+#: ../gtk/gtkentry.c:840
 msgid "Width in chars"
 msgstr "Bredde i tegn"
 
-#: ../gtk/gtkentry.c:822
+#: ../gtk/gtkentry.c:841
 msgid "Number of characters to leave space for in the entry"
 msgstr "Antall tegn det skal være plass til i feltet"
 
-#: ../gtk/gtkentry.c:831
+#: ../gtk/gtkentry.c:850
 msgid "Scroll offset"
 msgstr "Rulleavstand"
 
-#: ../gtk/gtkentry.c:832
+#: ../gtk/gtkentry.c:851
 msgid "Number of pixels of the entry scrolled off the screen to the left"
 msgstr "Antall piksler av oppføringen som rullet ut av skjermen til venstre"
 
-#: ../gtk/gtkentry.c:842
+#: ../gtk/gtkentry.c:861
 msgid "The contents of the entry"
 msgstr "Innhold i oppføringen"
 
-#: ../gtk/gtkentry.c:857 ../gtk/gtkmisc.c:103
+#: ../gtk/gtkentry.c:876 ../gtk/gtkmisc.c:103
 msgid "X align"
 msgstr "X-justering"
 
-#: ../gtk/gtkentry.c:858 ../gtk/gtkmisc.c:104
+#: ../gtk/gtkentry.c:877 ../gtk/gtkmisc.c:104
 msgid ""
 "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL "
 "layouts."
@@ -2917,313 +2948,317 @@
 "Horisontal justering, fra 0 (venstre) til 1 (høyre). Omvendt for RTL-"
 "utforminger."
 
-#: ../gtk/gtkentry.c:874
+#: ../gtk/gtkentry.c:893
 msgid "Truncate multiline"
 msgstr "Gjør om flere linjer til en"
 
-#: ../gtk/gtkentry.c:875
+#: ../gtk/gtkentry.c:894
 msgid "Whether to truncate multiline pastes to one line."
 msgstr "Om «Lim inn» av flere linjer skal endres til én linje."
 
-#: ../gtk/gtkentry.c:891
+#: ../gtk/gtkentry.c:910
 msgid "Which kind of shadow to draw around the entry when has-frame is set"
 msgstr ""
+"Hva slags skygge som skal tegnes rundt tekstfeltet når «has-frame» er bestemt"
 
-#: ../gtk/gtkentry.c:906 ../gtk/gtktextview.c:784
+#: ../gtk/gtkentry.c:925 ../gtk/gtktextview.c:812
 msgid "Overwrite mode"
 msgstr "Overskrivingsmodus"
 
-#: ../gtk/gtkentry.c:907
+#: ../gtk/gtkentry.c:926
 msgid "Whether new text overwrites existing text"
 msgstr "Om ny tekst overskriver eksisterende"
 
-#: ../gtk/gtkentry.c:922
+#: ../gtk/gtkentry.c:941
 msgid "Length of the text currently in the entry"
 msgstr "Lengde på tekst i oppføringen"
 
-#: ../gtk/gtkentry.c:937
+#: ../gtk/gtkentry.c:956
 msgid "Invisible character set"
 msgstr "Usynlig tegn satt"
 
-#: ../gtk/gtkentry.c:938
+#: ../gtk/gtkentry.c:957
 msgid "Whether the invisible character has been set"
 msgstr "Om usynlig tegn er satt"
 
-#: ../gtk/gtkentry.c:956
+#: ../gtk/gtkentry.c:975
 msgid "Caps Lock warning"
 msgstr "Varsel om Caps Lock"
 
-#: ../gtk/gtkentry.c:957
+#: ../gtk/gtkentry.c:976
 msgid "Whether password entries will show a warning when Caps Lock is on"
 msgstr "Om passordoppføringer skal vise en advarsel når Caps Lock er på"
 
-#: ../gtk/gtkentry.c:971
+#: ../gtk/gtkentry.c:990
 msgid "Progress Fraction"
 msgstr "Andel framdrift"
 
-#: ../gtk/gtkentry.c:972
+#: ../gtk/gtkentry.c:991
 msgid "The current fraction of the task that's been completed"
-msgstr ""
+msgstr "Andelen av oppgaven som er fullført hittil"
 
-#: ../gtk/gtkentry.c:989
+#: ../gtk/gtkentry.c:1008
 msgid "Progress Pulse Step"
-msgstr ""
+msgstr "Pulssteg for framdriftsviser"
 
-#: ../gtk/gtkentry.c:990
+#: ../gtk/gtkentry.c:1009
 msgid ""
 "The fraction of total entry width to move the progress bouncing block for "
 "each call to gtk_entry_progress_pulse()"
 msgstr ""
+"Andelen av total bredde som fremdriftsviseren skal flyttes for hver gang "
+"gtk_entry_progress_pulse() kalles på"
 
-#: ../gtk/gtkcellrenderertext.c:636 ../gtk/gtkentry.c:1007
+#: ../gtk/gtkcellrenderertext.c:634 ../gtk/gtkentry.c:1026
 msgid "Placeholder text"
-msgstr ""
+msgstr "Plassholdertekst"
 
-#: ../gtk/gtkentry.c:1008
+#: ../gtk/gtkentry.c:1027
 msgid "Show text in the entry when it's empty and unfocused"
-msgstr ""
+msgstr "Vis tekst i oppføringen når den er tom og ute av fokus"
 
-#: ../gtk/gtkentry.c:1022
+#: ../gtk/gtkentry.c:1041
 msgid "Primary pixbuf"
 msgstr "Primær pixbuf"
 
-#: ../gtk/gtkentry.c:1023
+#: ../gtk/gtkentry.c:1042
 msgid "Primary pixbuf for the entry"
 msgstr "Primær pixbuf for oppføringen"
 
-#: ../gtk/gtkentry.c:1037
+#: ../gtk/gtkentry.c:1056
 msgid "Secondary pixbuf"
 msgstr "Sekundær pixbuf"
 
-#: ../gtk/gtkentry.c:1038
+#: ../gtk/gtkentry.c:1057
 msgid "Secondary pixbuf for the entry"
 msgstr "Sekundær pixbuf for oppføringen"
 
-#: ../gtk/gtkentry.c:1052
+#: ../gtk/gtkentry.c:1073
 msgid "Primary stock ID"
-msgstr ""
+msgstr "Primær standard-ID"
 
-#: ../gtk/gtkentry.c:1053
+#: ../gtk/gtkentry.c:1074
 msgid "Stock ID for primary icon"
-msgstr ""
+msgstr "Standard-ID for primært ikon"
 
-#: ../gtk/gtkentry.c:1067
+#: ../gtk/gtkentry.c:1090
 msgid "Secondary stock ID"
-msgstr ""
+msgstr "Sekundær standard-ID"
 
-#: ../gtk/gtkentry.c:1068
+#: ../gtk/gtkentry.c:1091
 msgid "Stock ID for secondary icon"
-msgstr ""
+msgstr "Standard-ID for sekundært ikon"
 
-#: ../gtk/gtkentry.c:1082
+#: ../gtk/gtkentry.c:1105
 msgid "Primary icon name"
 msgstr "Primært ikonnavn"
 
-#: ../gtk/gtkentry.c:1083
+#: ../gtk/gtkentry.c:1106
 msgid "Icon name for primary icon"
 msgstr "Ikonnavn for primært ikon"
 
-#: ../gtk/gtkentry.c:1097
+#: ../gtk/gtkentry.c:1120
 msgid "Secondary icon name"
 msgstr "Sekundært ikonnavn"
 
-#: ../gtk/gtkentry.c:1098
+#: ../gtk/gtkentry.c:1121
 msgid "Icon name for secondary icon"
-msgstr ""
+msgstr "Ikonnavn for sekundært ikon"
 
-#: ../gtk/gtkentry.c:1112
+#: ../gtk/gtkentry.c:1135
 msgid "Primary GIcon"
 msgstr "Primært GIcon"
 
-#: ../gtk/gtkentry.c:1113
+#: ../gtk/gtkentry.c:1136
 msgid "GIcon for primary icon"
 msgstr "GIcon for primært ikon"
 
-#: ../gtk/gtkentry.c:1127
+#: ../gtk/gtkentry.c:1150
 msgid "Secondary GIcon"
 msgstr "Sekundært GIcon"
 
-#: ../gtk/gtkentry.c:1128
+#: ../gtk/gtkentry.c:1151
 msgid "GIcon for secondary icon"
 msgstr "GIcon for sekundært ikon"
 
-#: ../gtk/gtkentry.c:1142
+#: ../gtk/gtkentry.c:1165
 msgid "Primary storage type"
 msgstr "Primær lagringstype"
 
-#: ../gtk/gtkentry.c:1143
+#: ../gtk/gtkentry.c:1166
 msgid "The representation being used for primary icon"
 msgstr "Representasjonen som brukes for primært ikon"
 
-#: ../gtk/gtkentry.c:1158
+#: ../gtk/gtkentry.c:1181
 msgid "Secondary storage type"
 msgstr "Sekundær lagertype"
 
-#: ../gtk/gtkentry.c:1159
+#: ../gtk/gtkentry.c:1182
 msgid "The representation being used for secondary icon"
 msgstr "Representasjonen som brukes for sekundært ikon"
 
-#: ../gtk/gtkentry.c:1180
+#: ../gtk/gtkentry.c:1203
 msgid "Primary icon activatable"
 msgstr "Primærikon kan aktiveres"
 
-#: ../gtk/gtkentry.c:1181
+#: ../gtk/gtkentry.c:1204
 msgid "Whether the primary icon is activatable"
 msgstr "Om primært ikon kan aktiveres"
 
-#: ../gtk/gtkentry.c:1201
+#: ../gtk/gtkentry.c:1224
 msgid "Secondary icon activatable"
 msgstr "Sekundært ikon aktiverbart"
 
-#: ../gtk/gtkentry.c:1202
+#: ../gtk/gtkentry.c:1225
 msgid "Whether the secondary icon is activatable"
 msgstr "Om sekundært ikon kan aktiveres"
 
-#: ../gtk/gtkentry.c:1224
+#: ../gtk/gtkentry.c:1247
 msgid "Primary icon sensitive"
 msgstr "Primærikon er sensitivt"
 
-#: ../gtk/gtkentry.c:1225
+#: ../gtk/gtkentry.c:1248
 msgid "Whether the primary icon is sensitive"
 msgstr "Om primært ikon er sensitivt"
 
-#: ../gtk/gtkentry.c:1246
+#: ../gtk/gtkentry.c:1269
 msgid "Secondary icon sensitive"
 msgstr "Sekundærikon er sensitivt"
 
-#: ../gtk/gtkentry.c:1247
+#: ../gtk/gtkentry.c:1270
 msgid "Whether the secondary icon is sensitive"
 msgstr "Om sekundært ikon er sensitivt"
 
-#: ../gtk/gtkentry.c:1263
+#: ../gtk/gtkentry.c:1286
 msgid "Primary icon tooltip text"
 msgstr "Tekst for verktøytips for primært ikon"
 
-#: ../gtk/gtkentry.c:1264 ../gtk/gtkentry.c:1300
+#: ../gtk/gtkentry.c:1287 ../gtk/gtkentry.c:1323
 msgid "The contents of the tooltip on the primary icon"
 msgstr "Innhold i verktøytips på primært ikon"
 
-#: ../gtk/gtkentry.c:1280
+#: ../gtk/gtkentry.c:1303
 msgid "Secondary icon tooltip text"
 msgstr "Tekst for verktøytips for sekundært ikon"
 
-#: ../gtk/gtkentry.c:1281 ../gtk/gtkentry.c:1319
+#: ../gtk/gtkentry.c:1304 ../gtk/gtkentry.c:1342
 msgid "The contents of the tooltip on the secondary icon"
 msgstr "Innhold i verktøytips på sekundært ikon"
 
-#: ../gtk/gtkentry.c:1299
+#: ../gtk/gtkentry.c:1322
 msgid "Primary icon tooltip markup"
-msgstr ""
+msgstr "Markering av tips for primærikon"
 
-#: ../gtk/gtkentry.c:1318
+#: ../gtk/gtkentry.c:1341
 msgid "Secondary icon tooltip markup"
-msgstr ""
+msgstr "Markering av tips for sekundærikon"
 
-#: ../gtk/gtkentry.c:1338 ../gtk/gtktextview.c:812
+#: ../gtk/gtkentry.c:1361 ../gtk/gtktextview.c:840
 msgid "IM module"
 msgstr "IM-modul"
 
-#: ../gtk/gtkentry.c:1339 ../gtk/gtktextview.c:813
+#: ../gtk/gtkentry.c:1362 ../gtk/gtktextview.c:841
 msgid "Which IM module should be used"
 msgstr "IM-modul som skal brukes"
 
-#: ../gtk/gtkentry.c:1353
+#: ../gtk/gtkentry.c:1376
 msgid "Completion"
 msgstr "Fullføring"
 
-#: ../gtk/gtkentry.c:1354
+#: ../gtk/gtkentry.c:1377
 msgid "The auxiliary completion object"
-msgstr ""
+msgstr "Ekstra ferdigstillingsobjekt"
 
-#: ../gtk/gtkentry.c:1425
+#: ../gtk/gtkentry.c:1478
 msgid "Icon Prelight"
-msgstr ""
+msgstr "Forhåndslys på ikoner"
 
-#: ../gtk/gtkentry.c:1426
+#: ../gtk/gtkentry.c:1479
 msgid "Whether activatable icons should prelight when hovered"
 msgstr ""
+"Om aktiverbare ikoner skal lyses opp når du beveger musepekeren over dem"
 
-#: ../gtk/gtkentry.c:1443
+#: ../gtk/gtkentry.c:1496
 msgid "Progress Border"
-msgstr "Kremgangsmåler"
+msgstr "Kant for framdriftsviser"
 
-#: ../gtk/gtkentry.c:1444
+#: ../gtk/gtkentry.c:1497
 msgid "Border around the progress bar"
-msgstr "Kant rundt fremgangsmåleren"
+msgstr "Kant rundt framdriftsviseren"
 
-#: ../gtk/gtkentry.c:1942
+#: ../gtk/gtkentry.c:2002
 msgid "Border between text and frame."
 msgstr "Kant mellom tekst og ramme."
 
-#: ../gtk/gtkentrycompletion.c:323
+#: ../gtk/gtkentrycompletion.c:332
 msgid "Completion Model"
 msgstr "Fullføringsmodell"
 
-#: ../gtk/gtkentrycompletion.c:324
+#: ../gtk/gtkentrycompletion.c:333
 msgid "The model to find matches in"
 msgstr "Modell for søk etter treff"
 
-#: ../gtk/gtkentrycompletion.c:330
+#: ../gtk/gtkentrycompletion.c:339
 msgid "Minimum Key Length"
 msgstr "Minste lengde på nøkkel"
 
-#: ../gtk/gtkentrycompletion.c:331
+#: ../gtk/gtkentrycompletion.c:340
 msgid "Minimum length of the search key in order to look up matches"
 msgstr "Minimumslengde på nøkkel for søk for å slå opp treff"
 
-#: ../gtk/gtkentrycompletion.c:347 ../gtk/gtkiconview.c:432
+#: ../gtk/gtkentrycompletion.c:356 ../gtk/gtkiconview.c:436
 msgid "Text column"
 msgstr "Tekstkolonne"
 
-#: ../gtk/gtkentrycompletion.c:348
+#: ../gtk/gtkentrycompletion.c:357
 msgid "The column of the model containing the strings."
 msgstr "En kolonne i modellen som inneholder strengene."
 
-#: ../gtk/gtkentrycompletion.c:367
+#: ../gtk/gtkentrycompletion.c:376
 msgid "Inline completion"
 msgstr "Innebygd fullføring"
 
-#: ../gtk/gtkentrycompletion.c:368
+#: ../gtk/gtkentrycompletion.c:377
 msgid "Whether the common prefix should be inserted automatically"
 msgstr "Om det vanlige prefikset skal ble satt inn automatisk"
 
-#: ../gtk/gtkentrycompletion.c:382
+#: ../gtk/gtkentrycompletion.c:391
 msgid "Popup completion"
 msgstr "Oppsprett fullføring"
 
-#: ../gtk/gtkentrycompletion.c:383
+#: ../gtk/gtkentrycompletion.c:392
 msgid "Whether the completions should be shown in a popup window"
 msgstr "Om fullføringen skal bli vist i et oppsprettsvindu"
 
-#: ../gtk/gtkentrycompletion.c:398
+#: ../gtk/gtkentrycompletion.c:407
 msgid "Popup set width"
 msgstr "Sprett opp sett bredde"
 
-#: ../gtk/gtkentrycompletion.c:399
+#: ../gtk/gtkentrycompletion.c:408
 msgid "If TRUE, the popup window will have the same size as the entry"
 msgstr "Hvis «TRUE» vil oppsprettvinduet ha samme størrelsen som oppføringen"
 
-#: ../gtk/gtkentrycompletion.c:417
+#: ../gtk/gtkentrycompletion.c:426
 msgid "Popup single match"
 msgstr "Sprett opp enslig treff"
 
-#: ../gtk/gtkentrycompletion.c:418
+#: ../gtk/gtkentrycompletion.c:427
 msgid "If TRUE, the popup window will appear for a single match."
 msgstr "Hvis «TRUE» vil oppsprettvinduet vises for et enslig treff."
 
-#: ../gtk/gtkentrycompletion.c:432
+#: ../gtk/gtkentrycompletion.c:441
 msgid "Inline selection"
 msgstr "Innebygd utvalg"
 
-#: ../gtk/gtkentrycompletion.c:433
+#: ../gtk/gtkentrycompletion.c:442
 msgid "Your description here"
 msgstr "Beskrivelse plasseres her"
 
-#: ../gtk/gtkeventbox.c:107
+#: ../gtk/gtkeventbox.c:114
 msgid "Visible Window"
 msgstr "Synlig vindu"
 
-#: ../gtk/gtkeventbox.c:108
+#: ../gtk/gtkeventbox.c:115
 msgid ""
 "Whether the event box is visible, as opposed to invisible and only used to "
 "trap events."
@@ -3231,11 +3266,11 @@
 "Om handlingsboksen er synlig i motsetning til usynlig. I tillegg kan den kun "
 "brukes til å fange opp hendelser."
 
-#: ../gtk/gtkeventbox.c:114
+#: ../gtk/gtkeventbox.c:121
 msgid "Above child"
 msgstr "Over barn"
 
-#: ../gtk/gtkeventbox.c:115
+#: ../gtk/gtkeventbox.c:122
 msgid ""
 "Whether the event-trapping window of the eventbox is above the window of the "
 "child widget as opposed to below it."
@@ -3255,11 +3290,11 @@
 msgid "Text of the expander's label"
 msgstr "Tekst i utviderens etikett"
 
-#: ../gtk/gtkexpander.c:304 ../gtk/gtklabel.c:735
+#: ../gtk/gtkexpander.c:304 ../gtk/gtklabel.c:738
 msgid "Use markup"
 msgstr "Bruk tagging"
 
-#: ../gtk/gtkexpander.c:305 ../gtk/gtklabel.c:736
+#: ../gtk/gtkexpander.c:305 ../gtk/gtklabel.c:739
 msgid "The text of the label includes XML markup. See pango_parse_markup()"
 msgstr "Teksten i etiketten inneholder XML-tagger. Se pango_parse_markup()"
 
@@ -3267,8 +3302,8 @@
 msgid "Space to put between the label and the child"
 msgstr "Mellomrom som skal plasseres mellom etiketten og barnet"
 
-#: ../gtk/gtkexpander.c:322 ../gtk/gtkframe.c:205 ../gtk/gtktoolbutton.c:253
-#: ../gtk/gtktoolitemgroup.c:1604
+#: ../gtk/gtkexpander.c:322 ../gtk/gtkframe.c:206 ../gtk/gtktoolbutton.c:253
+#: ../gtk/gtktoolitemgroup.c:1600
 msgid "Label widget"
 msgstr "Etikett-widget"
 
@@ -3283,24 +3318,28 @@
 #: ../gtk/gtkexpander.c:331
 msgid "Whether the label widget should fill all available horizontal space"
 msgstr ""
+"Om etikettelementet skal bruke all horisontal plass som er tilgjengelig på "
+"skjermen"
 
 #: ../gtk/gtkexpander.c:346
 msgid "Resize toplevel"
-msgstr ""
+msgstr "Endre størrelse på toppnivå"
 
 #: ../gtk/gtkexpander.c:347
 msgid ""
 "Whether the expander will resize the toplevel window upon expanding and "
 "collapsing"
 msgstr ""
+"Om utvideren skal endre størrelse på vinduet som ligger på toppen ved "
+"utvidelse og sammenfolding"
 
-#: ../gtk/gtkexpander.c:353 ../gtk/gtktoolitemgroup.c:1632
-#: ../gtk/gtktreeview.c:1203
+#: ../gtk/gtkexpander.c:353 ../gtk/gtktoolitemgroup.c:1628
+#: ../gtk/gtktreeview.c:1210
 msgid "Expander Size"
 msgstr "Størrelse på utvider"
 
-#: ../gtk/gtkexpander.c:354 ../gtk/gtktoolitemgroup.c:1633
-#: ../gtk/gtktreeview.c:1204
+#: ../gtk/gtkexpander.c:354 ../gtk/gtktoolitemgroup.c:1629
+#: ../gtk/gtktreeview.c:1211
 msgid "Size of the expander arrow"
 msgstr "Størrelse på utviderpil"
 
@@ -3308,102 +3347,102 @@
 msgid "Spacing around expander arrow"
 msgstr "Tomrom rundt utviderpilen"
 
-#: ../gtk/gtkfilechooserbutton.c:408
+#: ../gtk/gtkfilechooserbutton.c:418
 msgid "Dialog"
 msgstr "Dialog"
 
-#: ../gtk/gtkfilechooserbutton.c:409
+#: ../gtk/gtkfilechooserbutton.c:419
 msgid "The file chooser dialog to use."
 msgstr "Filvelgingsdialog som skal brukes."
 
-#: ../gtk/gtkfilechooserbutton.c:440
+#: ../gtk/gtkfilechooserbutton.c:450
 msgid "The title of the file chooser dialog."
 msgstr "Tittelen på dialogen for filvalg."
 
-#: ../gtk/gtkfilechooserbutton.c:454
+#: ../gtk/gtkfilechooserbutton.c:464
 msgid "The desired width of the button widget, in characters."
 msgstr "Den ønskede bredden på knappelementet, i tegn."
 
-#: ../gtk/gtkfilechooser.c:745
+#: ../gtk/gtkfilechooser.c:744
 msgid "Action"
 msgstr "Handling"
 
-#: ../gtk/gtkfilechooser.c:746
+#: ../gtk/gtkfilechooser.c:745
 msgid "The type of operation that the file selector is performing"
 msgstr "Type operasjon om utføres av filutvalgsdialogen"
 
-#: ../gtk/gtkfilechooser.c:752 ../gtk/gtkrecentchooser.c:262
+#: ../gtk/gtkfilechooser.c:751 ../gtk/gtkrecentchooser.c:259
 msgid "Filter"
 msgstr "Filter"
 
-#: ../gtk/gtkfilechooser.c:753
+#: ../gtk/gtkfilechooser.c:752
 msgid "The current filter for selecting which files are displayed"
 msgstr "Filter for å velge hvilke filer som vises"
 
-#: ../gtk/gtkfilechooser.c:758
+#: ../gtk/gtkfilechooser.c:757 ../gtk/gtkplacessidebar.c:4294
 msgid "Local Only"
 msgstr "Kun lokalt"
 
-#: ../gtk/gtkfilechooser.c:759
+#: ../gtk/gtkfilechooser.c:758
 msgid "Whether the selected file(s) should be limited to local file: URLs"
 msgstr "Om valgt(e) fil(er) skal begrenses til lokale file: URLer"
 
-#: ../gtk/gtkfilechooser.c:764
+#: ../gtk/gtkfilechooser.c:763
 msgid "Preview widget"
 msgstr "Forhåndsvisningskomponent"
 
-#: ../gtk/gtkfilechooser.c:765
+#: ../gtk/gtkfilechooser.c:764
 msgid "Application supplied widget for custom previews."
 msgstr "Komponent for egendefinerte forhåndsvisninger levert av programmet."
 
-#: ../gtk/gtkfilechooser.c:770
+#: ../gtk/gtkfilechooser.c:769
 msgid "Preview Widget Active"
 msgstr "Forhåndsvisningskomponent aktiv"
 
-#: ../gtk/gtkfilechooser.c:771
+#: ../gtk/gtkfilechooser.c:770
 msgid ""
 "Whether the application supplied widget for custom previews should be shown."
 msgstr ""
 "Om komponent for egendefinerte forhåndsvisninger levert av programmet skal "
 "vises."
 
-#: ../gtk/gtkfilechooser.c:776
+#: ../gtk/gtkfilechooser.c:775
 msgid "Use Preview Label"
 msgstr "Bruk etikett for forhåndsvisning"
 
-#: ../gtk/gtkfilechooser.c:777
+#: ../gtk/gtkfilechooser.c:776
 msgid "Whether to display a stock label with the name of the previewed file."
 msgstr "Om en standardetikett med navn på forhåndsvist fil skal vises."
 
-#: ../gtk/gtkfilechooser.c:782
+#: ../gtk/gtkfilechooser.c:781
 msgid "Extra widget"
 msgstr "Ekstra komponent"
 
-#: ../gtk/gtkfilechooser.c:783
+#: ../gtk/gtkfilechooser.c:782
 msgid "Application supplied widget for extra options."
 msgstr "Komponent for ekstra alternativer levert av programmet."
 
-#: ../gtk/gtkfilechooser.c:788 ../gtk/gtkrecentchooser.c:201
+#: ../gtk/gtkfilechooser.c:787 ../gtk/gtkrecentchooser.c:201
 msgid "Select Multiple"
 msgstr "Velg flere"
 
-#: ../gtk/gtkfilechooser.c:789
+#: ../gtk/gtkfilechooser.c:788
 msgid "Whether to allow multiple files to be selected"
 msgstr "Om valg av flere filer skal tillates"
 
-#: ../gtk/gtkfilechooser.c:795
+#: ../gtk/gtkfilechooser.c:794
 msgid "Show Hidden"
 msgstr "Vis skjulte"
 
-#: ../gtk/gtkfilechooser.c:796
+#: ../gtk/gtkfilechooser.c:795
 msgid "Whether the hidden files and folders should be displayed"
 msgstr "Om skjulte filer og mapper skal vises"
 
-#: ../gtk/gtkfilechooser.c:811
+#: ../gtk/gtkfilechooser.c:810
 msgid "Do overwrite confirmation"
 msgstr "Vis overskrivingsbekreftelse"
 
-#: ../gtk/gtkfilechooser.c:812
+#: ../gtk/gtkfilechooser.c:811
 msgid ""
 "Whether a file chooser in save mode will present an overwrite confirmation "
 "dialog if necessary."
@@ -3411,74 +3450,74 @@
 "Om filvelger i lagremodus vil presentere en bekreftelsedialog for "
 "overskriving hvis nødvendig."
 
-#: ../gtk/gtkfilechooser.c:828
+#: ../gtk/gtkfilechooser.c:827
 msgid "Allow folder creation"
 msgstr "Tillat oppretting av mapper"
 
-#: ../gtk/gtkfilechooser.c:829
+#: ../gtk/gtkfilechooser.c:828
 msgid ""
 "Whether a file chooser not in open mode will offer the user to create new "
 "folders."
 msgstr ""
 "Om filvelger som ikke er i åpningsmodus vil la bruker opprette nye mapper."
 
-#: ../gtk/gtkfixed.c:150 ../gtk/gtklayout.c:646 ../gtk/gtktreeviewcolumn.c:261
+#: ../gtk/gtkfixed.c:153 ../gtk/gtklayout.c:647 ../gtk/gtktreeviewcolumn.c:262
 msgid "X position"
 msgstr "X-posisjon"
 
-#: ../gtk/gtkfixed.c:151 ../gtk/gtklayout.c:647
+#: ../gtk/gtkfixed.c:154 ../gtk/gtklayout.c:648
 msgid "X position of child widget"
 msgstr "X-posisjon for underwidgetet"
 
-#: ../gtk/gtkfixed.c:158 ../gtk/gtklayout.c:656
+#: ../gtk/gtkfixed.c:161 ../gtk/gtklayout.c:657
 msgid "Y position"
 msgstr "Y-posisjon"
 
-#: ../gtk/gtkfixed.c:159 ../gtk/gtklayout.c:657
+#: ../gtk/gtkfixed.c:162 ../gtk/gtklayout.c:658
 msgid "Y position of child widget"
 msgstr "Y-posisjon for underwidgetet"
 
-#: ../gtk/gtkfontbutton.c:435
+#: ../gtk/gtkfontbutton.c:437
 msgid "The title of the font chooser dialog"
 msgstr "Tittel på dialogen for valg av skrift"
 
-#: ../gtk/gtkfontbutton.c:451
+#: ../gtk/gtkfontbutton.c:453
 msgid "The name of the selected font"
 msgstr "Navn på valgt skrift"
 
-#: ../gtk/gtkfontbutton.c:452
+#: ../gtk/gtkfontbutton.c:454
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:467
+#: ../gtk/gtkfontbutton.c:469
 msgid "Use font in label"
 msgstr "Bruk skrift i etikett"
 
-#: ../gtk/gtkfontbutton.c:468
+#: ../gtk/gtkfontbutton.c:470
 msgid "Whether the label is drawn in the selected font"
 msgstr "Om etiketten tegnes med valgt skrift"
 
-#: ../gtk/gtkfontbutton.c:483
+#: ../gtk/gtkfontbutton.c:485
 msgid "Use size in label"
 msgstr "Bruk størrelse i etikett"
 
-#: ../gtk/gtkfontbutton.c:484
+#: ../gtk/gtkfontbutton.c:486
 msgid "Whether the label is drawn with the selected font size"
 msgstr "Om etiketteksten tegnes med valgt skriftstørrelse"
 
-#: ../gtk/gtkfontbutton.c:500
+#: ../gtk/gtkfontbutton.c:502
 msgid "Show style"
 msgstr "Vis stil"
 
-#: ../gtk/gtkfontbutton.c:501
+#: ../gtk/gtkfontbutton.c:503
 msgid "Whether the selected font style is shown in the label"
 msgstr "Om valgt skriftstil vises i etiketten"
 
-#: ../gtk/gtkfontbutton.c:516
+#: ../gtk/gtkfontbutton.c:518
 msgid "Show size"
 msgstr "Vis størrelse"
 
-#: ../gtk/gtkfontbutton.c:517
+#: ../gtk/gtkfontbutton.c:519
 msgid "Whether selected font size is shown in the label"
 msgstr "Om valgt skriftstørrelse vises i etiketten"
 
@@ -3488,344 +3527,345 @@
 
 #: ../gtk/gtkfontchooser.c:104
 msgid "Show preview text entry"
-msgstr ""
+msgstr "Vis forhåndsvisningstekst"
 
 #: ../gtk/gtkfontchooser.c:105
 msgid "Whether the preview text entry is shown or not"
-msgstr ""
+msgstr "Om forhåndsvisningsteksten skal vises eller ikke"
 
-#: ../gtk/gtkframe.c:171
+#: ../gtk/gtkframe.c:172
 msgid "Text of the frame's label"
 msgstr "Teksten i rammens etikett"
 
-#: ../gtk/gtkframe.c:178
+#: ../gtk/gtkframe.c:179
 msgid "Label xalign"
 msgstr "X-justering for etikett"
 
-#: ../gtk/gtkframe.c:179
+#: ../gtk/gtkframe.c:180
 msgid "The horizontal alignment of the label"
 msgstr "Horisontal justering for etikett"
 
-#: ../gtk/gtkframe.c:187
+#: ../gtk/gtkframe.c:188
 msgid "Label yalign"
 msgstr "Y-justering for etikett"
 
-#: ../gtk/gtkframe.c:188
+#: ../gtk/gtkframe.c:189
 msgid "The vertical alignment of the label"
 msgstr "Vertikal justering for etikett"
 
-#: ../gtk/gtkframe.c:196
+#: ../gtk/gtkframe.c:197
 msgid "Frame shadow"
 msgstr "Skygge for ramme"
 
-#: ../gtk/gtkframe.c:197
+#: ../gtk/gtkframe.c:198
 msgid "Appearance of the frame border"
 msgstr "Utseende for rammekanten"
 
-#: ../gtk/gtkframe.c:206
+#: ../gtk/gtkframe.c:207
 msgid "A widget to display in place of the usual frame label"
 msgstr "Et widget som vises i stedet for den vanlige rammeetiketten"
 
-#: ../gtk/gtkgrid.c:1406
+#: ../gtk/gtkgrid.c:1746
 msgid "Row Homogeneous"
 msgstr "Homogen rad"
 
-#: ../gtk/gtkgrid.c:1407
+#: ../gtk/gtkgrid.c:1747
 msgid "If TRUE, the rows are all the same height"
-msgstr ""
+msgstr "Hvis verdien er TRUE, har alle rader samme høyde"
 
-#: ../gtk/gtkgrid.c:1413
+#: ../gtk/gtkgrid.c:1753
 msgid "Column Homogeneous"
 msgstr "Homogen kolonne"
 
-#: ../gtk/gtkgrid.c:1414
+#: ../gtk/gtkgrid.c:1754
 msgid "If TRUE, the columns are all the same width"
-msgstr ""
+msgstr "Hvis verdien er TRUE, har alle kolonner samme bredde"
 
-#: ../gtk/gtkgrid.c:1428
+#: ../gtk/gtkgrid.c:1775
 msgid "The row number to attach the top side of a child widget to"
-msgstr ""
+msgstr "Radnummeret som toppdelen av et underelement skal festes til"
 
-#: ../gtk/gtkgrid.c:1434 ../gtk/gtklayout.c:672 ../gtk/gtktreeviewcolumn.c:271
+#: ../gtk/gtkgrid.c:1781 ../gtk/gtklayout.c:673 ../gtk/gtktreeviewcolumn.c:272
 msgid "Width"
 msgstr "Bredde"
 
-#: ../gtk/gtkgrid.c:1435
+#: ../gtk/gtkgrid.c:1782
 msgid "The number of columns that a child spans"
-msgstr ""
+msgstr "Hvor mange kolonner et underelement skal strekke seg over"
 
-#: ../gtk/gtkgrid.c:1441 ../gtk/gtklayout.c:681
+#: ../gtk/gtkgrid.c:1788 ../gtk/gtklayout.c:682
 msgid "Height"
 msgstr "Høyde"
 
-#: ../gtk/gtkgrid.c:1442
+#: ../gtk/gtkgrid.c:1789
 msgid "The number of rows that a child spans"
-msgstr ""
+msgstr "Hvor mange rader et underelement skal strekke seg over"
 
-#: ../gtk/gtkiconview.c:395 ../gtk/gtktreeselection.c:130
+#: ../gtk/gtkflowbox.c:3654 ../gtk/gtkiconview.c:399 ../gtk/gtklistbox.c:357
+#: ../gtk/gtktreeselection.c:130
 msgid "Selection mode"
 msgstr "Utvalgsmodus"
 
-#: ../gtk/gtkiconview.c:396
+#: ../gtk/gtkflowbox.c:3655 ../gtk/gtkiconview.c:400 ../gtk/gtklistbox.c:358
 msgid "The selection mode"
 msgstr "Utvalgsmodus som brukes"
 
-#: ../gtk/gtkiconview.c:414
+#: ../gtk/gtkiconview.c:418
 msgid "Pixbuf column"
 msgstr "Pixbuf-kolonne"
 
-#: ../gtk/gtkiconview.c:415
+#: ../gtk/gtkiconview.c:419
 msgid "Model column used to retrieve the icon pixbuf from"
 msgstr "Modellkolonne brukt til å hente «icon pixbuf» fra"
 
-#: ../gtk/gtkiconview.c:433
+#: ../gtk/gtkiconview.c:437
 msgid "Model column used to retrieve the text from"
 msgstr "Modelkolonne brukt til å hente teksten fra"
 
-#: ../gtk/gtkiconview.c:452
+#: ../gtk/gtkiconview.c:456
 msgid "Markup column"
 msgstr "Kolonne for tagging"
 
-#: ../gtk/gtkiconview.c:453
+#: ../gtk/gtkiconview.c:457
 msgid "Model column used to retrieve the text if using Pango markup"
 msgstr ""
 "Modelkolonne brukt til å hente teksten fra hvis «Pango markup» er brukt"
 
-#: ../gtk/gtkiconview.c:460
+#: ../gtk/gtkiconview.c:464
 msgid "Icon View Model"
 msgstr "Modell for ikonvisning"
 
-#: ../gtk/gtkiconview.c:461
+#: ../gtk/gtkiconview.c:465
 msgid "The model for the icon view"
 msgstr "Modellen for ikonvisning"
 
-#: ../gtk/gtkiconview.c:477
+#: ../gtk/gtkiconview.c:481
 msgid "Number of columns"
 msgstr "Antall kolonner"
 
-#: ../gtk/gtkiconview.c:478
+#: ../gtk/gtkiconview.c:482
 msgid "Number of columns to display"
 msgstr "Antall kolonner som skal vises"
 
-#: ../gtk/gtkiconview.c:495
+#: ../gtk/gtkiconview.c:499
 msgid "Width for each item"
 msgstr "Bredde for hver oppføring"
 
-#: ../gtk/gtkiconview.c:496
+#: ../gtk/gtkiconview.c:500
 msgid "The width used for each item"
 msgstr "Bredde som brukes for hver oppføring"
 
-#: ../gtk/gtkiconview.c:512
+#: ../gtk/gtkiconview.c:516
 msgid "Space which is inserted between cells of an item"
 msgstr "Plass som er satt inn mellom cellene til et element"
 
-#: ../gtk/gtkiconview.c:527
+#: ../gtk/gtkiconview.c:531
 msgid "Row Spacing"
 msgstr "Avstand mellom rader"
 
-#: ../gtk/gtkiconview.c:528
+#: ../gtk/gtkiconview.c:532
 msgid "Space which is inserted between grid rows"
 msgstr "Plass som er satt inn mellom ruterekkene"
 
-#: ../gtk/gtkiconview.c:543
+#: ../gtk/gtkiconview.c:547
 msgid "Column Spacing"
 msgstr "Avstand mellom kolonner"
 
-#: ../gtk/gtkiconview.c:544
+#: ../gtk/gtkiconview.c:548
 msgid "Space which is inserted between grid columns"
 msgstr "Plass som er satt inn mellom rutenettkolonnene"
 
-#: ../gtk/gtkiconview.c:559
+#: ../gtk/gtkiconview.c:563
 msgid "Margin"
 msgstr "Marg"
 
-#: ../gtk/gtkiconview.c:560
+#: ../gtk/gtkiconview.c:564
 msgid "Space which is inserted at the edges of the icon view"
 msgstr "Plass som er satt inn ved kantene til ikonvisningen"
 
-#: ../gtk/gtkiconview.c:575
+#: ../gtk/gtkiconview.c:579
 msgid "Item Orientation"
 msgstr "Orientering for oppføring"
 
-#: ../gtk/gtkiconview.c:576
+#: ../gtk/gtkiconview.c:580
 msgid ""
 "How the text and icon of each item are positioned relative to each other"
 msgstr ""
 "Hvordan teksten og ikonet til hvert element er plassert i forhold til "
 "hverandre"
 
-#: ../gtk/gtkiconview.c:592 ../gtk/gtktreeview.c:1022
-#: ../gtk/gtktreeviewcolumn.c:371
+#: ../gtk/gtkiconview.c:596 ../gtk/gtktreeview.c:1029
+#: ../gtk/gtktreeviewcolumn.c:372
 msgid "Reorderable"
 msgstr "Kan omorganiseres"
 
-#: ../gtk/gtkiconview.c:593 ../gtk/gtktreeview.c:1023
+#: ../gtk/gtkiconview.c:597 ../gtk/gtktreeview.c:1030
 msgid "View is reorderable"
 msgstr "Visningen kan omorganiseres"
 
-#: ../gtk/gtkiconview.c:600 ../gtk/gtktreeview.c:1173
+#: ../gtk/gtkiconview.c:604 ../gtk/gtktreeview.c:1180
 msgid "Tooltip Column"
 msgstr "Kolonne for verktøytips"
 
-#: ../gtk/gtkiconview.c:601
+#: ../gtk/gtkiconview.c:605
 msgid "The column in the model containing the tooltip texts for the items"
 msgstr ""
 "En kolonne i modellen som inneholder tekst for verktøytips for oppføringene"
 
-#: ../gtk/gtkiconview.c:618
+#: ../gtk/gtkiconview.c:622
 msgid "Item Padding"
 msgstr "Fyll for oppføring"
 
-#: ../gtk/gtkiconview.c:619
+#: ../gtk/gtkiconview.c:623
 msgid "Padding around icon view items"
-msgstr ""
+msgstr "Fyll rundt oppføringer i ikonvisning"
 
-#: ../gtk/gtkiconview.c:666
+#: ../gtk/gtkiconview.c:670
 msgid "Selection Box Color"
 msgstr "Boks for fargevalg"
 
-#: ../gtk/gtkiconview.c:667
+#: ../gtk/gtkiconview.c:671
 msgid "Color of the selection box"
 msgstr "Fargen på valgboksen"
 
-#: ../gtk/gtkiconview.c:673
+#: ../gtk/gtkiconview.c:677
 msgid "Selection Box Alpha"
 msgstr "Valgboks alfa"
 
-#: ../gtk/gtkiconview.c:674
+#: ../gtk/gtkiconview.c:678
 msgid "Opacity of the selection box"
 msgstr "Ugjennomsiktigheten for valgboksen"
 
-#: ../gtk/gtkimage.c:218 ../gtk/gtkstatusicon.c:223
+#: ../gtk/gtkimage.c:231 ../gtk/gtkstatusicon.c:222
 msgid "Pixbuf"
 msgstr "Pixbuf"
 
-#: ../gtk/gtkimage.c:219 ../gtk/gtkstatusicon.c:224
+#: ../gtk/gtkimage.c:232 ../gtk/gtkstatusicon.c:223
 msgid "A GdkPixbuf to display"
 msgstr "En GdkPixuf som skal vises"
 
-#: ../gtk/gtkimage.c:226 ../gtk/gtkrecentmanager.c:293
-#: ../gtk/gtkstatusicon.c:231
+#: ../gtk/gtkimage.c:247 ../gtk/gtkrecentmanager.c:293
+#: ../gtk/gtkstatusicon.c:230
 msgid "Filename"
 msgstr "Filnavn"
 
-#: ../gtk/gtkimage.c:227 ../gtk/gtkstatusicon.c:232
+#: ../gtk/gtkimage.c:248 ../gtk/gtkstatusicon.c:231
 msgid "Filename to load and display"
 msgstr "Filnavn som skal lastes og vises"
 
-#: ../gtk/gtkimage.c:236 ../gtk/gtkstatusicon.c:240
+#: ../gtk/gtkimage.c:262 ../gtk/gtkstatusicon.c:244
 msgid "Stock ID for a stock image to display"
 msgstr "Standard ID for et standardbilde som skal vises"
 
-#: ../gtk/gtkimage.c:243
+#: ../gtk/gtkimage.c:275
 msgid "Icon set"
 msgstr "Ikonsett"
 
-#: ../gtk/gtkimage.c:244
+#: ../gtk/gtkimage.c:276
 msgid "Icon set to display"
 msgstr "Ikonsett som skal vises"
 
-#: ../gtk/gtkimage.c:251 ../gtk/gtkscalebutton.c:228 ../gtk/gtktoolbar.c:527
-#: ../gtk/gtktoolpalette.c:1013
+#: ../gtk/gtkimage.c:284 ../gtk/gtkscalebutton.c:238 ../gtk/gtktoolbar.c:531
+#: ../gtk/gtktoolpalette.c:942
 msgid "Icon size"
 msgstr "Ikonstørrelse"
 
-#: ../gtk/gtkimage.c:252
+#: ../gtk/gtkimage.c:285
 msgid "Symbolic size to use for stock icon, icon set or named icon"
 msgstr ""
 "Symbolsk størrelse å bruke for standard ikon, ikonsett eller navngitt ikon"
 
-#: ../gtk/gtkimage.c:268
+#: ../gtk/gtkimage.c:301
 msgid "Pixel size"
 msgstr "Pikselstørrelse"
 
-#: ../gtk/gtkimage.c:269
+#: ../gtk/gtkimage.c:302
 msgid "Pixel size to use for named icon"
 msgstr "Pikselstørrelse å bruke for navngitt ikon"
 
-#: ../gtk/gtkimage.c:277
+#: ../gtk/gtkimage.c:310
 msgid "Animation"
 msgstr "Animasjon"
 
-#: ../gtk/gtkimage.c:278
+#: ../gtk/gtkimage.c:311
 msgid "GdkPixbufAnimation to display"
 msgstr "GdkPixbufAnimation som skal vises"
 
-#: ../gtk/gtkimage.c:333 ../gtk/gtkstatusicon.c:271
+#: ../gtk/gtkimage.c:366 ../gtk/gtkstatusicon.c:275
 msgid "Storage type"
 msgstr "Lagertype"
 
-#: ../gtk/gtkimage.c:334 ../gtk/gtkstatusicon.c:272
+#: ../gtk/gtkimage.c:367 ../gtk/gtkstatusicon.c:276
 msgid "The representation being used for image data"
 msgstr "Representasjonen som brukes for bildedata"
 
-#: ../gtk/gtkimage.c:352
+#: ../gtk/gtkimage.c:385
 msgid "Use Fallback"
 msgstr "Bruk reserve"
 
-#: ../gtk/gtkimage.c:353
+#: ../gtk/gtkimage.c:386
 msgid "Whether to use icon names fallback"
-msgstr ""
+msgstr "Om gamle ikonnavn skal brukes"
 
-#: ../gtk/gtkimagemenuitem.c:159
+#: ../gtk/deprecated/gtkimagemenuitem.c:169
 msgid "Child widget to appear next to the menu text"
 msgstr "Barnwidget som skal vises ved siden av menyteksten"
 
-#: ../gtk/gtkimagemenuitem.c:174
+#: ../gtk/deprecated/gtkimagemenuitem.c:186
 msgid "Whether to use the label text to create a stock menu item"
-msgstr ""
+msgstr "Om etikett-teksten skal brukes til å lage en standardmenyoppføring"
 
-#: ../gtk/gtkimagemenuitem.c:207 ../gtk/gtkmenu.c:569
+#: ../gtk/deprecated/gtkimagemenuitem.c:222 ../gtk/gtkmenu.c:572
 msgid "Accel Group"
 msgstr "Akselleratorgruppe"
 
-#: ../gtk/gtkimagemenuitem.c:208
+#: ../gtk/deprecated/gtkimagemenuitem.c:223
 msgid "The Accel Group to use for stock accelerator keys"
-msgstr ""
+msgstr "Accel-gruppa som skal brukes til standard aksellerasjonsknapper"
 
-#: ../gtk/gtkinfobar.c:414 ../gtk/gtkmessagedialog.c:205
+#: ../gtk/gtkinfobar.c:446 ../gtk/gtkmessagedialog.c:187
 msgid "Message Type"
 msgstr "Meldingstype"
 
-#: ../gtk/gtkinfobar.c:415 ../gtk/gtkmessagedialog.c:206
+#: ../gtk/gtkinfobar.c:447 ../gtk/gtkmessagedialog.c:188
 msgid "The type of message"
 msgstr "Type melding"
 
-#: ../gtk/gtkinfobar.c:471
+#: ../gtk/gtkinfobar.c:518
 msgid "Width of border around the content area"
 msgstr "Bredde på kanten rundt innholdsområdet"
 
-#: ../gtk/gtkinfobar.c:489
+#: ../gtk/gtkinfobar.c:536
 msgid "Spacing between elements of the area"
 msgstr "Mellomrom mellom elementene i området"
 
-#: ../gtk/gtkinfobar.c:523
+#: ../gtk/gtkinfobar.c:570
 msgid "Width of border around the action area"
 msgstr "Bredde på kanten rundt handlingsområdet"
 
-#: ../gtk/gtkinvisible.c:101 ../gtk/gtkmountoperation.c:179
-#: ../gtk/gtkstatusicon.c:290 ../gtk/gtkstylecontext.c:441
-#: ../gtk/gtkwindow.c:781
+#: ../gtk/gtkinvisible.c:101 ../gtk/gtkmountoperation.c:176
+#: ../gtk/gtkstatusicon.c:294 ../gtk/gtkstylecontext.c:444
+#: ../gtk/gtkwindow.c:864
 msgid "Screen"
 msgstr "Skjerm"
 
-#: ../gtk/gtkinvisible.c:102 ../gtk/gtkwindow.c:782
+#: ../gtk/gtkinvisible.c:102 ../gtk/gtkwindow.c:865
 msgid "The screen where this window will be displayed"
 msgstr "Skjermen hvor dette vinduet vil vises"
 
-#: ../gtk/gtklabel.c:722
+#: ../gtk/gtklabel.c:725
 msgid "The text of the label"
 msgstr "Tekst for etiketten"
 
-#: ../gtk/gtkentry.c:1411 ../gtk/gtklabel.c:729
+#: ../gtk/gtkentry.c:1434 ../gtk/gtklabel.c:732
 msgid "A list of style attributes to apply to the text of the label"
 msgstr "En liste med stilattributter som skal påføres etikettens tekst"
 
-#: ../gtk/gtklabel.c:750 ../gtk/gtktexttag.c:404 ../gtk/gtktextview.c:721
+#: ../gtk/gtklabel.c:753 ../gtk/gtktexttag.c:404 ../gtk/gtktextview.c:749
 msgid "Justification"
 msgstr "Justering"
 
-#: ../gtk/gtklabel.c:751
+#: ../gtk/gtklabel.c:754
 msgid ""
 "The alignment of the lines in the text of the label relative to each other. "
 "This does NOT affect the alignment of the label within its allocation. See "
@@ -3835,11 +3875,11 @@
 "påvirker IKKE justeringen av etiketten innen sitt område. Se GtkMisc::xalign "
 "for det"
 
-#: ../gtk/gtklabel.c:759
+#: ../gtk/gtklabel.c:762
 msgid "Pattern"
 msgstr "Mønster"
 
-#: ../gtk/gtklabel.c:760
+#: ../gtk/gtklabel.c:763
 msgid ""
 "A string with _ characters in positions correspond to characters in the text "
 "to underline"
@@ -3847,256 +3887,264 @@
 "En streng med «_»-tegn i posisjoner tilsvarer tegn i teksten som skal "
 "understrekes"
 
-#: ../gtk/gtklabel.c:767
+#: ../gtk/gtklabel.c:770
 msgid "Line wrap"
 msgstr "Linjebryting"
 
-#: ../gtk/gtklabel.c:768
+#: ../gtk/gtklabel.c:771
 msgid "If set, wrap lines if the text becomes too wide"
 msgstr "Bryt linjer hvis teksten blir for bred hvis dette er satt"
 
-#: ../gtk/gtklabel.c:783
+#: ../gtk/gtklabel.c:786
 msgid "Line wrap mode"
 msgstr "Linjebrytingsmodus"
 
-#: ../gtk/gtklabel.c:784
+#: ../gtk/gtklabel.c:787
 msgid "If wrap is set, controls how linewrapping is done"
 msgstr ""
+"Hvis tekstbryting er valgt, kontrollerer dette hvordan rader skal brytes"
 
-#: ../gtk/gtklabel.c:792
+#: ../gtk/gtklabel.c:795
 msgid "Whether the label text can be selected with the mouse"
 msgstr "Om etiketteksten kan velges med musen"
 
-#: ../gtk/gtklabel.c:798
+#: ../gtk/gtklabel.c:801
 msgid "Mnemonic key"
 msgstr "Hinttast"
 
-#: ../gtk/gtklabel.c:799
+#: ../gtk/gtklabel.c:802
 msgid "The mnemonic accelerator key for this label"
 msgstr "Hint for akselleratortast for denne etiketten"
 
-#: ../gtk/gtklabel.c:807
+#: ../gtk/gtklabel.c:810
 msgid "Mnemonic widget"
 msgstr "Hintwidget"
 
-#: ../gtk/gtklabel.c:808
+#: ../gtk/gtklabel.c:811
 msgid "The widget to be activated when the label's mnemonic key is pressed"
 msgstr "Widget som skal aktiveres når etikettens hinttast trykkes"
 
-#: ../gtk/gtklabel.c:854
+#: ../gtk/gtklabel.c:857
 msgid ""
 "The preferred place to ellipsize the string, if the label does not have "
 "enough room to display the entire string"
 msgstr ""
+"Foretrukket sted å forkorte strengen, hvis etiketten ikke har nok plass til "
+"å vise hele."
 
-#: ../gtk/gtklabel.c:895
+#: ../gtk/gtklabel.c:898
 msgid "Single Line Mode"
 msgstr "Enkeltlinjemodus"
 
-#: ../gtk/gtklabel.c:896
+#: ../gtk/gtklabel.c:899
 msgid "Whether the label is in single line mode"
 msgstr "Om etiketten er i singellinjemodus"
 
-#: ../gtk/gtklabel.c:913
+#: ../gtk/gtklabel.c:916
 msgid "Angle"
 msgstr "Vinkel"
 
-#: ../gtk/gtklabel.c:914
+#: ../gtk/gtklabel.c:917
 msgid "Angle at which the label is rotated"
 msgstr "Vinkel for rotert etikett"
 
-#: ../gtk/gtklabel.c:936
+#: ../gtk/gtklabel.c:939
 msgid "The desired maximum width of the label, in characters"
 msgstr "Den ønskede maksimale bredden til merkelappen, i tegn"
 
-#: ../gtk/gtklabel.c:954
+#: ../gtk/gtklabel.c:957
 msgid "Track visited links"
 msgstr "Spor besøkte lenker"
 
-#: ../gtk/gtklabel.c:955
+#: ../gtk/gtklabel.c:958
 msgid "Whether visited links should be tracked"
 msgstr "Om besøkte lenker skal spores"
 
-#: ../gtk/gtklayout.c:673
+#: ../gtk/gtklayout.c:674
 msgid "The width of the layout"
 msgstr "Bredde på plasseringen"
 
-#: ../gtk/gtklayout.c:682
+#: ../gtk/gtklayout.c:683
 msgid "The height of the layout"
 msgstr "Høyde på plasseringen"
 
-#: ../gtk/gtklinkbutton.c:175
+#: ../gtk/gtklinkbutton.c:168
 msgid "URI"
 msgstr "URI"
 
-#: ../gtk/gtklinkbutton.c:176
+#: ../gtk/gtklinkbutton.c:169
 msgid "The URI bound to this button"
 msgstr "URI bundet til denne knappen"
 
-#: ../gtk/gtklinkbutton.c:190
+#: ../gtk/gtklinkbutton.c:183
 msgid "Visited"
 msgstr "Besøkt"
 
-#: ../gtk/gtklinkbutton.c:191
+#: ../gtk/gtklinkbutton.c:184
 msgid "Whether this link has been visited."
 msgstr "Om denne lenken har vært besøkt.<"
 
-#: ../gtk/gtklockbutton.c:280
+#: ../gtk/gtklockbutton.c:256
 msgid "Permission"
 msgstr "Rettighet"
 
-#: ../gtk/gtklockbutton.c:281
+#: ../gtk/gtklockbutton.c:257
 msgid "The GPermission object controlling this button"
-msgstr ""
+msgstr "GPermission-objektet som styrer denne knappen"
 
-#: ../gtk/gtklockbutton.c:288
+#: ../gtk/gtklockbutton.c:264
 msgid "Lock Text"
 msgstr "Tekst ved låsing"
 
-#: ../gtk/gtklockbutton.c:289
+#: ../gtk/gtklockbutton.c:265
 msgid "The text to display when prompting the user to lock"
-msgstr ""
+msgstr "Tekst som skal vises når brukeren blir bedt om å låse"
 
-#: ../gtk/gtklockbutton.c:297
+#: ../gtk/gtklockbutton.c:273
 msgid "Unlock Text"
 msgstr "Tekst ved opplåsing"
 
-#: ../gtk/gtklockbutton.c:298
+#: ../gtk/gtklockbutton.c:274
 msgid "The text to display when prompting the user to unlock"
-msgstr ""
+msgstr "Tekst som skal vises når brukeren blir bedt om å låse opp"
 
-#: ../gtk/gtklockbutton.c:306
+#: ../gtk/gtklockbutton.c:282
 msgid "Lock Tooltip"
-msgstr ""
+msgstr "Verktøytips for låsning"
 
-#: ../gtk/gtklockbutton.c:307
+#: ../gtk/gtklockbutton.c:283
 msgid "The tooltip to display when prompting the user to lock"
-msgstr ""
+msgstr "Tips som skal vises når brukeren blir bedt om å låse"
 
-#: ../gtk/gtklockbutton.c:315
+#: ../gtk/gtklockbutton.c:291
 msgid "Unlock Tooltip"
-msgstr ""
+msgstr "Verktøytips for opplåsning"
 
-#: ../gtk/gtklockbutton.c:316
+#: ../gtk/gtklockbutton.c:292
 msgid "The tooltip to display when prompting the user to unlock"
-msgstr ""
+msgstr "Tips som skal vises når brukeren blir bedt om å låse opp"
 
-#: ../gtk/gtklockbutton.c:324
+#: ../gtk/gtklockbutton.c:300
 msgid "Not Authorized Tooltip"
-msgstr ""
+msgstr "Verktøytips for manglende autorisasjon"
 
-#: ../gtk/gtklockbutton.c:325
+#: ../gtk/gtklockbutton.c:301
 msgid ""
 "The tooltip to display when prompting the user cannot obtain authorization"
 msgstr ""
+"Verktøytipset som skal vises når brukeren får beskjed om manglende "
+"autorisasjon"
 
-#: ../gtk/gtkmenubar.c:187
+#: ../gtk/gtkmenubar.c:190
 msgid "Pack direction"
 msgstr "Pakkeretning"
 
-#: ../gtk/gtkmenubar.c:188
+#: ../gtk/gtkmenubar.c:191
 msgid "The pack direction of the menubar"
 msgstr "Pakkeretning for menylinjen"
 
-#: ../gtk/gtkmenubar.c:204
+#: ../gtk/gtkmenubar.c:207
 msgid "Child Pack direction"
-msgstr ""
+msgstr "Retning for pakking av underelementer"
 
-#: ../gtk/gtkmenubar.c:205
+#: ../gtk/gtkmenubar.c:208
 msgid "The child pack direction of the menubar"
-msgstr ""
+msgstr "Retning for pakking av underelementer på menylinja"
 
-#: ../gtk/gtkmenubar.c:214
+#: ../gtk/gtkmenubar.c:217
 msgid "Style of bevel around the menubar"
 msgstr "Stil på kanten rundt menylinjen"
 
-#: ../gtk/gtkmenubar.c:230 ../gtk/gtktoolbar.c:586
+#: ../gtk/gtkmenubar.c:233 ../gtk/gtktoolbar.c:590
 msgid "Internal padding"
 msgstr "Internt fyll"
 
-#: ../gtk/gtkmenubar.c:231
+#: ../gtk/gtkmenubar.c:234
 msgid "Amount of border space between the menubar shadow and the menu items"
 msgstr "Mengde med kantplass mellom menylinjens skygge og menyoppføringene"
 
-#: ../gtk/gtkmenu.c:555
+#: ../gtk/gtkmenu.c:558
 msgid "The currently selected menu item"
 msgstr "Valgt menyoppføring"
 
-#: ../gtk/gtkmenu.c:570
+#: ../gtk/gtkmenu.c:573
 msgid "The accel group holding accelerators for the menu"
 msgstr "Akselleratorgruppe som inneholder akselleratorer for menyen"
 
-#: ../gtk/gtkmenu.c:584 ../gtk/gtkmenuitem.c:415
+#: ../gtk/gtkmenu.c:587 ../gtk/gtkmenuitem.c:433
 msgid "Accel Path"
 msgstr "Akselleratorsti"
 
-#: ../gtk/gtkmenu.c:585
+#: ../gtk/gtkmenu.c:588
 msgid ""
 "An accel path used to conveniently construct accel paths of child items"
 msgstr ""
+"En aksellerasjonssti som brukes til å konstruere accel-stier for "
+"underelementer"
 
-#: ../gtk/gtkmenu.c:601
+#: ../gtk/gtkmenu.c:604
 msgid "Attach Widget"
 msgstr "Fest komponent"
 
-#: ../gtk/gtkmenu.c:602
+#: ../gtk/gtkmenu.c:605
 msgid "The widget the menu is attached to"
 msgstr "Komponenten menyen er festet til"
 
-#: ../gtk/gtkmenu.c:610
+#: ../gtk/gtkmenu.c:621
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
 msgstr ""
 "En tittel som skal vises av vindushåndtereren når denne menyen er avrevet"
 
-#: ../gtk/gtkmenu.c:624
+#: ../gtk/gtkmenu.c:637
 msgid "Tearoff State"
 msgstr "Avrevet tilstand"
 
-#: ../gtk/gtkmenu.c:625
+#: ../gtk/gtkmenu.c:638
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "En bolsk verdi som indikerer om menyen er avrevet"
 
-#: ../gtk/gtkmenu.c:639
+#: ../gtk/gtkmenu.c:652
 msgid "Monitor"
 msgstr "Skjerm"
 
-#: ../gtk/gtkmenu.c:640
+#: ../gtk/gtkmenu.c:653
 msgid "The monitor the menu will be popped up on"
-msgstr ""
+msgstr "Skjermen som menyen skal sprette opp på"
 
-#: ../gtk/gtkmenu.c:695
+#: ../gtk/gtkmenu.c:708
 msgid "Vertical Padding"
 msgstr "Vertikalt fyll"
 
-#: ../gtk/gtkmenu.c:696
+#: ../gtk/gtkmenu.c:709
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Ekstra mellomrom på topp og bunn av menyen"
 
-#: ../gtk/gtkmenu.c:660
+#: ../gtk/gtkmenu.c:673
 msgid "Reserve Toggle Size"
-msgstr ""
+msgstr "Reserver bryterstørrelse"
 
-#: ../gtk/gtkmenu.c:661
+#: ../gtk/gtkmenu.c:674
 msgid ""
 "A boolean that indicates whether the menu reserves space for toggles and "
 "icons"
 msgstr ""
+"En boolsk verdi som avgjør om menyen reserverer plass til brytere og ikoner"
 
-#: ../gtk/gtkmenu.c:676
+#: ../gtk/gtkmenu.c:689
 msgid "Horizontal Padding"
 msgstr "Horisontalt fyll"
 
-#: ../gtk/gtkmenu.c:677
+#: ../gtk/gtkmenu.c:690
 msgid "Extra space at the left and right edges of the menu"
 msgstr "Ekstra plass på venstre og høyre side av menyen"
 
-#: ../gtk/gtkmenu.c:705
+#: ../gtk/gtkmenu.c:718
 msgid "Vertical Offset"
 msgstr "Vertikal avstand"
 
-#: ../gtk/gtkmenu.c:706
+#: ../gtk/gtkmenu.c:719
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
@@ -4104,11 +4152,11 @@
 "Plasser menyen med vertikal avstand lik dette antall piksler når den er en "
 "undermeny"
 
-#: ../gtk/gtkmenu.c:714
+#: ../gtk/gtkmenu.c:727
 msgid "Horizontal Offset"
 msgstr "Horisontal avstand"
 
-#: ../gtk/gtkmenu.c:715
+#: ../gtk/gtkmenu.c:728
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
@@ -4116,95 +4164,95 @@
 "Plasser menyen med horisontal avstand lik dette antall piksler når den er en "
 "undermeny."
 
-#: ../gtk/gtkmenu.c:723
+#: ../gtk/gtkmenu.c:736
 msgid "Double Arrows"
 msgstr "Doble piler"
 
-#: ../gtk/gtkmenu.c:724
+#: ../gtk/gtkmenu.c:737
 msgid "When scrolling, always show both arrows."
-msgstr ""
+msgstr "Vis alltid begge pilene under rulling."
 
-#: ../gtk/gtkmenu.c:737
+#: ../gtk/gtkmenu.c:750
 msgid "Arrow Placement"
 msgstr "Plassering av pil"
 
-#: ../gtk/gtkmenu.c:738
+#: ../gtk/gtkmenu.c:751
 msgid "Indicates where scroll arrows should be placed"
-msgstr ""
+msgstr "Bestemmer hvor rullepiler skal plasseres"
 
-#: ../gtk/gtkmenu.c:746
+#: ../gtk/gtkmenu.c:759
 msgid "Left Attach"
 msgstr "Venstre feste"
 
-#: ../gtk/gtkmenu.c:754
+#: ../gtk/gtkmenu.c:767
 msgid "Right Attach"
 msgstr "Høyre feste"
 
-#: ../gtk/gtkmenu.c:755
+#: ../gtk/gtkmenu.c:768
 msgid "The column number to attach the right side of the child to"
 msgstr "Kolonnenummer som høyre side av etterkommer skal festes til"
 
-#: ../gtk/gtkmenu.c:762
+#: ../gtk/gtkmenu.c:775
 msgid "Top Attach"
 msgstr "Toppfeste"
 
-#: ../gtk/gtkmenu.c:763
+#: ../gtk/gtkmenu.c:776
 msgid "The row number to attach the top of the child to"
 msgstr "Radnummer som toppen av etterkommer skal festes til"
 
-#: ../gtk/gtkmenu.c:770
+#: ../gtk/gtkmenu.c:783
 msgid "Bottom Attach"
 msgstr "Bunnfeste"
 
-#: ../gtk/gtkmenu.c:785
+#: ../gtk/gtkmenu.c:798
 msgid "Arbitrary constant to scale down the size of the scroll arrow"
-msgstr ""
+msgstr "Skjønnsmessig konstant som nedskalerer størrelsen på rullepila"
 
-#: ../gtk/gtkmenuitem.c:383
+#: ../gtk/gtkmenuitem.c:401
 msgid "Right Justified"
 msgstr "Høyrejustert"
 
-#: ../gtk/gtkmenuitem.c:384
+#: ../gtk/gtkmenuitem.c:402
 msgid ""
 "Sets whether the menu item appears justified at the right side of a menu bar"
-msgstr ""
+msgstr "Velger om menyvalget skal dukke opp på høyre side av en menylinje"
 
-#: ../gtk/gtkmenuitem.c:398
+#: ../gtk/gtkmenuitem.c:416
 msgid "Submenu"
 msgstr "Undermeny"
 
-#: ../gtk/gtkmenuitem.c:399
+#: ../gtk/gtkmenuitem.c:417
 msgid "The submenu attached to the menu item, or NULL if it has none"
-msgstr ""
+msgstr "Undermenyen som er koblet til menyvalget, eller NULL hvis ingen"
 
-#: ../gtk/gtkmenuitem.c:416
+#: ../gtk/gtkmenuitem.c:434
 msgid "Sets the accelerator path of the menu item"
 msgstr ""
 
-#: ../gtk/gtkmenuitem.c:431
+#: ../gtk/gtkmenuitem.c:449
 msgid "The text for the child label"
 msgstr "Tekst for underetiketten"
 
-#: ../gtk/gtkmenuitem.c:507
+#: ../gtk/gtkmenuitem.c:525
 msgid ""
 "Amount of space used up by arrow, relative to the menu item's font size"
-msgstr ""
+msgstr "Hvor stor plass en pil skal ta, målt mot menyvalgets skriftstørrelse"
 
-#: ../gtk/gtkmenuitem.c:520
+#: ../gtk/gtkmenuitem.c:538
 msgid "Width in Characters"
 msgstr "Bredde i tegn"
 
-#: ../gtk/gtkmenuitem.c:521
+#: ../gtk/gtkmenuitem.c:539
 msgid "The minimum desired width of the menu item in characters"
 msgstr "Den minste ønskede bredden på menyoppføringen i antall tegn"
 
-#: ../gtk/gtkmenushell.c:449
+#: ../gtk/gtkmenushell.c:418
 msgid "Take Focus"
 msgstr "Ta fokus"
 
-#: ../gtk/gtkmenushell.c:450
+#: ../gtk/gtkmenushell.c:419
 msgid "A boolean that determines whether the menu grabs the keyboard focus"
-msgstr ""
+msgstr "En bolsk verdi som avgjør om menyen tar tastaturfokus"
 
 #: ../gtk/gtkmenutoolbutton.c:272
 msgid "Menu"
@@ -4214,65 +4262,65 @@
 msgid "The dropdown menu"
 msgstr "Hurtigmenyen"
 
-#: ../gtk/gtkmessagedialog.c:188
+#: ../gtk/gtkmessagedialog.c:170
 msgid "Image/label border"
 msgstr "Kant for bilde/etikett"
 
-#: ../gtk/gtkmessagedialog.c:189
+#: ../gtk/gtkmessagedialog.c:171
 msgid "Width of border around the label and image in the message dialog"
 msgstr "Bredde på kanten rundt etikett og bilde i meldingsdialogen"
 
-#: ../gtk/gtkmessagedialog.c:213
+#: ../gtk/gtkmessagedialog.c:195
 msgid "Message Buttons"
 msgstr "Meldingsknapper"
 
-#: ../gtk/gtkmessagedialog.c:214
+#: ../gtk/gtkmessagedialog.c:196
 msgid "The buttons shown in the message dialog"
 msgstr "Knappene som vises i meldingsdialogen"
 
-#: ../gtk/gtkmessagedialog.c:231
+#: ../gtk/gtkmessagedialog.c:213
 msgid "The primary text of the message dialog"
 msgstr "Primær tekst i meldingsdialogen"
 
-#: ../gtk/gtkmessagedialog.c:246
+#: ../gtk/gtkmessagedialog.c:228
 msgid "Use Markup"
 msgstr "Bruk tagging"
 
-#: ../gtk/gtkmessagedialog.c:247
+#: ../gtk/gtkmessagedialog.c:229
 msgid "The primary text of the title includes Pango markup."
-msgstr ""
+msgstr "Primærteksten i tittelen inneholder Pango-tagger."
 
-#: ../gtk/gtkmessagedialog.c:261
+#: ../gtk/gtkmessagedialog.c:243
 msgid "Secondary Text"
 msgstr "Sekundær tekst"
 
-#: ../gtk/gtkmessagedialog.c:262
+#: ../gtk/gtkmessagedialog.c:244
 msgid "The secondary text of the message dialog"
 msgstr "Sekundær tekst i meldingsdialogen"
 
-#: ../gtk/gtkmessagedialog.c:277
+#: ../gtk/gtkmessagedialog.c:259
 msgid "Use Markup in secondary"
-msgstr ""
+msgstr "Bruk merking i sekundær"
 
-#: ../gtk/gtkmessagedialog.c:278
+#: ../gtk/gtkmessagedialog.c:260
 msgid "The secondary text includes Pango markup."
 msgstr "Sekundær tekst inkluderer Pango-merking."
 
-#: ../gtk/gtkmessagedialog.c:292
+#: ../gtk/gtkmessagedialog.c:274
 msgid "Image"
 msgstr "Bilde"
 
-#: ../gtk/gtkmessagedialog.c:293
+#: ../gtk/gtkmessagedialog.c:275
 msgid "The image"
 msgstr "Bildet"
 
-#: ../gtk/gtkmessagedialog.c:309
+#: ../gtk/gtkmessagedialog.c:291
 msgid "Message area"
 msgstr "Meldingsområde"
 
-#: ../gtk/gtkmessagedialog.c:310
+#: ../gtk/gtkmessagedialog.c:292
 msgid "GtkVBox that holds the dialog's primary and secondary labels"
-msgstr ""
+msgstr "En GtkVBox som inneholder dialogens primær- og sekundæretikett"
 
 #: ../gtk/gtkmisc.c:113
 msgid "Y align"
@@ -4300,73 +4348,73 @@
 "The amount of space to add on the top and bottom of the widget, in pixels"
 msgstr "Mende mellomrom over og under widgetet, i piksler"
 
-#: ../gtk/gtkmountoperation.c:163 ../gtk/gtkstylecontext.c:464
+#: ../gtk/gtkmountoperation.c:160 ../gtk/gtkstylecontext.c:474
 msgid "Parent"
 msgstr "Opphav"
 
-#: ../gtk/gtkmountoperation.c:164
+#: ../gtk/gtkmountoperation.c:161
 msgid "The parent window"
 msgstr "Opphavsvindu"
 
-#: ../gtk/gtkmountoperation.c:171
+#: ../gtk/gtkmountoperation.c:168
 msgid "Is Showing"
 msgstr "Vises"
 
-#: ../gtk/gtkmountoperation.c:172
+#: ../gtk/gtkmountoperation.c:169
 msgid "Are we showing a dialog"
 msgstr "Viser vi en dialog"
 
-#: ../gtk/gtkmountoperation.c:180
+#: ../gtk/gtkmountoperation.c:177
 msgid "The screen where this window will be displayed."
 msgstr "Skjermen hvor dette vinduet vil vises."
 
-#: ../gtk/gtknotebook.c:693
+#: ../gtk/gtknotebook.c:699
 msgid "Page"
 msgstr "Side"
 
-#: ../gtk/gtknotebook.c:694
+#: ../gtk/gtknotebook.c:700
 msgid "The index of the current page"
 msgstr "Indeks for aktiv side"
 
-#: ../gtk/gtknotebook.c:702
+#: ../gtk/gtknotebook.c:708
 msgid "Tab Position"
 msgstr "Faneplassering"
 
-#: ../gtk/gtknotebook.c:703
+#: ../gtk/gtknotebook.c:709
 msgid "Which side of the notebook holds the tabs"
 msgstr "Hvilken side av notisblokken innehar fanene"
 
-#: ../gtk/gtknotebook.c:710
+#: ../gtk/gtknotebook.c:716
 msgid "Show Tabs"
 msgstr "Vis faner"
 
-#: ../gtk/gtknotebook.c:711
+#: ../gtk/gtknotebook.c:717
 msgid "Whether tabs should be shown"
 msgstr "Hvorvidt faner skal vises"
 
-#: ../gtk/gtknotebook.c:717
+#: ../gtk/gtknotebook.c:723
 msgid "Show Border"
 msgstr "Vis kant"
 
-#: ../gtk/gtknotebook.c:718
+#: ../gtk/gtknotebook.c:724
 msgid "Whether the border should be shown"
 msgstr "Hvorvidt kant skal vises"
 
-#: ../gtk/gtknotebook.c:724
+#: ../gtk/gtknotebook.c:730
 msgid "Scrollable"
 msgstr "Rullbar"
 
-#: ../gtk/gtknotebook.c:725
+#: ../gtk/gtknotebook.c:731
 msgid "If TRUE, scroll arrows are added if there are too many tabs to fit"
 msgstr ""
 "Hvis SANN vil rullepiler legges til hvis det er flere faner enn det som "
 "passer"
 
-#: ../gtk/gtknotebook.c:731
+#: ../gtk/gtknotebook.c:737
 msgid "Enable Popup"
 msgstr "Slå på oppsprett"
 
-#: ../gtk/gtknotebook.c:732
+#: ../gtk/gtknotebook.c:738
 msgid ""
 "If TRUE, pressing the right mouse button on the notebook pops up a menu that "
 "you can use to go to a page"
@@ -4374,169 +4422,170 @@
 "Hvis denne er satt til SANN vil det ved å klikke på notisblokken med høyre "
 "musknapp sprette opp en meny som kan brukes til å gå til en side"
 
-#: ../gtk/gtknotebook.c:746
+#: ../gtk/gtknotebook.c:752
 msgid "Group Name"
 msgstr "Gruppenavn"
 
-#: ../gtk/gtknotebook.c:747
+#: ../gtk/gtknotebook.c:753
 msgid "Group name for tab drag and drop"
 msgstr "Gruppenavn for dra-og-slipp av faner"
 
-#: ../gtk/gtknotebook.c:754
+#: ../gtk/gtknotebook.c:760
 msgid "Tab label"
 msgstr "Etikett for fanen"
 
-#: ../gtk/gtknotebook.c:755
+#: ../gtk/gtknotebook.c:761
 msgid "The string displayed on the child's tab label"
 msgstr "Strengen som vises i etterkommerens faneetikett"
 
-#: ../gtk/gtknotebook.c:761
+#: ../gtk/gtknotebook.c:767
 msgid "Menu label"
 msgstr "Etikett for meny"
 
-#: ../gtk/gtknotebook.c:762
+#: ../gtk/gtknotebook.c:768
 msgid "The string displayed in the child's menu entry"
 msgstr "Strengen som vises i etterkommerens menyoppføring"
 
-#: ../gtk/gtknotebook.c:775
+#: ../gtk/gtknotebook.c:781
 msgid "Tab expand"
 msgstr "Faneutvidelse"
 
-#: ../gtk/gtknotebook.c:776
+#: ../gtk/gtknotebook.c:782
 msgid "Whether to expand the child's tab"
-msgstr ""
+msgstr "Om underfanen skal utvides"
 
-#: ../gtk/gtknotebook.c:782
+#: ../gtk/gtknotebook.c:788
 msgid "Tab fill"
 msgstr "Fyll for fane"
 
-#: ../gtk/gtknotebook.c:783
+#: ../gtk/gtknotebook.c:789
 msgid "Whether the child's tab should fill the allocated area"
-msgstr ""
+msgstr "Om underfanen skal utfylle det tildelte området sitt"
 
-#: ../gtk/gtknotebook.c:790
+#: ../gtk/gtknotebook.c:796
 msgid "Tab reorderable"
 msgstr "Faner kan omorganiseres"
 
-#: ../gtk/gtknotebook.c:791
+#: ../gtk/gtknotebook.c:797
 msgid "Whether the tab is reorderable by user action"
-msgstr ""
+msgstr "Om faner kan omorganiseres av brukeren"
 
-#: ../gtk/gtknotebook.c:797
+#: ../gtk/gtknotebook.c:803
 msgid "Tab detachable"
 msgstr "Avtagbar fane"
 
-#: ../gtk/gtknotebook.c:798
+#: ../gtk/gtknotebook.c:804
 msgid "Whether the tab is detachable"
 msgstr "Om fanen er avtagbar"
 
-#: ../gtk/gtknotebook.c:813 ../gtk/gtkscrollbar.c:100
+#: ../gtk/gtknotebook.c:819 ../gtk/gtkscrollbar.c:100
 msgid "Secondary backward stepper"
 msgstr "Sekundært bakoversteg"
 
-#: ../gtk/gtknotebook.c:814
+#: ../gtk/gtknotebook.c:820
 msgid ""
 "Display a second backward arrow button on the opposite end of the tab area"
 msgstr "Vis en sekundær knapp med bakoverpil på motsatt side av fanefeltet"
 
-#: ../gtk/gtknotebook.c:829 ../gtk/gtkscrollbar.c:107
+#: ../gtk/gtknotebook.c:835 ../gtk/gtkscrollbar.c:107
 msgid "Secondary forward stepper"
 msgstr "Sekundært framoversteg"
 
-#: ../gtk/gtknotebook.c:830
+#: ../gtk/gtknotebook.c:836
 msgid ""
 "Display a second forward arrow button on the opposite end of the tab area"
 msgstr "Vis en sekundær knapp med framoverpil på motsatt side av fanefeltet"
 
-#: ../gtk/gtknotebook.c:844 ../gtk/gtkscrollbar.c:86
+#: ../gtk/gtknotebook.c:850 ../gtk/gtkscrollbar.c:86
 msgid "Backward stepper"
 msgstr "Bakoversteg"
 
-#: ../gtk/gtknotebook.c:845 ../gtk/gtkscrollbar.c:87
+#: ../gtk/gtknotebook.c:851 ../gtk/gtkscrollbar.c:87
 msgid "Display the standard backward arrow button"
 msgstr "Vis standard knapp med bakoverpil"
 
-#: ../gtk/gtknotebook.c:859 ../gtk/gtkscrollbar.c:93
+#: ../gtk/gtknotebook.c:865 ../gtk/gtkscrollbar.c:93
 msgid "Forward stepper"
 msgstr "Framoversteg"
 
-#: ../gtk/gtknotebook.c:860 ../gtk/gtkscrollbar.c:94
+#: ../gtk/gtknotebook.c:866 ../gtk/gtkscrollbar.c:94
 msgid "Display the standard forward arrow button"
 msgstr "Vis standard knapp med framoversteg"
 
-#: ../gtk/gtknotebook.c:874
+#: ../gtk/gtknotebook.c:880
 msgid "Tab overlap"
 msgstr "Faneoverlapping"
 
-#: ../gtk/gtknotebook.c:875
+#: ../gtk/gtknotebook.c:881
 msgid "Size of tab overlap area"
 msgstr "Størrelse på område for overlapping mellom faner"
 
-#: ../gtk/gtknotebook.c:890
+#: ../gtk/gtknotebook.c:896
 msgid "Tab curvature"
-msgstr ""
+msgstr "Fanekrumming"
 
-#: ../gtk/gtknotebook.c:891
+#: ../gtk/gtknotebook.c:897
 msgid "Size of tab curvature"
-msgstr ""
+msgstr "Størrelse på fanekrumminga"
 
-#: ../gtk/gtknotebook.c:907
+#: ../gtk/gtknotebook.c:913
 msgid "Arrow spacing"
 msgstr "Mellomrom mellom piler"
 
-#: ../gtk/gtknotebook.c:908
+#: ../gtk/gtknotebook.c:914
 msgid "Scroll arrow spacing"
-msgstr ""
+msgstr "Luft rundt rullepil"
 
-#: ../gtk/gtknotebook.c:924
+#: ../gtk/gtknotebook.c:930
 msgid "Initial gap"
 msgstr ""
 
-#: ../gtk/gtknotebook.c:925
+#: ../gtk/gtknotebook.c:931
 msgid "Initial gap before the first tab"
 msgstr ""
 
-#: ../gtk/gtknumerableicon.c:653
+#: ../gtk/gtknumerableicon.c:641
 msgid "Icon's count"
-msgstr ""
+msgstr "Ikonnummer"
 
-#: ../gtk/gtknumerableicon.c:654
+#: ../gtk/gtknumerableicon.c:642
 msgid "The count of the emblem currently displayed"
-msgstr ""
+msgstr "Nummeret på emblemet som vises"
 
-#: ../gtk/gtknumerableicon.c:660
+#: ../gtk/gtknumerableicon.c:648
 msgid "Icon's label"
 msgstr "Etikett for ikon"
 
-#: ../gtk/gtknumerableicon.c:661
+#: ../gtk/gtknumerableicon.c:649
 msgid "The label to be displayed over the icon"
 msgstr "Etikett som skal vises over ikonet"
 
-#: ../gtk/gtknumerableicon.c:667
+#: ../gtk/gtknumerableicon.c:655
 msgid "Icon's style context"
-msgstr ""
+msgstr "Ikonkets stilkontekst"
 
-#: ../gtk/gtknumerableicon.c:668
+#: ../gtk/gtknumerableicon.c:656
 msgid "The style context to theme the icon appearance"
 msgstr ""
+"Stilkontekst som skal brukes for å la temaet bestemmer hvordan ikonet ser ut"
 
-#: ../gtk/gtknumerableicon.c:674
+#: ../gtk/gtknumerableicon.c:662
 msgid "Background icon"
 msgstr "Bakgrunnsikon"
 
-#: ../gtk/gtknumerableicon.c:675
+#: ../gtk/gtknumerableicon.c:663
 msgid "The icon for the number emblem background"
 msgstr ""
 
-#: ../gtk/gtknumerableicon.c:681
+#: ../gtk/gtknumerableicon.c:669
 msgid "Background icon name"
 msgstr "Navn på bakgrunnsikon"
 
-#: ../gtk/gtknumerableicon.c:682
+#: ../gtk/gtknumerableicon.c:670
 msgid "The icon name for the number emblem background"
 msgstr ""
 
-#: ../gtk/gtkorientable.c:61 ../gtk/gtkstatusicon.c:330
+#: ../gtk/gtkorientable.c:61 ../gtk/gtkstatusicon.c:334
 #: ../gtk/gtktrayicon-x11.c:126
 msgid "Orientation"
 msgstr "Orientering"
@@ -4545,62 +4594,62 @@
 msgid "The orientation of the orientable"
 msgstr "Orientering for orienterbar komponent"
 
-#: ../gtk/gtkpaned.c:349
+#: ../gtk/gtkpaned.c:351
 msgid ""
 "Position of paned separator in pixels (0 means all the way to the left/top)"
 msgstr ""
 "Posisjon for «paned»-separator i piksler (0 betyr øverst til venstre)"
 
-#: ../gtk/gtkpaned.c:358
+#: ../gtk/gtkpaned.c:360
 msgid "Position Set"
 msgstr "Posisjon satt"
 
-#: ../gtk/gtkpaned.c:359
+#: ../gtk/gtkpaned.c:361
 msgid "TRUE if the Position property should be used"
 msgstr "SANN hvis egenskapen Position skal brukes"
 
-#: ../gtk/gtkpaned.c:365
+#: ../gtk/gtkpaned.c:367
 msgid "Handle Size"
 msgstr "Størrelse på håndtak"
 
-#: ../gtk/gtkpaned.c:366
+#: ../gtk/gtkpaned.c:368
 msgid "Width of handle"
 msgstr "Størrelse på håndtak"
 
-#: ../gtk/gtkpaned.c:382
+#: ../gtk/gtkpaned.c:384
 msgid "Minimal Position"
 msgstr "Minste posisjon"
 
-#: ../gtk/gtkpaned.c:383
+#: ../gtk/gtkpaned.c:385
 msgid "Smallest possible value for the \"position\" property"
 msgstr "Minste mulige verdi for egenskapen «position»"
 
-#: ../gtk/gtkpaned.c:400
+#: ../gtk/gtkpaned.c:402
 msgid "Maximal Position"
 msgstr "Største posisjon"
 
-#: ../gtk/gtkpaned.c:401
+#: ../gtk/gtkpaned.c:403
 msgid "Largest possible value for the \"position\" property"
 msgstr "Største mulige verdi for egenskapen «position»"
 
-#: ../gtk/gtkpaned.c:418
+#: ../gtk/gtkpaned.c:420
 msgid "Resize"
 msgstr "Endre størrelse"
 
-#: ../gtk/gtkpaned.c:419
+#: ../gtk/gtkpaned.c:421
 msgid "If TRUE, the child expands and shrinks along with the paned widget"
 msgstr ""
 "Hvis SANN vil etterkommer utvides og krypmes sammen med paned-komponenten"
 
-#: ../gtk/gtkpaned.c:434
+#: ../gtk/gtkpaned.c:436
 msgid "Shrink"
 msgstr "Krymp"
 
-#: ../gtk/gtkpaned.c:435
+#: ../gtk/gtkpaned.c:437
 msgid "If TRUE, the child can be made smaller than its requisition"
 msgstr "Hvis SANN vil etter kommer gjøres mindre enn forespurt størrelse"
 
-#: ../gtk/gtkplug.c:202 ../gtk/gtkstatusicon.c:314
+#: ../gtk/gtkplug.c:202 ../gtk/gtkstatusicon.c:318
 msgid "Embedded"
 msgstr "Innebygget"
 
@@ -4616,99 +4665,99 @@
 msgid "The window of the socket the plug is embedded in"
 msgstr ""
 
-#: ../gtk/gtkpressandhold.c:148
+#: ../gtk/gtkpressandhold.c:147
 msgid "Hold Time"
-msgstr ""
+msgstr "Pausetid"
 
-#: ../gtk/gtkpressandhold.c:148
+#: ../gtk/gtkpressandhold.c:147
 msgid "Hold Time (in milliseconds)"
-msgstr ""
+msgstr "Pausetid (i millisekunder)"
 
-#: ../gtk/gtkpressandhold.c:152
+#: ../gtk/gtkpressandhold.c:151
 msgid "Drag Threshold"
 msgstr "Terskel for dra-operasjon"
 
-#: ../gtk/gtkpressandhold.c:152
+#: ../gtk/gtkpressandhold.c:151
 msgid "Drag Threshold (in pixels)"
 msgstr "Terskel for dra-operasjon (i piksler)"
 
-#: ../gtk/gtkprinter.c:124
+#: ../gtk/gtkprinter.c:122
 msgid "Name of the printer"
 msgstr "Navn på skriveren"
 
-#: ../gtk/gtkprinter.c:130
+#: ../gtk/gtkprinter.c:128
 msgid "Backend"
 msgstr "Motor"
 
-#: ../gtk/gtkprinter.c:131
+#: ../gtk/gtkprinter.c:129
 msgid "Backend for the printer"
 msgstr "Motor for skriveren"
 
-#: ../gtk/gtkprinter.c:137
+#: ../gtk/gtkprinter.c:135
 msgid "Is Virtual"
 msgstr "Er virtuell"
 
-#: ../gtk/gtkprinter.c:138
+#: ../gtk/gtkprinter.c:136
 msgid "FALSE if this represents a real hardware printer"
 msgstr "FALSE hvis dette representerer en faktisk maskinvareskriver"
 
-#: ../gtk/gtkprinter.c:144
+#: ../gtk/gtkprinter.c:142
 msgid "Accepts PDF"
 msgstr "Godtar PDF"
 
-#: ../gtk/gtkprinter.c:145
+#: ../gtk/gtkprinter.c:143
 msgid "TRUE if this printer can accept PDF"
 msgstr "TRUE hvis skriveren kan motta PDF"
 
-#: ../gtk/gtkprinter.c:151
+#: ../gtk/gtkprinter.c:149
 msgid "Accepts PostScript"
 msgstr "Godtar PostScript"
 
-#: ../gtk/gtkprinter.c:152
+#: ../gtk/gtkprinter.c:150
 msgid "TRUE if this printer can accept PostScript"
 msgstr "TRUE hvis denne skriveren kan motta PostScript"
 
-#: ../gtk/gtkprinter.c:158
+#: ../gtk/gtkprinter.c:156
 msgid "State Message"
 msgstr "Tilstandsmelding"
 
-#: ../gtk/gtkprinter.c:159
+#: ../gtk/gtkprinter.c:157
 msgid "String giving the current state of the printer"
 msgstr "Streng som viser skriverens nåværende tilstand"
 
-#: ../gtk/gtkprinter.c:165
+#: ../gtk/gtkprinter.c:163
 msgid "Location"
 msgstr "Adresse"
 
-#: ../gtk/gtkprinter.c:166
+#: ../gtk/gtkprinter.c:164
 msgid "The location of the printer"
 msgstr "Adresse til skriveren"
 
-#: ../gtk/gtkprinter.c:173
+#: ../gtk/gtkprinter.c:171
 msgid "The icon name to use for the printer"
 msgstr "Ikonnavn som skal brukes for skriveren"
 
-#: ../gtk/gtkprinter.c:179
+#: ../gtk/gtkprinter.c:177
 msgid "Job Count"
 msgstr "Jobantall"
 
-#: ../gtk/gtkprinter.c:180
+#: ../gtk/gtkprinter.c:178
 msgid "Number of jobs queued in the printer"
 msgstr "Antall jobber som er kølagt for denne skriveren"
 
-#: ../gtk/gtkprinter.c:198
+#: ../gtk/gtkprinter.c:196
 msgid "Paused Printer"
 msgstr "Stoppet skriver"
 
-#: ../gtk/gtkprinter.c:199
+#: ../gtk/gtkprinter.c:197
 msgid "TRUE if this printer is paused"
 msgstr "TRUE hvis skriveren er på pause"
 
-#: ../gtk/gtkprinter.c:212
+#: ../gtk/gtkprinter.c:210
 msgid "Accepting Jobs"
 msgstr "Godtar jobber"
 
-#: ../gtk/gtkprinter.c:213
+#: ../gtk/gtkprinter.c:211
 msgid "TRUE if this printer is accepting new jobs"
 msgstr "TRUE hvis skriveren kan motta nye jobber"
 
@@ -4720,174 +4769,187 @@
 msgid "Value of the option"
 msgstr "Verdi for alternativet"
 
-#: ../gtk/gtkprinteroptionwidget.c:132
+#: ../gtk/gtkprinteroptionwidget.c:126
 msgid "Source option"
 msgstr "Alternativ for kilde"
 
-#: ../gtk/gtkprinteroptionwidget.c:133
+#: ../gtk/gtkprinteroptionwidget.c:127
 msgid "The PrinterOption backing this widget"
-msgstr ""
+msgstr "«PrinterOption»-valget som står bak dette elementet"
 
-#: ../gtk/gtkprintjob.c:140
+#: ../gtk/gtkprintjob.c:135
 msgid "Title of the print job"
 msgstr "Tittelen på utskriftsjobben"
 
-#: ../gtk/gtkprintjob.c:148
+#: ../gtk/gtkprintjob.c:143
 msgid "Printer"
 msgstr "Skriver"
 
-#: ../gtk/gtkprintjob.c:149
+#: ../gtk/gtkprintjob.c:144
 msgid "Printer to print the job to"
 msgstr "Skriver jobben skal sendes til"
 
-#: ../gtk/gtkprintjob.c:157
+#: ../gtk/gtkprintjob.c:152
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: ../gtk/gtkprintjob.c:158
+#: ../gtk/gtkprintjob.c:153
 msgid "Printer settings"
 msgstr "Innstillinger for skriver"
 
-#: ../gtk/gtkprintjob.c:166 ../gtk/gtkprintjob.c:167
-#: ../gtk/gtkprintunixdialog.c:366
+#: ../gtk/gtkprintjob.c:161 ../gtk/gtkprintjob.c:162
+#: ../gtk/gtkprintunixdialog.c:413
 msgid "Page Setup"
 msgstr "Sideoppsett"
 
-#: ../gtk/gtkprintjob.c:175 ../gtk/gtkprintoperation.c:1215
+#: ../gtk/gtkprintjob.c:170 ../gtk/gtkprintoperation.c:1212
 msgid "Track Print Status"
 msgstr "Spor skriverstatus"
 
-#: ../gtk/gtkprintjob.c:176
+#: ../gtk/gtkprintjob.c:171
 msgid ""
 "TRUE if the print job will continue to emit status-changed signals after the "
 "print data has been sent to the printer or print server."
 msgstr ""
+"Verdien er sann («TRUE») hvis utskriftsjobben fortsetter med å sende "
+"statusendringssignal etter at utskriftsdata har blitt sendt til skriveren "
+"eller utskriftstjeneren."
 
-#: ../gtk/gtkprintoperation.c:1087
+#: ../gtk/gtkprintoperation.c:1084
 msgid "Default Page Setup"
 msgstr "Forvalgt sideoppsett"
 
-#: ../gtk/gtkprintoperation.c:1088
+#: ../gtk/gtkprintoperation.c:1085
 msgid "The GtkPageSetup used by default"
 msgstr "GtkPageSetup brukt som forvalg"
 
-#: ../gtk/gtkprintoperation.c:1106 ../gtk/gtkprintunixdialog.c:384
+#: ../gtk/gtkprintoperation.c:1103 ../gtk/gtkprintunixdialog.c:431
 msgid "Print Settings"
 msgstr "Skriverinnstillinger"
 
-#: ../gtk/gtkprintoperation.c:1107 ../gtk/gtkprintunixdialog.c:385
+#: ../gtk/gtkprintoperation.c:1104 ../gtk/gtkprintunixdialog.c:432
 msgid "The GtkPrintSettings used for initializing the dialog"
-msgstr ""
+msgstr "«GtkPrintSettings»-valget som brukes til å klargjøre dialogboksen"
 
-#: ../gtk/gtkprintoperation.c:1125
+#: ../gtk/gtkprintoperation.c:1122
 msgid "Job Name"
 msgstr "Navn på jobb"
 
-#: ../gtk/gtkprintoperation.c:1126
+#: ../gtk/gtkprintoperation.c:1123
 msgid "A string used for identifying the print job."
 msgstr "En streng som brukes for å identifisere utskriftsjobben."
 
-#: ../gtk/gtkprintoperation.c:1150
+#: ../gtk/gtkprintoperation.c:1147
 msgid "Number of Pages"
 msgstr "Antall sider"
 
-#: ../gtk/gtkprintoperation.c:1151
+#: ../gtk/gtkprintoperation.c:1148
 msgid "The number of pages in the document."
 msgstr "Antall sider i dokumentet."
 
-#: ../gtk/gtkprintoperation.c:1172 ../gtk/gtkprintunixdialog.c:374
+#: ../gtk/gtkprintoperation.c:1169 ../gtk/gtkprintunixdialog.c:421
 msgid "Current Page"
 msgstr "Denne siden"
 
-#: ../gtk/gtkprintoperation.c:1173 ../gtk/gtkprintunixdialog.c:375
+#: ../gtk/gtkprintoperation.c:1170 ../gtk/gtkprintunixdialog.c:422
 msgid "The current page in the document"
 msgstr "Aktiv side i dokumentet"
 
-#: ../gtk/gtkprintoperation.c:1194
+#: ../gtk/gtkprintoperation.c:1191
 msgid "Use full page"
 msgstr "Bruk full side"
 
-#: ../gtk/gtkprintoperation.c:1195
+#: ../gtk/gtkprintoperation.c:1192
 msgid ""
 "TRUE if the origin of the context should be at the corner of the page and "
 "not the corner of the imageable area"
 msgstr ""
+"Verdien er sann («TRUE») hvis kontekstens opphav skal være i hjørnet av "
+"arket, og ikke i hjørnet av det brukbare området"
 
-#: ../gtk/gtkprintoperation.c:1216
+#: ../gtk/gtkprintoperation.c:1213
 msgid ""
 "TRUE if the print operation will continue to report on the print job status "
 "after the print data has been sent to the printer or print server."
 msgstr ""
+"Verdien er sann («TRUE») hvis utskriftshandlingen skal fortsette med å "
+"rapportere status på utskriftsjobben etter at dataene har blitt sendt til "
+"skriveren eller utskriftstjeneren."
 
-#: ../gtk/gtkprintoperation.c:1233
+#: ../gtk/gtkprintoperation.c:1230
 msgid "Unit"
 msgstr "Enhet"
 
-#: ../gtk/gtkprintoperation.c:1234
+#: ../gtk/gtkprintoperation.c:1231
 msgid "The unit in which distances can be measured in the context"
-msgstr ""
+msgstr "Enheten som konteksten skal måle avstander i"
 
-#: ../gtk/gtkprintoperation.c:1251
+#: ../gtk/gtkprintoperation.c:1248
 msgid "Show Dialog"
 msgstr "Vis dialog"
 
-#: ../gtk/gtkprintoperation.c:1252
+#: ../gtk/gtkprintoperation.c:1249
 msgid "TRUE if a progress dialog is shown while printing."
 msgstr ""
+"Verdien er sann («TRUE») hvis en dialogboks for framdrift skal vises under "
+"utskrift."
 
-#: ../gtk/gtkprintoperation.c:1275
+#: ../gtk/gtkprintoperation.c:1272
 msgid "Allow Async"
 msgstr "Tillat asynkron"
 
-#: ../gtk/gtkprintoperation.c:1276
+#: ../gtk/gtkprintoperation.c:1273
 msgid "TRUE if print process may run asynchronous."
 msgstr ""
+"Verdien er sann («TRUE») hvis utskriftsprosessen kan kjøre asynkront."
 
-#: ../gtk/gtkprintoperation.c:1298 ../gtk/gtkprintoperation.c:1299
+#: ../gtk/gtkprintoperation.c:1295 ../gtk/gtkprintoperation.c:1296
 msgid "Export filename"
 msgstr "Eksporter filnavn"
 
-#: ../gtk/gtkprintoperation.c:1313
+#: ../gtk/gtkprintoperation.c:1310
 msgid "Status"
 msgstr "Status"
 
-#: ../gtk/gtkprintoperation.c:1314
+#: ../gtk/gtkprintoperation.c:1311
 msgid "The status of the print operation"
 msgstr "Status for utskriftsoperasjonen"
 
-#: ../gtk/gtkprintoperation.c:1334
+#: ../gtk/gtkprintoperation.c:1331
 msgid "Status String"
 msgstr "Statusstreng"
 
-#: ../gtk/gtkprintoperation.c:1335
+#: ../gtk/gtkprintoperation.c:1332
 msgid "A human-readable description of the status"
 msgstr "Beskrivelse av status"
 
-#: ../gtk/gtkprintoperation.c:1353
+#: ../gtk/gtkprintoperation.c:1350
 msgid "Custom tab label"
 msgstr "Egendefinert etikett for fane"
 
-#: ../gtk/gtkprintoperation.c:1354
+#: ../gtk/gtkprintoperation.c:1351
 msgid "Label for the tab containing custom widgets."
 msgstr ""
 
-#: ../gtk/gtkprintoperation.c:1369 ../gtk/gtkprintunixdialog.c:409
+#: ../gtk/gtkprintoperation.c:1366 ../gtk/gtkprintunixdialog.c:456
 msgid "Support Selection"
 msgstr ""
 
-#: ../gtk/gtkprintoperation.c:1370
+#: ../gtk/gtkprintoperation.c:1367
 msgid "TRUE if the print operation will support print of selection."
 msgstr ""
+"Verdien er sann («TRUE») hvis utskriftshandlingen skal støtte utskrift av "
+"utvalgt område eller tekst."
 
-#: ../gtk/gtkprintoperation.c:1386 ../gtk/gtkprintunixdialog.c:417
+#: ../gtk/gtkprintoperation.c:1383 ../gtk/gtkprintunixdialog.c:464
 msgid "Has Selection"
 msgstr "Har utvalg"
 
-#: ../gtk/gtkprintoperation.c:1387
+#: ../gtk/gtkprintoperation.c:1384
 msgid "TRUE if a selection exists."
 msgstr "TRUE hvis et utvalg eksisterer."
 
-#: ../gtk/gtkprintoperation.c:1402 ../gtk/gtkprintunixdialog.c:425
+#: ../gtk/gtkprintoperation.c:1399 ../gtk/gtkprintunixdialog.c:472
 msgid "Embed Page Setup"
 msgstr ""
 
@@ -4895,134 +4957,139 @@
 msgid "TRUE if page setup combos are embedded in GtkPrintDialog"
 msgstr ""
 
-#: ../gtk/gtkprintoperation.c:1424
+#: ../gtk/gtkprintoperation.c:1421
 msgid "Number of Pages To Print"
 msgstr "Antall sider som skal skrives ut"
 
-#: ../gtk/gtkprintoperation.c:1425
+#: ../gtk/gtkprintoperation.c:1422
 msgid "The number of pages that will be printed."
 msgstr "Antall sider som vil bli skrevet ut."
 
-#: ../gtk/gtkprintunixdialog.c:367
+#: ../gtk/gtkprintunixdialog.c:414
 msgid "The GtkPageSetup to use"
 msgstr "GtkPageSetup som skal brukes"
 
-#: ../gtk/gtkprintunixdialog.c:392
+#: ../gtk/gtkprintunixdialog.c:439
 msgid "Selected Printer"
 msgstr "Valgt skriver"
 
-#: ../gtk/gtkprintunixdialog.c:393
+#: ../gtk/gtkprintunixdialog.c:440
 msgid "The GtkPrinter which is selected"
 msgstr "GtkPrinter som er valgt"
 
-#: ../gtk/gtkprintunixdialog.c:400
+#: ../gtk/gtkprintunixdialog.c:447
 msgid "Manual Capabilities"
 msgstr ""
 
-#: ../gtk/gtkprintunixdialog.c:401
+#: ../gtk/gtkprintunixdialog.c:448
 msgid "Capabilities the application can handle"
 msgstr ""
 
-#: ../gtk/gtkprintunixdialog.c:410
+#: ../gtk/gtkprintunixdialog.c:457
 msgid "Whether the dialog supports selection"
-msgstr ""
+msgstr "Om dialogboksen støtter utvalg"
 
-#: ../gtk/gtkprintunixdialog.c:418
+#: ../gtk/gtkprintunixdialog.c:465
 msgid "Whether the application has a selection"
-msgstr ""
+msgstr "Om programmet har et utvalg"
 
-#: ../gtk/gtkprintoperation.c:1403 ../gtk/gtkprintunixdialog.c:426
+#: ../gtk/gtkprintoperation.c:1400 ../gtk/gtkprintunixdialog.c:473
 msgid "TRUE if page setup combos are embedded in GtkPrintUnixDialog"
 msgstr ""
+"Verdien er sann («TRUE») hvis kombinasjoner av sideoppsett er innebygd i "
+"«GtkPrintUnixDialog»"
 
-#: ../gtk/gtkprogressbar.c:157
+#: ../gtk/gtkprogressbar.c:163
 msgid "Fraction"
 msgstr "Andel"
 
-#: ../gtk/gtkprogressbar.c:158
+#: ../gtk/gtkprogressbar.c:164
 msgid "The fraction of total work that has been completed"
 msgstr "Total andel av arbeid som er fullført"
 
-#: ../gtk/gtkprogressbar.c:165
+#: ../gtk/gtkprogressbar.c:171
 msgid "Pulse Step"
 msgstr "Pulssteg"
 
-#: ../gtk/gtkprogressbar.c:166
+#: ../gtk/gtkprogressbar.c:172
 msgid "The fraction of total progress to move the bouncing block when pulsed"
 msgstr ""
-"Andel total fremgang for bevegelse av den sprettende blokken for hver puls"
+"Hvor stor andel av total framdrift den sprettende blokken skal flyttes per "
+"puls"
 
-#: ../gtk/gtkprogressbar.c:174
+#: ../gtk/gtkprogressbar.c:180
 msgid "Text to be displayed in the progress bar"
-msgstr "Tekst som skal vises i fremgangsmåleren"
+msgstr "Tekst som skal vises i framdriftsviseren"
 
-#: ../gtk/gtkprogressbar.c:195
+#: ../gtk/gtkprogressbar.c:201
 msgid "Show text"
 msgstr "Vis tekst"
 
-#: ../gtk/gtkprogressbar.c:196
+#: ../gtk/gtkprogressbar.c:202
 msgid "Whether the progress is shown as text."
-msgstr "Om fremgang vises som tekst."
+msgstr "Om framdrift vises som tekst."
 
-#: ../gtk/gtkprogressbar.c:218
+#: ../gtk/gtkprogressbar.c:224
 msgid ""
 "The preferred place to ellipsize the string, if the progress bar does not "
 "have enough room to display the entire string, if at all."
 msgstr ""
+"Det foretrukne stedet å bruke elipsetegn i strengen hvis framdriftsviseren "
+"ikke har nok plass til å vise hele strengen."
 
-#: ../gtk/gtkprogressbar.c:225
+#: ../gtk/gtkprogressbar.c:231
 msgid "X spacing"
 msgstr "X-mellomrom"
 
-#: ../gtk/gtkprogressbar.c:226
+#: ../gtk/gtkprogressbar.c:232
 msgid "Extra spacing applied to the width of a progress bar."
-msgstr ""
+msgstr "Ekstra luft lagt til i bredden av framdriftsviseren."
 
-#: ../gtk/gtkprogressbar.c:231
+#: ../gtk/gtkprogressbar.c:237
 msgid "Y spacing"
 msgstr "Y-mellomrom"
 
-#: ../gtk/gtkprogressbar.c:232
+#: ../gtk/gtkprogressbar.c:238
 msgid "Extra spacing applied to the height of a progress bar."
-msgstr ""
+msgstr "Ekstra avstand som skal legges til i høyden av framdriftsviseren."
 
-#: ../gtk/gtkprogressbar.c:245
+#: ../gtk/gtkprogressbar.c:251
 msgid "Minimum horizontal bar width"
-msgstr ""
+msgstr "Minste bredde på horisontal viser"
 
-#: ../gtk/gtkprogressbar.c:246
+#: ../gtk/gtkprogressbar.c:252
 msgid "The minimum horizontal width of the progress bar"
-msgstr ""
+msgstr "Minste horisontale bredde for framdriftviseren"
 
-#: ../gtk/gtkprogressbar.c:258
+#: ../gtk/gtkprogressbar.c:264
 msgid "Minimum horizontal bar height"
-msgstr ""
+msgstr "Minste høyde på horisontal viser"
 
-#: ../gtk/gtkprogressbar.c:259
+#: ../gtk/gtkprogressbar.c:265
 msgid "Minimum horizontal height of the progress bar"
-msgstr ""
+msgstr "Minste horisontale høyde på framdriftsviseren"
 
-#: ../gtk/gtkprogressbar.c:271
+#: ../gtk/gtkprogressbar.c:277
 msgid "Minimum vertical bar width"
-msgstr ""
+msgstr "Minste bredde på vertikal viser"
 
-#: ../gtk/gtkprogressbar.c:272
+#: ../gtk/gtkprogressbar.c:278
 msgid "The minimum vertical width of the progress bar"
-msgstr ""
+msgstr "Minste vertikale høyde på framdriftsviseren"
 
-#: ../gtk/gtkprogressbar.c:284
+#: ../gtk/gtkprogressbar.c:290
 msgid "Minimum vertical bar height"
-msgstr ""
+msgstr "Minste høyde på vertikal viser"
 
-#: ../gtk/gtkprogressbar.c:285
+#: ../gtk/gtkprogressbar.c:291
 msgid "The minimum vertical height of the progress bar"
-msgstr ""
+msgstr "Minste vertikale høyde på framdriftsviseren"
 
-#: ../gtk/gtkradioaction.c:116
+#: ../gtk/deprecated/gtkradioaction.c:120
 msgid "The value"
 msgstr "Verdien"
 
-#: ../gtk/gtkradioaction.c:117
+#: ../gtk/deprecated/gtkradioaction.c:121
 msgid ""
 "The value returned by gtk_radio_action_get_current_value() when this action "
 "is the current action of its group."
@@ -5030,20 +5097,20 @@
 "Verdien som returneres av gtk_radio_action_get_current_value() når denne "
 "handlingen er aktiv handling i sin gruppe."
 
-#: ../gtk/gtkradioaction.c:133 ../gtk/gtkradiobutton.c:163
-#: ../gtk/gtkradiomenuitem.c:426 ../gtk/gtkradiotoolbutton.c:83
+#: ../gtk/deprecated/gtkradioaction.c:139 ../gtk/gtkradiobutton.c:163
+#: ../gtk/gtkradiomenuitem.c:410 ../gtk/gtkradiotoolbutton.c:80
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../gtk/gtkradioaction.c:134
+#: ../gtk/deprecated/gtkradioaction.c:140
 msgid "The radio action whose group this action belongs to."
 msgstr "Radiohandling hvis gruppe denne handlingen tilhører."
 
-#: ../gtk/gtkradioaction.c:149
+#: ../gtk/deprecated/gtkradioaction.c:157
 msgid "The current value"
 msgstr "Nåværende verdi"
 
-#: ../gtk/gtkradioaction.c:150
+#: ../gtk/deprecated/gtkradioaction.c:158
 msgid ""
 "The value property of the currently active member of the group to which this "
 "action belongs."
@@ -5053,149 +5120,149 @@
 msgid "The radio button whose group this widget belongs to."
 msgstr "Radioknappen med samme gruppe som widgetet tilhører."
 
-#: ../gtk/gtkradiomenuitem.c:427
+#: ../gtk/gtkradiomenuitem.c:411
 msgid "The radio menu item whose group this widget belongs to."
 msgstr ""
 
-#: ../gtk/gtkradiotoolbutton.c:84
+#: ../gtk/gtkradiotoolbutton.c:81
 msgid "The radio tool button whose group this button belongs to."
 msgstr ""
 
-#: ../gtk/gtkrange.c:425
+#: ../gtk/gtkrange.c:436
 msgid ""
 "The GtkAdjustment that contains the current value of this range object"
 msgstr ""
 "GtkAdjustment som inneholder nåværende verdi for dette områdeobjektet"
 
-#: ../gtk/gtkrange.c:433
+#: ../gtk/gtkrange.c:444
 msgid "Invert direction slider moves to increase range value"
 msgstr "Snu retningen glideren beveger seg for å øke verdien i området"
 
-#: ../gtk/gtkrange.c:440
+#: ../gtk/gtkrange.c:451
 msgid "Lower stepper sensitivity"
 msgstr ""
 
-#: ../gtk/gtkrange.c:441
+#: ../gtk/gtkrange.c:452
 msgid ""
 "The sensitivity policy for the stepper that points to the adjustment's lower "
 "side"
 msgstr ""
 
-#: ../gtk/gtkrange.c:449
+#: ../gtk/gtkrange.c:460
 msgid "Upper stepper sensitivity"
 msgstr ""
 
-#: ../gtk/gtkrange.c:450
+#: ../gtk/gtkrange.c:461
 msgid ""
 "The sensitivity policy for the stepper that points to the adjustment's upper "
 "side"
 msgstr ""
 
-#: ../gtk/gtkrange.c:467
+#: ../gtk/gtkrange.c:478
 msgid "Show Fill Level"
 msgstr "Vis fyllnivå"
 
-#: ../gtk/gtkrange.c:468
+#: ../gtk/gtkrange.c:479
 msgid "Whether to display a fill level indicator graphics on trough."
 msgstr ""
 
-#: ../gtk/gtkrange.c:484
+#: ../gtk/gtkrange.c:495
 msgid "Restrict to Fill Level"
 msgstr ""
 
-#: ../gtk/gtkrange.c:485
+#: ../gtk/gtkrange.c:496
 msgid "Whether to restrict the upper boundary to the fill level."
 msgstr ""
 
-#: ../gtk/gtkrange.c:500
+#: ../gtk/gtkrange.c:511
 msgid "Fill Level"
 msgstr "Fyllnivå"
 
-#: ../gtk/gtkrange.c:501
+#: ../gtk/gtkrange.c:512
 msgid "The fill level."
 msgstr "Fyllnivået."
 
-#: ../gtk/gtkrange.c:518
+#: ../gtk/gtkrange.c:529
 msgid "Round Digits"
 msgstr "Avrundingssiffer"
 
-#: ../gtk/gtkrange.c:519
+#: ../gtk/gtkrange.c:530
 msgid "The number of digits to round the value to."
 msgstr ""
 
-#: ../gtk/gtkrange.c:527 ../gtk/gtkswitch.c:848
+#: ../gtk/gtkrange.c:538 ../gtk/gtkswitch.c:868
 msgid "Slider Width"
 msgstr "Bredde på rullelisten"
 
-#: ../gtk/gtkrange.c:528
+#: ../gtk/gtkrange.c:539
 msgid "Width of scrollbar or scale thumb"
 msgstr "Bredde for rullefeltet eller skalering"
 
-#: ../gtk/gtkrange.c:535
+#: ../gtk/gtkrange.c:546
 msgid "Trough Border"
 msgstr "Gjennom kant"
 
-#: ../gtk/gtkrange.c:536
+#: ../gtk/gtkrange.c:547
 msgid "Spacing between thumb/steppers and outer trough bevel"
 msgstr "Mellomrom mellom «thumb/steppers» og ytre kant"
 
-#: ../gtk/gtkrange.c:543
+#: ../gtk/gtkrange.c:554
 msgid "Stepper Size"
 msgstr "Størrelse på steg"
 
-#: ../gtk/gtkrange.c:544
+#: ../gtk/gtkrange.c:555
 msgid "Length of step buttons at ends"
 msgstr "Lengde på stegknappene ved kantene"
 
-#: ../gtk/gtkrange.c:557
+#: ../gtk/gtkrange.c:568
 msgid "Stepper Spacing"
 msgstr "Stegmellomrom"
 
-#: ../gtk/gtkrange.c:558
+#: ../gtk/gtkrange.c:569
 msgid "Spacing between step buttons and thumb"
 msgstr "Mellomrom mellom stegknapper og «thumb»"
 
-#: ../gtk/gtkrange.c:565
+#: ../gtk/gtkrange.c:576
 msgid "Arrow X Displacement"
 msgstr "X-forskyvning for pil"
 
-#: ../gtk/gtkrange.c:566
+#: ../gtk/gtkrange.c:577
 msgid ""
 "How far in the x direction to move the arrow when the button is depressed"
 msgstr "Hvor langt pilen flyttes i x-retning når knappen er nedtrykt"
 
-#: ../gtk/gtkrange.c:573
+#: ../gtk/gtkrange.c:584
 msgid "Arrow Y Displacement"
 msgstr "Y-forskyvning for pil"
 
-#: ../gtk/gtkrange.c:574
+#: ../gtk/gtkrange.c:585
 msgid ""
 "How far in the y direction to move the arrow when the button is depressed"
 msgstr "Hvor langt pilen flyttes i y-retning når knappen er nedtrykt"
 
-#: ../gtk/gtkrange.c:590
+#: ../gtk/gtkrange.c:601
 msgid "Trough Under Steppers"
 msgstr ""
 
-#: ../gtk/gtkrange.c:591
+#: ../gtk/gtkrange.c:602
 msgid ""
 "Whether to draw trough for full length of range or exclude the steppers and "
 "spacing"
 msgstr ""
 
-#: ../gtk/gtkrange.c:604
+#: ../gtk/gtkrange.c:615
 msgid "Arrow scaling"
 msgstr "Skalering av piler"
 
-#: ../gtk/gtkrange.c:605
+#: ../gtk/gtkrange.c:616
 msgid "Arrow scaling with regard to scroll button size"
 msgstr ""
 
-#: ../gtk/gtkrecentaction.c:633 ../gtk/gtkrecentchoosermenu.c:244
+#: ../gtk/deprecated/gtkrecentaction.c:645 ../gtk/gtkrecentchoosermenu.c:244
 msgid "Show Numbers"
 msgstr "Vis tall"
 
-#: ../gtk/gtkrecentaction.c:634 ../gtk/gtkrecentchoosermenu.c:245
+#: ../gtk/deprecated/gtkrecentaction.c:646 ../gtk/gtkrecentchoosermenu.c:245
 msgid "Whether the items should be displayed with a number"
 msgstr ""
 
@@ -5253,23 +5320,23 @@
 "Whether the selected resource(s) should be limited to local file: URIs"
 msgstr ""
 
-#: ../gtk/gtkrecentchooser.c:232
+#: ../gtk/gtkrecentchooser.c:229
 msgid "Limit"
 msgstr "Grense"
 
-#: ../gtk/gtkrecentchooser.c:233
+#: ../gtk/gtkrecentchooser.c:230
 msgid "The maximum number of items to be displayed"
 msgstr "Maksimalt antall oppføringer som skal vises"
 
-#: ../gtk/gtkrecentchooser.c:247
+#: ../gtk/gtkrecentchooser.c:244
 msgid "Sort Type"
 msgstr "Sorteringstype"
 
-#: ../gtk/gtkrecentchooser.c:248
+#: ../gtk/gtkrecentchooser.c:245
 msgid "The sorting order of the items displayed"
 msgstr "Sorteringsrekkefølge for oppføringer som skal vises"
 
-#: ../gtk/gtkrecentchooser.c:263
+#: ../gtk/gtkrecentchooser.c:260
 msgid "The current filter for selecting which resources are displayed"
 msgstr ""
 
@@ -5281,24 +5348,24 @@
 msgid "The size of the recently used resources list"
 msgstr ""
 
-#: ../gtk/gtkscalebutton.c:219
+#: ../gtk/gtkscalebutton.c:229
 msgid "The value of the scale"
 msgstr ""
 
-#: ../gtk/gtkscalebutton.c:229
+#: ../gtk/gtkscalebutton.c:239
 msgid "The icon size"
 msgstr "Størrelse på ikon"
 
-#: ../gtk/gtkscalebutton.c:238
+#: ../gtk/gtkscalebutton.c:248
 msgid ""
 "The GtkAdjustment that contains the current value of this scale button object"
 msgstr ""
 
-#: ../gtk/gtkscalebutton.c:266
+#: ../gtk/gtkscalebutton.c:276
 msgid "Icons"
 msgstr "Ikoner"
 
-#: ../gtk/gtkscalebutton.c:267
+#: ../gtk/gtkscalebutton.c:277
 msgid "List of icon names"
 msgstr "Liste med ikonnavn"
 
@@ -5404,105 +5471,105 @@
 "Display a second forward arrow button on the opposite end of the scrollbar"
 msgstr ""
 
-#: ../gtk/gtkscrolledwindow.c:367
+#: ../gtk/gtkscrolledwindow.c:360
 msgid "Horizontal Adjustment"
 msgstr "Horisontal justering"
 
-#: ../gtk/gtkscrolledwindow.c:368
+#: ../gtk/gtkscrolledwindow.c:361
 msgid "The GtkAdjustment for the horizontal position"
 msgstr "GtkAdjustment for horisontal posisjon"
 
-#: ../gtk/gtkscrolledwindow.c:374
+#: ../gtk/gtkscrolledwindow.c:367
 msgid "Vertical Adjustment"
 msgstr "Vertikal justering"
 
-#: ../gtk/gtkscrolledwindow.c:375
+#: ../gtk/gtkscrolledwindow.c:368
 msgid "The GtkAdjustment for the vertical position"
 msgstr "GtkAdjustment for vertikal posisjon"
 
-#: ../gtk/gtkscrolledwindow.c:381
+#: ../gtk/gtkscrolledwindow.c:374
 msgid "Horizontal Scrollbar Policy"
 msgstr "Oppførsel for horisontalt rullefelt"
 
-#: ../gtk/gtkscrolledwindow.c:382
+#: ../gtk/gtkscrolledwindow.c:375
 msgid "When the horizontal scrollbar is displayed"
 msgstr "Når horisontalt rullefelt skal vises"
 
-#: ../gtk/gtkscrolledwindow.c:389
+#: ../gtk/gtkscrolledwindow.c:382
 msgid "Vertical Scrollbar Policy"
 msgstr "Oppførsel for vertikalt rullefelt"
 
-#: ../gtk/gtkscrolledwindow.c:390
+#: ../gtk/gtkscrolledwindow.c:383
 msgid "When the vertical scrollbar is displayed"
 msgstr "Når vertikalt rullefelt skal vises"
 
-#: ../gtk/gtkscrolledwindow.c:398
+#: ../gtk/gtkscrolledwindow.c:391
 msgid "Window Placement"
 msgstr "Vinduplassering"
 
-#: ../gtk/gtkscrolledwindow.c:399
+#: gtk/gtkscrolledwindow.c:400
 msgid ""
 "Where the contents are located with respect to the scrollbars. This property "
 "only takes effect if \"window-placement-set\" is TRUE."
 msgstr ""
 
-#: ../gtk/gtkscrolledwindow.c:416
+#: ../gtk/gtkscrolledwindow.c:411
 msgid "Window Placement Set"
 msgstr "Vinduplassering satt"
 
-#: ../gtk/gtkscrolledwindow.c:417
+#: ../gtk/gtkscrolledwindow.c:412
 msgid ""
 "Whether \"window-placement\" should be used to determine the location of the "
 "contents with respect to the scrollbars."
 msgstr ""
 
-#: ../gtk/gtkscrolledwindow.c:423
+#: ../gtk/gtkscrolledwindow.c:418
 msgid "Shadow Type"
 msgstr "Skyggetype"
 
-#: ../gtk/gtkscrolledwindow.c:424
+#: ../gtk/gtkscrolledwindow.c:419
 msgid "Style of bevel around the contents"
 msgstr "Stil på kanten rundt innholdet"
 
-#: ../gtk/gtkscrolledwindow.c:438
+#: ../gtk/gtkscrolledwindow.c:433
 msgid "Scrollbars within bevel"
 msgstr ""
 
-#: ../gtk/gtkscrolledwindow.c:439
+#: ../gtk/gtkscrolledwindow.c:434
 msgid "Place scrollbars within the scrolled window's bevel"
 msgstr ""
 
-#: ../gtk/gtkscrolledwindow.c:445
+#: ../gtk/gtkscrolledwindow.c:440
 msgid "Scrollbar spacing"
 msgstr "Avstand for rullefelt"
 
-#: ../gtk/gtkscrolledwindow.c:446
+#: ../gtk/gtkscrolledwindow.c:441
 msgid "Number of pixels between the scrollbars and the scrolled window"
 msgstr "Antall piksler mellom rullefeltet og vinduet som rulles"
 
-#: ../gtk/gtkscrolledwindow.c:462
+#: ../gtk/gtkscrolledwindow.c:457
 msgid "Minimum Content Width"
 msgstr "Minste bredde for innhold"
 
-#: ../gtk/gtkscrolledwindow.c:463
+#: ../gtk/gtkscrolledwindow.c:458
 msgid ""
 "The minimum width that the scrolled window will allocate to its content"
 msgstr ""
 
-#: ../gtk/gtkscrolledwindow.c:477
+#: ../gtk/gtkscrolledwindow.c:472
 msgid "Minimum Content Height"
 msgstr "Minste høyde for innhold"
 
-#: ../gtk/gtkscrolledwindow.c:478
+#: ../gtk/gtkscrolledwindow.c:473
 msgid ""
 "The minimum height that the scrolled window will allocate to its content"
 msgstr ""
 
-#: ../gtk/gtkscrolledwindow.c:493
+#: ../gtk/gtkscrolledwindow.c:488
 msgid "Kinetic Scrolling"
 msgstr "Kinetisk rulling"
 
-#: ../gtk/gtkscrolledwindow.c:494
+#: ../gtk/gtkscrolledwindow.c:489
 msgid "Kinetic scrolling mode."
 msgstr ""
 
@@ -5514,11 +5581,11 @@
 msgid "Whether the separator is drawn, or just blank"
 msgstr "Om  en skillelinje eller bare tomrom vises"
 
-#: ../gtk/gtksettings.c:354
+#: ../gtk/gtksettings.c:363
 msgid "Double Click Time"
 msgstr "Tid for dobbelklikk"
 
-#: ../gtk/gtksettings.c:355
+#: ../gtk/gtksettings.c:364
 msgid ""
 "Maximum time allowed between two clicks for them to be considered a double "
 "click (in milliseconds)"
@@ -5526,11 +5593,11 @@
 "Lengste tidsintervall mellom to klikk for at de skal betraktes som et "
 "dobbelklikk (i millisekunder)"
 
-#: ../gtk/gtksettings.c:362
+#: ../gtk/gtksettings.c:371
 msgid "Double Click Distance"
 msgstr "Avstand for dobbelklikk"
 
-#: ../gtk/gtksettings.c:363
+#: ../gtk/gtksettings.c:372
 msgid ""
 "Maximum distance allowed between two clicks for them to be considered a "
 "double click (in pixels)"
@@ -5538,35 +5605,35 @@
 "Lengste avstand mellom to klikk for at de skal betraktes som et dobbelklikk "
 "(i piksler)"
 
-#: ../gtk/gtksettings.c:379
+#: ../gtk/gtksettings.c:388
 msgid "Cursor Blink"
 msgstr "Markørblinking"
 
-#: ../gtk/gtksettings.c:380
+#: ../gtk/gtksettings.c:389
 msgid "Whether the cursor should blink"
 msgstr "La markøren blinke"
 
-#: ../gtk/gtksettings.c:387
+#: ../gtk/gtksettings.c:396
 msgid "Cursor Blink Time"
 msgstr "Tid for markørblink"
 
-#: ../gtk/gtksettings.c:388
+#: ../gtk/gtksettings.c:397
 msgid "Length of the cursor blink cycle, in milliseconds"
 msgstr "Lengde på markørblinking, i millisekunder"
 
-#: ../gtk/gtksettings.c:407
+#: ../gtk/gtksettings.c:416
 msgid "Cursor Blink Timeout"
 msgstr "Tidsavbrudd for markørblink"
 
-#: ../gtk/gtksettings.c:408
+#: ../gtk/gtksettings.c:417
 msgid "Time after which the cursor stops blinking, in seconds"
 msgstr ""
 
-#: ../gtk/gtksettings.c:415
+#: ../gtk/gtksettings.c:424
 msgid "Split Cursor"
 msgstr "Delt markør"
 
-#: ../gtk/gtksettings.c:416
+#: ../gtk/gtksettings.c:425
 msgid ""
 "Whether two cursors should be displayed for mixed left-to-right and right-to-"
 "left text"
@@ -5574,700 +5641,700 @@
 "Om to markører skal vises for blandet venstre-til-høyre og høyre-til-venstre "
 "tekst"
 
-#: ../gtk/gtksettings.c:423
+#: ../gtk/gtksettings.c:432
 msgid "Theme Name"
 msgstr "Temanavn"
 
-#: ../gtk/gtksettings.c:424
+#: ../gtk/gtksettings.c:433
 msgid "Name of theme to load"
 msgstr "Navn på tema som skal lastes"
 
-#: ../gtk/gtksettings.c:436
+#: ../gtk/gtksettings.c:445
 msgid "Icon Theme Name"
 msgstr "Navn på ikontema"
 
-#: ../gtk/gtksettings.c:437
+#: ../gtk/gtksettings.c:446
 msgid "Name of icon theme to use"
 msgstr "Navn på ikontema som skal brukes"
 
-#: ../gtk/gtksettings.c:445
+#: ../gtk/gtksettings.c:461
 msgid "Fallback Icon Theme Name"
 msgstr "Navn på reserveikontema"
 
-#: ../gtk/gtksettings.c:446
+#: ../gtk/gtksettings.c:462
 msgid "Name of a icon theme to fall back to"
 msgstr "Navn på ikontema som skal brukes som reserve"
 
-#: ../gtk/gtksettings.c:454
+#: ../gtk/gtksettings.c:470
 msgid "Key Theme Name"
 msgstr "Navn på tastaturtema"
 
-#: ../gtk/gtksettings.c:455
+#: ../gtk/gtksettings.c:471
 msgid "Name of key theme to load"
 msgstr "Navn på tastaturtema som skal lastes"
 
-#: ../gtk/gtksettings.c:463
+#: ../gtk/gtksettings.c:486
 msgid "Menu bar accelerator"
 msgstr "Aksellerator for menylinje"
 
-#: ../gtk/gtksettings.c:464
+#: ../gtk/gtksettings.c:487
 msgid "Keybinding to activate the menu bar"
 msgstr "Tastaturbinding som aktiverer menylinjen"
 
-#: ../gtk/gtksettings.c:472
+#: ../gtk/gtksettings.c:495
 msgid "Drag threshold"
 msgstr "Terskel for dra-operasjon"
 
-#: ../gtk/gtksettings.c:473
+#: ../gtk/gtksettings.c:496
 msgid "Number of pixels the cursor can move before dragging"
 msgstr "Antall piklser markøren kan flyttes før en dra-operasjon startes"
 
-#: ../gtk/gtksettings.c:481
+#: ../gtk/gtksettings.c:504
 msgid "Font Name"
 msgstr "Skriftnavn"
 
-#: ../gtk/gtksettings.c:482
+#: ../gtk/gtksettings.c:505
 msgid "Name of default font to use"
 msgstr "Navn på forvalgt skrift"
 
-#: ../gtk/gtksettings.c:504
+#: ../gtk/gtksettings.c:529
 msgid "Icon Sizes"
 msgstr "Ikonstørrelser"
 
-#: ../gtk/gtksettings.c:505
+#: ../gtk/gtksettings.c:530
 msgid "List of icon sizes (gtk-menu=16,16:gtk-button=20,20..."
 msgstr "Liste over ikonstørrelser (gtk-menu=16,16;gtk-button=20,20 …"
 
-#: ../gtk/gtksettings.c:513
+#: ../gtk/gtksettings.c:538
 msgid "GTK Modules"
 msgstr "GTK-moduler"
 
-#: ../gtk/gtksettings.c:514
+#: ../gtk/gtksettings.c:539
 msgid "List of currently active GTK modules"
 msgstr "Liste over aktive GTK-moduler"
 
-#: ../gtk/gtksettings.c:522
+#: ../gtk/gtksettings.c:547
 msgid "Xft Antialias"
 msgstr "Xft skriftutjevning"
 
-#: ../gtk/gtksettings.c:523
+#: ../gtk/gtksettings.c:548
 msgid "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"
 msgstr ""
 "Om skriftutjevning skal brukes for Xft-skrifter; 0=nei, 1=ja, -1=forvalg"
 
-#: ../gtk/gtksettings.c:532
+#: ../gtk/gtksettings.c:557
 msgid "Xft Hinting"
 msgstr "Xft-hint"
 
-#: ../gtk/gtksettings.c:533
+#: ../gtk/gtksettings.c:558
 msgid "Whether to hint Xft fonts; 0=no, 1=yes, -1=default"
 msgstr "Om hint skal brukes for Xft-skrifter"
 
-#: ../gtk/gtksettings.c:542
+#: ../gtk/gtksettings.c:567
 msgid "Xft Hint Style"
 msgstr "Xft-hintstil"
 
-#: ../gtk/gtksettings.c:543
+#: ../gtk/gtksettings.c:568
 msgid ""
 "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"
 msgstr ""
 "Grad av hint som skal brukes; hintnone, hintslight, hintmedium, eller "
 "hintfull"
 
-#: ../gtk/gtksettings.c:552
+#: ../gtk/gtksettings.c:577
 msgid "Xft RGBA"
 msgstr "Xft RGBA"
 
-#: ../gtk/gtksettings.c:553
+#: ../gtk/gtksettings.c:578
 msgid "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"
 msgstr "Type pikselutjevning: none, rgb, bgr, vrgb, vbgr"
 
-#: ../gtk/gtksettings.c:562
+#: ../gtk/gtksettings.c:587
 msgid "Xft DPI"
 msgstr "Xft DPI"
 
-#: ../gtk/gtksettings.c:563
+#: ../gtk/gtksettings.c:588
 msgid "Resolution for Xft, in 1024 * dots/inch. -1 to use default value"
 msgstr ""
 "Oppløsning for Xft i 1024 * punkter per tomme. -1 for å bruke forvalgt verdi"
 
-#: ../gtk/gtksettings.c:572
+#: ../gtk/gtksettings.c:597
 msgid "Cursor theme name"
 msgstr "Navn på pekertema"
 
-#: ../gtk/gtksettings.c:573
+#: ../gtk/gtksettings.c:598
 msgid "Name of the cursor theme to use, or NULL to use the default theme"
 msgstr ""
 "Navn på pekertema som skal brukes, eller NULL for å bruke forvalgt tema"
 
-#: ../gtk/gtksettings.c:581
+#: ../gtk/gtksettings.c:606
 msgid "Cursor theme size"
 msgstr "Størrelse på pekertema"
 
-#: ../gtk/gtksettings.c:582
+#: ../gtk/gtksettings.c:607
 msgid "Size to use for cursors, or 0 to use the default size"
 msgstr "Størrelse å bruke for peker, eller 0 for å bruke forvalgt størrelse"
 
-#: ../gtk/gtksettings.c:591
+#: ../gtk/gtksettings.c:616
 msgid "Alternative button order"
 msgstr "Alternativ knapperekkefølge"
 
-#: ../gtk/gtksettings.c:592
+#: ../gtk/gtksettings.c:617
 msgid "Whether buttons in dialogs should use the alternative button order"
 msgstr ""
 "Om knapper i dialoger skal bruke den alternative rekkefølgen for knapper"
 
-#: ../gtk/gtksettings.c:609
+#: ../gtk/gtksettings.c:634
 msgid "Alternative sort indicator direction"
 msgstr ""
 
-#: ../gtk/gtksettings.c:610
+#: ../gtk/gtksettings.c:635
 msgid ""
 "Whether the direction of the sort indicators in list and tree views is "
 "inverted compared to the default (where down means ascending)"
 msgstr ""
 
-#: ../gtk/gtksettings.c:618
+#: ../gtk/gtksettings.c:648
 msgid "Show the 'Input Methods' menu"
 msgstr "Vis menyen «Inndatametoder»"
 
-#: ../gtk/gtksettings.c:619
+#: ../gtk/gtksettings.c:649
 msgid ""
 "Whether the context menus of entries and text views should offer to change "
 "the input method"
 msgstr ""
 
-#: ../gtk/gtksettings.c:627
+#: ../gtk/gtksettings.c:662
 msgid "Show the 'Insert Unicode Control Character' menu"
 msgstr ""
 
-#: ../gtk/gtksettings.c:628
+#: ../gtk/gtksettings.c:663
 msgid ""
 "Whether the context menus of entries and text views should offer to insert "
 "control characters"
 msgstr ""
 
-#: ../gtk/gtksettings.c:636
+#: ../gtk/gtksettings.c:676
 msgid "Start timeout"
 msgstr "Tidsavbrudd for start"
 
-#: ../gtk/gtksettings.c:637
+#: ../gtk/gtksettings.c:677
 msgid "Starting value for timeouts, when button is pressed"
 msgstr ""
 
-#: ../gtk/gtksettings.c:646
+#: ../gtk/gtksettings.c:691
 msgid "Repeat timeout"
 msgstr "Tidsavbrudd for gjentakelse"
 
-#: ../gtk/gtksettings.c:647
+#: ../gtk/gtksettings.c:692
 msgid "Repeat value for timeouts, when button is pressed"
 msgstr ""
 
-#: ../gtk/gtksettings.c:656
+#: ../gtk/gtksettings.c:706
 msgid "Expand timeout"
 msgstr "Tidsavbrudd for utvidelse"
 
-#: ../gtk/gtksettings.c:657
+#: ../gtk/gtksettings.c:707
 msgid "Expand value for timeouts, when a widget is expanding a new region"
 msgstr ""
 
-#: ../gtk/gtksettings.c:695
+#: ../gtk/gtksettings.c:745
 msgid "Color scheme"
 msgstr "Fargetema"
 
-#: ../gtk/gtksettings.c:696
+#: ../gtk/gtksettings.c:746
 msgid "A palette of named colors for use in themes"
 msgstr "Palett med navngitte farger for bruk i tema"
 
-#: ../gtk/gtksettings.c:705
+#: ../gtk/gtksettings.c:755
 msgid "Enable Animations"
 msgstr "Aktiver animasjoner"
 
-#: ../gtk/gtksettings.c:706
+#: ../gtk/gtksettings.c:756
 msgid "Whether to enable toolkit-wide animations."
 msgstr ""
 
-#: ../gtk/gtksettings.c:727
+#: ../gtk/gtksettings.c:777
 msgid "Enable Touchscreen Mode"
 msgstr "Slå på berøringsskjermmodus"
 
-#: ../gtk/gtksettings.c:728
+#: ../gtk/gtksettings.c:778
 msgid "When TRUE, there are no motion notify events delivered on this screen"
 msgstr ""
 
-#: ../gtk/gtksettings.c:745
+#: ../gtk/gtksettings.c:797
 msgid "Tooltip timeout"
 msgstr "Tidsavbrudd for verktøytips"
 
-#: ../gtk/gtksettings.c:746
+#: ../gtk/gtksettings.c:798
 msgid "Timeout before tooltip is shown"
 msgstr "Tidsavbrudd før verktøytips vises"
 
-#: ../gtk/gtksettings.c:771
+#: ../gtk/gtksettings.c:825
 msgid "Tooltip browse timeout"
 msgstr ""
 
-#: ../gtk/gtksettings.c:772
+#: ../gtk/gtksettings.c:826
 msgid "Timeout before tooltip is shown when browse mode is enabled"
 msgstr ""
 
-#: ../gtk/gtksettings.c:793
+#: ../gtk/gtksettings.c:849
 msgid "Tooltip browse mode timeout"
 msgstr ""
 
-#: ../gtk/gtksettings.c:794
+#: ../gtk/gtksettings.c:850
 msgid "Timeout after which browse mode is disabled"
 msgstr ""
 
-#: ../gtk/gtksettings.c:813
+#: ../gtk/gtksettings.c:872
 msgid "Keynav Cursor Only"
 msgstr ""
 
-#: ../gtk/gtksettings.c:814
+#: ../gtk/gtksettings.c:873
 msgid "When TRUE, there are only cursor keys available to navigate widgets"
 msgstr ""
 
-#: ../gtk/gtksettings.c:831
+#: ../gtk/gtksettings.c:892
 msgid "Keynav Wrap Around"
 msgstr ""
 
-#: ../gtk/gtksettings.c:832
+#: ../gtk/gtksettings.c:893
 msgid "Whether to wrap around when keyboard-navigating widgets"
 msgstr ""
 
-#: ../gtk/gtksettings.c:852
+#: ../gtk/gtksettings.c:913
 msgid "Error Bell"
 msgstr ""
 
-#: ../gtk/gtksettings.c:853
+#: ../gtk/gtksettings.c:914
 msgid "When TRUE, keyboard navigation and other errors will cause a beep"
 msgstr ""
 
-#: ../gtk/gtksettings.c:872
+#: ../gtk/gtksettings.c:933
 msgid "Color Hash"
 msgstr ""
 
-#: ../gtk/gtksettings.c:873
+#: ../gtk/gtksettings.c:934
 msgid "A hash table representation of the color scheme."
 msgstr ""
 
-#: ../gtk/gtksettings.c:881
+#: ../gtk/gtksettings.c:949
 msgid "Default file chooser backend"
 msgstr "Forvalgt motor for filvelger"
 
-#: ../gtk/gtksettings.c:882
+#: ../gtk/gtksettings.c:950
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Navn på GtkFileChooser-motor som skal brukes som forvalg"
 
-#: ../gtk/gtksettings.c:899
+#: ../gtk/gtksettings.c:967
 msgid "Default print backend"
 msgstr "Forvalgt motor for utskrift"
 
-#: ../gtk/gtksettings.c:900
+#: ../gtk/gtksettings.c:968
 msgid "List of the GtkPrintBackend backends to use by default"
 msgstr "Liste med GtkFileChooser-motorer som skal brukes som forvalg"
 
-#: ../gtk/gtksettings.c:923
+#: ../gtk/gtksettings.c:991
 msgid "Default command to run when displaying a print preview"
 msgstr ""
 
-#: ../gtk/gtksettings.c:924
+#: ../gtk/gtksettings.c:992
 msgid "Command to run when displaying a print preview"
 msgstr ""
 
-#: ../gtk/gtksettings.c:940
+#: ../gtk/gtksettings.c:1010
 msgid "Enable Mnemonics"
 msgstr "Slå på hurtigtaster"
 
-#: ../gtk/gtksettings.c:941
+#: ../gtk/gtksettings.c:1011
 msgid "Whether labels should have mnemonics"
 msgstr "Om etiketter skal ha hurtigtaster"
 
-#: ../gtk/gtksettings.c:957
+#: ../gtk/gtksettings.c:1027
 msgid "Enable Accelerators"
 msgstr "Aktiver hurtigtaster"
 
-#: ../gtk/gtksettings.c:958
+#: ../gtk/gtksettings.c:1028
 msgid "Whether menu items should have accelerators"
 msgstr "Om menyoppføringer skal ha akselleratorer"
 
-#: ../gtk/gtksettings.c:975
+#: ../gtk/gtksettings.c:1047
 msgid "Recent Files Limit"
 msgstr "Grense for nylig brukte filer"
 
-#: ../gtk/gtksettings.c:976
+#: ../gtk/gtksettings.c:1048
 msgid "Number of recently used files"
 msgstr "Antall nylig brukte filer"
 
-#: ../gtk/gtksettings.c:996
+#: ../gtk/gtksettings.c:1068
 msgid "Default IM module"
 msgstr "Forvalgt IM-modul"
 
-#: ../gtk/gtksettings.c:997
+#: ../gtk/gtksettings.c:1069
 msgid "Which IM module should be used by default"
 msgstr ""
 
-#: ../gtk/gtksettings.c:1015
+#: ../gtk/gtksettings.c:1087
 msgid "Recent Files Max Age"
 msgstr "Maksimal alder for nylig brukte filer"
 
-#: ../gtk/gtksettings.c:1016
+#: ../gtk/gtksettings.c:1088
 msgid "Maximum age of recently used files, in days"
 msgstr ""
 
-#: ../gtk/gtksettings.c:1025
+#: ../gtk/gtksettings.c:1097
 msgid "Fontconfig configuration timestamp"
 msgstr "Tidsstempel for Fontconfig-konfigurasjon"
 
-#: ../gtk/gtksettings.c:1026
+#: ../gtk/gtksettings.c:1098
 msgid "Timestamp of current fontconfig configuration"
 msgstr ""
 
-#: ../gtk/gtksettings.c:1048
+#: ../gtk/gtksettings.c:1120
 msgid "Sound Theme Name"
 msgstr "Navn på lydtema"
 
-#: ../gtk/gtksettings.c:1049
+#: ../gtk/gtksettings.c:1121
 msgid "XDG sound theme name"
 msgstr "Navn på XDG-lydtema"
 
 #. Translators: this means sounds that are played as feedback to user input
-#: ../gtk/gtksettings.c:1071
+#: ../gtk/gtksettings.c:1143
 msgid "Audible Input Feedback"
 msgstr ""
 
-#: ../gtk/gtksettings.c:1072
+#: ../gtk/gtksettings.c:1144
 msgid "Whether to play event sounds as feedback to user input"
 msgstr ""
 
-#: ../gtk/gtksettings.c:1093
+#: ../gtk/gtksettings.c:1165
 msgid "Enable Event Sounds"
 msgstr "Slå på lyder for hendelser"
 
-#: ../gtk/gtksettings.c:1094
+#: ../gtk/gtksettings.c:1166
 msgid "Whether to play any event sounds at all"
 msgstr "Om lyder skal spilles av for hendelser"
 
-#: ../gtk/gtksettings.c:1109
+#: ../gtk/gtksettings.c:1183
 msgid "Enable Tooltips"
 msgstr "Slå på verktøytips"
 
-#: ../gtk/gtksettings.c:1110
+#: ../gtk/gtksettings.c:1184
 msgid "Whether tooltips should be shown on widgets"
 msgstr "Om verktøytips skal vises på komponenter"
 
-#: ../gtk/gtksettings.c:1123
+#: ../gtk/gtksettings.c:1199
 msgid "Toolbar style"
 msgstr "Verktøylinjestil"
 
-#: ../gtk/gtksettings.c:1124
+#: ../gtk/gtksettings.c:1200
 msgid ""
 "Whether default toolbars have text only, text and icons, icons only, etc."
 msgstr ""
 "Om forvalgte verktøylinje har tekst, tekst og ikoner, kun ikoner, etc."
 
-#: ../gtk/gtksettings.c:1138
+#: ../gtk/gtksettings.c:1216
 msgid "Toolbar Icon Size"
 msgstr "Størrelse på verktøylinjeikon"
 
-#: ../gtk/gtksettings.c:1139
+#: ../gtk/gtksettings.c:1217
 msgid "The size of icons in default toolbars."
 msgstr "Størrelse på ikoner i standard verktøylinjer."
 
-#: ../gtk/gtksettings.c:1156
+#: ../gtk/gtksettings.c:1236
 msgid "Auto Mnemonics"
 msgstr "Automatisk visning av hurtigtaster"
 
-#: ../gtk/gtksettings.c:1157
+#: ../gtk/gtksettings.c:1237
 msgid ""
 "Whether mnemonics should be automatically shown and hidden when the user "
 "presses the mnemonic activator."
 msgstr ""
 
-#: ../gtk/gtksettings.c:1190
+#: ../gtk/gtksettings.c:1272
 msgid "Visible Focus"
 msgstr ""
 
-#: ../gtk/gtksettings.c:1191
+#: ../gtk/gtksettings.c:1273
 msgid ""
 "Whether 'focus rectangles' should be hidden until the user starts to use the "
 "keyboard."
 msgstr ""
 
-#: ../gtk/gtksettings.c:1217
+#: ../gtk/gtksettings.c:1299
 msgid "Application prefers a dark theme"
 msgstr ""
 
-#: ../gtk/gtksettings.c:1218
+#: ../gtk/gtksettings.c:1300
 msgid "Whether the application prefers to have a dark theme."
 msgstr ""
 
-#: ../gtk/gtksettings.c:1233
+#: ../gtk/gtksettings.c:1317
 msgid "Show button images"
 msgstr "Vis knappebilder"
 
-#: ../gtk/gtksettings.c:1234
+#: ../gtk/gtksettings.c:1318
 msgid "Whether images should be shown on buttons"
 msgstr "Om bilder skal vises på knapper"
 
-#: ../gtk/gtksettings.c:1242 ../gtk/gtksettings.c:1336
+#: ../gtk/gtksettings.c:1326 ../gtk/gtksettings.c:1457
 msgid "Select on focus"
 msgstr "Velg på fokus"
 
-#: ../gtk/gtksettings.c:1243
+#: ../gtk/gtksettings.c:1327
 msgid "Whether to select the contents of an entry when it is focused"
 msgstr "Om innholdet i oppføringen skal markeres når den får fokus"
 
-#: ../gtk/gtksettings.c:1260
+#: ../gtk/gtksettings.c:1344
 msgid "Password Hint Timeout"
 msgstr "Tidsavbrudd for passordhint"
 
-#: ../gtk/gtksettings.c:1261
+#: ../gtk/gtksettings.c:1345
 msgid "How long to show the last input character in hidden entries"
 msgstr "Hvor lenge skal siste tegn vises i skjulte oppføringer"
 
-#: ../gtk/gtksettings.c:1270
+#: ../gtk/gtksettings.c:1361
 msgid "Show menu images"
 msgstr "Vis bilder i menyer"
 
-#: ../gtk/gtksettings.c:1271
+#: ../gtk/gtksettings.c:1362
 msgid "Whether images should be shown in menus"
 msgstr "Om bilder skal vises i menyer"
 
-#: ../gtk/gtksettings.c:1279
+#: ../gtk/gtksettings.c:1377
 msgid "Delay before drop down menus appear"
 msgstr "Pause før nedtrekksmenyer vises"
 
-#: ../gtk/gtksettings.c:1280
+#: ../gtk/gtksettings.c:1378
 msgid "Delay before the submenus of a menu bar appear"
 msgstr "Pause før undermenyene i en menylinje vises"
 
-#: ../gtk/gtksettings.c:1297
+#: ../gtk/gtksettings.c:1397
 msgid "Scrolled Window Placement"
 msgstr ""
 
-#: ../gtk/gtksettings.c:1298
+#: ../gtk/gtksettings.c:1398
 msgid ""
 "Where the contents of scrolled windows are located with respect to the "
 "scrollbars, if not overridden by the scrolled window's own placement."
 msgstr ""
 
-#: ../gtk/gtksettings.c:1307
+#: ../gtk/gtksettings.c:1414
 msgid "Can change accelerators"
 msgstr "Kan endre akselleratorer"
 
-#: ../gtk/gtksettings.c:1308
+#: ../gtk/gtksettings.c:1415
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""
 "Om menyakselleratorer kan endres ved å trykke en tast over menyoppføringen"
 
-#: ../gtk/gtksettings.c:1316
+#: ../gtk/gtksettings.c:1430
 msgid "Delay before submenus appear"
 msgstr "Pause før undermenyer vises"
 
-#: ../gtk/gtksettings.c:1317
+#: ../gtk/gtksettings.c:1431
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "Minste tid pekeren kan være over en menyoppføring før undermenyen vises"
 
-#: ../gtk/gtksettings.c:1326
+#: ../gtk/gtksettings.c:1447
 msgid "Delay before hiding a submenu"
 msgstr "Pause før en undermeny skjules"
 
-#: ../gtk/gtksettings.c:1327
+#: ../gtk/gtksettings.c:1448
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
 msgstr "Tid før undermenyen skjules når pekeren beveger seg mot undermenyen"
 
-#: ../gtk/gtksettings.c:1337
+#: ../gtk/gtksettings.c:1458
 msgid ""
 "Whether to select the contents of a selectable label when it is focused"
 msgstr ""
 
-#: ../gtk/gtksettings.c:1345
+#: ../gtk/gtksettings.c:1473
 msgid "Custom palette"
 msgstr "Egendefinert palett"
 
-#: ../gtk/gtksettings.c:1346
+#: ../gtk/gtksettings.c:1474
 msgid "Palette to use in the color selector"
 msgstr "Palett som skal brukes i fargevelgeren"
 
-#: ../gtk/gtksettings.c:1354
+#: ../gtk/gtksettings.c:1489
 msgid "IM Preedit style"
 msgstr "Stil for IM-forhåndsredigering"
 
-#: ../gtk/gtksettings.c:1355
+#: ../gtk/gtksettings.c:1490
 msgid "How to draw the input method preedit string"
 msgstr "Hvordan forhåndsredigeringsstrengen for en inndatametode tegnes"
 
-#: ../gtk/gtksettings.c:1364
+#: ../gtk/gtksettings.c:1506
 msgid "IM Status style"
 msgstr "IM statusstil"
 
-#: ../gtk/gtksettings.c:1365
+#: ../gtk/gtksettings.c:1507
 msgid "How to draw the input method statusbar"
 msgstr "Hvordan statuslinjen for inndatametoden tegnes"
 
-#: ../gtk/gtksettings.c:1374
+#: ../gtk/gtksettings.c:1516
 msgid "Desktop shell shows app menu"
 msgstr ""
 
-#: ../gtk/gtksettings.c:1375
+#: ../gtk/gtksettings.c:1517
 msgid ""
 "Set to TRUE if the desktop environment is displaying the app menu, FALSE if "
 "the app should display it itself."
 msgstr ""
 
-#: ../gtk/gtksettings.c:1384
+#: ../gtk/gtksettings.c:1526
 msgid "Desktop shell shows the menubar"
 msgstr ""
 
-#: ../gtk/gtksettings.c:1385
+#: ../gtk/gtksettings.c:1527
 msgid ""
 "Set to TRUE if the desktop environment is displaying the menubar, FALSE if "
 "the app should display it itself."
 msgstr ""
 
-#: ../gtk/gtksizegroup.c:324 ../gtk/gtktreeselection.c:129
+#: ../gtk/gtksizegroup.c:329 ../gtk/gtktreeselection.c:129
 msgid "Mode"
 msgstr "Modus"
 
-#: ../gtk/gtksizegroup.c:325
+#: ../gtk/gtksizegroup.c:330
 msgid ""
 "The directions in which the size group affects the requested sizes of its "
 "component widgets"
 msgstr ""
 
-#: ../gtk/gtksizegroup.c:341
+#: ../gtk/gtksizegroup.c:346
 msgid "Ignore hidden"
 msgstr "Ignorer gjemt"
 
-#: ../gtk/gtksizegroup.c:342
+#: ../gtk/gtksizegroup.c:347
 msgid ""
 "If TRUE, unmapped widgets are ignored when determining the size of the group"
 msgstr ""
 
-#: ../gtk/gtkspinbutton.c:344
+#: ../gtk/gtkspinbutton.c:357
 msgid "Climb Rate"
 msgstr "Klatrerate"
 
-#: ../gtk/gtkspinbutton.c:364
+#: ../gtk/gtkspinbutton.c:377
 msgid "Snap to Ticks"
 msgstr "Fest til tikk"
 
-#: ../gtk/gtkspinbutton.c:365
+#: ../gtk/gtkspinbutton.c:378
 msgid ""
 "Whether erroneous values are automatically changed to a spin button's "
 "nearest step increment"
 msgstr ""
 "Om feilverdier skal endres automatisk til nærmeste verdisteg for knappen"
 
-#: ../gtk/gtkspinbutton.c:372
+#: ../gtk/gtkspinbutton.c:385
 msgid "Numeric"
 msgstr "Numerisk"
 
-#: ../gtk/gtkspinbutton.c:373
+#: ../gtk/gtkspinbutton.c:386
 msgid "Whether non-numeric characters should be ignored"
 msgstr "Ignorer ikke-numeriske tegn"
 
-#: ../gtk/gtkspinbutton.c:380
+#: ../gtk/gtkspinbutton.c:393
 msgid "Wrap"
 msgstr "Bryt"
 
-#: ../gtk/gtkspinbutton.c:381
+#: ../gtk/gtkspinbutton.c:394
 msgid "Whether a spin button should wrap upon reaching its limits"
 msgstr "Om en «spin button» skal snu rundt når den når grenseverdiene"
 
-#: ../gtk/gtkspinbutton.c:388
+#: ../gtk/gtkspinbutton.c:401
 msgid "Update Policy"
 msgstr "Oppdateringspolicy"
 
-#: ../gtk/gtkspinbutton.c:389
+#: ../gtk/gtkspinbutton.c:402
 msgid ""
 "Whether the spin button should update always, or only when the value is legal"
 msgstr ""
 "Om «spin button» alltid skal oppdatere, eller kun når verdien er gyldig"
 
-#: ../gtk/gtkspinbutton.c:398
+#: ../gtk/gtkspinbutton.c:411
 msgid "Reads the current value, or sets a new value"
 msgstr "Leser aktiv verdi eller setter en ny"
 
-#: ../gtk/gtkspinbutton.c:411
+#: ../gtk/gtkspinbutton.c:424
 msgid "Style of bevel around the spin button"
 msgstr "Stil på kanten rundt spinbutton"
 
-#: ../gtk/gtkspinner.c:115
+#: ../gtk/gtkspinner.c:114
 msgid "Whether the spinner is active"
 msgstr ""
 
-#: ../gtk/gtkstatusbar.c:183
+#: ../gtk/gtkstatusbar.c:175
 msgid "Style of bevel around the statusbar text"
 msgstr "Stil for kant rundt statuslinjetekst"
 
-#: ../gtk/gtkstatusicon.c:281
+#: ../gtk/gtkstatusicon.c:285
 msgid "The size of the icon"
 msgstr "Størrelse på ikonet"
 
-#: ../gtk/gtkstatusicon.c:291
+#: ../gtk/gtkstatusicon.c:295
 msgid "The screen where this status icon will be displayed"
 msgstr "Skjermen hvor dette statusikonet vil vises"
 
-#: ../gtk/gtkstatusicon.c:299
+#: ../gtk/gtkstatusicon.c:303
 msgid "Whether the status icon is visible"
 msgstr "Om statusikonet er synlig"
 
-#: ../gtk/gtkstatusicon.c:315
+#: ../gtk/gtkstatusicon.c:319
 msgid "Whether the status icon is embedded"
 msgstr "Om statusikon er innebygget"
 
-#: ../gtk/gtkstatusicon.c:331 ../gtk/gtktrayicon-x11.c:127
+#: ../gtk/gtkstatusicon.c:335 ../gtk/gtktrayicon-x11.c:127
 msgid "The orientation of the tray"
 msgstr "Orientering for systemområdet"
 
-#: ../gtk/gtkstatusicon.c:358 ../gtk/gtkwidget.c:1119
+#: ../gtk/gtkstatusicon.c:362 ../gtk/gtkwidget.c:1299
 msgid "Has tooltip"
 msgstr "Har verktøytips"
 
-#: ../gtk/gtkstatusicon.c:359
+#: ../gtk/gtkstatusicon.c:363
 msgid "Whether this tray icon has a tooltip"
 msgstr ""
 
-#: ../gtk/gtkstatusicon.c:384 ../gtk/gtkwidget.c:1140
+#: ../gtk/gtkstatusicon.c:388 ../gtk/gtkwidget.c:1320
 msgid "Tooltip Text"
 msgstr "Tekst for verktøytips"
 
-#: ../gtk/gtkstatusicon.c:385 ../gtk/gtkwidget.c:1141 ../gtk/gtkwidget.c:1162
+#: ../gtk/gtkstatusicon.c:389 ../gtk/gtkwidget.c:1321 ../gtk/gtkwidget.c:1342
 msgid "The contents of the tooltip for this widget"
 msgstr "Innhold i verktøytips for denne komponenten"
 
-#: ../gtk/gtkstatusicon.c:408 ../gtk/gtkwidget.c:1161
+#: ../gtk/gtkstatusicon.c:412 ../gtk/gtkwidget.c:1341
 msgid "Tooltip markup"
 msgstr ""
 
-#: ../gtk/gtkstatusicon.c:409
+#: ../gtk/gtkstatusicon.c:413
 msgid "The contents of the tooltip for this tray icon"
 msgstr ""
 
-#: ../gtk/gtkstatusicon.c:427
+#: ../gtk/gtkstatusicon.c:431
 msgid "The title of this tray icon"
 msgstr ""
 
-#: ../gtk/gtkstylecontext.c:442
+#: ../gtk/gtkstylecontext.c:445
 msgid "The associated GdkScreen"
 msgstr ""
 
-#: ../gtk/gtkstylecontext.c:448
+#: ../gtk/gtkmenubutton.c:561 ../gtk/gtkstylecontext.c:458
 msgid "Direction"
 msgstr "Retning"
 
-#: ../gtk/gtkstylecontext.c:449 ../gtk/gtktexttag.c:287
+#: ../gtk/gtkstylecontext.c:459 ../gtk/gtktexttag.c:287
 msgid "Text direction"
 msgstr "Tekstretning"
 
-#: ../gtk/gtkstylecontext.c:465
+#: ../gtk/gtkstylecontext.c:475
 msgid "The parent style context"
 msgstr ""
 
@@ -6287,11 +6354,11 @@
 msgid "The value type returned by GtkStyleContext"
 msgstr ""
 
-#: ../gtk/gtkswitch.c:815
+#: ../gtk/gtkswitch.c:835
 msgid "Whether the switch is on or off"
 msgstr "Om bryteren er på eller av"
 
-#: ../gtk/gtkswitch.c:849
+#: ../gtk/gtkswitch.c:869
 msgid "The minimum width of the handle"
 msgstr "Minste bredde på håndtaket"
 
@@ -6423,7 +6490,7 @@
 "er derfor anbefalt. Pango predefinerer noen skaleringer slik som "
 "PANGO_SCALE_X_LARGE"
 
-#: ../gtk/gtktexttag.c:405 ../gtk/gtktextview.c:722
+#: ../gtk/gtktexttag.c:405 ../gtk/gtktextview.c:750
 msgid "Left, right, or center justification"
 msgstr "Venstre-, høyre- eller senterjustering"
 
@@ -6440,7 +6507,7 @@
 msgid "Left margin"
 msgstr "Venstre marg"
 
-#: ../gtk/gtktexttag.c:432 ../gtk/gtktextview.c:731
+#: ../gtk/gtktexttag.c:432 ../gtk/gtktextview.c:759
 msgid "Width of the left margin in pixels"
 msgstr "Bredde på venstre marg i piksler"
 
@@ -6448,15 +6515,15 @@
 msgid "Right margin"
 msgstr "Høyre marg"
 
-#: ../gtk/gtktexttag.c:442 ../gtk/gtktextview.c:741
+#: ../gtk/gtktexttag.c:442 ../gtk/gtktextview.c:769
 msgid "Width of the right margin in pixels"
 msgstr "Bredde på høyre marg i piksler"
 
-#: ../gtk/gtktexttag.c:452 ../gtk/gtktextview.c:750
+#: ../gtk/gtktexttag.c:452 ../gtk/gtktextview.c:778
 msgid "Indent"
 msgstr "Rykk inn"
 
-#: ../gtk/gtktexttag.c:453 ../gtk/gtktextview.c:751
+#: ../gtk/gtktexttag.c:453 ../gtk/gtktextview.c:779
 msgid "Amount to indent the paragraph, in pixels"
 msgstr "Innrykksmengde for avsnittet, i piksler"
 
@@ -6472,7 +6539,7 @@
 msgid "Pixels above lines"
 msgstr "Piksler over linjer"
 
-#: ../gtk/gtktexttag.c:474 ../gtk/gtktextview.c:675
+#: ../gtk/gtktexttag.c:474 ../gtk/gtktextview.c:703
 msgid "Pixels of blank space above paragraphs"
 msgstr "Antall piksler med tomrom over avsnittene"
 
@@ -6480,7 +6547,7 @@
 msgid "Pixels below lines"
 msgstr "Piksler under linjer"
 
-#: ../gtk/gtktexttag.c:484 ../gtk/gtktextview.c:685
+#: ../gtk/gtktexttag.c:484 ../gtk/gtktextview.c:713
 msgid "Pixels of blank space below paragraphs"
 msgstr "Antall piksler med tomrom under avsnittene"
 
@@ -6488,20 +6555,20 @@
 msgid "Pixels inside wrap"
 msgstr "Piksler før brytning"
 
-#: ../gtk/gtktexttag.c:494 ../gtk/gtktextview.c:695
+#: ../gtk/gtktexttag.c:494 ../gtk/gtktextview.c:723
 msgid "Pixels of blank space between wrapped lines in a paragraph"
 msgstr "Piksler med tomt rom mellom brutte linjer i et avsnitt"
 
-#: ../gtk/gtktexttag.c:521 ../gtk/gtktextview.c:713
+#: ../gtk/gtktexttag.c:521 ../gtk/gtktextview.c:741
 msgid ""
 "Whether to wrap lines never, at word boundaries, or at character boundaries"
 msgstr "Regler for linjebryting; aldri, ved ordgrenser eller ved tegngrenser"
 
-#: ../gtk/gtktexttag.c:530 ../gtk/gtktextview.c:760
+#: ../gtk/gtkentry.c:1463 ../gtk/gtktexttag.c:530 ../gtk/gtktextview.c:788
 msgid "Tabs"
 msgstr "Faner"
 
-#: ../gtk/gtktexttag.c:531 ../gtk/gtktextview.c:761
+#: ../gtk/gtktexttag.c:531 ../gtk/gtktextview.c:789
 msgid "Custom tabs for this text"
 msgstr "Egendefinerte faner for denne teksten"
 
@@ -6637,172 +6704,172 @@
 msgid "Whether this tag affects the paragraph background color"
 msgstr "Om denne merkingen påvirker bakgrunnsfargen for avsnitt"
 
-#: ../gtk/gtktextview.c:674
+#: ../gtk/gtktextview.c:702
 msgid "Pixels Above Lines"
 msgstr "Piksler over linjer"
 
-#: ../gtk/gtktextview.c:684
+#: ../gtk/gtktextview.c:712
 msgid "Pixels Below Lines"
 msgstr "Piksler under linjer"
 
-#: ../gtk/gtktextview.c:694
+#: ../gtk/gtktextview.c:722
 msgid "Pixels Inside Wrap"
 msgstr "Piksler før brytning"
 
-#: ../gtk/gtktextview.c:712
+#: ../gtk/gtktextview.c:740
 msgid "Wrap Mode"
 msgstr "Brytningsmodus"
 
-#: ../gtk/gtktextview.c:730
+#: ../gtk/gtktextview.c:758
 msgid "Left Margin"
 msgstr "Venstre marg"
 
-#: ../gtk/gtktextview.c:740
+#: ../gtk/gtktextview.c:768
 msgid "Right Margin"
 msgstr "Høyre marg"
 
-#: ../gtk/gtktextview.c:768
+#: ../gtk/gtktextview.c:796
 msgid "Cursor Visible"
 msgstr "Synlig markør"
 
-#: ../gtk/gtktextview.c:769
+#: ../gtk/gtktextview.c:797
 msgid "If the insertion cursor is shown"
 msgstr "Vis innsettingsmarkør"
 
-#: ../gtk/gtktextview.c:776
+#: ../gtk/gtktextview.c:804
 msgid "Buffer"
 msgstr "Buffer"
 
-#: ../gtk/gtktextview.c:777
+#: ../gtk/gtktextview.c:805
 msgid "The buffer which is displayed"
 msgstr "Buffer som vises"
 
-#: ../gtk/gtktextview.c:785
+#: ../gtk/gtktextview.c:813
 msgid "Whether entered text overwrites existing contents"
 msgstr "Om oppgitt tekst overskriver eksisterende innhold"
 
-#: ../gtk/gtktextview.c:792
+#: ../gtk/gtktextview.c:820
 msgid "Accepts tab"
 msgstr "Godtar tabulator"
 
-#: ../gtk/gtktextview.c:793
+#: ../gtk/gtktextview.c:821
 msgid "Whether Tab will result in a tab character being entered"
 msgstr "Om tab resulterer i at et tabulatortegn settes inn"
 
-#: ../gtk/gtktextview.c:864
+#: ../gtk/gtktextview.c:909
 msgid "Error underline color"
 msgstr "Farge for understreking av feil"
 
-#: ../gtk/gtktextview.c:865
+#: ../gtk/gtktextview.c:910
 msgid "Color with which to draw error-indication underlines"
 msgstr "Farge for understreking av feil"
 
-#: ../gtk/gtkthemingengine.c:259
+#: ../gtk/gtkthemingengine.c:263
 msgid "Theming engine name"
 msgstr "Navn på temamotor"
 
-#: ../gtk/gtktoggleaction.c:116
+#: ../gtk/deprecated/gtktoggleaction.c:120
 msgid "Create the same proxies as a radio action"
 msgstr "Opprett samme proxyer som en radiohandling"
 
-#: ../gtk/gtktoggleaction.c:117
+#: ../gtk/deprecated/gtktoggleaction.c:121
 msgid "Whether the proxies for this action look like radio action proxies"
 msgstr "Om proxyene for denne handlingen ser ut som radiohandlingproxyer"
 
-#: ../gtk/gtktoggleaction.c:132
+#: ../gtk/deprecated/gtktoggleaction.c:138
 msgid "Whether the toggle action should be active"
-msgstr ""
+msgstr "Om bryterhandlingen skal være aktiv"
 
-#: ../gtk/gtktogglebutton.c:174 ../gtk/gtktoggletoolbutton.c:126
+#: ../gtk/gtktogglebutton.c:177 ../gtk/gtktoggletoolbutton.c:128
 msgid "If the toggle button should be pressed in"
 msgstr ""
 
-#: ../gtk/gtktogglebutton.c:182
+#: ../gtk/gtktogglebutton.c:185
 msgid "If the toggle button is in an \"in between\" state"
 msgstr "Om knappen er i en mellomtilstand"
 
-#: ../gtk/gtktogglebutton.c:189
+#: ../gtk/gtktogglebutton.c:192
 msgid "Draw Indicator"
 msgstr "Tegn indikator"
 
-#: ../gtk/gtktogglebutton.c:190
+#: ../gtk/gtktogglebutton.c:193
 msgid "If the toggle part of the button is displayed"
 msgstr "Om venderdelen av knappen skal vises"
 
-#: ../gtk/gtktoolbar.c:498 ../gtk/gtktoolpalette.c:1043
+#: ../gtk/gtktoolbar.c:502 ../gtk/gtktoolpalette.c:972
 msgid "Toolbar Style"
 msgstr "Stil for verktøylinje"
 
-#: ../gtk/gtktoolbar.c:499
+#: ../gtk/gtktoolbar.c:503
 msgid "How to draw the toolbar"
 msgstr "Hvordan tegnes verktøylinjen"
 
-#: ../gtk/gtktoolbar.c:506
+#: ../gtk/gtktoolbar.c:510
 msgid "Show Arrow"
 msgstr "Vis pil"
 
-#: ../gtk/gtktoolbar.c:507
+#: ../gtk/gtktoolbar.c:511
 msgid "If an arrow should be shown if the toolbar doesn't fit"
 msgstr "Om en pil skal vises hvis verktøylinjen ikke passer"
 
-#: ../gtk/gtktoolbar.c:528
+#: ../gtk/gtktoolbar.c:532
 msgid "Size of icons in this toolbar"
 msgstr "Størrelse på ikoner i denne verktøylinjen"
 
-#: ../gtk/gtktoolbar.c:543 ../gtk/gtktoolpalette.c:1029
+#: ../gtk/gtktoolbar.c:547 ../gtk/gtktoolpalette.c:958
 msgid "Icon size set"
 msgstr "Ikonstørrelse satt"
 
-#: ../gtk/gtktoolbar.c:544 ../gtk/gtktoolpalette.c:1030
+#: ../gtk/gtktoolbar.c:548 ../gtk/gtktoolpalette.c:959
 msgid "Whether the icon-size property has been set"
 msgstr ""
 
-#: ../gtk/gtktoolbar.c:553
+#: ../gtk/gtktoolbar.c:557
 msgid "Whether the item should receive extra space when the toolbar grows"
 msgstr "Om oppføringen skal få mer plass når verktøylinjen vokser"
 
-#: ../gtk/gtktoolbar.c:561 ../gtk/gtktoolitemgroup.c:1651
+#: ../gtk/gtktoolbar.c:565 ../gtk/gtktoolitemgroup.c:1647
 msgid "Whether the item should be the same size as other homogeneous items"
 msgstr ""
 "Om oppføringen skal forbli samme størrelse som andre homogene oppføringer"
 
-#: ../gtk/gtktoolbar.c:568
+#: ../gtk/gtktoolbar.c:572
 msgid "Spacer size"
 msgstr "Størrelse på mellomrom"
 
-#: ../gtk/gtktoolbar.c:569
+#: ../gtk/gtktoolbar.c:573
 msgid "Size of spacers"
 msgstr "Størrelse på plassholdere"
 
-#: ../gtk/gtktoolbar.c:587
+#: ../gtk/gtktoolbar.c:591
 msgid "Amount of border space between the toolbar shadow and the buttons"
 msgstr "Mengde kantområde mellom verktøylinjens skygge og knappene"
 
-#: ../gtk/gtktoolbar.c:595
+#: ../gtk/gtktoolbar.c:599
 msgid "Maximum child expand"
 msgstr ""
 
-#: ../gtk/gtktoolbar.c:596
+#: ../gtk/gtktoolbar.c:600
 msgid "Maximum amount of space an expandable item will be given"
 msgstr ""
 
-#: ../gtk/gtktoolbar.c:604
+#: ../gtk/gtktoolbar.c:608
 msgid "Space style"
 msgstr "Stil på mellomrom"
 
-#: ../gtk/gtktoolbar.c:605
+#: ../gtk/gtktoolbar.c:609
 msgid "Whether spacers are vertical lines or just blank"
 msgstr "Om mellomrommene er vertikale linjer eller bare tomrom"
 
-#: ../gtk/gtktoolbar.c:612
+#: ../gtk/gtktoolbar.c:616
 msgid "Button relief"
 msgstr "Kantavsleping"
 
-#: ../gtk/gtktoolbar.c:613
+#: ../gtk/gtktoolbar.c:617
 msgid "Type of bevel around toolbar buttons"
 msgstr "Type kant rundt verktøylinjeknappene"
 
-#: ../gtk/gtktoolbar.c:629
+#: ../gtk/gtktoolbar.c:633
 msgid "Style of bevel around the toolbar"
 msgstr "Stil på kant rundt verktøylinjen"
 
@@ -6822,39 +6889,39 @@
 msgid "Widget to use as the item label"
 msgstr "Komponent som skal brukes som etikett for oppføringen"
 
-#: ../gtk/gtktoolbutton.c:260
+#: ../gtk/gtktoolbutton.c:265
 msgid "Stock Id"
 msgstr "Standard-ID"
 
-#: ../gtk/gtktoolbutton.c:261
+#: ../gtk/gtktoolbutton.c:266
 msgid "The stock icon displayed on the item"
 msgstr "Standardikon som vises på oppføringen"
 
-#: ../gtk/gtktoolbutton.c:277
+#: ../gtk/gtkstack.c:425 ../gtk/gtktoolbutton.c:282
 msgid "Icon name"
 msgstr "Navn på ikon"
 
-#: ../gtk/gtktoolbutton.c:278
+#: ../gtk/gtktoolbutton.c:283
 msgid "The name of the themed icon displayed on the item"
 msgstr "Navnet på standardikon som vises på oppføringen"
 
-#: ../gtk/gtktoolbutton.c:284
+#: ../gtk/gtktoolbutton.c:289
 msgid "Icon widget"
 msgstr "Ikonkomponent"
 
-#: ../gtk/gtktoolbutton.c:285
+#: ../gtk/gtktoolbutton.c:290
 msgid "Icon widget to display in the item"
 msgstr "Ikonkomponent som skal vises i oppføringen"
 
-#: ../gtk/gtktoolbutton.c:301
+#: ../gtk/gtktoolbutton.c:306
 msgid "Icon spacing"
 msgstr "Avstand mellom ikoner"
 
-#: ../gtk/gtktoolbutton.c:302
+#: ../gtk/gtktoolbutton.c:307
 msgid "Spacing in pixels between the icon and label"
 msgstr "Mellomrom i piksler mellom ikonet og etiketten"
 
-#: ../gtk/gtktoolitem.c:206
+#: ../gtk/gtktoolitem.c:209
 msgid ""
 "Whether the toolbar item is considered important. When TRUE, toolbar buttons "
 "show text in GTK_TOOLBAR_BOTH_HORIZ mode"
@@ -6862,83 +6929,83 @@
 "Om verktøylinjeoppføringen ses på som viktig. Hvis TRUE vil knapper på "
 "verktøylinjen ha tekst i GTK_TOOLBAR_BOTH_HORIZ-modus"
 
-#: ../gtk/gtktoolitemgroup.c:1598
+#: ../gtk/gtktoolitemgroup.c:1594
 msgid "The human-readable title of this item group"
 msgstr ""
 
-#: ../gtk/gtktoolitemgroup.c:1605
+#: ../gtk/gtktoolitemgroup.c:1601
 msgid "A widget to display in place of the usual label"
 msgstr ""
 
-#: ../gtk/gtktoolitemgroup.c:1611
+#: ../gtk/gtktoolitemgroup.c:1607
 msgid "Collapsed"
 msgstr "Slått sammen"
 
-#: ../gtk/gtktoolitemgroup.c:1612
+#: ../gtk/gtktoolitemgroup.c:1608
 msgid "Whether the group has been collapsed and items are hidden"
 msgstr ""
 
-#: ../gtk/gtktoolitemgroup.c:1618
+#: ../gtk/gtktoolitemgroup.c:1614
 msgid "ellipsize"
 msgstr ""
 
-#: ../gtk/gtktoolitemgroup.c:1619
+#: ../gtk/gtktoolitemgroup.c:1615
 msgid "Ellipsize for item group headers"
 msgstr ""
 
-#: ../gtk/gtktoolitemgroup.c:1625
+#: ../gtk/gtktoolitemgroup.c:1621
 msgid "Header Relief"
 msgstr ""
 
-#: ../gtk/gtktoolitemgroup.c:1626
+#: ../gtk/gtktoolitemgroup.c:1622
 msgid "Relief of the group header button"
 msgstr ""
 
-#: ../gtk/gtktoolitemgroup.c:1641
+#: ../gtk/gtktoolitemgroup.c:1637
 msgid "Header Spacing"
 msgstr ""
 
-#: ../gtk/gtktoolitemgroup.c:1642
+#: ../gtk/gtktoolitemgroup.c:1638
 msgid "Spacing between expander arrow and caption"
 msgstr ""
 
-#: ../gtk/gtktoolitemgroup.c:1658
+#: ../gtk/gtktoolitemgroup.c:1654
 msgid "Whether the item should receive extra space when the group grows"
 msgstr ""
 
-#: ../gtk/gtktoolitemgroup.c:1665
+#: ../gtk/gtktoolitemgroup.c:1661
 msgid "Whether the item should fill the available space"
 msgstr ""
 
-#: ../gtk/gtktoolitemgroup.c:1671
+#: ../gtk/gtktoolitemgroup.c:1667
 msgid "New Row"
 msgstr "Ny rad"
 
-#: ../gtk/gtktoolitemgroup.c:1672
+#: ../gtk/gtktoolitemgroup.c:1668
 msgid "Whether the item should start a new row"
 msgstr ""
 
-#: ../gtk/gtktoolitemgroup.c:1679
+#: ../gtk/gtktoolitemgroup.c:1675
 msgid "Position of the item within this group"
 msgstr ""
 
-#: ../gtk/gtktoolpalette.c:1014
+#: ../gtk/gtktoolpalette.c:943
 msgid "Size of icons in this tool palette"
 msgstr ""
 
-#: ../gtk/gtktoolpalette.c:1044
+#: ../gtk/gtktoolpalette.c:973
 msgid "Style of items in the tool palette"
 msgstr ""
 
-#: ../gtk/gtktoolpalette.c:1060
+#: ../gtk/gtktoolpalette.c:989
 msgid "Exclusive"
 msgstr "Ekslusiv"
 
-#: ../gtk/gtktoolpalette.c:1061
+#: ../gtk/gtktoolpalette.c:990
 msgid "Whether the item group should be the only expanded at a given time"
 msgstr ""
 
-#: ../gtk/gtktoolpalette.c:1076
+#: ../gtk/gtktoolpalette.c:1005
 msgid ""
 "Whether the item group should receive extra space when the palette grows"
 msgstr ""
@@ -6983,401 +7050,401 @@
 msgid "The pixel size that icons should be forced to, or zero"
 msgstr ""
 
-#: ../gtk/gtktreemenu.c:290
+#: ../gtk/gtktreemenu.c:272
 msgid "TreeMenu model"
 msgstr "TreeMenu-modell"
 
-#: ../gtk/gtktreemenu.c:291
+#: ../gtk/gtktreemenu.c:273
 msgid "The model for the tree menu"
 msgstr ""
 
-#: ../gtk/gtktreemenu.c:313
+#: ../gtk/gtktreemenu.c:295
 msgid "TreeMenu root row"
 msgstr ""
 
-#: ../gtk/gtktreemenu.c:314
+#: ../gtk/gtktreemenu.c:296
 msgid "The TreeMenu will display children of the specified root"
 msgstr ""
 
-#: ../gtk/gtktreemenu.c:347
+#: ../gtk/gtktreemenu.c:329
 msgid "Tearoff"
 msgstr ""
 
-#: ../gtk/gtktreemenu.c:348
+#: ../gtk/gtktreemenu.c:330
 msgid "Whether the menu has a tearoff item"
 msgstr ""
 
-#: ../gtk/gtktreemenu.c:364
+#: ../gtk/gtktreemenu.c:346
 msgid "Wrap Width"
 msgstr "Bredde for bryting"
 
-#: ../gtk/gtktreemenu.c:365
+#: ../gtk/gtktreemenu.c:347
 msgid "Wrap width for laying out items in a grid"
 msgstr ""
 
-#: ../gtk/gtktreemodelsort.c:489
+#: ../gtk/gtktreemodelsort.c:488
 msgid "TreeModelSort Model"
 msgstr "TreeModelSort modell"
 
-#: ../gtk/gtktreemodelsort.c:490
+#: ../gtk/gtktreemodelsort.c:489
 msgid "The model for the TreeModelSort to sort"
 msgstr "Modell som TreeModelSort skal sortere"
 
-#: ../gtk/gtktreeview.c:985
+#: ../gtk/gtktreeview.c:992
 msgid "TreeView Model"
 msgstr "TreeView modell"
 
-#: ../gtk/gtktreeview.c:986
+#: ../gtk/gtktreeview.c:993
 msgid "The model for the tree view"
 msgstr "Modell for treevisning"
 
-#: ../gtk/gtktreeview.c:998
+#: ../gtk/gtktreeview.c:1005
 msgid "Headers Visible"
 msgstr "Synlig topptekst"
 
-#: ../gtk/gtktreeview.c:999
+#: ../gtk/gtktreeview.c:1006
 msgid "Show the column header buttons"
 msgstr "Vis knapper for kolonnetopptekst"
 
-#: ../gtk/gtktreeview.c:1006
+#: ../gtk/gtktreeview.c:1013
 msgid "Headers Clickable"
 msgstr "Topptekst kan klikkes"
 
-#: ../gtk/gtktreeview.c:1007
+#: ../gtk/gtktreeview.c:1014
 msgid "Column headers respond to click events"
 msgstr "Kolonnetitler svarer på klikk"
 
-#: ../gtk/gtktreeview.c:1014
+#: ../gtk/gtktreeview.c:1021
 msgid "Expander Column"
 msgstr "Utviderkolonne"
 
-#: ../gtk/gtktreeview.c:1015
+#: ../gtk/gtktreeview.c:1022
 msgid "Set the column for the expander column"
 msgstr "Sett kolonne for utviderkolonne"
 
-#: ../gtk/gtktreeview.c:1030
+#: ../gtk/gtktreeview.c:1037
 msgid "Rules Hint"
 msgstr "Regelhint"
 
-#: ../gtk/gtktreeview.c:1031
+#: ../gtk/gtktreeview.c:1038
 msgid "Set a hint to the theme engine to draw rows in alternating colors"
 msgstr "Sett et hint til temamotoren for å tegne rader i alternerende farger"
 
-#: ../gtk/gtktreeview.c:1038
+#: ../gtk/gtktreeview.c:1045
 msgid "Enable Search"
 msgstr "Aktiver søk"
 
-#: ../gtk/gtktreeview.c:1039
+#: ../gtk/gtktreeview.c:1046
 msgid "View allows user to search through columns interactively"
 msgstr "Visning lar bruker søke gjennom kolonner interaktivt"
 
-#: ../gtk/gtktreeview.c:1046
+#: ../gtk/gtktreeview.c:1053
 msgid "Search Column"
 msgstr "Søkekolonne"
 
-#: ../gtk/gtktreeview.c:1047
+#: ../gtk/gtktreeview.c:1054
 msgid "Model column to search through during interactive search"
 msgstr "Modellkolonne som skal søkes gjennom ved interaktivt søk"
 
-#: ../gtk/gtktreeview.c:1067
+#: ../gtk/gtktreeview.c:1074
 msgid "Fixed Height Mode"
 msgstr "Fast høyde"
 
-#: ../gtk/gtktreeview.c:1068
+#: ../gtk/gtktreeview.c:1075
 msgid "Speeds up GtkTreeView by assuming that all rows have the same height"
 msgstr "Gjør GtkTreeView raskere ved å anta at alle rader har samme høyde"
 
-#: ../gtk/gtktreeview.c:1088
+#: ../gtk/gtktreeview.c:1095
 msgid "Hover Selection"
 msgstr "Svevende utvalg"
 
-#: ../gtk/gtktreeview.c:1089
+#: ../gtk/gtktreeview.c:1096
 msgid "Whether the selection should follow the pointer"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1108
+#: ../gtk/gtktreeview.c:1115
 msgid "Hover Expand"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1109
+#: ../gtk/gtktreeview.c:1116
 msgid ""
 "Whether rows should be expanded/collapsed when the pointer moves over them"
 msgstr "Om rader skal utvides/sammensunket når pekeren beveger seg over dem"
 
-#: ../gtk/gtktreeview.c:1123
+#: ../gtk/gtktreeview.c:1130
 msgid "Show Expanders"
 msgstr "Vis utvidere"
 
-#: ../gtk/gtktreeview.c:1124
+#: ../gtk/gtktreeview.c:1131
 msgid "View has expanders"
 msgstr "Visning har utvidere"
 
-#: ../gtk/gtktreeview.c:1138
+#: ../gtk/gtktreeview.c:1145
 msgid "Level Indentation"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1139
+#: ../gtk/gtktreeview.c:1146
 msgid "Extra indentation for each level"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1148
+#: ../gtk/gtktreeview.c:1155
 msgid "Rubber Banding"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1149
+#: ../gtk/gtktreeview.c:1156
 msgid ""
 "Whether to enable selection of multiple items by dragging the mouse pointer"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1156
+#: ../gtk/gtktreeview.c:1163
 msgid "Enable Grid Lines"
 msgstr "Aktiver linjer i rutenett"
 
-#: ../gtk/gtktreeview.c:1157
+#: ../gtk/gtktreeview.c:1164
 msgid "Whether grid lines should be drawn in the tree view"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1165
+#: ../gtk/gtktreeview.c:1172
 msgid "Enable Tree Lines"
 msgstr "Aktiver linjer i tre"
 
-#: ../gtk/gtktreeview.c:1166
+#: ../gtk/gtktreeview.c:1173
 msgid "Whether tree lines should be drawn in the tree view"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1174
+#: ../gtk/gtktreeview.c:1181
 msgid "The column in the model containing the tooltip texts for the rows"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1212
+#: ../gtk/gtktreeview.c:1219
 msgid "Vertical Separator Width"
 msgstr "Bredde på vertikal separator"
 
-#: ../gtk/gtktreeview.c:1213
+#: ../gtk/gtktreeview.c:1220
 msgid "Vertical space between cells.  Must be an even number"
 msgstr "Vertikalt mellomrom mellom celler. Må være et liketall"
 
-#: ../gtk/gtktreeview.c:1221
+#: ../gtk/gtktreeview.c:1228
 msgid "Horizontal Separator Width"
 msgstr "Bredde på horisontal separator"
 
-#: ../gtk/gtktreeview.c:1222
+#: ../gtk/gtktreeview.c:1229
 msgid "Horizontal space between cells.  Must be an even number"
 msgstr "Horisontalt mellomrom mellom celler. Må være et liketall"
 
-#: ../gtk/gtktreeview.c:1230
+#: ../gtk/gtktreeview.c:1237
 msgid "Allow Rules"
 msgstr "Tillat linjaler"
 
-#: ../gtk/gtktreeview.c:1231
+#: ../gtk/gtktreeview.c:1238
 msgid "Allow drawing of alternating color rows"
 msgstr "Tillat tegning av alternerende fargerader"
 
-#: ../gtk/gtktreeview.c:1237
+#: ../gtk/gtktreeview.c:1244
 msgid "Indent Expanders"
 msgstr "Indenter utvidere"
 
-#: ../gtk/gtktreeview.c:1238
+#: ../gtk/gtktreeview.c:1245
 msgid "Make the expanders indented"
 msgstr "Gjør utvidere indentert"
 
-#: ../gtk/gtktreeview.c:1244
+#: ../gtk/gtktreeview.c:1251
 msgid "Even Row Color"
 msgstr "Farge for like rader"
 
-#: ../gtk/gtktreeview.c:1245
+#: ../gtk/gtktreeview.c:1252
 msgid "Color to use for even rows"
 msgstr "Farge som skal brukes for like rader"
 
-#: ../gtk/gtktreeview.c:1251
+#: ../gtk/gtktreeview.c:1258
 msgid "Odd Row Color"
 msgstr "Farge for ulike rader"
 
-#: ../gtk/gtktreeview.c:1252
+#: ../gtk/gtktreeview.c:1259
 msgid "Color to use for odd rows"
 msgstr "Farge som skal brukes for ulike rader"
 
-#: ../gtk/gtktreeview.c:1258
+#: ../gtk/gtktreeview.c:1265
 msgid "Grid line width"
 msgstr "Linjebredde i rutenett"
 
-#: ../gtk/gtktreeview.c:1259
+#: ../gtk/gtktreeview.c:1266
 msgid "Width, in pixels, of the tree view grid lines"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1265
+#: ../gtk/gtktreeview.c:1272
 msgid "Tree line width"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1266
+#: ../gtk/gtktreeview.c:1273
 msgid "Width, in pixels, of the tree view lines"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1272
+#: ../gtk/gtktreeview.c:1279
 msgid "Grid line pattern"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1273
+#: ../gtk/gtktreeview.c:1280
 msgid "Dash pattern used to draw the tree view grid lines"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1279
+#: ../gtk/gtktreeview.c:1286
 msgid "Tree line pattern"
 msgstr ""
 
-#: ../gtk/gtktreeview.c:1280
+#: ../gtk/gtktreeview.c:1287
 msgid "Dash pattern used to draw the tree view lines"
 msgstr ""
 
-#: ../gtk/gtktreeviewcolumn.c:246
+#: ../gtk/gtktreeviewcolumn.c:247
 msgid "Whether to display the column"
 msgstr "Vis kolonnen"
 
-#: ../gtk/gtktreeviewcolumn.c:253 ../gtk/gtkwindow.c:651
+#: ../gtk/gtktreeviewcolumn.c:254 ../gtk/gtkwindow.c:736
 msgid "Resizable"
 msgstr "Kan endre størrelse"
 
-#: ../gtk/gtktreeviewcolumn.c:254
+#: ../gtk/gtktreeviewcolumn.c:255
 msgid "Column is user-resizable"
 msgstr "Bruker kan endre størrelse på kolonnen"
 
-#: ../gtk/gtktreeviewcolumn.c:262
+#: ../gtk/gtktreeviewcolumn.c:263
 msgid "Current X position of the column"
 msgstr ""
 
-#: ../gtk/gtktreeviewcolumn.c:272
+#: ../gtk/gtktreeviewcolumn.c:273
 msgid "Current width of the column"
 msgstr "Nåværende bredde på kolonnen"
 
-#: ../gtk/gtktreeviewcolumn.c:289
+#: ../gtk/gtktreeviewcolumn.c:290
 msgid "Sizing"
 msgstr "Størrelse"
 
-#: ../gtk/gtktreeviewcolumn.c:290
+#: ../gtk/gtktreeviewcolumn.c:291
 msgid "Resize mode of the column"
 msgstr "Modus for endring av størrelse for kolonnen"
 
-#: ../gtk/gtktreeviewcolumn.c:298
+#: ../gtk/gtktreeviewcolumn.c:299
 msgid "Fixed Width"
 msgstr "Fast bredde"
 
-#: ../gtk/gtktreeviewcolumn.c:299
+#: ../gtk/gtktreeviewcolumn.c:300
 msgid "Current fixed width of the column"
 msgstr "Nåværende fast bredde på kolonnen"
 
-#: ../gtk/gtktreeviewcolumn.c:309
+#: ../gtk/gtktreeviewcolumn.c:310
 msgid "Minimum allowed width of the column"
 msgstr "Minimum tillatt bredde på kolonne"
 
-#: ../gtk/gtktreeviewcolumn.c:318
+#: ../gtk/gtktreeviewcolumn.c:319
 msgid "Maximum Width"
 msgstr "Maksimal bredde"
 
-#: ../gtk/gtktreeviewcolumn.c:319
+#: ../gtk/gtktreeviewcolumn.c:320
 msgid "Maximum allowed width of the column"
 msgstr "Maksimum tillatt bredde på kolonnen"
 
-#: ../gtk/gtktreeviewcolumn.c:329
+#: ../gtk/gtktreeviewcolumn.c:330
 msgid "Title to appear in column header"
 msgstr "Tittel som vises i kolonnetopptekst"
 
-#: ../gtk/gtktreeviewcolumn.c:337
+#: ../gtk/gtktreeviewcolumn.c:338
 msgid "Column gets share of extra width allocated to the widget"
 msgstr "Kolonnen får en del av ekstra bredde allokert til komponenten"
 
-#: ../gtk/gtktreeviewcolumn.c:344
+#: ../gtk/gtktreeviewcolumn.c:345
 msgid "Clickable"
 msgstr "Klikkbar"
 
-#: ../gtk/gtktreeviewcolumn.c:345
+#: ../gtk/gtktreeviewcolumn.c:346
 msgid "Whether the header can be clicked"
 msgstr "Om toppteksten kan klikkes"
 
-#: ../gtk/gtktreeviewcolumn.c:354
+#: ../gtk/gtktreeviewcolumn.c:355
 msgid "Widget to put in column header button instead of column title"
 msgstr ""
 "Widget som skal legges i kappen for kolonneheader i stedet for kolonnens "
 "tittel"
 
-#: ../gtk/gtktreeviewcolumn.c:362
+#: ../gtk/gtktreeviewcolumn.c:363
 msgid "X Alignment of the column header text or widget"
 msgstr "X-justering for kolonneheaders tekst eller widget"
 
-#: ../gtk/gtktreeviewcolumn.c:372
+#: ../gtk/gtktreeviewcolumn.c:373
 msgid "Whether the column can be reordered around the headers"
 msgstr "Kolonnen kan omorganiseres etter titler"
 
-#: ../gtk/gtktreeviewcolumn.c:379
+#: ../gtk/gtktreeviewcolumn.c:380
 msgid "Sort indicator"
 msgstr "Sorter indikator"
 
-#: ../gtk/gtktreeviewcolumn.c:380
+#: ../gtk/gtktreeviewcolumn.c:381
 msgid "Whether to show a sort indicator"
 msgstr "Sorter indikator eller ikke"
 
-#: ../gtk/gtktreeviewcolumn.c:387
+#: ../gtk/gtktreeviewcolumn.c:388
 msgid "Sort order"
 msgstr "Sorteringsrekkefølge"
 
-#: ../gtk/gtktreeviewcolumn.c:388
+#: ../gtk/gtktreeviewcolumn.c:389
 msgid "Sort direction the sort indicator should indicate"
 msgstr "Sorteringsretning indikert av sorteringsindikator"
 
-#: ../gtk/gtktreeviewcolumn.c:404
+#: ../gtk/gtktreeviewcolumn.c:405
 msgid "Sort column ID"
 msgstr ""
 
-#: ../gtk/gtktreeviewcolumn.c:405
+#: ../gtk/gtktreeviewcolumn.c:406
 msgid "Logical sort column ID this column sorts on when selected for sorting"
 msgstr ""
 
-#: ../gtk/gtkuimanager.c:488
+#: ../gtk/deprecated/gtkuimanager.c:486
 msgid "Whether tearoff menu items should be added to menus"
 msgstr "Om avrivningsoppføringer skal legges til for menyen"
 
-#: ../gtk/gtkuimanager.c:495
+#: ../gtk/deprecated/gtkuimanager.c:493
 msgid "Merged UI definition"
 msgstr "Flettet brukergrensesnittdefinisjon"
 
-#: ../gtk/gtkuimanager.c:496
+#: ../gtk/deprecated/gtkuimanager.c:494
 msgid "An XML string describing the merged UI"
 msgstr "En XML-streng som beskriver flettet brukergrensesnitt"
 
-#: ../gtk/gtkviewport.c:156
+#: ../gtk/gtkviewport.c:164
 msgid "Determines how the shadowed box around the viewport is drawn"
 msgstr ""
 "Bestemmer hvordan den skyggelagte boksen rundt visningsområdet tegnes"
 
-#: ../gtk/gtkvolumebutton.c:155
+#: ../gtk/gtkvolumebutton.c:156
 msgid "Use symbolic icons"
 msgstr "Bruk symbolske ikoner"
 
-#: ../gtk/gtkvolumebutton.c:156
+#: ../gtk/gtkvolumebutton.c:157
 msgid "Whether to use symbolic icons"
 msgstr "Hvorvidt symbolske ikoner skal brukes"
 
-#: ../gtk/gtkwidget.c:978
+#: ../gtk/gtkwidget.c:1152
 msgid "Widget name"
 msgstr "Navn på widget"
 
-#: ../gtk/gtkwidget.c:979
+#: ../gtk/gtkwidget.c:1153
 msgid "The name of the widget"
 msgstr "Navnet på komponenten"
 
-#: ../gtk/gtktexthandle.c:470 ../gtk/gtktexthandle.c:471
-#: ../gtk/gtkwidget.c:985
+#: ../gtk/gtktexthandle.c:523 ../gtk/gtktexthandle.c:524
+#: ../gtk/gtkwidget.c:1159
 msgid "Parent widget"
 msgstr "Opphavswidget"
 
-#: ../gtk/gtkwidget.c:986
+#: ../gtk/gtkwidget.c:1160
 msgid "The parent widget of this widget. Must be a Container widget"
 msgstr "Opphav for widget. Må være et container-widget"
 
-#: ../gtk/gtkwidget.c:993
+#: ../gtk/gtkwidget.c:1167
 msgid "Width request"
 msgstr "Breddeforespørsel"
 
-#: ../gtk/gtkwidget.c:994
+#: ../gtk/gtkwidget.c:1168
 msgid ""
 "Override for width request of the widget, or -1 if natural request should be "
 "used"
@@ -7385,11 +7452,11 @@
 "Overstyring for breddeforespørsel for widget, eller -1 hvis naturlig "
 "forespørsel skal brukes"
 
-#: ../gtk/gtkwidget.c:1002
+#: ../gtk/gtkwidget.c:1176
 msgid "Height request"
 msgstr "Høydeforespørsel"
 
-#: ../gtk/gtkwidget.c:1003
+#: ../gtk/gtkwidget.c:1177
 msgid ""
 "Override for height request of the widget, or -1 if natural request should "
 "be used"
@@ -7397,84 +7464,84 @@
 "Overstyring for høydeforespørsel for widget, eller -1 hvis vanlig "
 "forespørsel skal brukes"
 
-#: ../gtk/gtkwidget.c:1012
+#: ../gtk/gtkwidget.c:1186
 msgid "Whether the widget is visible"
 msgstr "Widgetet er synlig"
 
-#: ../gtk/gtkwidget.c:1019
+#: ../gtk/gtkwidget.c:1193
 msgid "Whether the widget responds to input"
 msgstr "Widgetet tar imot inndata"
 
-#: ../gtk/gtkwidget.c:1025
+#: ../gtk/gtkwidget.c:1199
 msgid "Application paintable"
 msgstr "Tegnbar av applikasjon"
 
-#: ../gtk/gtkwidget.c:1026
+#: ../gtk/gtkwidget.c:1200
 msgid "Whether the application will paint directly on the widget"
 msgstr "Applikasjonen vil tegne direkte på widgetet"
 
-#: ../gtk/gtkwidget.c:1032
+#: ../gtk/gtkwidget.c:1206
 msgid "Can focus"
 msgstr "Kan fokusere"
 
-#: ../gtk/gtkwidget.c:1033
+#: ../gtk/gtkwidget.c:1207
 msgid "Whether the widget can accept the input focus"
 msgstr "Widget kan akseptere inndatafokus"
 
-#: ../gtk/gtkwidget.c:1039
+#: ../gtk/gtkwidget.c:1213
 msgid "Has focus"
 msgstr "Har fokus"
 
-#: ../gtk/gtkwidget.c:1040
+#: ../gtk/gtkwidget.c:1214
 msgid "Whether the widget has the input focus"
 msgstr "Widget har inndatafokus"
 
-#: ../gtk/gtkwidget.c:1046
+#: ../gtk/gtkwidget.c:1220
 msgid "Is focus"
 msgstr "Er fokus"
 
-#: ../gtk/gtkwidget.c:1047
+#: ../gtk/gtkwidget.c:1221
 msgid "Whether the widget is the focus widget within the toplevel"
 msgstr "Om widget er fokus-widget i toppnoden"
 
-#: ../gtk/gtkwidget.c:1053
+#: ../gtk/gtkwidget.c:1227
 msgid "Can default"
 msgstr "Kan være forvalgt"
 
-#: ../gtk/gtkwidget.c:1054
+#: ../gtk/gtkwidget.c:1228
 msgid "Whether the widget can be the default widget"
 msgstr "Om widget kan være forvalgt widget"
 
-#: ../gtk/gtkwidget.c:1060
+#: ../gtk/gtkwidget.c:1234
 msgid "Has default"
 msgstr "Har forvalg"
 
-#: ../gtk/gtkwidget.c:1061
+#: ../gtk/gtkwidget.c:1235
 msgid "Whether the widget is the default widget"
 msgstr "Widget er forvalgt widget"
 
-#: ../gtk/gtkwidget.c:1067
+#: ../gtk/gtkwidget.c:1241
 msgid "Receives default"
 msgstr "Mottar forvalg"
 
-#: ../gtk/gtkwidget.c:1068
+#: ../gtk/gtkwidget.c:1242
 msgid ""
 "If TRUE, the widget will receive the default action when it is focused"
 msgstr "Hvis SANN, vil widgetet motta forvalgt handling når det er fokusert"
 
-#: ../gtk/gtkwidget.c:1074
+#: ../gtk/gtkwidget.c:1248
 msgid "Composite child"
 msgstr "Sammensatt barn"
 
-#: ../gtk/gtkwidget.c:1075
+#: ../gtk/gtkwidget.c:1249
 msgid "Whether the widget is part of a composite widget"
 msgstr "Om widgetet er en del av et sammensatt widget"
 
-#: ../gtk/gtkwidget.c:1081
+#: ../gtk/gtkwidget.c:1258
 msgid "Style"
 msgstr "Stil"
 
-#: ../gtk/gtkwidget.c:1082
+#: ../gtk/gtkwidget.c:1259
 msgid ""
 "The style of the widget, which contains information about how it will look "
 "(colors etc)"
@@ -7482,176 +7549,176 @@
 "Stil for widgetet. Inneholder informasjon om hvordan det vil se ut (farger "
 "etc)"
 
-#: ../gtk/gtkwidget.c:1088
+#: ../gtk/gtkwidget.c:1268
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../gtk/gtkwidget.c:1089
+#: ../gtk/gtkwidget.c:1269
 msgid "The event mask that decides what kind of GdkEvents this widget gets"
 msgstr ""
 "Hendelsesmasken som bestemmer hvilke typer GdkEvents dette widgetet mottar"
 
-#: ../gtk/gtkwidget.c:1096
+#: ../gtk/gtkwidget.c:1276
 msgid "No show all"
 msgstr "Ikke vis alle"
 
-#: ../gtk/gtkwidget.c:1097
+#: ../gtk/gtkwidget.c:1277
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "Om gtk_widget_show_all() skal ha effekt for denne komponenten"
 
-#: ../gtk/gtkwidget.c:1120
+#: ../gtk/gtkwidget.c:1300
 msgid "Whether this widget has a tooltip"
 msgstr "Om denne komponenten har verktøytips"
 
-#: ../gtk/gtktexthandle.c:478 ../gtk/gtkwidget.c:1176
+#: ../gtk/gtktexthandle.c:531 ../gtk/gtkwidget.c:1356
 msgid "Window"
 msgstr "Vindu"
 
-#: ../gtk/gtkwidget.c:1177
+#: ../gtk/gtkwidget.c:1357
 msgid "The widget's window if it is realized"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1191
+#: ../gtk/gtkwidget.c:1371
 msgid "Double Buffered"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1192
+#: ../gtk/gtkwidget.c:1372
 msgid "Whether the widget is double buffered"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1207
+#: ../gtk/gtkwidget.c:1387
 msgid "How to position in extra horizontal space"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1223
+#: ../gtk/gtkwidget.c:1403
 msgid "How to position in extra vertical space"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1242
+#: ../gtk/gtkwidget.c:1424
 msgid "Margin on Left"
 msgstr "Venstre marg"
 
-#: ../gtk/gtkwidget.c:1243
+#: ../gtk/gtkwidget.c:1425
 msgid "Pixels of extra space on the left side"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1263
+#: ../gtk/gtkwidget.c:1447
 msgid "Margin on Right"
 msgstr "Høyre marg"
 
-#: ../gtk/gtkwidget.c:1264
+#: ../gtk/gtkwidget.c:1448
 msgid "Pixels of extra space on the right side"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1284
+#: ../gtk/gtkwidget.c:1510
 msgid "Margin on Top"
 msgstr "Toppmarg"
 
-#: ../gtk/gtkwidget.c:1285
+#: ../gtk/gtkwidget.c:1511
 msgid "Pixels of extra space on the top side"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1305
+#: ../gtk/gtkwidget.c:1531
 msgid "Margin on Bottom"
 msgstr "Bunnmarg"
 
-#: ../gtk/gtkwidget.c:1306
+#: ../gtk/gtkwidget.c:1532
 msgid "Pixels of extra space on the bottom side"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1323
+#: ../gtk/gtkwidget.c:1549
 msgid "All Margins"
 msgstr "Alle marger"
 
-#: ../gtk/gtkwidget.c:1324
+#: ../gtk/gtkwidget.c:1550
 msgid "Pixels of extra space on all four sides"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1357
+#: ../gtk/gtkwidget.c:1583
 msgid "Horizontal Expand"
 msgstr "Horisontal utvidelse"
 
-#: ../gtk/gtkwidget.c:1358
+#: ../gtk/gtkwidget.c:1584
 msgid "Whether widget wants more horizontal space"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1372
+#: ../gtk/gtkwidget.c:1598
 msgid "Horizontal Expand Set"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1373
+#: ../gtk/gtkwidget.c:1599
 msgid "Whether to use the hexpand property"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1387
+#: ../gtk/gtkwidget.c:1613
 msgid "Vertical Expand"
 msgstr "Vertikal utvidelse"
 
-#: ../gtk/gtkwidget.c:1388
+#: ../gtk/gtkwidget.c:1614
 msgid "Whether widget wants more vertical space"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1402
+#: ../gtk/gtkwidget.c:1628
 msgid "Vertical Expand Set"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1403
+#: ../gtk/gtkwidget.c:1629
 msgid "Whether to use the vexpand property"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:1417
+#: ../gtk/gtkwidget.c:1643
 msgid "Expand Both"
 msgstr "Utvid begge"
 
-#: ../gtk/gtkwidget.c:1418
+#: ../gtk/gtkwidget.c:1644
 msgid "Whether widget wants to expand in both directions"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:3139
+#: ../gtk/gtkwidget.c:3455
 msgid "Interior Focus"
 msgstr "Internt fokus"
 
-#: ../gtk/gtkwidget.c:3140
+#: ../gtk/gtkwidget.c:3456
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Om fokusindikator skal tegnes inne i et widget"
 
-#: ../gtk/gtkwidget.c:3146
+#: ../gtk/gtkwidget.c:3462
 msgid "Focus linewidth"
 msgstr "Fokuslinjebredde"
 
-#: ../gtk/gtkwidget.c:3147
+#: ../gtk/gtkwidget.c:3463
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Fokusindikatorlinjens bredde i piksler"
 
-#: ../gtk/gtkwidget.c:3153
+#: ../gtk/gtkwidget.c:3469
 msgid "Focus line dash pattern"
 msgstr "Prikkemønster for fokuslinje"
 
-#: ../gtk/gtkwidget.c:3154
+#: ../gtk/gtkwidget.c:3470
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Prikkemønster som brukes til å tegne fokusindikator"
 
-#: ../gtk/gtkwidget.c:3159
+#: ../gtk/gtkwidget.c:3475
 msgid "Focus padding"
 msgstr "Fyll for fokus"
 
-#: ../gtk/gtkwidget.c:3160
+#: ../gtk/gtkwidget.c:3476
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr "Bredde i piksler mellom fokusindikator og widgetboksen"
 
-#: ../gtk/gtkwidget.c:3165
+#: ../gtk/gtkwidget.c:3481
 msgid "Cursor color"
 msgstr "Markørfarge"
 
-#: ../gtk/gtkwidget.c:3166
+#: ../gtk/gtkwidget.c:3482
 msgid "Color with which to draw insertion cursor"
 msgstr "Farge som markøren skal tegnes med"
 
-#: ../gtk/gtkwidget.c:3171
+#: ../gtk/gtkwidget.c:3487
 msgid "Secondary cursor color"
 msgstr "Sekundær markørfarge"
 
-#: ../gtk/gtkwidget.c:3172
+#: ../gtk/gtkwidget.c:3488
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -7659,216 +7726,216 @@
 "Farge for sekundær innsettingsmarkør ved redigering av blandet høyre-til-"
 "venstre og venstre-til-høyre tekst"
 
-#: ../gtk/gtkwidget.c:3177
+#: ../gtk/gtkwidget.c:3493
 msgid "Cursor line aspect ratio"
 msgstr "Aspektrate for markørlinje"
 
-#: ../gtk/gtkwidget.c:3178
+#: ../gtk/gtkwidget.c:3494
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Aspektrate for tegning av innsettingsmarkør"
 
-#: ../gtk/gtkwidget.c:3184
+#: ../gtk/gtkwidget.c:3500
 msgid "Window dragging"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:3185
+#: gtk/gtkwidget.c:3454
 msgid "Whether windows can be dragged by clicking on empty areas"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:3198
+#: ../gtk/gtkwidget.c:3514
 msgid "Unvisited Link Color"
 msgstr "Lenkefarge for ikke besøkt lenke"
 
-#: ../gtk/gtkwidget.c:3199
+#: ../gtk/gtkwidget.c:3515
 msgid "Color of unvisited links"
 msgstr "Farge på ikke besøkte lenker"
 
-#: ../gtk/gtkwidget.c:3212
+#: ../gtk/gtkwidget.c:3528
 msgid "Visited Link Color"
 msgstr "Lenkefarge for besøkt lenke"
 
-#: ../gtk/gtkwidget.c:3213
+#: ../gtk/gtkwidget.c:3529
 msgid "Color of visited links"
 msgstr "Farge på besøkte lenker"
 
-#: ../gtk/gtkwidget.c:3227
+#: ../gtk/gtkwidget.c:3543
 msgid "Wide Separators"
 msgstr "Brede skillelinjer"
 
-#: ../gtk/gtkwidget.c:3228
+#: ../gtk/gtkwidget.c:3544
 msgid ""
 "Whether separators have configurable width and should be drawn using a box "
 "instead of a line"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:3242
+#: ../gtk/gtkwidget.c:3558
 msgid "Separator Width"
 msgstr "Bredde på separator"
 
-#: ../gtk/gtkwidget.c:3243
+#: ../gtk/gtkwidget.c:3559
 msgid "The width of separators if wide-separators is TRUE"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:3257
+#: ../gtk/gtkwidget.c:3573
 msgid "Separator Height"
 msgstr "Høyde på separator"
 
-#: ../gtk/gtkwidget.c:3258
+#: ../gtk/gtkwidget.c:3574
 msgid "The height of separators if \"wide-separators\" is TRUE"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:3272
+#: ../gtk/gtkwidget.c:3588
 msgid "Horizontal Scroll Arrow Length"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:3273
+#: ../gtk/gtkwidget.c:3589
 msgid "The length of horizontal scroll arrows"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:3287
+#: ../gtk/gtkwidget.c:3603
 msgid "Vertical Scroll Arrow Length"
 msgstr ""
 
-#: ../gtk/gtkwidget.c:3288
+#: ../gtk/gtkwidget.c:3604
 msgid "The length of vertical scroll arrows"
 msgstr ""
 
-#: ../gtk/gtkwindow.c:609
+#: ../gtk/gtkwindow.c:694
 msgid "Window Type"
 msgstr "Vindustype"
 
-#: ../gtk/gtkwindow.c:610
+#: ../gtk/gtkwindow.c:695
 msgid "The type of the window"
 msgstr "Type vindu"
 
-#: ../gtk/gtkwindow.c:618
+#: ../gtk/gtkwindow.c:703
 msgid "Window Title"
 msgstr "Vindustittel"
 
-#: ../gtk/gtkwindow.c:619
+#: ../gtk/gtkwindow.c:704
 msgid "The title of the window"
 msgstr "Tittelen på vinduet"
 
-#: ../gtk/gtkwindow.c:626
+#: ../gtk/gtkwindow.c:711
 msgid "Window Role"
 msgstr "Vindusrolle"
 
-#: ../gtk/gtkwindow.c:627
+#: ../gtk/gtkwindow.c:712
 msgid "Unique identifier for the window to be used when restoring a session"
 msgstr ""
 "Unik indentifikator for vinduet som brukes ved gjenoppretting av en økt"
 
-#: ../gtk/gtkwindow.c:643
+#: ../gtk/gtkwindow.c:728
 msgid "Startup ID"
 msgstr "Oppstarts-ID"
 
-#: ../gtk/gtkwindow.c:644
+#: ../gtk/gtkwindow.c:729
 msgid "Unique startup identifier for the window used by startup-notification"
 msgstr "Unik indentifikator for vinduet som brukes ved varsling av oppstart"
 
-#: ../gtk/gtkwindow.c:652
+#: ../gtk/gtkwindow.c:737
 msgid "If TRUE, users can resize the window"
 msgstr "Brukere kan endre størrelse på vinduet hvis SANN"
 
-#: ../gtk/gtkwindow.c:659
+#: ../gtk/gtkwindow.c:744
 msgid "Modal"
 msgstr "Modal"
 
-#: ../gtk/gtkwindow.c:660
+#: ../gtk/gtkwindow.c:745
 msgid ""
 "If TRUE, the window is modal (other windows are not usable while this one is "
 "up)"
 msgstr ""
 "Hvis SANN er vinduet modalt (andre vinduer er ikke brukbare når dette vises)"
 
-#: ../gtk/gtkwindow.c:667
+#: ../gtk/gtkwindow.c:752
 msgid "Window Position"
 msgstr "Vindusplassering"
 
-#: ../gtk/gtkwindow.c:668
+#: ../gtk/gtkwindow.c:753
 msgid "The initial position of the window"
 msgstr "Startposisjon for vinduet"
 
-#: ../gtk/gtkwindow.c:676
+#: ../gtk/gtkwindow.c:761
 msgid "Default Width"
 msgstr "Standard bredde"
 
-#: ../gtk/gtkwindow.c:677
+#: ../gtk/gtkwindow.c:762
 msgid ""
 "The default width of the window, used when initially showing the window"
 msgstr "Forvalgt bredde for vinduet. Brukt når vinduet først vises"
 
-#: ../gtk/gtkwindow.c:686
+#: ../gtk/gtkwindow.c:771
 msgid "Default Height"
 msgstr "Standard høyde"
 
-#: ../gtk/gtkwindow.c:687
+#: ../gtk/gtkwindow.c:772
 msgid ""
 "The default height of the window, used when initially showing the window"
 msgstr "Forvalgt høyde for vindu. Brukt når vinduet først vises"
 
-#: ../gtk/gtkwindow.c:696
+#: ../gtk/gtkwindow.c:781
 msgid "Destroy with Parent"
 msgstr "Ødelegg med opphav"
 
-#: ../gtk/gtkwindow.c:697
+#: ../gtk/gtkwindow.c:782
 msgid "If this window should be destroyed when the parent is destroyed"
 msgstr "Vinduet skal ødelegges når opphavet ødelegges"
 
-#: ../gtk/gtkwindow.c:711
+#: ../gtk/gtkwindow.c:796
 msgid "Hide the titlebar during maximization"
 msgstr ""
 
-#: ../gtk/gtkwindow.c:712
+#: ../gtk/gtkwindow.c:797
 msgid ""
 "If this window's titlebar should be hidden when the window is maximized"
 msgstr ""
 
-#: ../gtk/gtkwindow.c:720
+#: ../gtk/gtkwindow.c:805
 msgid "Icon for this window"
 msgstr "Ikon for dette vinduet"
 
-#: ../gtk/gtkwindow.c:738
+#: ../gtk/gtkwindow.c:822
 msgid "Mnemonics Visible"
 msgstr "Synlige hurtigtaster"
 
-#: ../gtk/gtkwindow.c:739
+#: ../gtk/gtkwindow.c:823
 msgid "Whether mnemonics are currently visible in this window"
 msgstr ""
 
-#: ../gtk/gtkwindow.c:757
+#: ../gtk/gtkwindow.c:840
 msgid "Focus Visible"
 msgstr "Synlig fokus"
 
-#: ../gtk/gtkwindow.c:758
+#: ../gtk/gtkwindow.c:841
 msgid "Whether focus rectangles are currently visible in this window"
 msgstr ""
 
-#: ../gtk/gtkwindow.c:774
+#: ../gtk/gtkwindow.c:857
 msgid "Name of the themed icon for this window"
 msgstr "Navnet på temaikonet for dette vinduet"
 
-#: ../gtk/gtkwindow.c:789
+#: ../gtk/gtkwindow.c:872
 msgid "Is Active"
 msgstr "Er aktiv"
 
-#: ../gtk/gtkwindow.c:790
+#: ../gtk/gtkwindow.c:873
 msgid "Whether the toplevel is the current active window"
 msgstr "Om toppnivået er aktivt vindu"
 
-#: ../gtk/gtkwindow.c:797
+#: ../gtk/gtkwindow.c:880
 msgid "Focus in Toplevel"
 msgstr "Fokus i toppnivå"
 
-#: ../gtk/gtkwindow.c:798
+#: ../gtk/gtkwindow.c:881
 msgid "Whether the input focus is within this GtkWindow"
 msgstr "Om inndatafokus er i dette GtkWindow"
 
-#: ../gtk/gtkwindow.c:805
+#: ../gtk/gtkwindow.c:888
 msgid "Type hint"
 msgstr "Type hint"
 
-#: ../gtk/gtkwindow.c:806
+#: ../gtk/gtkwindow.c:889
 msgid ""
 "Hint to help the desktop environment understand what kind of window this is "
 "and how to treat it."
@@ -7876,123 +7943,123 @@
 "Hint som skal hjelpe skrivebordsmiljøet med å forstå hvilken type vindu "
 "dette er og hvordan det skal behandles."
 
-#: ../gtk/gtkwindow.c:814
+#: ../gtk/gtkwindow.c:897
 msgid "Skip taskbar"
 msgstr "Hopp over oppgaveliste"
 
-#: ../gtk/gtkwindow.c:815
+#: ../gtk/gtkwindow.c:898
 msgid "TRUE if the window should not be in the task bar."
 msgstr "SANN hvis vinduet ikke skal være i oppgavelisten."
 
-#: ../gtk/gtkwindow.c:822
+#: ../gtk/gtkwindow.c:905
 msgid "Skip pager"
 msgstr "Hopp over vinduliste"
 
-#: ../gtk/gtkwindow.c:823
+#: ../gtk/gtkwindow.c:906
 msgid "TRUE if the window should not be in the pager."
 msgstr "SANN hvis vinduet ikke skal være i vindulisten."
 
-#: ../gtk/gtkwindow.c:830
+#: ../gtk/gtkwindow.c:913
 msgid "Urgent"
 msgstr "Viktig"
 
-#: ../gtk/gtkwindow.c:831
+#: ../gtk/gtkwindow.c:914
 msgid "TRUE if the window should be brought to the user's attention."
 msgstr "TRUE hvis vinduet skal bli gitt brukerens oppmerksomhet."
 
-#: ../gtk/gtkwindow.c:845
+#: ../gtk/gtkwindow.c:928
 msgid "Accept focus"
 msgstr "Godta fokus"
 
-#: ../gtk/gtkwindow.c:846
+#: ../gtk/gtkwindow.c:929
 msgid "TRUE if the window should receive the input focus."
 msgstr "SANN hvis vinduet skal motta fokus for inndata."
 
-#: ../gtk/gtkwindow.c:860
+#: ../gtk/gtkwindow.c:943
 msgid "Focus on map"
 msgstr "Fokuser på kart"
 
-#: ../gtk/gtkwindow.c:861
+#: ../gtk/gtkwindow.c:944
 msgid "TRUE if the window should receive the input focus when mapped."
 msgstr "«TRUE» hvis vinduet skal få inndatafokus når kartlagt."
 
-#: ../gtk/gtkwindow.c:875
+#: ../gtk/gtkwindow.c:958
 msgid "Decorated"
 msgstr "Dekorert"
 
-#: ../gtk/gtkwindow.c:876
+#: ../gtk/gtkwindow.c:959
 msgid "Whether the window should be decorated by the window manager"
 msgstr "Om vinduet skal dekoreres av vindushåndtereren"
 
-#: ../gtk/gtkwindow.c:890
+#: ../gtk/gtkwindow.c:973
 msgid "Deletable"
 msgstr "Slettbar"
 
-#: ../gtk/gtkwindow.c:891
+#: ../gtk/gtkwindow.c:974
 msgid "Whether the window frame should have a close button"
 msgstr "Om vinduet skal ha en knapp for å lukke det"
 
-#: ../gtk/gtkwindow.c:910
+#: ../gtk/gtkwindow.c:993
 msgid "Resize grip"
 msgstr "Håndtak for endring av størrelse"
 
-#: ../gtk/gtkwindow.c:911
+#: ../gtk/gtkwindow.c:994
 msgid "Specifies whether the window should have a resize grip"
 msgstr ""
 
-#: ../gtk/gtkwindow.c:925
+#: ../gtk/gtkwindow.c:1008
 msgid "Resize grip is visible"
 msgstr ""
 
-#: ../gtk/gtkwindow.c:926
+#: ../gtk/gtkwindow.c:1009
 msgid "Specifies whether the window's resize grip is visible."
 msgstr ""
 
-#: ../gtk/gtkwindow.c:942
+#: ../gtk/gtkwindow.c:1025
 msgid "Gravity"
 msgstr "Tyngde"
 
-#: ../gtk/gtkwindow.c:943
+#: ../gtk/gtkwindow.c:1026
 msgid "The window gravity of the window"
 msgstr "Vinduets tyngde"
 
-#: ../gtk/gtkwindow.c:960
+#: ../gtk/gtkwindow.c:1043
 msgid "Transient for Window"
 msgstr ""
 
-#: ../gtk/gtkwindow.c:961
+#: ../gtk/gtkwindow.c:1044
 msgid "The transient parent of the dialog"
 msgstr ""
 
-#: ../gtk/gtkwindow.c:981
+#: ../gtk/gtkwindow.c:1064
 msgid "Attached to Widget"
 msgstr "Festet til komponent"
 
-#: ../gtk/gtkwindow.c:982
+#: ../gtk/gtkwindow.c:1065
 msgid "The widget where the window is attached"
 msgstr ""
 
-#: ../gtk/gtkwindow.c:997
+#: gtk/gtkwindow.c:1002
 msgid "Opacity for Window"
 msgstr ""
 
-#: ../gtk/gtkwindow.c:998
+#: gtk/gtkwindow.c:1003
 msgid "The opacity of the window, from 0 to 1"
 msgstr ""
 
-#: ../gtk/gtkwindow.c:1008 ../gtk/gtkwindow.c:1009
+#: ../gtk/gtkwindow.c:1087 ../gtk/gtkwindow.c:1088
 msgid "Width of resize grip"
 msgstr ""
 
-#: ../gtk/gtkwindow.c:1014 ../gtk/gtkwindow.c:1015
+#: ../gtk/gtkwindow.c:1093 ../gtk/gtkwindow.c:1094
 msgid "Height of resize grip"
 msgstr ""
 
-#: ../gtk/gtkwindow.c:1037
+#: ../gtk/gtkwindow.c:1116
 msgid "GtkApplication"
 msgstr "GtkApplication"
 
-#: ../gtk/gtkwindow.c:1038
+#: ../gtk/gtkwindow.c:1117
 msgid "The GtkApplication for the window"
 msgstr "GtkApplication for vinduet"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtk30.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtk30.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtk30.po	2013-01-29 09:33:59.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtk30.po	2014-01-07 06:37:37.000000000 +0000
@@ -15,52 +15,52 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:21+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:16+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: no\n"
 
-#: ../gdk/gdk.c:155
+#: ../gdk/gdk.c:158
 #, c-format
 msgid "Error parsing option --gdk-debug"
 msgstr "Feil ved lesing av flagg --gdk-debug"
 
-#: ../gdk/gdk.c:175
+#: ../gdk/gdk.c:178
 #, c-format
 msgid "Error parsing option --gdk-no-debug"
 msgstr "Feil ved lesing av flagg --gdk-no-debug"
 
 #. Description of --class=CLASS in --help output
-#: ../gdk/gdk.c:203
+#: ../gdk/gdk.c:206
 msgid "Program class as used by the window manager"
 msgstr "Programklasse som brukes av vindushåndtereren"
 
 #. Placeholder in --class=CLASS in --help output
-#: ../gdk/gdk.c:204
+#: ../gdk/gdk.c:207
 msgid "CLASS"
 msgstr "KLASSE"
 
 #. Description of --name=NAME in --help output
-#: ../gdk/gdk.c:206
+#: ../gdk/gdk.c:209
 msgid "Program name as used by the window manager"
 msgstr "Programnavn som brukes av vindushåndtereren"
 
 #. Placeholder in --name=NAME in --help output
-#: ../gdk/gdk.c:207
+#: ../gdk/gdk.c:210
 msgid "NAME"
 msgstr "NAVN"
 
 #. Description of --display=DISPLAY in --help output
-#: ../gdk/gdk.c:209
+#: ../gdk/gdk.c:212
 msgid "X display to use"
 msgstr "X-skjerm som skal brukes"
 
 #. Placeholder in --display=DISPLAY in --help output
-#: ../gdk/gdk.c:210
+#: ../gdk/gdk.c:213
 msgid "DISPLAY"
 msgstr "SKJERM"
 
 #. Description of --gdk-debug=FLAGS in --help output
-#: ../gdk/gdk.c:213
+#: ../gdk/gdk.c:216
 msgid "GDK debugging flags to set"
 msgstr "Feilsøkingsflagg som skal settes for GDK"
 
@@ -68,12 +68,12 @@
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:453 ../gtk/gtkmain.c:456
+#: ../gdk/gdk.c:217 ../gdk/gdk.c:220 ../gtk/gtkmain.c:455 ../gtk/gtkmain.c:458
 msgid "FLAGS"
 msgstr "FLAGG"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:216
+#: ../gdk/gdk.c:219
 msgid "GDK debugging flags to unset"
 msgstr "Feilsøkingsflagg som skal fjernes for GDK"
 
@@ -87,321 +87,320 @@
 #. * XF86AudioMute - Audio mute
 #. * Scroll_lock   - Scroll lock
 #. * KP_Space      - Space (keypad)
-#. * Page_Up       - Page up
 #. 
-#: ../gdk/keyname-table.h:3952
+#: ../gdk/keyname-table.h:6843
 msgctxt "keyboard label"
 msgid "BackSpace"
 msgstr "Rettetast"
 
-#: ../gdk/keyname-table.h:3953
+#: ../gdk/keyname-table.h:6844
 msgctxt "keyboard label"
 msgid "Tab"
 msgstr "Tab"
 
-#: ../gdk/keyname-table.h:3954
+#: ../gdk/keyname-table.h:6845
 msgctxt "keyboard label"
 msgid "Return"
 msgstr "Linjeskift"
 
-#: ../gdk/keyname-table.h:3955
+#: ../gdk/keyname-table.h:6846
 msgctxt "keyboard label"
 msgid "Pause"
 msgstr "Pause"
 
-#: ../gdk/keyname-table.h:3956
+#: ../gdk/keyname-table.h:6847
 msgctxt "keyboard label"
 msgid "Scroll_Lock"
 msgstr "Scroll Lock"
 
-#: ../gdk/keyname-table.h:3957
+#: ../gdk/keyname-table.h:6848
 msgctxt "keyboard label"
 msgid "Sys_Req"
 msgstr "Sys Req"
 
-#: ../gdk/keyname-table.h:3958
+#: ../gdk/keyname-table.h:6849
 msgctxt "keyboard label"
 msgid "Escape"
 msgstr "Escape"
 
-#: ../gdk/keyname-table.h:3959
+#: ../gdk/keyname-table.h:6850
 msgctxt "keyboard label"
 msgid "Multi_key"
 msgstr "Multi_key"
 
-#: ../gdk/keyname-table.h:3960
+#: ../gdk/keyname-table.h:6851
 msgctxt "keyboard label"
 msgid "Home"
 msgstr "Home"
 
-#: ../gdk/keyname-table.h:3961
+#: ../gdk/keyname-table.h:6852
 msgctxt "keyboard label"
 msgid "Left"
 msgstr "Venstre"
 
-#: ../gdk/keyname-table.h:3962
+#: ../gdk/keyname-table.h:6853
 msgctxt "keyboard label"
 msgid "Up"
 msgstr "Opp"
 
-#: ../gdk/keyname-table.h:3963
+#: ../gdk/keyname-table.h:6854
 msgctxt "keyboard label"
 msgid "Right"
 msgstr "Høyre"
 
-#: ../gdk/keyname-table.h:3964
+#: ../gdk/keyname-table.h:6855
 msgctxt "keyboard label"
 msgid "Down"
 msgstr "Ned"
 
-#: ../gdk/keyname-table.h:3965
+#: ../gdk/keyname-table.h:6856
 msgctxt "keyboard label"
 msgid "Page_Up"
 msgstr "Page Up"
 
-#: ../gdk/keyname-table.h:3966
+#: ../gdk/keyname-table.h:6857
 msgctxt "keyboard label"
 msgid "Page_Down"
 msgstr "Page Down"
 
-#: ../gdk/keyname-table.h:3967
+#: ../gdk/keyname-table.h:6858
 msgctxt "keyboard label"
 msgid "End"
 msgstr "End"
 
-#: ../gdk/keyname-table.h:3968
+#: ../gdk/keyname-table.h:6859
 msgctxt "keyboard label"
 msgid "Begin"
 msgstr "Begin"
 
-#: ../gdk/keyname-table.h:3969
+#: ../gdk/keyname-table.h:6860
 msgctxt "keyboard label"
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../gdk/keyname-table.h:3970
+#: ../gdk/keyname-table.h:6861
 msgctxt "keyboard label"
 msgid "Insert"
 msgstr "Sett inn"
 
-#: ../gdk/keyname-table.h:3971
+#: ../gdk/keyname-table.h:6862
 msgctxt "keyboard label"
 msgid "Num_Lock"
 msgstr "Num Lock"
 
 #. Translators: KP_ means 'key pad' here
-#: ../gdk/keyname-table.h:3973
+#: ../gdk/keyname-table.h:6864
 msgctxt "keyboard label"
 msgid "KP_Space"
 msgstr "Mellomrom"
 
-#: ../gdk/keyname-table.h:3974
+#: ../gdk/keyname-table.h:6865
 msgctxt "keyboard label"
 msgid "KP_Tab"
 msgstr "Tabulator"
 
-#: ../gdk/keyname-table.h:3975
+#: ../gdk/keyname-table.h:6866
 msgctxt "keyboard label"
 msgid "KP_Enter"
 msgstr "Linjeskift"
 
-#: ../gdk/keyname-table.h:3976
+#: ../gdk/keyname-table.h:6867
 msgctxt "keyboard label"
 msgid "KP_Home"
 msgstr "Home"
 
-#: ../gdk/keyname-table.h:3977
+#: ../gdk/keyname-table.h:6868
 msgctxt "keyboard label"
 msgid "KP_Left"
 msgstr "Venstre"
 
-#: ../gdk/keyname-table.h:3978
+#: ../gdk/keyname-table.h:6869
 msgctxt "keyboard label"
 msgid "KP_Up"
 msgstr "Opp"
 
-#: ../gdk/keyname-table.h:3979
+#: ../gdk/keyname-table.h:6870
 msgctxt "keyboard label"
 msgid "KP_Right"
 msgstr "Høyre"
 
-#: ../gdk/keyname-table.h:3980
+#: ../gdk/keyname-table.h:6871
 msgctxt "keyboard label"
 msgid "KP_Down"
 msgstr "Ned"
 
-#: ../gdk/keyname-table.h:3981
+#: ../gdk/keyname-table.h:6872
 msgctxt "keyboard label"
 msgid "KP_Page_Up"
 msgstr "Page Up"
 
-#: ../gdk/keyname-table.h:3982
+#: ../gdk/keyname-table.h:6873
 msgctxt "keyboard label"
 msgid "KP_Prior"
 msgstr "Forrige"
 
-#: ../gdk/keyname-table.h:3983
+#: ../gdk/keyname-table.h:6874
 msgctxt "keyboard label"
 msgid "KP_Page_Down"
 msgstr "Page Down"
 
-#: ../gdk/keyname-table.h:3984
+#: ../gdk/keyname-table.h:6875
 msgctxt "keyboard label"
 msgid "KP_Next"
 msgstr "Neste"
 
-#: ../gdk/keyname-table.h:3985
+#: ../gdk/keyname-table.h:6876
 msgctxt "keyboard label"
 msgid "KP_End"
 msgstr "End"
 
-#: ../gdk/keyname-table.h:3986
+#: ../gdk/keyname-table.h:6877
 msgctxt "keyboard label"
 msgid "KP_Begin"
 msgstr "Begin"
 
-#: ../gdk/keyname-table.h:3987
+#: ../gdk/keyname-table.h:6878
 msgctxt "keyboard label"
 msgid "KP_Insert"
 msgstr "Sett inn"
 
-#: ../gdk/keyname-table.h:3988
+#: ../gdk/keyname-table.h:6879
 msgctxt "keyboard label"
 msgid "KP_Delete"
 msgstr "Slett"
 
-#: ../gdk/keyname-table.h:3989
+#: ../gdk/keyname-table.h:6880
 msgctxt "keyboard label"
 msgid "Delete"
 msgstr "Slett"
 
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
-#: ../gdk/keyname-table.h:3991
+#: gdk/keyname-table.h:3991
 msgctxt "keyboard label"
 msgid "XF86MonBrightnessUp"
 msgstr "Lysstyrke opp"
 
-#: ../gdk/keyname-table.h:3992
+#: gdk/keyname-table.h:3992
 msgctxt "keyboard label"
 msgid "XF86MonBrightnessDown"
 msgstr "Lysstyrke ned"
 
-#: ../gdk/keyname-table.h:3993
+#: gdk/keyname-table.h:3993
 msgctxt "keyboard label"
 msgid "XF86AudioMute"
 msgstr "Demp lyd"
 
-#: ../gdk/keyname-table.h:3994
+#: gdk/keyname-table.h:3994
 msgctxt "keyboard label"
 msgid "XF86AudioLowerVolume"
 msgstr "Senk volum"
 
-#: ../gdk/keyname-table.h:3995
+#: gdk/keyname-table.h:3995
 msgctxt "keyboard label"
 msgid "XF86AudioRaiseVolume"
 msgstr "Hev volum"
 
-#: ../gdk/keyname-table.h:3996
+#: gdk/keyname-table.h:3996
 msgctxt "keyboard label"
 msgid "XF86AudioPlay"
 msgstr "Spill av"
 
-#: ../gdk/keyname-table.h:3997
+#: gdk/keyname-table.h:3997
 msgctxt "keyboard label"
 msgid "XF86AudioStop"
 msgstr "Stopp"
 
-#: ../gdk/keyname-table.h:3998
+#: gdk/keyname-table.h:3998
 msgctxt "keyboard label"
 msgid "XF86AudioNext"
 msgstr "Neste"
 
-#: ../gdk/keyname-table.h:3999
+#: gdk/keyname-table.h:3999
 msgctxt "keyboard label"
 msgid "XF86AudioPrev"
 msgstr "Forrige"
 
-#: ../gdk/keyname-table.h:4000
+#: gdk/keyname-table.h:4000
 msgctxt "keyboard label"
 msgid "XF86AudioRecord"
 msgstr "Ta opp"
 
-#: ../gdk/keyname-table.h:4001
+#: gdk/keyname-table.h:4001
 msgctxt "keyboard label"
 msgid "XF86AudioPause"
 msgstr "Pause"
 
-#: ../gdk/keyname-table.h:4002
+#: gdk/keyname-table.h:4002
 msgctxt "keyboard label"
 msgid "XF86AudioRewind"
 msgstr "Spol tilbake"
 
-#: ../gdk/keyname-table.h:4003
+#: gdk/keyname-table.h:4003
 msgctxt "keyboard label"
 msgid "XF86AudioMedia"
 msgstr "Medie"
 
-#: ../gdk/keyname-table.h:4004
+#: gdk/keyname-table.h:4004
 msgctxt "keyboard label"
 msgid "XF86ScreenSaver"
 msgstr "Skjermsparer"
 
-#: ../gdk/keyname-table.h:4005
+#: gdk/keyname-table.h:4005
 msgctxt "keyboard label"
 msgid "XF86Battery"
 msgstr "Batteri"
 
-#: ../gdk/keyname-table.h:4006
+#: gdk/keyname-table.h:4006
 msgctxt "keyboard label"
 msgid "XF86Launch1"
 msgstr "Start1"
 
-#: ../gdk/keyname-table.h:4007
+#: gdk/keyname-table.h:4007
 msgctxt "keyboard label"
 msgid "XF86Forward"
 msgstr "Framover"
 
-#: ../gdk/keyname-table.h:4008
+#: gdk/keyname-table.h:4008
 msgctxt "keyboard label"
 msgid "XF86Back"
 msgstr "Tilbake"
 
-#: ../gdk/keyname-table.h:4009
+#: gdk/keyname-table.h:4009
 msgctxt "keyboard label"
 msgid "XF86Sleep"
 msgstr "Hvilemodus"
 
-#: ../gdk/keyname-table.h:4010
+#: gdk/keyname-table.h:4010
 msgctxt "keyboard label"
 msgid "XF86Hibernate"
 msgstr "Dvalemodus"
 
-#: ../gdk/keyname-table.h:4011
+#: gdk/keyname-table.h:4011
 msgctxt "keyboard label"
 msgid "XF86WLAN"
 msgstr "WLAN"
 
-#: ../gdk/keyname-table.h:4012
+#: gdk/keyname-table.h:4012
 msgctxt "keyboard label"
 msgid "XF86WebCam"
 msgstr "Webkamera"
 
-#: ../gdk/keyname-table.h:4013
+#: gdk/keyname-table.h:4013
 msgctxt "keyboard label"
 msgid "XF86Display"
 msgstr "Skjerm"
 
-#: ../gdk/keyname-table.h:4014
+#: gdk/keyname-table.h:4014
 msgctxt "keyboard label"
 msgid "XF86TouchpadToggle"
 msgstr "Slå av/på pekerflate"
 
-#: ../gdk/keyname-table.h:4015
+#: gdk/keyname-table.h:4015
 msgctxt "keyboard label"
 msgid "XF86WakeUp"
 msgstr "Våkne"
 
-#: ../gdk/keyname-table.h:4016
+#: gdk/keyname-table.h:4016
 msgctxt "keyboard label"
 msgid "XF86Suspend"
 msgstr "Hvilemodus"
@@ -436,17 +435,17 @@
 msgid "COLORS"
 msgstr "FARGER"
 
-#: ../gdk/x11/gdkapplaunchcontext-x11.c:292
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:296
 #, c-format
 msgid "Starting %s"
 msgstr "Starter %s"
 
-#: ../gdk/x11/gdkapplaunchcontext-x11.c:305
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:309
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 
-#: ../gdk/x11/gdkapplaunchcontext-x11.c:310
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:314
 #, c-format
 msgid "Opening %d Item"
 msgid_plural "Opening %d Items"
@@ -462,16 +461,16 @@
 msgid "Provides visual indication of progress"
 msgstr "Gir visuell indikasjon av framdrift"
 
-#: ../gtk/a11y/gtkswitchaccessible.c:62
+#: gtk/a11y/gtkswitchaccessible.c:63
 msgctxt "light switch widget"
 msgid "Switch"
 msgstr "Bryter"
 
-#: ../gtk/a11y/gtkswitchaccessible.c:63
+#: gtk/a11y/gtkswitchaccessible.c:64
 msgid "Switches between on and off states"
 msgstr "Bytter mellom av/på tilstand"
 
-#: ../gtk/deprecated/gtkcolorsel.c:425
+#: ../gtk/deprecated/gtkcolorsel.c:423
 msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
@@ -479,7 +478,7 @@
 "Velg fargen du ønsker fra den ytre ringen. Velg lysstyrke for denne fargen "
 "ved å bruke den indre trekanten."
 
-#: ../gtk/deprecated/gtkcolorsel.c:451
+#: ../gtk/deprecated/gtkcolorsel.c:449
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
@@ -487,67 +486,67 @@
 "Trykk på dråpetelleren og trykk så på en farge hvor som helst på skjermen "
 "for å velge denne fargen."
 
-#: ../gtk/deprecated/gtkcolorsel.c:461
+#: ../gtk/deprecated/gtkcolorsel.c:459
 msgid "_Hue:"
 msgstr "_Glød:"
 
-#: ../gtk/deprecated/gtkcolorsel.c:462
+#: ../gtk/deprecated/gtkcolorsel.c:460
 msgid "Position on the color wheel."
 msgstr "Posisjon på fargehjulet."
 
-#: ../gtk/deprecated/gtkcolorsel.c:464
+#: ../gtk/deprecated/gtkcolorsel.c:462
 msgid "S_aturation:"
 msgstr "_Metning:"
 
-#: ../gtk/deprecated/gtkcolorsel.c:465
+#: ../gtk/deprecated/gtkcolorsel.c:463
 msgid "Intensity of the color."
 msgstr "Intensitet for fargen."
 
-#: ../gtk/deprecated/gtkcolorsel.c:466
+#: ../gtk/deprecated/gtkcolorsel.c:464
 msgid "_Value:"
 msgstr "_Verdi:"
 
-#: ../gtk/deprecated/gtkcolorsel.c:467
+#: ../gtk/deprecated/gtkcolorsel.c:465
 msgid "Brightness of the color."
 msgstr "Lysstyrke for fargen."
 
-#: ../gtk/deprecated/gtkcolorsel.c:468
+#: ../gtk/deprecated/gtkcolorsel.c:466
 msgid "_Red:"
 msgstr "_Rød:"
 
-#: ../gtk/deprecated/gtkcolorsel.c:469
+#: ../gtk/deprecated/gtkcolorsel.c:467
 msgid "Amount of red light in the color."
 msgstr "Mende med rødt lys i fargen."
 
-#: ../gtk/deprecated/gtkcolorsel.c:470
+#: ../gtk/deprecated/gtkcolorsel.c:468
 msgid "_Green:"
 msgstr "_Grønn:"
 
-#: ../gtk/deprecated/gtkcolorsel.c:471
+#: ../gtk/deprecated/gtkcolorsel.c:469
 msgid "Amount of green light in the color."
 msgstr "Mengde med grønt lys i fargen."
 
-#: ../gtk/deprecated/gtkcolorsel.c:472
+#: ../gtk/deprecated/gtkcolorsel.c:470
 msgid "_Blue:"
 msgstr "_Blå:"
 
-#: ../gtk/deprecated/gtkcolorsel.c:473
+#: ../gtk/deprecated/gtkcolorsel.c:471
 msgid "Amount of blue light in the color."
 msgstr "Mengde med blått lys i fargen."
 
-#: ../gtk/deprecated/gtkcolorsel.c:476
+#: ../gtk/deprecated/gtkcolorsel.c:474
 msgid "Op_acity:"
 msgstr "_Ugjennomsiktighet:"
 
-#: ../gtk/deprecated/gtkcolorsel.c:484 ../gtk/deprecated/gtkcolorsel.c:494
+#: ../gtk/deprecated/gtkcolorsel.c:482 ../gtk/deprecated/gtkcolorsel.c:492
 msgid "Transparency of the color."
 msgstr "Gjennomsiktighet for fargen."
 
-#: ../gtk/deprecated/gtkcolorsel.c:501
+#: ../gtk/deprecated/gtkcolorsel.c:499
 msgid "Color _name:"
 msgstr "Farge_navn:"
 
-#: ../gtk/deprecated/gtkcolorsel.c:516
+#: ../gtk/deprecated/gtkcolorsel.c:514
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
@@ -555,15 +554,15 @@
 "Du kan skrive inn en heksadesimal fargeverdi i HTML-stil, eller bruke et "
 "fargenavn som f.eks. «oransje» i denne oppføringen."
 
-#: ../gtk/deprecated/gtkcolorsel.c:548
+#: ../gtk/deprecated/gtkcolorsel.c:546
 msgid "_Palette:"
 msgstr "_Palett:"
 
-#: ../gtk/deprecated/gtkcolorsel.c:578
+#: ../gtk/deprecated/gtkcolorsel.c:576
 msgid "Color Wheel"
 msgstr "Fargehjul"
 
-#: ../gtk/deprecated/gtkcolorsel.c:1072
+#: ../gtk/deprecated/gtkcolorsel.c:1070
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now. You can drag this color to a palette entry, or select this color as "
@@ -573,7 +572,7 @@
 "denne fargen til en palettoppføring, eller velge denne fargen som aktiv ved "
 "å dra den til den andre fargeprøven ved siden av."
 
-#: ../gtk/deprecated/gtkcolorsel.c:1078
+#: ../gtk/deprecated/gtkcolorsel.c:1076
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
@@ -581,21 +580,21 @@
 "Fargen du har valgt. Du kan dra denne fargen til en palettoppføring for å "
 "lagre den for senere bruk."
 
-#: ../gtk/deprecated/gtkcolorsel.c:1084
+#: ../gtk/deprecated/gtkcolorsel.c:1082
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now."
 msgstr "Tidligere valgt farge. For sammenligning med fargen du velger nå."
 
-#: ../gtk/deprecated/gtkcolorsel.c:1088
+#: ../gtk/deprecated/gtkcolorsel.c:1086
 msgid "The color you've chosen."
 msgstr "Fargen du har valgt."
 
-#: ../gtk/deprecated/gtkcolorsel.c:1491
+#: ../gtk/deprecated/gtkcolorsel.c:1490
 msgid "_Save color here"
 msgstr "_Lagre fargen her"
 
-#: ../gtk/deprecated/gtkcolorsel.c:1695
+#: ../gtk/deprecated/gtkcolorsel.c:1694
 msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
@@ -604,50 +603,47 @@
 "endre denne oppføringen drar du en fargeprøve hit eller høyreklikk den og "
 "velg «Lagre farge her.»"
 
-#. We emit the response for the Select button manually,
-#. * since we want to save the color first
-#. 
-#: ../gtk/deprecated/gtkcolorseldialog.c:201 ../gtk/gtkappchooserdialog.c:574
-#: ../gtk/gtkcolorchooserdialog.c:150 ../gtk/gtkfontchooserdialog.c:174
-#: ../gtk/gtkprinteroptionwidget.c:550
+#: ../gtk/deprecated/gtkcolorseldialog.c:196
+#: ../gtk/gtkprinteroptionwidget.c:546 ../gtk/gtkappchooserdialog.ui.h:2
+#: ../gtk/gtkcolorchooserdialog.ui.h:3 ../gtk/gtkfontchooserdialog.ui.h:3
 msgid "_Select"
 msgstr "Vel_g"
 
-#: ../gtk/deprecated/gtkcolorseldialog.c:219
+#: ../gtk/deprecated/gtkcolorseldialog.c:214
 msgid "Color Selection"
 msgstr "Fargevalg"
 
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: ../gtk/deprecated/gtkfontsel.c:124
+#: ../gtk/deprecated/gtkfontsel.c:121
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "abcdefghijk ABCDEFGHIJK"
 
-#: ../gtk/deprecated/gtkfontsel.c:393
+#: ../gtk/deprecated/gtkfontsel.c:386
 msgid "_Family:"
 msgstr "_Familie:"
 
-#: ../gtk/deprecated/gtkfontsel.c:400
+#: ../gtk/deprecated/gtkfontsel.c:393
 msgid "_Style:"
 msgstr "_Stil:"
 
-#: ../gtk/deprecated/gtkfontsel.c:407
+#: ../gtk/deprecated/gtkfontsel.c:400
 msgid "Si_ze:"
 msgstr "St_ørrelse:"
 
 #. create the text entry widget
-#: ../gtk/deprecated/gtkfontsel.c:584
+#: ../gtk/deprecated/gtkfontsel.c:577
 msgid "_Preview:"
 msgstr "_Forhåndsvisning:"
 
-#: ../gtk/deprecated/gtkfontsel.c:1720 ../gtk/gtkfontchooserdialog.c:183
+#: ../gtk/deprecated/gtkfontsel.c:1710 ../gtk/gtkfontchooserdialog.ui.h:1
 msgid "Font Selection"
 msgstr "Valg av skrift"
 
 #. Translators: this is the license preamble; the string at the end
 #. * contains the URL of the license.
 #. 
-#: ../gtk/gtkaboutdialog.c:104
+#: gtk/gtkaboutdialog.c:102
 #, c-format
 msgid ""
 "This program comes with ABSOLUTELY NO WARRANTY;\n"
@@ -656,25 +652,23 @@
 "Dette programmet kommer UTEN NOEN SOM HELST GARANTI;\n"
 "besøk  <a href=«%s»>%s</a> for detaljer"
 
-#: ../gtk/gtkaboutdialog.c:357
+#: ../gtk/gtkaboutdialog.c:109 ../gtk/gtkaboutdialog.c:375
 msgid "License"
 msgstr "Lisens"
 
-#: ../gtk/gtkaboutdialog.c:358
+#: ../gtk/gtkaboutdialog.c:376
 msgid "The license of the program"
 msgstr "Programmets lisens"
 
-#. Add the credits button
-#: ../gtk/gtkaboutdialog.c:751
+#: ../gtk/gtkaboutdialog.ui.h:1
 msgid "C_redits"
-msgstr "Bid_ragsytere"
+msgstr "_Bidragsytere"
 
-#. Add the license button
-#: ../gtk/gtkaboutdialog.c:764
+#: ../gtk/gtkaboutdialog.ui.h:2
 msgid "_License"
 msgstr "_Lisens"
 
-#: ../gtk/gtkaboutdialog.c:980
+#: ../gtk/gtkaboutdialog.c:924
 msgid "Could not show link"
 msgstr "Klarte ikke å vise lenke"
 
@@ -682,24 +676,24 @@
 msgid "Homepage"
 msgstr "Hjemmeside"
 
-#: ../gtk/gtkaboutdialog.c:1071
+#: ../gtk/gtkaboutdialog.c:1015
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#: ../gtk/gtkaboutdialog.c:2398
+#: ../gtk/gtkaboutdialog.c:2289
 msgid "Created by"
 msgstr "Laget av"
 
-#: ../gtk/gtkaboutdialog.c:2401
+#: ../gtk/gtkaboutdialog.c:2292
 msgid "Documented by"
 msgstr "Dokumentert av"
 
-#: ../gtk/gtkaboutdialog.c:2411
+#: ../gtk/gtkaboutdialog.c:2302
 msgid "Translated by"
 msgstr "Oversatt av"
 
-#: ../gtk/gtkaboutdialog.c:2416
+#: ../gtk/gtkaboutdialog.c:2307
 msgid "Artwork by"
 msgstr "Grafikk av"
 
@@ -738,7 +732,7 @@
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #. 
-#: ../gtk/gtkaccellabel.c:805
+#: ../gtk/gtkaccellabel.c:801
 msgctxt "keyboard label"
 msgid "Super"
 msgstr "Super"
@@ -748,7 +742,7 @@
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #. 
-#: ../gtk/gtkaccellabel.c:818
+#: ../gtk/gtkaccellabel.c:814
 msgctxt "keyboard label"
 msgid "Hyper"
 msgstr "Hyper"
@@ -758,17 +752,17 @@
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #. 
-#: ../gtk/gtkaccellabel.c:832
+#: ../gtk/gtkaccellabel.c:828
 msgctxt "keyboard label"
 msgid "Meta"
 msgstr "Meta"
 
-#: ../gtk/gtkaccellabel.c:848
+#: ../gtk/gtkaccellabel.c:845
 msgctxt "keyboard label"
 msgid "Space"
 msgstr "Mellomrom"
 
-#: ../gtk/gtkaccellabel.c:851
+#: ../gtk/gtkaccellabel.c:848
 msgctxt "keyboard label"
 msgid "Backslash"
 msgstr "Backslash"
@@ -777,7 +771,7 @@
 msgid "Other application..."
 msgstr "Annet program..."
 
-#: ../gtk/gtkappchooserdialog.c:137
+#: gtk/gtkappchooserdialog.c:138
 msgid "Failed to look for applications online"
 msgstr "Klarte ikke å se etter programmer på nettet"
 
@@ -785,42 +779,42 @@
 msgid "Find applications online"
 msgstr "Finn programmer på nettet"
 
-#: ../gtk/gtkappchooserdialog.c:247
+#: gtk/gtkappchooserdialog.c:247
 msgid "Could not run application"
 msgstr "Klarte ikke å kjøre programmet"
 
-#: ../gtk/gtkappchooserdialog.c:260
+#: gtk/gtkappchooserdialog.c:260
 #, c-format
 msgid "Could not find '%s'"
 msgstr "Klarte ikke å finne «%s»"
 
-#: ../gtk/gtkappchooserdialog.c:263
+#: gtk/gtkappchooserdialog.c:263
 msgid "Could not find application"
 msgstr "Klarte ikke å finne programmet"
 
 #. Translators: %s is a filename
-#: ../gtk/gtkappchooserdialog.c:397
+#: gtk/gtkappchooserdialog.c:332
 #, c-format
 msgid "Select an application to open \"%s\""
 msgstr "Velg et program å åpne «%s» i"
 
-#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657
+#: gtk/gtkappchooserdialog.c:333 gtk/gtkappchooserwidget.c:657
 #, c-format
 msgid "No applications available to open \"%s\""
 msgstr "Ingen tilgjengelige programmer for åpning av «%s»"
 
 #. Translators: %s is a file type description
-#: ../gtk/gtkappchooserdialog.c:404
+#: gtk/gtkappchooserdialog.c:339
 #, c-format
 msgid "Select an application for \"%s\" files"
 msgstr "Velg et program for «%s»-filer"
 
-#: ../gtk/gtkappchooserdialog.c:406
+#: gtk/gtkappchooserdialog.c:341
 #, c-format
 msgid "No applications available to open \"%s\" files"
 msgstr "Ingen tilgjengelige programmer for åpning av «%s»-filer"
 
-#: ../gtk/gtkappchooserdialog.c:422
+#: gtk/gtkappchooserdialog.c:358
 msgid ""
 "Click \"Show other applications\", for more options, or \"Find applications "
 "online\" to install a new application"
@@ -828,31 +822,31 @@
 "Klikk på «Vis andre programmer» for flere alternativer, eller «Finn "
 "programmer på nettet» for å installere et nytt program"
 
-#: ../gtk/gtkappchooserdialog.c:492
+#: ../gtk/gtkappchooserdialog.c:293
 msgid "Forget association"
 msgstr "Glem kobling"
 
-#: ../gtk/gtkappchooserdialog.c:558
+#: gtk/gtkappchooserdialog.c:493
 msgid "Show other applications"
 msgstr "Vis andre programmer"
 
-#: ../gtk/gtkappchooserwidget.c:606
+#: ../gtk/gtkappchooserwidget.c:619
 msgid "Default Application"
 msgstr "Forvalgt program"
 
-#: ../gtk/gtkappchooserwidget.c:744
+#: ../gtk/gtkappchooserwidget.c:757
 msgid "Recommended Applications"
 msgstr "Anbefalte programmer"
 
-#: ../gtk/gtkappchooserwidget.c:759
+#: ../gtk/gtkappchooserwidget.c:772
 msgid "Related Applications"
 msgstr "Relaterte programmer"
 
-#: ../gtk/gtkappchooserwidget.c:773
+#: ../gtk/gtkappchooserwidget.c:786
 msgid "Other Applications"
 msgstr "Andre programmer"
 
-#: ../gtk/gtkapplication.c:1557
+#: ../gtk/gtkapplication-quartz.c:87
 #, c-format
 msgid ""
 "%s cannot quit at this time:\n"
@@ -863,20 +857,20 @@
 "\n"
 "%s"
 
-#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480
-#: ../gtk/gtkprintoperation-win32.c:1445
+#: ../gtk/gtkapplicationwindow.c:326 ../gtk/gtkprintoperation-unix.c:480
+#: ../gtk/gtkprintoperation-win32.c:1447
 msgid "Application"
 msgstr "Program"
 
-#: ../gtk/gtkassistant.c:1008
+#: ../gtk/gtkassistant.ui.h:2
 msgid "C_ontinue"
 msgstr "F_ortsett"
 
-#: ../gtk/gtkassistant.c:1011
+#: ../gtk/gtkassistant.ui.h:3
 msgid "Go _Back"
 msgstr "Gå til_bake"
 
-#: ../gtk/gtkassistant.c:1015
+#: ../gtk/gtkassistant.ui.h:4
 msgid "_Finish"
 msgstr "_Fullfør"
 
@@ -895,22 +889,22 @@
 msgid "text may not appear inside <%s>"
 msgstr "tekst kan ikke plasseres inne i <%s>"
 
-#: ../gtk/gtkbuilderparser.c:341
+#: ../gtk/gtkbuilderparser.c:354
 #, c-format
 msgid "Invalid type function on line %d: '%s'"
 msgstr "Ugyldig type funksjon på linje %d: «%s»"
 
-#: ../gtk/gtkbuilderparser.c:405
+#: ../gtk/gtkbuilderparser.c:419 ../gtk/gtkbuilderparser.c:504
 #, c-format
 msgid "Duplicate object ID '%s' on line %d (previously on line %d)"
 msgstr "Duplisert objekt-ID «%s» på linje %d (tidligere på linje %d)"
 
-#: ../gtk/gtkbuilderparser.c:865
+#: ../gtk/gtkbuilderparser.c:971
 #, c-format
 msgid "Invalid root element: '%s'"
 msgstr "Ugyldig rotelement: «%s»"
 
-#: ../gtk/gtkbuilderparser.c:906
+#: ../gtk/gtkbuilderparser.c:1014
 #, c-format
 msgid "Unhandled tag: '%s'"
 msgstr "Uhåndtert tag «%s»"
@@ -925,7 +919,7 @@
 #. * text direction of RTL and specify "calendar:YM", then the year
 #. * will appear to the right of the month.
 #. 
-#: ../gtk/gtkcalendar.c:872
+#: ../gtk/gtkcalendar.c:869
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -933,7 +927,7 @@
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #. 
-#: ../gtk/gtkcalendar.c:910
+#: ../gtk/gtkcalendar.c:907
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
@@ -942,7 +936,7 @@
 #. *
 #. * If you don't understand this, leave it as "2000"
 #. 
-#: ../gtk/gtkcalendar.c:1910
+#: ../gtk/gtkcalendar.c:1907
 msgctxt "year measurement template"
 msgid "2000"
 msgstr "2000"
@@ -957,7 +951,7 @@
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #. 
-#: ../gtk/gtkcalendar.c:1941 ../gtk/gtkcalendar.c:2633
+#: ../gtk/gtkcalendar.c:1938 ../gtk/gtkcalendar.c:2630
 #, c-format
 msgctxt "calendar:day:digits"
 msgid "%d"
@@ -973,7 +967,7 @@
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #. 
-#: ../gtk/gtkcalendar.c:1973 ../gtk/gtkcalendar.c:2499
+#: ../gtk/gtkcalendar.c:1970 ../gtk/gtkcalendar.c:2496
 #, c-format
 msgctxt "calendar:week:digits"
 msgid "%d"
@@ -989,7 +983,7 @@
 #. *
 #. * "%Y" is appropriate for most locales.
 #. 
-#: ../gtk/gtkcalendar.c:2268
+#: ../gtk/gtkcalendar.c:2265
 msgctxt "calendar year format"
 msgid "%Y"
 msgstr "%Y"
@@ -997,7 +991,7 @@
 #. This label is displayed in a treeview cell displaying
 #. * a disabled accelerator key combination.
 #. 
-#: ../gtk/gtkcellrendereraccel.c:282
+#: ../gtk/gtkcellrendereraccel.c:278
 msgctxt "Accelerator"
 msgid "Disabled"
 msgstr "Slått av"
@@ -1006,7 +1000,7 @@
 #. * an accelerator key combination that is not valid according
 #. * to gtk_accelerator_valid().
 #. 
-#: ../gtk/gtkcellrendereraccel.c:292
+#: ../gtk/gtkcellrendereraccel.c:288
 msgctxt "Accelerator"
 msgid "Invalid"
 msgstr "Ugyldig"
@@ -1015,278 +1009,278 @@
 #. * an accelerator when the cell is clicked to change the
 #. * acelerator.
 #. 
-#: gtk/gtkcellrendereraccel.c:416 gtk/gtkcellrendereraccel.c:747
+#: gtk/gtkcellrendereraccel.c:416 gtk/gtkcellrendereraccel.c:745
 msgid "New accelerator..."
 msgstr "Ny hurtigtast …"
 
-#: ../gtk/gtkcellrendererprogress.c:372 ../gtk/gtkcellrendererprogress.c:462
+#: ../gtk/gtkcellrendererprogress.c:368 ../gtk/gtkcellrendererprogress.c:458
 #, c-format
 msgctxt "progress bar label"
 msgid "%d %%"
 msgstr "%d %%"
 
-#: ../gtk/gtkcolorbutton.c:188 ../gtk/gtkcolorbutton.c:449
+#: ../gtk/gtkcolorbutton.c:189 ../gtk/gtkcolorbutton.c:444
 msgid "Pick a Color"
 msgstr "Velg en farge"
 
-#: ../gtk/gtkcolorchooserdialog.c:164
+#: ../gtk/gtkcolorchooserdialog.ui.h:1
 msgid "Select a Color"
 msgstr "Velg en farge"
 
-#: ../gtk/gtkcolorchooserwidget.c:281
+#: ../gtk/gtkcolorchooserwidget.c:282
 #, c-format
 msgid "Red %d%%, Green %d%%, Blue %d%%, Alpha %d%%"
 msgstr "Rød %d%%, Grønn %d%%, Blå %d%%, Utjevning %d%%"
 
-#: ../gtk/gtkcolorchooserwidget.c:287
+#: ../gtk/gtkcolorchooserwidget.c:288
 #, c-format
 msgid "Red %d%%, Green %d%%, Blue %d%%"
 msgstr "Rød %d%%, Grønn, %d%%, Blå %d%%"
 
-#: ../gtk/gtkcolorchooserwidget.c:360
+#: ../gtk/gtkcolorchooserwidget.c:365
 #, c-format
 msgid "Color: %s"
 msgstr "Farge: %s"
 
-#: ../gtk/gtkcolorchooserwidget.c:419
+#: ../gtk/gtkcolorchooserwidget.c:424
 msgctxt "Color name"
 msgid "Light Scarlet Red"
 msgstr "Lys skarlagensrød"
 
-#: ../gtk/gtkcolorchooserwidget.c:420
+#: ../gtk/gtkcolorchooserwidget.c:425
 msgctxt "Color name"
 msgid "Scarlet Red"
 msgstr "Skarlagensrød"
 
-#: ../gtk/gtkcolorchooserwidget.c:421
+#: ../gtk/gtkcolorchooserwidget.c:426
 msgctxt "Color name"
 msgid "Dark Scarlet Red"
 msgstr "Mørk skarlagensrød"
 
-#: ../gtk/gtkcolorchooserwidget.c:422
+#: ../gtk/gtkcolorchooserwidget.c:427
 msgctxt "Color name"
 msgid "Light Orange"
 msgstr "Lys oransje"
 
-#: ../gtk/gtkcolorchooserwidget.c:423
+#: ../gtk/gtkcolorchooserwidget.c:428
 msgctxt "Color name"
 msgid "Orange"
 msgstr "Oransje"
 
-#: ../gtk/gtkcolorchooserwidget.c:424
+#: ../gtk/gtkcolorchooserwidget.c:429
 msgctxt "Color name"
 msgid "Dark Orange"
 msgstr "Mørk oransje"
 
-#: ../gtk/gtkcolorchooserwidget.c:425
+#: ../gtk/gtkcolorchooserwidget.c:430
 msgctxt "Color name"
 msgid "Light Butter"
 msgstr "Lys smørfarge"
 
-#: ../gtk/gtkcolorchooserwidget.c:426
+#: ../gtk/gtkcolorchooserwidget.c:431
 msgctxt "Color name"
 msgid "Butter"
 msgstr "Smør"
 
-#: ../gtk/gtkcolorchooserwidget.c:427
+#: ../gtk/gtkcolorchooserwidget.c:432
 msgctxt "Color name"
 msgid "Dark Butter"
 msgstr "Mørkt smør"
 
-#: ../gtk/gtkcolorchooserwidget.c:428
+#: ../gtk/gtkcolorchooserwidget.c:433
 msgctxt "Color name"
 msgid "Light Chameleon"
 msgstr "Lys kamelon"
 
-#: ../gtk/gtkcolorchooserwidget.c:429
+#: ../gtk/gtkcolorchooserwidget.c:434
 msgctxt "Color name"
 msgid "Chameleon"
 msgstr "Kamelon"
 
-#: ../gtk/gtkcolorchooserwidget.c:430
+#: ../gtk/gtkcolorchooserwidget.c:435
 msgctxt "Color name"
 msgid "Dark Chameleon"
 msgstr "Mørk kamelon"
 
-#: ../gtk/gtkcolorchooserwidget.c:431
+#: ../gtk/gtkcolorchooserwidget.c:436
 msgctxt "Color name"
 msgid "Light Sky Blue"
 msgstr "Lys himmelblå"
 
-#: ../gtk/gtkcolorchooserwidget.c:432
+#: ../gtk/gtkcolorchooserwidget.c:437
 msgctxt "Color name"
 msgid "Sky Blue"
 msgstr "Himmelblå"
 
-#: ../gtk/gtkcolorchooserwidget.c:433
+#: ../gtk/gtkcolorchooserwidget.c:438
 msgctxt "Color name"
 msgid "Dark Sky Blue"
 msgstr "Mørk himmelblå"
 
-#: ../gtk/gtkcolorchooserwidget.c:434
+#: ../gtk/gtkcolorchooserwidget.c:439
 msgctxt "Color name"
 msgid "Light Plum"
 msgstr "Lys plomme"
 
-#: ../gtk/gtkcolorchooserwidget.c:435
+#: ../gtk/gtkcolorchooserwidget.c:440
 msgctxt "Color name"
 msgid "Plum"
 msgstr "Plomme"
 
-#: ../gtk/gtkcolorchooserwidget.c:436
+#: ../gtk/gtkcolorchooserwidget.c:441
 msgctxt "Color name"
 msgid "Dark Plum"
 msgstr "Mørk plomme"
 
-#: ../gtk/gtkcolorchooserwidget.c:437
+#: ../gtk/gtkcolorchooserwidget.c:442
 msgctxt "Color name"
 msgid "Light Chocolate"
 msgstr "Lys sjokolade"
 
-#: ../gtk/gtkcolorchooserwidget.c:438
+#: ../gtk/gtkcolorchooserwidget.c:443
 msgctxt "Color name"
 msgid "Chocolate"
 msgstr "Sjokolade"
 
-#: ../gtk/gtkcolorchooserwidget.c:439
+#: ../gtk/gtkcolorchooserwidget.c:444
 msgctxt "Color name"
 msgid "Dark Chocolate"
 msgstr "Mørk sjokolade"
 
-#: ../gtk/gtkcolorchooserwidget.c:440
+#: ../gtk/gtkcolorchooserwidget.c:445
 msgctxt "Color name"
 msgid "Light Aluminum 1"
 msgstr "Lys aluminium 1"
 
-#: ../gtk/gtkcolorchooserwidget.c:441
+#: ../gtk/gtkcolorchooserwidget.c:446
 msgctxt "Color name"
 msgid "Aluminum 1"
 msgstr "Aluminium 1"
 
-#: ../gtk/gtkcolorchooserwidget.c:442
+#: ../gtk/gtkcolorchooserwidget.c:447
 msgctxt "Color name"
 msgid "Dark Aluminum 1"
 msgstr "Mørk aluminium 1"
 
-#: ../gtk/gtkcolorchooserwidget.c:443
+#: ../gtk/gtkcolorchooserwidget.c:448
 msgctxt "Color name"
 msgid "Light Aluminum 2"
 msgstr "Lys aluminium 2"
 
-#: ../gtk/gtkcolorchooserwidget.c:444
+#: ../gtk/gtkcolorchooserwidget.c:449
 msgctxt "Color name"
 msgid "Aluminum 2"
 msgstr "Aluminium 2"
 
-#: ../gtk/gtkcolorchooserwidget.c:445
+#: ../gtk/gtkcolorchooserwidget.c:450
 msgctxt "Color name"
 msgid "Dark Aluminum 2"
 msgstr "Mørk aluminium 2"
 
-#: ../gtk/gtkcolorchooserwidget.c:459
+#: ../gtk/gtkcolorchooserwidget.c:464
 msgctxt "Color name"
 msgid "Black"
 msgstr "Sort"
 
-#: ../gtk/gtkcolorchooserwidget.c:460
+#: ../gtk/gtkcolorchooserwidget.c:465
 msgctxt "Color name"
 msgid "Very Dark Gray"
 msgstr "Meget mørk grå"
 
-#: ../gtk/gtkcolorchooserwidget.c:461
+#: ../gtk/gtkcolorchooserwidget.c:466
 msgctxt "Color name"
 msgid "Darker Gray"
 msgstr "Mørkere grå"
 
-#: ../gtk/gtkcolorchooserwidget.c:462
+#: ../gtk/gtkcolorchooserwidget.c:467
 msgctxt "Color name"
 msgid "Dark Gray"
 msgstr "Mørk grå"
 
-#: ../gtk/gtkcolorchooserwidget.c:463
+#: ../gtk/gtkcolorchooserwidget.c:468
 msgctxt "Color name"
 msgid "Medium Gray"
 msgstr "Middels grå"
 
-#: ../gtk/gtkcolorchooserwidget.c:464
+#: ../gtk/gtkcolorchooserwidget.c:469
 msgctxt "Color name"
 msgid "Light Gray"
 msgstr "Lys grå"
 
-#: ../gtk/gtkcolorchooserwidget.c:465
+#: ../gtk/gtkcolorchooserwidget.c:470
 msgctxt "Color name"
 msgid "Lighter Gray"
 msgstr "Lysere grå"
 
-#: ../gtk/gtkcolorchooserwidget.c:466
+#: ../gtk/gtkcolorchooserwidget.c:471
 msgctxt "Color name"
 msgid "Very Light Gray"
 msgstr "Meget lys grå"
 
-#: ../gtk/gtkcolorchooserwidget.c:467
+#: ../gtk/gtkcolorchooserwidget.c:472
 msgctxt "Color name"
 msgid "White"
 msgstr "Hvit"
 
 #. translators: label for the custom section in the color chooser
-#: ../gtk/gtkcolorchooserwidget.c:516
+#: ../gtk/gtkcolorchooserwidget.c:521
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../gtk/gtkcolorchooserwidget.c:524
+#: ../gtk/gtkcolorchooserwidget.c:529
 msgid "Create custom color"
 msgstr "Opprett egendefinert farge"
 
-#: ../gtk/gtkcolorchooserwidget.c:542
+#: ../gtk/gtkcolorchooserwidget.c:548
 #, c-format
 msgid "Custom color %d: %s"
 msgstr "Egendefinert farge %d: %s"
 
-#: ../gtk/gtkcoloreditor.c:412
+#: ../gtk/gtkcoloreditor.ui.h:1
 msgid "Color Name"
 msgstr "Fargenavn"
 
-#: ../gtk/gtkcoloreditor.c:457
+#: gtk/gtkcoloreditor.c:457
 msgctxt "Color channel"
 msgid "Saturation"
 msgstr "Metning"
 
-#: ../gtk/gtkcoloreditor.c:463
+#: gtk/gtkcoloreditor.c:463
 msgctxt "Color channel"
 msgid "Value"
 msgstr "Verdi"
 
-#: ../gtk/gtkcoloreditor.c:471
+#: gtk/gtkcoloreditor.c:471
 msgctxt "Color channel"
 msgid "S"
 msgstr "S"
 
-#: ../gtk/gtkcoloreditor.c:473
+#: gtk/gtkcoloreditor.c:473
 msgctxt "Color channel"
 msgid "V"
 msgstr "V"
 
-#: ../gtk/gtkcoloreditor.c:481 ../gtk/gtkcolorscale.c:301
+#: ../gtk/gtkcolorscale.c:300
 msgctxt "Color channel"
 msgid "Hue"
 msgstr "Glød"
 
-#: ../gtk/gtkcoloreditor.c:488
+#: ../gtk/gtkcoloreditor.ui.h:4
 msgctxt "Color channel"
 msgid "H"
-msgstr "H"
+msgstr "G"
 
-#: ../gtk/gtkcoloreditor.c:496 ../gtk/gtkcolorscale.c:303
+#: ../gtk/gtkcolorscale.c:302
 msgctxt "Color channel"
 msgid "Alpha"
 msgstr "Utjevning"
 
-#: ../gtk/gtkcoloreditor.c:503
+#: ../gtk/gtkcoloreditor.ui.h:2
 msgctxt "Color channel"
 msgid "A"
 msgstr "A"
 
-#: ../gtk/gtkcolorplane.c:438
+#: ../gtk/gtkcolorplane.c:443
 msgid "Color Plane"
 msgstr "Fargeplan"
 
@@ -1305,68 +1299,68 @@
 msgstr "default:mm"
 
 #. And show the custom paper dialog
-#: ../gtk/gtkcustompaperunixdialog.c:397 ../gtk/gtkprintunixdialog.c:3275
+#: ../gtk/gtkcustompaperunixdialog.c:389 ../gtk/gtkprintunixdialog.c:3203
 msgid "Manage Custom Sizes"
 msgstr "Håndter egendefinerte størrelser"
 
-#: ../gtk/gtkcustompaperunixdialog.c:558 ../gtk/gtkpagesetupunixdialog.c:778
+#: ../gtk/gtkcustompaperunixdialog.c:550 ../gtk/gtkpagesetupunixdialog.c:806
 msgid "inch"
 msgstr "tomme"
 
-#: ../gtk/gtkcustompaperunixdialog.c:560 ../gtk/gtkpagesetupunixdialog.c:776
+#: ../gtk/gtkcustompaperunixdialog.c:552 ../gtk/gtkpagesetupunixdialog.c:804
 msgid "mm"
 msgstr "mm"
 
-#: gtk/gtkcustompaperunixdialog.c:605
+#: gtk/gtkcustompaperunixdialog.c:578
 msgid "Margins from Printer..."
 msgstr "Marger fra skriver …"
 
-#: ../gtk/gtkcustompaperunixdialog.c:771
+#: ../gtk/gtkcustompaperunixdialog.c:763
 #, c-format
 msgid "Custom Size %d"
 msgstr "Egendefinert størrelse %d"
 
-#: ../gtk/gtkcustompaperunixdialog.c:1109
+#: ../gtk/gtkcustompaperunixdialog.c:1101
 msgid "_Width:"
 msgstr "_Bredde:"
 
-#: ../gtk/gtkcustompaperunixdialog.c:1120
+#: ../gtk/gtkcustompaperunixdialog.c:1112
 msgid "_Height:"
 msgstr "_Høyde:"
 
-#: ../gtk/gtkcustompaperunixdialog.c:1131
+#: ../gtk/gtkcustompaperunixdialog.c:1123
 msgid "Paper Size"
 msgstr "Papirstørrelse:"
 
-#: ../gtk/gtkcustompaperunixdialog.c:1140
+#: ../gtk/gtkcustompaperunixdialog.c:1132
 msgid "_Top:"
 msgstr "_Topp:"
 
-#: ../gtk/gtkcustompaperunixdialog.c:1151
+#: ../gtk/gtkcustompaperunixdialog.c:1143
 msgid "_Bottom:"
 msgstr "_Bunn:"
 
-#: ../gtk/gtkcustompaperunixdialog.c:1162
+#: ../gtk/gtkcustompaperunixdialog.c:1154
 msgid "_Left:"
 msgstr "_Venstre:"
 
-#: ../gtk/gtkcustompaperunixdialog.c:1173
+#: ../gtk/gtkcustompaperunixdialog.c:1165
 msgid "_Right:"
 msgstr "Høy_re:"
 
-#: ../gtk/gtkcustompaperunixdialog.c:1212
+#: ../gtk/gtkcustompaperunixdialog.c:1204
 msgid "Paper Margins"
 msgstr "Papirmarger"
 
-#: ../gtk/gtkentry.c:9127 ../gtk/gtktextview.c:8591
+#: gtk/gtkentry.c:9209 gtk/gtktextview.c:8685
 msgid "Input _Methods"
 msgstr "Inndata_metoder"
 
-#: ../gtk/gtkentry.c:9141 ../gtk/gtktextview.c:8605
+#: gtk/gtkentry.c:9223 gtk/gtktextview.c:8699
 msgid "_Insert Unicode Control Character"
 msgstr "Sett _inn Unicode kontrolltegn"
 
-#: ../gtk/gtkentry.c:10094
+#: ../gtk/gtkentry.c:10387
 msgid "Caps Lock is on"
 msgstr "Caps Lock er på"
 
@@ -1402,7 +1396,7 @@
 #. *
 #. * <important>
 #. * The #GtkFileChooserButton will ellipsize the label,
-#. * and thus will thus request little horizontal space.  To give the button
+#. * and will thus request little horizontal space.  To give the button
 #. * more space, you should call gtk_widget_get_preferred_size(),
 #. * gtk_file_chooser_button_set_width_chars(), or pack the button in
 #. * such a way that other interface elements give space to the widget.
@@ -1415,11 +1409,11 @@
 msgid "Select a File"
 msgstr "Velg en fil"
 
-#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1806
+#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkplacessidebar.c:846
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: ../gtk/gtkfilechooserbutton.c:106
+#: ../gtk/gtkfilechooserbutton.c:106 ../gtk/gtkfilechooserbutton.ui.h:1
 msgid "(None)"
 msgstr "(Ingen)"
 
@@ -1427,27 +1421,27 @@
 msgid "Other..."
 msgstr "Annet …"
 
-#: ../gtk/gtkfilechooserdefault.c:152
+#: ../gtk/gtkfilechooserdefault.c:318
 msgid "Type name of new folder"
 msgstr "Skriv inn navn på ny mappe"
 
-#: ../gtk/gtkfilechooserdefault.c:957
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not retrieve information about the file"
 msgstr "Klarte ikke å hente informasjon om filen"
 
-#: ../gtk/gtkfilechooserdefault.c:968
+#: gtk/gtkfilechooserdefault.c:965
 msgid "Could not add a bookmark"
 msgstr "Klarte ikke å legge til bokmerke"
 
-#: ../gtk/gtkfilechooserdefault.c:979
+#: gtk/gtkfilechooserdefault.c:976
 msgid "Could not remove bookmark"
 msgstr "Klarte ikke å fjerne bokmerke"
 
-#: ../gtk/gtkfilechooserdefault.c:990
+#: ../gtk/gtkfilechooserdefault.c:731
 msgid "The folder could not be created"
 msgstr "Klarte ikke å lage mappen"
 
-#: ../gtk/gtkfilechooserdefault.c:1003
+#: ../gtk/gtkfilechooserdefault.c:744
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1455,16 +1449,16 @@
 "Klarte ikke å lage mappen på grunn av at det allerede eksisterer en fil med "
 "samme navn. Bruk et annet navn for mappen eller gi et nytt navn til filen."
 
-#: ../gtk/gtkfilechooserdefault.c:1017
+#: ../gtk/gtkfilechooserdefault.c:758
 msgid "You need to choose a valid filename."
 msgstr "Du må velge et gyldig filnavn."
 
-#: ../gtk/gtkfilechooserdefault.c:1020
+#: ../gtk/gtkfilechooserdefault.c:761
 #, c-format
 msgid "Cannot create a file under %s as it is not a folder"
 msgstr "Kan ikke lage en fil under %s fordi den ikke er en mappe"
 
-#: ../gtk/gtkfilechooserdefault.c:1032
+#: gtk/gtkfilechooserdefault.c:1029
 msgid ""
 "You may only select folders.  The item that you selected is not a folder; "
 "try using a different item."
@@ -1472,11 +1466,11 @@
 "Du kan kun velge mapper. Oppføringen du valgte er ikke en mappe. Prøv å "
 "bruke en annen oppføring."
 
-#: ../gtk/gtkfilechooserdefault.c:1042
+#: ../gtk/gtkfilechooserdefault.c:789
 msgid "Invalid file name"
 msgstr "Ugyldig filnavn"
 
-#: ../gtk/gtkfilechooserdefault.c:1052
+#: ../gtk/gtkfilechooserdefault.c:799
 msgid "The folder contents could not be displayed"
 msgstr "Mappeinholdet kunne ikke vises"
 
@@ -1484,194 +1478,193 @@
 #. * is a hostname. Nautilus and the panel contain the same string
 #. * to translate.
 #. 
-#: ../gtk/gtkfilechooserdefault.c:1578
+#: ../gtk/gtkfilechooserutils.c:488
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 
-#: ../gtk/gtkfilechooserdefault.c:1727
+#: ../gtk/gtksearchentry.c:241
 msgid "Search"
 msgstr "Søk"
 
-#: ../gtk/gtkfilechooserdefault.c:1751 ../gtk/gtkfilechooserdefault.c:4977
+#: ../gtk/gtkfilechooserdefault.c:2239
 msgid "Recently Used"
 msgstr "Sist brukt"
 
-#: ../gtk/gtkfilechooserdefault.c:2350
+#: ../gtk/gtkfilechooserdefault.ui.h:9
 msgid "Select which types of files are shown"
-msgstr "Velg hvilke filtyper som skal vises"
+msgstr "Velg hvilke typer filer som skal vises"
 
-#: ../gtk/gtkfilechooserdefault.c:2709
+#: gtk/gtkfilechooserdefault.c:2728
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Legg til mappe «%s» i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:2753
+#: gtk/gtkfilechooserdefault.c:2772
 #, c-format
 msgid "Add the current folder to the bookmarks"
 msgstr "Legg til aktiv mappe i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:2755
+#: gtk/gtkfilechooserdefault.c:2774
 #, c-format
 msgid "Add the selected folders to the bookmarks"
 msgstr "Legg til valgte mapper i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:2793
+#: gtk/gtkfilechooserdefault.c:2812
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Fjern bokmerke «%s»"
 
-#: ../gtk/gtkfilechooserdefault.c:2795
+#: gtk/gtkfilechooserdefault.c:2814
 #, c-format
 msgid "Bookmark '%s' cannot be removed"
 msgstr "Bokmerke «%s» kan ikke fjernes"
 
-#: ../gtk/gtkfilechooserdefault.c:2802 ../gtk/gtkfilechooserdefault.c:3688
+#: gtk/gtkfilechooserdefault.c:2821 gtk/gtkfilechooserdefault.c:3707
 msgid "Remove the selected bookmark"
 msgstr "Fjern valgt bokmerke"
 
-#: ../gtk/gtkfilechooserdefault.c:3366
+#: ../gtk/gtkplacessidebar.c:3205
 msgid "Remove"
 msgstr "Fjern"
 
-#: gtk/gtkfilechooserdefault.c:3388
+#: gtk/gtkfilechooserdefault.c:3384
 msgid "Rename..."
 msgstr "Gi nytt navn …"
 
-#. Accessible object name for the file chooser's shortcuts pane
-#: ../gtk/gtkfilechooserdefault.c:3539
+#. add built-in bookmarks
+#: ../gtk/gtkplacessidebar.c:812
 msgid "Places"
 msgstr "Steder"
 
 #. Column header for the file chooser's shortcuts pane
-#: ../gtk/gtkfilechooserdefault.c:3596
+#: gtk/gtkfilechooserdefault.c:3615
 msgid "_Places"
 msgstr "_Steder"
 
-#: ../gtk/gtkfilechooserdefault.c:3676
+#: gtk/gtkfilechooserdefault.c:3695
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Legg til valgt mappe i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:3937
+#: ../gtk/gtkfilechooserdefault.c:1434
 msgid "Could not select file"
 msgstr "Klarte ikke å merke filen"
 
-#: ../gtk/gtkfilechooserdefault.c:4162
+#: gtk/gtkfilechooserdefault.c:4185
 msgid "_Visit this file"
 msgstr "_Gå til denne filen"
 
-#: gtk/gtkfilechooserdefault.c:4178
+#: gtk/gtkfilechooserdefault.c:4174
 msgid "_Copy file's location"
 msgstr "_Kopier filens lokasjon"
 
-#: ../gtk/gtkfilechooserdefault.c:4168
+#: ../gtk/gtkfilechooserdefault.c:1670
 msgid "_Add to Bookmarks"
 msgstr "L_egg til i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:4175
+#: ../gtk/gtkfilechooserdefault.c:1677
 msgid "Show _Hidden Files"
 msgstr "Vis sk_julte filer"
 
-#: ../gtk/gtkfilechooserdefault.c:4178
+#: ../gtk/gtkfilechooserdefault.c:1680
 msgid "Show _Size Column"
 msgstr "Vis kolonne for _størrelse"
 
-#: ../gtk/gtkfilechooserdefault.c:4403
+#: ../gtk/gtkfilechooserdefault.ui.h:5
 msgid "Files"
 msgstr "Filer"
 
-#: ../gtk/gtkfilechooserdefault.c:4454
+#: ../gtk/gtkfilechooserdefault.ui.h:6
 msgid "Name"
 msgstr "Navn"
 
-#: ../gtk/gtkfilechooserdefault.c:4477
+#: ../gtk/gtkfilechooserdefault.ui.h:7
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../gtk/gtkfilechooserdefault.c:4491
+#: ../gtk/gtkfilechooserdefault.ui.h:8
 msgid "Modified"
 msgstr "Endret"
 
 #. Label
-#: ../gtk/gtkfilechooserdefault.c:4584
+#: ../gtk/gtkfilechooserdefault.c:1929
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../gtk/gtkfilechooserdefault.c:4815
+#: ../gtk/gtkfilechooserdefault.ui.h:2 ../gtk/gtkfilechooserdefault.ui.h:3
 msgid "Type a file name"
 msgstr "Skriv et filnavn"
 
-#: ../gtk/gtkfilechooserdefault.c:4862 ../gtk/gtkfilechooserdefault.c:4873
+#: ../gtk/gtkfilechooserdefault.c:2177 ../gtk/gtkfilechooserdefault.c:2188
 msgid "Please select a folder below"
 msgstr "Velg en mappe under"
 
-#: ../gtk/gtkfilechooserdefault.c:4868
+#: ../gtk/gtkfilechooserdefault.c:2183
 msgid "Please type a file name"
 msgstr "Skriv et filnavn"
 
-#. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:4939
+#: ../gtk/gtkfilechooserdefault.ui.h:4
 msgid "Create Fo_lder"
-msgstr "Opprett _mappe"
+msgstr "Lag _mappe"
 
-#: ../gtk/gtkfilechooserdefault.c:4987
+#: ../gtk/gtkfilechooserdefault.c:2249
 msgid "Search:"
 msgstr "Søk:"
 
-#: ../gtk/gtkfilechooserdefault.c:5038
+#: ../gtk/gtkfilechooserdefault.ui.h:1
 msgid "_Location:"
 msgstr "_Adresse:"
 
-#: ../gtk/gtkfilechooserdefault.c:5488
+#: gtk/gtkfilechooserdefault.c:5511
 msgid "Save in _folder:"
 msgstr "Lagre i _mappe:"
 
-#: ../gtk/gtkfilechooserdefault.c:5490
+#: gtk/gtkfilechooserdefault.c:5513
 msgid "Create in _folder:"
 msgstr "Opprett i _mappe:"
 
-#: ../gtk/gtkfilechooserdefault.c:6515
+#: ../gtk/gtkfilechooserdefault.c:3837
 #, c-format
 msgid "Could not read the contents of %s"
 msgstr "Klarte ikke å lese innholdet av %s"
 
-#: ../gtk/gtkfilechooserdefault.c:6519
+#: ../gtk/gtkfilechooserdefault.c:3841
 msgid "Could not read the contents of the folder"
 msgstr "Klarte ikke å lese innholdet i mappen"
 
-#: ../gtk/gtkfilechooserdefault.c:6612 ../gtk/gtkfilechooserdefault.c:6680
-#: ../gtk/gtkfilechooserdefault.c:6860
+#: ../gtk/gtkfilechooserdefault.c:3938 ../gtk/gtkfilechooserdefault.c:4006
+#: ../gtk/gtkfilechooserdefault.c:4187
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../gtk/gtkfilechooserdefault.c:6627
+#: ../gtk/gtkfilechooserdefault.c:3953
 msgid "%H:%M"
 msgstr "%H.%M"
 
-#: ../gtk/gtkfilechooserdefault.c:6629
+#: ../gtk/gtkfilechooserdefault.c:3955
 msgid "Yesterday at %H:%M"
 msgstr "I går kl. %H.%M"
 
-#: ../gtk/gtkfilechooserdefault.c:7331
+#: ../gtk/gtkfilechooserdefault.c:4652
 msgid "Cannot change to folder because it is not local"
 msgstr "Kan ikke gå til mappen fordi den ikke er lokal"
 
-#: ../gtk/gtkfilechooserdefault.c:7928 ../gtk/gtkfilechooserdefault.c:7949
+#: gtk/gtkfilechooserdefault.c:7947 gtk/gtkfilechooserdefault.c:7968
 #, c-format
 msgid "Shortcut %s already exists"
 msgstr "Snarvei %s eksisterer allerede"
 
-#: ../gtk/gtkfilechooserdefault.c:8039
+#: gtk/gtkfilechooserdefault.c:8058
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Snarvei %s eksisterer ikke"
 
-#: ../gtk/gtkfilechooserdefault.c:8286 ../gtk/gtkprintunixdialog.c:548
+#: gtk/gtkfilechooserdefault.c:8305 gtk/gtkprintunixdialog.c:548
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "En fil med navn «%s» eksisterer allerede. Vil du erstatte den?"
 
-#: ../gtk/gtkfilechooserdefault.c:8289 ../gtk/gtkprintunixdialog.c:552
+#: gtk/gtkfilechooserdefault.c:8308 gtk/gtkprintunixdialog.c:552
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
@@ -1679,15 +1672,15 @@
 "Fila eksisterer allerede i «%s». Hvis du erstatter denne vil du overskrive "
 "innholdet."
 
-#: ../gtk/gtkfilechooserdefault.c:8294 ../gtk/gtkprintunixdialog.c:559
+#: ../gtk/gtkfilechooserdefault.c:5444 ../gtk/gtkprintunixdialog.c:685
 msgid "_Replace"
 msgstr "E_rstatt"
 
-#: ../gtk/gtkfilechooserdefault.c:9101
+#: ../gtk/gtkfilechooserdefault.c:6261
 msgid "Could not start the search process"
 msgstr "Klarte ikke å starte søkeprosessen"
 
-#: ../gtk/gtkfilechooserdefault.c:9102
+#: ../gtk/gtkfilechooserdefault.c:6262
 msgid ""
 "The program was not able to create a connection to the indexer daemon.  "
 "Please make sure it is running."
@@ -1695,11 +1688,11 @@
 "Programmet kunne ikke opprette en tilkobling til indekseringstjenesten. "
 "Sjekk at denne kjører."
 
-#: ../gtk/gtkfilechooserdefault.c:9116
+#: ../gtk/gtkfilechooserdefault.c:6276
 msgid "Could not send the search request"
 msgstr "Klarte ikke å sende søkeforespørselen"
 
-#: ../gtk/gtkfilechooserdefault.c:9726
+#: gtk/gtkfilechooserdefault.c:9745
 #, c-format
 msgid "Could not mount %s"
 msgstr "Klarte ikke å montere %s"
@@ -1713,87 +1706,87 @@
 msgid "File System"
 msgstr "Filsystem"
 
-#: ../gtk/gtkfontbutton.c:354
+#: ../gtk/gtkfontbutton.c:353
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:436 ../gtk/gtkfontbutton.c:563
+#: ../gtk/gtkfontbutton.c:438 ../gtk/gtkfontbutton.c:568
 msgid "Pick a Font"
 msgstr "Velg en skrift"
 
-#: ../gtk/gtkfontbutton.c:1121
+#: ../gtk/gtkfontbutton.ui.h:1
 msgid "Font"
 msgstr "Skrift"
 
-#: ../gtk/gtkfontchooserwidget.c:110
+#: ../gtk/gtkfontchooserwidget.ui.h:3
 msgid ""
 "No fonts matched your search. You can revise your search and try again."
-msgstr "Ingen skrifter passer til søket. Du kan endre søket og prøve igjen."
+msgstr "Ingen skrifter passet til søket. Du kan endre søket og prøve igjen."
 
-#: ../gtk/gtkfontchooserwidget.c:557
+#: ../gtk/gtkfontchooserwidget.ui.h:1
 msgid "Search font name"
-msgstr "Søk etter navn på skrift"
+msgstr "Søk etter skriftnavn"
 
-#: ../gtk/gtkfontchooserwidget.c:891
+#: ../gtk/gtkfontchooserwidget.ui.h:2
 msgid "Font Family"
 msgstr "Skriftfamilie"
 
-#: ../gtk/gtkicontheme.c:1931
+#: ../gtk/gtkicontheme.c:2124 ../gtk/gtkicontheme.c:2187
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikon «%s» er ikke tilstede i tema"
 
-#: ../gtk/gtkicontheme.c:3462
+#: ../gtk/gtkicontheme.c:3893
 msgid "Failed to load icon"
 msgstr "Feil under lasting av ikon"
 
-#: ../gtk/gtkimmodule.c:515
+#: ../gtk/gtkimmodule.c:538
 msgid "Simple"
 msgstr "Enkel"
 
-#: ../gtk/gtkimmulticontext.c:608
+#: ../gtk/gtkimmulticontext.c:611
 msgctxt "input method menu"
 msgid "System"
 msgstr "System"
 
-#: ../gtk/gtkimmulticontext.c:618
+#: ../gtk/gtkimmulticontext.c:621
 msgctxt "input method menu"
 msgid "None"
 msgstr "Ingen"
 
-#: ../gtk/gtkimmulticontext.c:701
+#: ../gtk/gtkimmulticontext.c:704
 #, c-format
 msgctxt "input method menu"
 msgid "System (%s)"
 msgstr "System (%s)"
 
 #. Open Link
-#: ../gtk/gtklabel.c:6139
+#: ../gtk/gtklabel.c:6233
 msgid "_Open Link"
 msgstr "_Åpne lenke"
 
 #. Copy Link Address
-#: ../gtk/gtklabel.c:6151
+#: ../gtk/gtklabel.c:6241
 msgid "Copy _Link Address"
 msgstr "Kopier _lenkas adresse"
 
-#: ../gtk/gtklinkbutton.c:499
+#: ../gtk/gtklinkbutton.c:442
 msgid "Copy URL"
 msgstr "Kopier URL"
 
-#: ../gtk/gtklinkbutton.c:665
+#: ../gtk/gtklinkbutton.c:605
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: ../gtk/gtklockbutton.c:290
+#: ../gtk/gtklockbutton.c:266 ../gtk/gtklockbutton.ui.h:1
 msgid "Lock"
 msgstr "Lås"
 
-#: ../gtk/gtklockbutton.c:299
+#: ../gtk/gtklockbutton.c:275 ../gtk/gtklockbutton.ui.h:2
 msgid "Unlock"
 msgstr "Lås opp"
 
-#: ../gtk/gtklockbutton.c:308
+#: ../gtk/gtklockbutton.c:284
 msgid ""
 "Dialog is unlocked.\n"
 "Click to prevent further changes"
@@ -1801,7 +1794,7 @@
 "Dialogen er låst opp.\n"
 "Klikk for å forhindre videre endringer"
 
-#: ../gtk/gtklockbutton.c:317
+#: ../gtk/gtklockbutton.c:293
 msgid ""
 "Dialog is locked.\n"
 "Click to make changes"
@@ -1809,7 +1802,7 @@
 "Dialogen er låst.\n"
 "Klikk for å gjøre endringer"
 
-#: ../gtk/gtklockbutton.c:326
+#: ../gtk/gtklockbutton.c:302
 msgid ""
 "System policy prevents changes.\n"
 "Contact your system administrator"
@@ -1818,27 +1811,27 @@
 "Kontakt din systemadministrator"
 
 #. Description of --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:446
+#: ../gtk/gtkmain.c:448
 msgid "Load additional GTK+ modules"
 msgstr "Last tilleggsmoduler for GTK+"
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:447
+#: ../gtk/gtkmain.c:449
 msgid "MODULES"
 msgstr "MODULER"
 
 #. Description of --g-fatal-warnings in --help output
-#: ../gtk/gtkmain.c:449
+#: ../gtk/gtkmain.c:451
 msgid "Make all warnings fatal"
 msgstr "La alle advarsler være fatale"
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:452
+#: ../gtk/gtkmain.c:454
 msgid "GTK+ debugging flags to set"
 msgstr "Feilsøkingsflagg som skal settes for GTK+"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:455
+#: ../gtk/gtkmain.c:457
 msgid "GTK+ debugging flags to unset"
 msgstr "Feilsøkingsflagg som skal fjernes for GTK+"
 
@@ -1847,24 +1840,24 @@
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #. 
-#: ../gtk/gtkmain.c:703
+#: ../gtk/gtkmain.c:1142
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../gtk/gtkmain.c:768
+#: ../gtk/gtkmain.c:759
 #, c-format
 msgid "Cannot open display: %s"
 msgstr "Kan ikke åpne skjerm: %s"
 
-#: ../gtk/gtkmain.c:834
+#: ../gtk/gtkmain.c:825
 msgid "GTK+ Options"
 msgstr "Alternativer for GTK+"
 
-#: ../gtk/gtkmain.c:834
+#: ../gtk/gtkmain.c:825
 msgid "Show GTK+ Options"
 msgstr "Vis alternativer for GTK+"
 
-#: ../gtk/gtkmountoperation.c:535
+#: ../gtk/gtkmountoperation.c:530
 msgid "Co_nnect"
 msgstr "K_oble til"
 
@@ -1888,28 +1881,28 @@
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../gtk/gtkmountoperation.c:671
+#: ../gtk/gtkmountoperation.c:666
 msgid "Forget password _immediately"
 msgstr "Glem _passordet med det samme"
 
-#: ../gtk/gtkmountoperation.c:681
+#: ../gtk/gtkmountoperation.c:676
 msgid "Remember password until you _logout"
 msgstr "Husk passordet til du _logger ut"
 
-#: ../gtk/gtkmountoperation.c:691
+#: ../gtk/gtkmountoperation.c:686
 msgid "Remember _forever"
 msgstr "Husk _for alltid"
 
-#: ../gtk/gtkmountoperation.c:1080
+#: ../gtk/gtkmountoperation.c:1075
 #, c-format
 msgid "Unknown Application (PID %d)"
 msgstr "Ukjent program (PID %d)"
 
-#: ../gtk/gtkmountoperation.c:1263
+#: ../gtk/gtkmountoperation.c:1258
 msgid "Unable to end process"
 msgstr "Kan ikke avslutte prosess"
 
-#: ../gtk/gtkmountoperation.c:1300
+#: ../gtk/gtkmountoperation.c:1297
 msgid "_End Process"
 msgstr "A_vslutt prosess"
 
@@ -1945,7 +1938,7 @@
 msgid "Cannot end process with PID %d: %s"
 msgstr "Kan ikke avslutte prosess med PID %d: %s"
 
-#: ../gtk/gtknotebook.c:5069 ../gtk/gtknotebook.c:7723
+#: ../gtk/gtknotebook.c:5061 ../gtk/gtknotebook.c:7794
 #, c-format
 msgid "Page %u"
 msgstr "Side %u"
@@ -1953,26 +1946,26 @@
 #. Translators: the format here is used to build the string that will be rendered
 #. * in the number emblem.
 #. 
-#: ../gtk/gtknumerableicon.c:482
+#: ../gtk/gtknumerableicon.c:472
 #, c-format
 msgctxt "Number format"
 msgid "%d"
 msgstr "%d"
 
-#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848
-#: ../gtk/gtkpapersize.c:888
+#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:850
+#: ../gtk/gtkpapersize.c:890
 msgid "Not a valid page setup file"
 msgstr "Ikke en gyldig fil for sideoppsett"
 
-#: ../gtk/gtkpagesetupunixdialog.c:167
+#: ../gtk/gtkpagesetupunixdialog.c:196
 msgid "Any Printer"
 msgstr "Alle skrivere"
 
-#: ../gtk/gtkpagesetupunixdialog.c:167
+#: ../gtk/gtkpagesetupunixdialog.c:196
 msgid "For portable documents"
 msgstr "For portable dokumenter"
 
-#: ../gtk/gtkpagesetupunixdialog.c:796
+#: ../gtk/gtkpagesetupunixdialog.c:824
 #, c-format
 msgid ""
 "Margins:\n"
@@ -1987,43 +1980,43 @@
 " Topp: %s %s\n"
 " Bunn: %s %s"
 
-#: gtk/gtkpagesetupunixdialog.c:845 gtk/gtkprintunixdialog.c:3329
+#: gtk/gtkpagesetupunixdialog.c:845 gtk/gtkprintunixdialog.c:3374
 msgid "Manage Custom Sizes..."
 msgstr "Håndter egendefinerte størrelser …"
 
-#: ../gtk/gtkpagesetupunixdialog.c:896
+#: ../gtk/gtkpagesetupunixdialog.ui.h:3
 msgid "_Format for:"
-msgstr "_Format for:"
+msgstr "_Formater for:"
 
-#: ../gtk/gtkpagesetupunixdialog.c:917 ../gtk/gtkprintunixdialog.c:3477
+#: ../gtk/gtkpagesetupunixdialog.ui.h:4 ../gtk/gtkprintunixdialog.ui.h:41
 msgid "_Paper size:"
 msgstr "_Papirstørrelse:"
 
-#: ../gtk/gtkpagesetupunixdialog.c:946
+#: ../gtk/gtkpagesetupunixdialog.ui.h:5
 msgid "_Orientation:"
 msgstr "_Orientering:"
 
-#: ../gtk/gtkpagesetupunixdialog.c:1006 ../gtk/gtkprintunixdialog.c:3531
+#: ../gtk/gtkpagesetupunixdialog.c:895 ../gtk/gtkprintunixdialog.ui.h:47
 msgid "Page Setup"
 msgstr "Sideoppsett"
 
-#: ../gtk/gtkpathbar.c:159
+#: ../gtk/gtkpathbar.ui.h:2
 msgid "Up Path"
-msgstr "Opp sti"
+msgstr "Sti opp"
 
-#: ../gtk/gtkpathbar.c:161
+#: ../gtk/gtkpathbar.ui.h:1
 msgid "Down Path"
-msgstr "Ned sti"
+msgstr "Sti ned"
 
-#: ../gtk/gtkpathbar.c:1644
+#: ../gtk/gtkpathbar.c:1608
 msgid "File System Root"
 msgstr "Filsystemrot"
 
-#: ../gtk/gtkprintbackend.c:750
+#: ../gtk/gtkprintbackend.c:746
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../gtk/gtkprinteroptionwidget.c:770
+#: ../gtk/gtkprinteroptionwidget.c:766
 msgid "Not available"
 msgstr "Ikke tilgjengelig"
 
@@ -2039,75 +2032,75 @@
 #. * jobs. %s gets replaced by the application name, %d gets replaced
 #. * by the job number.
 #. 
-#: ../gtk/gtkprintoperation.c:260
+#: ../gtk/gtkprintoperation.c:259
 #, c-format
 msgid "%s job #%d"
 msgstr "%s jobb #%d"
 
-#: ../gtk/gtkprintoperation.c:1777
+#: ../gtk/gtkprintoperation.c:1774
 msgctxt "print operation status"
 msgid "Initial state"
 msgstr "Starttilstand"
 
-#: ../gtk/gtkprintoperation.c:1778
+#: ../gtk/gtkprintoperation.c:1775
 msgctxt "print operation status"
 msgid "Preparing to print"
 msgstr "Forbereder utskrift"
 
-#: ../gtk/gtkprintoperation.c:1779
+#: ../gtk/gtkprintoperation.c:1776
 msgctxt "print operation status"
 msgid "Generating data"
 msgstr "Genererer data"
 
-#: ../gtk/gtkprintoperation.c:1780
+#: ../gtk/gtkprintoperation.c:1777
 msgctxt "print operation status"
 msgid "Sending data"
 msgstr "Sender data"
 
-#: ../gtk/gtkprintoperation.c:1781
+#: ../gtk/gtkprintoperation.c:1778
 msgctxt "print operation status"
 msgid "Waiting"
 msgstr "Venter"
 
-#: ../gtk/gtkprintoperation.c:1782
+#: ../gtk/gtkprintoperation.c:1779
 msgctxt "print operation status"
 msgid "Blocking on issue"
 msgstr "Blokkert pga hendelse"
 
-#: ../gtk/gtkprintoperation.c:1783
+#: ../gtk/gtkprintoperation.c:1780
 msgctxt "print operation status"
 msgid "Printing"
 msgstr "Skriver ut"
 
-#: ../gtk/gtkprintoperation.c:1784
+#: ../gtk/gtkprintoperation.c:1781
 msgctxt "print operation status"
 msgid "Finished"
 msgstr "Fullført"
 
-#: ../gtk/gtkprintoperation.c:1785
+#: ../gtk/gtkprintoperation.c:1782
 msgctxt "print operation status"
 msgid "Finished with error"
 msgstr "Fullført med feil"
 
-#: ../gtk/gtkprintoperation.c:2349
+#: ../gtk/gtkprintoperation.c:2346
 #, c-format
 msgid "Preparing %d"
 msgstr "Forbereder %d"
 
-#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983
+#: ../gtk/gtkprintoperation.c:2348 ../gtk/gtkprintoperation.c:2980
 msgid "Preparing"
 msgstr "Forbereder"
 
-#: ../gtk/gtkprintoperation.c:2354
+#: ../gtk/gtkprintoperation.c:2351
 #, c-format
 msgid "Printing %d"
 msgstr "Skriver ut %d"
 
-#: ../gtk/gtkprintoperation.c:3013
+#: ../gtk/gtkprintoperation.c:3011
 msgid "Error creating print preview"
 msgstr "Feil under oppretting av forhåndsvisning for utskrift"
 
-#: ../gtk/gtkprintoperation.c:3016
+#: ../gtk/gtkprintoperation.c:3014
 msgid ""
 "The most probable reason is that a temporary file could not be created."
 msgstr ""
@@ -2117,133 +2110,133 @@
 msgid "Error launching preview"
 msgstr "Feil under start av forhåndsvisning"
 
-#: ../gtk/gtkprintoperation-win32.c:609
+#: ../gtk/gtkprintoperation-win32.c:611
 msgid "Printer offline"
 msgstr "Skriver er frakoblet"
 
-#: ../gtk/gtkprintoperation-win32.c:611
+#: ../gtk/gtkprintoperation-win32.c:613
 msgid "Out of paper"
 msgstr "Tom for papir"
 
 #. Translators: this is a printer status.
-#: ../gtk/gtkprintoperation-win32.c:613
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2126
+#: ../gtk/gtkprintoperation-win32.c:615
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2293
 msgid "Paused"
 msgstr "Pause"
 
-#: ../gtk/gtkprintoperation-win32.c:615
+#: ../gtk/gtkprintoperation-win32.c:617
 msgid "Need user intervention"
 msgstr "Krever tilsyn av bruker"
 
-#: ../gtk/gtkprintoperation-win32.c:715
+#: ../gtk/gtkprintoperation-win32.c:717
 msgid "Custom size"
 msgstr "Egendefinert størrelse"
 
-#: ../gtk/gtkprintoperation-win32.c:1537
+#: ../gtk/gtkprintoperation-win32.c:1539
 msgid "No printer found"
 msgstr "Ingen skriver funnet"
 
-#: ../gtk/gtkprintoperation-win32.c:1564
+#: ../gtk/gtkprintoperation-win32.c:1566
 msgid "Invalid argument to CreateDC"
 msgstr "Ugyldig argument til CreateDC"
 
-#: ../gtk/gtkprintoperation-win32.c:1600 ../gtk/gtkprintoperation-win32.c:1827
+#: ../gtk/gtkprintoperation-win32.c:1602 ../gtk/gtkprintoperation-win32.c:1829
 msgid "Error from StartDoc"
 msgstr "Feil fra StartDoc"
 
-#: ../gtk/gtkprintoperation-win32.c:1682 ../gtk/gtkprintoperation-win32.c:1705
-#: ../gtk/gtkprintoperation-win32.c:1753
+#: ../gtk/gtkprintoperation-win32.c:1684 ../gtk/gtkprintoperation-win32.c:1707
+#: ../gtk/gtkprintoperation-win32.c:1755
 msgid "Not enough free memory"
 msgstr "Ikke nok minne ledig"
 
-#: ../gtk/gtkprintoperation-win32.c:1758
+#: ../gtk/gtkprintoperation-win32.c:1760
 msgid "Invalid argument to PrintDlgEx"
 msgstr "Ugyldig argument til PrintDlgEx"
 
-#: ../gtk/gtkprintoperation-win32.c:1763
+#: ../gtk/gtkprintoperation-win32.c:1765
 msgid "Invalid pointer to PrintDlgEx"
 msgstr "Ugyldig peker til PrintDlgEx"
 
-#: ../gtk/gtkprintoperation-win32.c:1768
+#: ../gtk/gtkprintoperation-win32.c:1770
 msgid "Invalid handle to PrintDlgEx"
 msgstr "Ugyldig håndtak til PrintDlgEx"
 
-#: ../gtk/gtkprintoperation-win32.c:1773
+#: ../gtk/gtkprintoperation-win32.c:1775
 msgid "Unspecified error"
 msgstr "Uspesifisert feil"
 
-#: ../gtk/gtkprintunixdialog.c:681
+#: ../gtk/gtkprintunixdialog.c:819
 msgid "Getting printer information failed"
 msgstr "Klarte ikke å hente informasjon om skriveren"
 
-#: gtk/gtkprintunixdialog.c:1916
+#: gtk/gtkprintunixdialog.c:1959
 msgid "Getting printer information..."
 msgstr "Henter informasjon om skriver …"
 
-#: ../gtk/gtkprintunixdialog.c:2184
+#: ../gtk/gtkprintunixdialog.ui.h:4
 msgid "Printer"
 msgstr "Skriver"
 
-#. Translators: this is the header for the location column in the print dialog
-#: ../gtk/gtkprintunixdialog.c:2194
+#. this is the header for the location column in the print dialog
+#: ../gtk/gtkprintunixdialog.ui.h:7
 msgid "Location"
 msgstr "Adresse"
 
-#. Translators: this is the header for the printer status column in the print dialog
-#: ../gtk/gtkprintunixdialog.c:2205
+#. this is the header for the printer status column in the print dialog
+#: ../gtk/gtkprintunixdialog.ui.h:10
 msgid "Status"
 msgstr "Status"
 
-#: ../gtk/gtkprintunixdialog.c:2231
+#: ../gtk/gtkprintunixdialog.ui.h:11
 msgid "Range"
 msgstr "Område"
 
-#: ../gtk/gtkprintunixdialog.c:2235
+#: ../gtk/gtkprintunixdialog.ui.h:12
 msgid "_All Pages"
-msgstr "Alle sider"
+msgstr "_Alle sider"
 
-#: ../gtk/gtkprintunixdialog.c:2240
+#: ../gtk/gtkprintunixdialog.ui.h:13
 msgid "C_urrent Page"
 msgstr "D_enne siden"
 
-#: ../gtk/gtkprintunixdialog.c:2248
+#: ../gtk/gtkprintunixdialog.ui.h:14
 msgid "Se_lection"
 msgstr "Utva_lg"
 
-#: ../gtk/gtkprintunixdialog.c:2254
+#: ../gtk/gtkprintunixdialog.ui.h:15
 msgid "Pag_es:"
 msgstr "Sid_er:"
 
-#: ../gtk/gtkprintunixdialog.c:2255
+#: ../gtk/gtkprintunixdialog.ui.h:16 ../gtk/gtkprintunixdialog.ui.h:18
+#: ../gtk/gtkprintunixdialog.ui.h:21
 msgid ""
 "Specify one or more page ranges,\n"
 " e.g. 1-3,7,11"
 msgstr ""
-"Oppgi en ett eller flere sideområder,\n"
-" f.eks 1-3,7,11"
+"Oppgi ett eller flere sideområder,\n"
+" f.eks. 1-3,7,11"
 
-#: ../gtk/gtkprintunixdialog.c:2264
+#: ../gtk/gtkprintunixdialog.ui.h:20
 msgid "Pages"
 msgstr "Sider"
 
-#: ../gtk/gtkprintunixdialog.c:2275
+#: ../gtk/gtkprintunixdialog.ui.h:23
 msgid "Copies"
 msgstr "Kopier"
 
-#. FIXME chpe: too much space between Copies and spinbutton, put those 2 in a hbox and make it span 2 columns
-#: ../gtk/gtkprintunixdialog.c:2280
+#: ../gtk/gtkprintunixdialog.ui.h:24
 msgid "Copie_s:"
-msgstr "_Kopier:"
+msgstr "Kopie_r:"
 
-#: ../gtk/gtkprintunixdialog.c:2296
+#: ../gtk/gtkprintunixdialog.ui.h:25
 msgid "C_ollate"
-msgstr "S_lå sammen"
+msgstr "Sl_å sammen"
 
-#: ../gtk/gtkprintunixdialog.c:2302
+#: ../gtk/gtkprintunixdialog.ui.h:26
 msgid "_Reverse"
-msgstr "_Omvendt"
+msgstr "_Vend om"
 
-#: ../gtk/gtkprintunixdialog.c:2318
+#: ../gtk/gtkprintunixdialog.ui.h:27
 msgid "General"
 msgstr "Generelt"
 
@@ -2253,282 +2246,272 @@
 #. Translators: These strings name the possible arrangements of
 #. * multiple pages on a sheet when printing
 #. 
-#: ../gtk/gtkprintunixdialog.c:3058
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3692
+#: ../gtk/gtkprintunixdialog.c:2986
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4780
 msgid "Left to right, top to bottom"
 msgstr "Venstre til høyre, topp til bunn"
 
-#: ../gtk/gtkprintunixdialog.c:3058
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3692
+#: ../gtk/gtkprintunixdialog.c:2986
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4780
 msgid "Left to right, bottom to top"
 msgstr "Venstre til høyre, bunn til topp"
 
-#: ../gtk/gtkprintunixdialog.c:3059
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3693
+#: ../gtk/gtkprintunixdialog.c:2987
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4781
 msgid "Right to left, top to bottom"
 msgstr "Høyre til venstre, topp til bunn"
 
-#: ../gtk/gtkprintunixdialog.c:3059
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3693
+#: ../gtk/gtkprintunixdialog.c:2987
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4781
 msgid "Right to left, bottom to top"
 msgstr "Høyre til venstre, bunn til topp"
 
-#: ../gtk/gtkprintunixdialog.c:3060
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3694
+#: ../gtk/gtkprintunixdialog.c:2988
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4782
 msgid "Top to bottom, left to right"
 msgstr "Topp til bunn, venstre til høyre"
 
-#: ../gtk/gtkprintunixdialog.c:3060
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3694
+#: ../gtk/gtkprintunixdialog.c:2988
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4782
 msgid "Top to bottom, right to left"
 msgstr "Topp til bunn, høyre til venstre"
 
-#: ../gtk/gtkprintunixdialog.c:3061
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3695
+#: ../gtk/gtkprintunixdialog.c:2989
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4783
 msgid "Bottom to top, left to right"
 msgstr "Bunn til topp, venstre til høyre"
 
-#: ../gtk/gtkprintunixdialog.c:3061
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3695
+#: ../gtk/gtkprintunixdialog.c:2989
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4783
 msgid "Bottom to top, right to left"
 msgstr "Bunn til topp, høyre til venstre"
 
 #. Translators, this string is used to label the option in the print
 #. * dialog that controls in what order multiple pages are arranged
 #. 
-#: ../gtk/gtkprintunixdialog.c:3065 ../gtk/gtkprintunixdialog.c:3078
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3772
+#: ../gtk/gtkprintunixdialog.c:2993 ../gtk/gtkprintunixdialog.c:3006
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4860
 msgid "Page Ordering"
 msgstr "Siderekkefølge"
 
-#: ../gtk/gtkprintunixdialog.c:3094
+#: ../gtk/gtkprintunixdialog.c:3022
 msgid "Left to right"
 msgstr "Venstre til høyre"
 
-#: ../gtk/gtkprintunixdialog.c:3095
+#: ../gtk/gtkprintunixdialog.c:3023
 msgid "Right to left"
 msgstr "Høyre til venstre"
 
-#: ../gtk/gtkprintunixdialog.c:3107
+#: ../gtk/gtkprintunixdialog.c:3035
 msgid "Top to bottom"
 msgstr "Topp til bunn"
 
-#: ../gtk/gtkprintunixdialog.c:3108
+#: ../gtk/gtkprintunixdialog.c:3036
 msgid "Bottom to top"
 msgstr "Bunn til topp"
 
-#: ../gtk/gtkprintunixdialog.c:3352
+#: ../gtk/gtkprintunixdialog.ui.h:28
 msgid "Layout"
 msgstr "Utforming"
 
-#: ../gtk/gtkprintunixdialog.c:3356
+#: ../gtk/gtkprintunixdialog.ui.h:29
 msgid "T_wo-sided:"
-msgstr "T_osidig:"
+msgstr "_Tosidig:"
 
-#: ../gtk/gtkprintunixdialog.c:3368
+#: ../gtk/gtkprintunixdialog.ui.h:30
 msgid "Pages per _side:"
-msgstr "Ark per _side:"
+msgstr "_Sider per side:"
 
-#: ../gtk/gtkprintunixdialog.c:3382
+#: ../gtk/gtkprintunixdialog.ui.h:31
 msgid "Page or_dering:"
-msgstr "Si_derekkefølge:"
+msgstr "Siderekkeføl_ge:"
 
-#: ../gtk/gtkprintunixdialog.c:3395
+#: ../gtk/gtkprintunixdialog.ui.h:32
 msgid "_Only print:"
-msgstr "K_un skriv ut:"
+msgstr "Skriv k_un ut:"
 
-#. In enum order
-#: ../gtk/gtkprintunixdialog.c:3407
+#: ../gtk/gtkprintunixdialog.ui.h:33
 msgid "All sheets"
 msgstr "Alle ark"
 
-#: ../gtk/gtkprintunixdialog.c:3408
+#: ../gtk/gtkprintunixdialog.ui.h:34
 msgid "Even sheets"
 msgstr "Like ark"
 
-#: ../gtk/gtkprintunixdialog.c:3409
+#: ../gtk/gtkprintunixdialog.ui.h:35
 msgid "Odd sheets"
 msgstr "Ulike ark"
 
-#: ../gtk/gtkprintunixdialog.c:3412
+#: ../gtk/gtkprintunixdialog.ui.h:36
 msgid "Sc_ale:"
-msgstr "Sk_aler:"
+msgstr "_Sk_aler:"
 
-#: ../gtk/gtkprintunixdialog.c:3436
+#: ../gtk/gtkprintunixdialog.ui.h:37
 msgid "Paper"
 msgstr "Papir"
 
-#: ../gtk/gtkprintunixdialog.c:3440
+#: ../gtk/gtkprintunixdialog.ui.h:38
 msgid "Paper _type:"
 msgstr "Papir_type:"
 
-#: ../gtk/gtkprintunixdialog.c:3452
+#: ../gtk/gtkprintunixdialog.ui.h:39
 msgid "Paper _source:"
-msgstr "Papi_rkilde:"
+msgstr "Papir_kilde:"
 
-#: ../gtk/gtkprintunixdialog.c:3464
+#: ../gtk/gtkprintunixdialog.ui.h:40
 msgid "Output t_ray:"
 msgstr "U_tskuff:"
 
-#: ../gtk/gtkprintunixdialog.c:3497
+#: ../gtk/gtkprintunixdialog.ui.h:42
 msgid "Or_ientation:"
 msgstr "Or_ientering:"
 
-#. In enum order
-#: ../gtk/gtkprintunixdialog.c:3509
+#: ../gtk/gtkpagesetupunixdialog.ui.h:6 ../gtk/gtkprintunixdialog.ui.h:43
 msgid "Portrait"
 msgstr "Portrett"
 
-#: ../gtk/gtkprintunixdialog.c:3510
+#: ../gtk/gtkpagesetupunixdialog.ui.h:8 ../gtk/gtkprintunixdialog.ui.h:44
 msgid "Landscape"
 msgstr "Landskap"
 
-#: ../gtk/gtkprintunixdialog.c:3511
+#: ../gtk/gtkpagesetupunixdialog.ui.h:7 ../gtk/gtkprintunixdialog.ui.h:45
 msgid "Reverse portrait"
 msgstr "Omvendt portrett"
 
-#: ../gtk/gtkprintunixdialog.c:3512
+#: ../gtk/gtkpagesetupunixdialog.ui.h:9 ../gtk/gtkprintunixdialog.ui.h:46
 msgid "Reverse landscape"
 msgstr "Omvendt landskap"
 
-#: ../gtk/gtkprintunixdialog.c:3556
+#: ../gtk/gtkprintunixdialog.ui.h:48
 msgid "Job Details"
-msgstr "Detaljer for jobb"
+msgstr "Detaljer om jobb"
 
-#: ../gtk/gtkprintunixdialog.c:3560
+#: ../gtk/gtkprintunixdialog.ui.h:49
 msgid "Pri_ority:"
 msgstr "Pri_oritet:"
 
-#: ../gtk/gtkprintunixdialog.c:3572
+#: ../gtk/gtkprintunixdialog.ui.h:50
 msgid "_Billing info:"
 msgstr "_Faktureringsinformasjon:"
 
-#: ../gtk/gtkprintunixdialog.c:3587
+#: ../gtk/gtkprintunixdialog.ui.h:51
 msgid "Print Document"
 msgstr "Skriv ut dokument"
 
-#. Translators: this is one of the choices for the print at option
-#. * in the print dialog
-#. 
-#: ../gtk/gtkprintunixdialog.c:3594
+#. this is one of the choices for the print at option in the print dialog
+#: ../gtk/gtkprintunixdialog.ui.h:54
 msgid "_Now"
 msgstr "_Nå"
 
-#: ../gtk/gtkprintunixdialog.c:3603
+#. this is one of the choices for the print at option in the print dialog. It also serves as the label for an entry that allows the user to enter a time.
+#: ../gtk/gtkprintunixdialog.ui.h:57
 msgid "A_t:"
 msgstr "_Tid:"
 
-#. Translators: Ability to parse the am/pm format depends on actual locale.
-#. * You can remove the am/pm values below for your locale if they are not
-#. * supported.
-#. 
-#: ../gtk/gtkprintunixdialog.c:3609
+#. Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.
+#: ../gtk/gtkprintunixdialog.ui.h:58 ../gtk/gtkprintunixdialog.ui.h:62
+#: ../gtk/gtkprintunixdialog.ui.h:64 ../gtk/gtkprintunixdialog.ui.h:68
+#: ../gtk/gtkprintunixdialog.ui.h:71
 msgid ""
 "Specify the time of print,\n"
 " e.g. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
 msgstr ""
-"Oppgi klokkeslett for utskrift.\n"
-" f.eks 15.30, 2.35 pm, 14.15.20, 11.46.30 am, 4 pm"
+"Oppgi tid for utskriften,\n"
+" f.eks. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
 
-#: ../gtk/gtkprintunixdialog.c:3617
+#: ../gtk/gtkprintunixdialog.ui.h:70
 msgid "Time of print"
 msgstr "Tid for utskrift"
 
-#: ../gtk/gtkprintunixdialog.c:3631
+#. this is one of the choices for the print at option in the print dialog. It means that the print job will not be printed until it explicitly gets 'released'.
+#: ../gtk/gtkprintunixdialog.ui.h:75
 msgid "On _hold"
 msgstr "På _vent"
 
-#: ../gtk/gtkprintunixdialog.c:3632
+#: ../gtk/gtkprintunixdialog.ui.h:76 ../gtk/gtkprintunixdialog.ui.h:77
 msgid "Hold the job until it is explicitly released"
-msgstr "Sett jobben på vent inntil den er eksplisitt aktivert"
+msgstr "Hold jobben tilbake til den eksplisitt frigis"
 
-#: ../gtk/gtkprintunixdialog.c:3650
+#: ../gtk/gtkprintunixdialog.ui.h:78
 msgid "Add Cover Page"
-msgstr "Legg til omslag"
+msgstr "Legg til forside"
 
-#. Translators, this is the label used for the option in the print
-#. * dialog that controls the front cover page.
-#. 
-#: ../gtk/gtkprintunixdialog.c:3657
+#. this is the label used for the option in the print dialog that controls the front cover page.
+#: ../gtk/gtkprintunixdialog.ui.h:81
 msgid "Be_fore:"
 msgstr "_Før:"
 
-#. Translators, this is the label used for the option in the print
-#. * dialog that controls the back cover page.
-#. 
-#: ../gtk/gtkprintunixdialog.c:3672
+#. this is the label used for the option in the print dialog that controls the back cover page.
+#: ../gtk/gtkprintunixdialog.ui.h:84
 msgid "_After:"
 msgstr "_Etter:"
 
-#. Translators: this is the tab label for the notebook tab containing
-#. * job-specific options in the print dialog
-#. 
-#: ../gtk/gtkprintunixdialog.c:3687
+#: ../gtk/gtkprintunixdialog.ui.h:85
 msgid "Job"
 msgstr "Jobb"
 
-#: ../gtk/gtkprintunixdialog.c:3753
+#: ../gtk/gtkprintunixdialog.ui.h:96
 msgid "Advanced"
 msgstr "Avansert"
 
-#. Translators: this will appear as tab label in print dialog.
-#: ../gtk/gtkprintunixdialog.c:3791
+#. This will appear as a tab label in the print dialog.
+#: ../gtk/gtkprintunixdialog.ui.h:88
 msgid "Image Quality"
 msgstr "Bildekvalitet"
 
-#. Translators: this will appear as tab label in print dialog.
-#: ../gtk/gtkprintunixdialog.c:3795
+#. This will appear as a tab label in the print dialog.
+#: ../gtk/gtkprintunixdialog.ui.h:91
 msgid "Color"
 msgstr "Farge"
 
-#. Translators: this will appear as tab label in print dialog.
+#. This will appear as a tab label in the print dialog.
 #. It's a typographical term, as in "Binding and finishing"
-#: ../gtk/gtkprintunixdialog.c:3800
+#: ../gtk/gtkprintunixdialog.ui.h:95
 msgid "Finishing"
 msgstr "Fullfører"
 
-#: ../gtk/gtkprintunixdialog.c:3810
+#: ../gtk/gtkprintunixdialog.ui.h:97
 msgid "Some of the settings in the dialog conflict"
-msgstr "Noen innstillinger i dialogen er i konflikt"
+msgstr "Noen av innstillingene i dialogen er i konflikt med hverandre"
 
-#: ../gtk/gtkprintunixdialog.c:3836
+#: ../gtk/gtkprintunixdialog.c:3279
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../gtk/gtkrecentchooserdefault.c:480
+#: ../gtk/gtkrecentchooserdefault.ui.h:1
 msgid "Select which type of documents are shown"
-msgstr "Velg hvilke dokumenttyper som skal vises"
+msgstr "Velg hvilken type dokumenter som skal vises"
 
-#: ../gtk/gtkrecentchooserdefault.c:1129 ../gtk/gtkrecentchooserdefault.c:1166
+#: ../gtk/gtkrecentchooserdefault.c:1049 ../gtk/gtkrecentchooserdefault.c:1086
 #, c-format
 msgid "No item for URI '%s' found"
 msgstr "Ingen oppføring funnet for URI «%s»"
 
-#: ../gtk/gtkrecentchooserdefault.c:1293
+#: ../gtk/gtkrecentchooserdefault.c:1213
 msgid "Untitled filter"
 msgstr "Filter uten tittel"
 
-#: ../gtk/gtkrecentchooserdefault.c:1646
+#: ../gtk/gtkrecentchooserdefault.c:1543
 msgid "Could not remove item"
 msgstr "Klarte ikke å fjerne oppføring"
 
-#: ../gtk/gtkrecentchooserdefault.c:1690
+#: ../gtk/gtkrecentchooserdefault.c:1587
 msgid "Could not clear list"
 msgstr "Klarte ikke tømme listen"
 
-#: ../gtk/gtkrecentchooserdefault.c:1774
+#: ../gtk/gtkrecentchooserdefault.c:1671
 msgid "Copy _Location"
 msgstr "Kopier _adresse"
 
-#: ../gtk/gtkrecentchooserdefault.c:1787
+#: ../gtk/gtkrecentchooserdefault.c:1682
 msgid "_Remove From List"
 msgstr "Fje_rn fra listen"
 
-#: ../gtk/gtkrecentchooserdefault.c:1796
+#: ../gtk/gtkrecentchooserdefault.c:1689
 msgid "_Clear List"
 msgstr "_Tøm listen"
 
-#: ../gtk/gtkrecentchooserdefault.c:1810
+#: ../gtk/gtkrecentchooserdefault.c:1701
 msgid "Show _Private Resources"
 msgstr "Vis _private ressurser"
 
@@ -2542,21 +2525,21 @@
 #. * user appended or prepended custom menu items to the
 #. * recent chooser menu widget.
 #. 
-#: ../gtk/gtkrecentchoosermenu.c:360
+#: ../gtk/gtkrecentchoosermenu.c:355
 msgid "No items found"
 msgstr "Ingen oppføring funnet"
 
-#: ../gtk/gtkrecentchoosermenu.c:526 ../gtk/gtkrecentchoosermenu.c:582
+#: ../gtk/gtkrecentchoosermenu.c:521 ../gtk/gtkrecentchoosermenu.c:577
 #, c-format
 msgid "No recently used resource found with URI `%s'"
 msgstr "Fant ingen nylig brukt ressurs med URI «%s»"
 
-#: ../gtk/gtkrecentchoosermenu.c:792
+#: ../gtk/gtkrecentchoosermenu.c:787
 #, c-format
 msgid "Open '%s'"
 msgstr "Åpne «%s»"
 
-#: ../gtk/gtkrecentchoosermenu.c:822
+#: ../gtk/gtkrecentchoosermenu.c:817
 msgid "Unknown item"
 msgstr "Ukjent oppføring"
 
@@ -2565,7 +2548,7 @@
 #. * the %s is the name of the item. Please keep the _ in front
 #. * of the number to give these menu items a mnemonic.
 #. 
-#: ../gtk/gtkrecentchoosermenu.c:833
+#: ../gtk/gtkrecentchoosermenu.c:828
 #, c-format
 msgctxt "recent menu label"
 msgid "_%d. %s"
@@ -2574,43 +2557,43 @@
 #. This is the format that is used for items in a recent files menu.
 #. * The %d is the number of the item, the %s is the name of the item.
 #. 
-#: ../gtk/gtkrecentchoosermenu.c:838
+#: ../gtk/gtkrecentchoosermenu.c:833
 #, c-format
 msgctxt "recent menu label"
 msgid "%d. %s"
 msgstr "%d. %s"
 
-#: ../gtk/gtkrecentmanager.c:1010 ../gtk/gtkrecentmanager.c:1023
-#: ../gtk/gtkrecentmanager.c:1160 ../gtk/gtkrecentmanager.c:1170
-#: ../gtk/gtkrecentmanager.c:1222 ../gtk/gtkrecentmanager.c:1231
-#: ../gtk/gtkrecentmanager.c:1246
+#: ../gtk/gtkrecentmanager.c:1030 ../gtk/gtkrecentmanager.c:1043
+#: ../gtk/gtkrecentmanager.c:1180 ../gtk/gtkrecentmanager.c:1190
+#: ../gtk/gtkrecentmanager.c:1242 ../gtk/gtkrecentmanager.c:1251
+#: ../gtk/gtkrecentmanager.c:1266
 #, c-format
 msgid "Unable to find an item with URI '%s'"
 msgstr "Kan ikke finne en oppføring med URI «%s»"
 
-#: ../gtk/gtkrecentmanager.c:2446
+#: ../gtk/gtkrecentmanager.c:2469
 #, c-format
 msgid "No registered application with name '%s' for item with URI '%s' found"
 msgstr ""
 "Ingen registrerte programmer med navn «%s» funnet for oppføring med URI «%s»"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: ../gtk/gtkstock.c:324
+#: ../gtk/a11y/gtkimageaccessible.c:65 ../gtk/deprecated/gtkstock.c:334
 msgctxt "Stock label"
 msgid "Information"
 msgstr "Informasjon"
 
-#: ../gtk/gtkstock.c:325
+#: ../gtk/a11y/gtkimageaccessible.c:67 ../gtk/deprecated/gtkstock.c:335
 msgctxt "Stock label"
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../gtk/gtkstock.c:326
+#: ../gtk/a11y/gtkimageaccessible.c:64 ../gtk/deprecated/gtkstock.c:336
 msgctxt "Stock label"
 msgid "Error"
 msgstr "Feil"
 
-#: ../gtk/gtkstock.c:327
+#: ../gtk/a11y/gtkimageaccessible.c:66 ../gtk/deprecated/gtkstock.c:337
 msgctxt "Stock label"
 msgid "Question"
 msgstr "Spørsmål"
@@ -2618,482 +2601,482 @@
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #. 
-#: ../gtk/gtkstock.c:332
+#: ../gtk/a11y/gtkimageaccessible.c:52 ../gtk/deprecated/gtkstock.c:342
 msgctxt "Stock label"
 msgid "_About"
 msgstr "_Om"
 
-#: ../gtk/gtkstock.c:333
+#: ../gtk/a11y/gtkimageaccessible.c:53 ../gtk/deprecated/gtkstock.c:343
 msgctxt "Stock label"
 msgid "_Add"
 msgstr "_Legg til"
 
-#: ../gtk/gtkstock.c:334
+#: ../gtk/deprecated/gtkstock.c:344
 msgctxt "Stock label"
 msgid "_Apply"
 msgstr "_Bruk"
 
-#: ../gtk/gtkstock.c:335
+#: ../gtk/a11y/gtkimageaccessible.c:54 ../gtk/deprecated/gtkstock.c:345
 msgctxt "Stock label"
 msgid "_Bold"
 msgstr "_Uthevet"
 
-#: ../gtk/gtkstock.c:336
+#: ../gtk/deprecated/gtkstock.c:346
 msgctxt "Stock label"
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../gtk/gtkstock.c:337
+#: ../gtk/a11y/gtkimageaccessible.c:55 ../gtk/deprecated/gtkstock.c:347
 msgctxt "Stock label"
 msgid "_CD-ROM"
 msgstr "_CD-ROM"
 
-#: ../gtk/gtkstock.c:338
+#: ../gtk/a11y/gtkimageaccessible.c:56 ../gtk/deprecated/gtkstock.c:348
 msgctxt "Stock label"
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: ../gtk/gtkstock.c:339
+#: ../gtk/a11y/gtkimageaccessible.c:57 ../gtk/deprecated/gtkstock.c:349
 msgctxt "Stock label"
 msgid "_Close"
 msgstr "_Lukk"
 
-#: ../gtk/gtkstock.c:340
+#: ../gtk/deprecated/gtkstock.c:350
 msgctxt "Stock label"
 msgid "C_onnect"
 msgstr "K_oble til"
 
-#: ../gtk/gtkstock.c:341
+#: ../gtk/deprecated/gtkstock.c:351
 msgctxt "Stock label"
 msgid "_Convert"
 msgstr "_Konverter"
 
-#: ../gtk/gtkstock.c:342
+#: ../gtk/a11y/gtkimageaccessible.c:61 ../gtk/deprecated/gtkstock.c:352
 msgctxt "Stock label"
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../gtk/gtkstock.c:343
+#: ../gtk/a11y/gtkimageaccessible.c:62 ../gtk/deprecated/gtkstock.c:353
 msgctxt "Stock label"
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
-#: ../gtk/gtkstock.c:344
+#: ../gtk/a11y/gtkimageaccessible.c:63 ../gtk/deprecated/gtkstock.c:354
 msgctxt "Stock label"
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../gtk/gtkstock.c:345
+#: ../gtk/deprecated/gtkstock.c:355
 msgctxt "Stock label"
 msgid "_Discard"
 msgstr "_Forkast"
 
-#: ../gtk/gtkstock.c:346
+#: ../gtk/deprecated/gtkstock.c:356
 msgctxt "Stock label"
 msgid "_Disconnect"
 msgstr "Koble _fra"
 
-#: ../gtk/gtkstock.c:347
+#: ../gtk/a11y/gtkimageaccessible.c:68 ../gtk/deprecated/gtkstock.c:357
 msgctxt "Stock label"
 msgid "_Execute"
 msgstr "_Kjør"
 
-#: ../gtk/gtkstock.c:348
+#: ../gtk/deprecated/gtkstock.c:358
 msgctxt "Stock label"
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../gtk/gtkstock.c:349
+#: ../gtk/a11y/gtkimageaccessible.c:69 ../gtk/deprecated/gtkstock.c:359
 msgctxt "Stock label"
 msgid "_File"
 msgstr "_Fil"
 
-#: ../gtk/gtkstock.c:350
+#: ../gtk/a11y/gtkimageaccessible.c:70 ../gtk/deprecated/gtkstock.c:360
 msgctxt "Stock label"
 msgid "_Find"
 msgstr "_Finn"
 
-#: ../gtk/gtkstock.c:351
+#: ../gtk/a11y/gtkimageaccessible.c:71 ../gtk/deprecated/gtkstock.c:361
 msgctxt "Stock label"
 msgid "Find and _Replace"
 msgstr "Finn og e_rstatt"
 
-#: ../gtk/gtkstock.c:352
+#: ../gtk/a11y/gtkimageaccessible.c:72 ../gtk/deprecated/gtkstock.c:362
 msgctxt "Stock label"
 msgid "_Floppy"
 msgstr "_Diskett"
 
-#: ../gtk/gtkstock.c:353
+#: ../gtk/a11y/gtkimageaccessible.c:73 ../gtk/deprecated/gtkstock.c:363
 msgctxt "Stock label"
 msgid "_Fullscreen"
 msgstr "_Fullskjerm"
 
-#: ../gtk/gtkstock.c:354
+#: ../gtk/a11y/gtkimageaccessible.c:93 ../gtk/deprecated/gtkstock.c:364
 msgctxt "Stock label"
 msgid "_Leave Fullscreen"
 msgstr "For_lat fullskjerm"
 
 #. This is a navigation label as in "go to the bottom of the page"
-#: ../gtk/gtkstock.c:356
+#: ../gtk/a11y/gtkimageaccessible.c:74 ../gtk/deprecated/gtkstock.c:366
 msgctxt "Stock label, navigation"
 msgid "_Bottom"
 msgstr "_Bunn"
 
 #. This is a navigation label as in "go to the first page"
-#: ../gtk/gtkstock.c:358
+#: ../gtk/a11y/gtkimageaccessible.c:75 ../gtk/deprecated/gtkstock.c:368
 msgctxt "Stock label, navigation"
 msgid "_First"
 msgstr "_Første"
 
 #. This is a navigation label as in "go to the last page"
-#: ../gtk/gtkstock.c:360
+#: ../gtk/a11y/gtkimageaccessible.c:76 ../gtk/deprecated/gtkstock.c:370
 msgctxt "Stock label, navigation"
 msgid "_Last"
 msgstr "_Siste"
 
 #. This is a navigation label as in "go to the top of the page"
-#: ../gtk/gtkstock.c:362
+#: ../gtk/a11y/gtkimageaccessible.c:77 ../gtk/deprecated/gtkstock.c:372
 msgctxt "Stock label, navigation"
 msgid "_Top"
 msgstr "_Topp"
 
 #. This is a navigation label as in "go back"
-#: ../gtk/gtkstock.c:364
+#: ../gtk/a11y/gtkimageaccessible.c:78 ../gtk/deprecated/gtkstock.c:374
 msgctxt "Stock label, navigation"
 msgid "_Back"
 msgstr "Til_bake"
 
 #. This is a navigation label as in "go down"
-#: ../gtk/gtkstock.c:366
+#: ../gtk/a11y/gtkimageaccessible.c:79 ../gtk/deprecated/gtkstock.c:376
 msgctxt "Stock label, navigation"
 msgid "_Down"
 msgstr "Ne_d"
 
 #. This is a navigation label as in "go forward"
-#: ../gtk/gtkstock.c:368
+#: ../gtk/a11y/gtkimageaccessible.c:80 ../gtk/deprecated/gtkstock.c:378
 msgctxt "Stock label, navigation"
 msgid "_Forward"
 msgstr "_Framover"
 
 #. This is a navigation label as in "go up"
-#: ../gtk/gtkstock.c:370
+#: ../gtk/a11y/gtkimageaccessible.c:81 ../gtk/deprecated/gtkstock.c:380
 msgctxt "Stock label, navigation"
 msgid "_Up"
 msgstr "_Opp"
 
-#: ../gtk/gtkstock.c:371
+#: ../gtk/a11y/gtkimageaccessible.c:82 ../gtk/deprecated/gtkstock.c:381
 msgctxt "Stock label"
 msgid "_Hard Disk"
 msgstr "_Harddisk"
 
-#: ../gtk/gtkstock.c:372
+#: ../gtk/a11y/gtkimageaccessible.c:83 ../gtk/deprecated/gtkstock.c:382
 msgctxt "Stock label"
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../gtk/gtkstock.c:373
+#: ../gtk/a11y/gtkimageaccessible.c:84 ../gtk/deprecated/gtkstock.c:383
 msgctxt "Stock label"
 msgid "_Home"
 msgstr "_Hjem"
 
-#: ../gtk/gtkstock.c:374
+#: ../gtk/a11y/gtkimageaccessible.c:85 ../gtk/deprecated/gtkstock.c:384
 msgctxt "Stock label"
 msgid "Increase Indent"
 msgstr "Rykk inn mer"
 
-#: ../gtk/gtkstock.c:375
+#: ../gtk/a11y/gtkimageaccessible.c:124 ../gtk/deprecated/gtkstock.c:385
 msgctxt "Stock label"
 msgid "Decrease Indent"
 msgstr "Rykk inn mindre"
 
-#: ../gtk/gtkstock.c:376
+#: ../gtk/deprecated/gtkstock.c:386
 msgctxt "Stock label"
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ../gtk/gtkstock.c:377
+#: ../gtk/a11y/gtkimageaccessible.c:86 ../gtk/deprecated/gtkstock.c:387
 msgctxt "Stock label"
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: ../gtk/gtkstock.c:378
+#: ../gtk/a11y/gtkimageaccessible.c:87 ../gtk/deprecated/gtkstock.c:388
 msgctxt "Stock label"
 msgid "_Italic"
 msgstr "Kurs_iv"
 
-#: ../gtk/gtkstock.c:379
+#: ../gtk/a11y/gtkimageaccessible.c:88 ../gtk/deprecated/gtkstock.c:389
 msgctxt "Stock label"
 msgid "_Jump to"
 msgstr "_Hopp til"
 
 #. This is about text justification, "centered text"
-#: ../gtk/gtkstock.c:381
+#: ../gtk/a11y/gtkimageaccessible.c:89 ../gtk/deprecated/gtkstock.c:391
 msgctxt "Stock label"
 msgid "_Center"
 msgstr "_Sentrer"
 
 #. This is about text justification
-#: ../gtk/gtkstock.c:383
+#: ../gtk/a11y/gtkimageaccessible.c:90 ../gtk/deprecated/gtkstock.c:393
 msgctxt "Stock label"
 msgid "_Fill"
 msgstr "_Fyll"
 
 #. This is about text justification, "left-justified text"
-#: ../gtk/gtkstock.c:385
+#: ../gtk/a11y/gtkimageaccessible.c:91 ../gtk/deprecated/gtkstock.c:395
 msgctxt "Stock label"
 msgid "_Left"
 msgstr "_Venstre"
 
 #. This is about text justification, "right-justified text"
-#: ../gtk/gtkstock.c:387
+#: ../gtk/a11y/gtkimageaccessible.c:92 ../gtk/deprecated/gtkstock.c:397
 msgctxt "Stock label"
 msgid "_Right"
 msgstr "Høy_re"
 
 #. Media label, as in "fast forward"
-#: ../gtk/gtkstock.c:390
+#: ../gtk/a11y/gtkimageaccessible.c:94 ../gtk/deprecated/gtkstock.c:400
 msgctxt "Stock label, media"
 msgid "_Forward"
 msgstr "_Framover"
 
 #. Media label, as in "next song"
-#: ../gtk/gtkstock.c:392
+#: ../gtk/a11y/gtkimageaccessible.c:95 ../gtk/deprecated/gtkstock.c:402
 msgctxt "Stock label, media"
 msgid "_Next"
 msgstr "_Neste"
 
 #. Media label, as in "pause music"
-#: ../gtk/gtkstock.c:394
+#: ../gtk/a11y/gtkimageaccessible.c:96 ../gtk/deprecated/gtkstock.c:404
 msgctxt "Stock label, media"
 msgid "P_ause"
 msgstr "P_ause"
 
 #. Media label, as in "play music"
-#: ../gtk/gtkstock.c:396
+#: ../gtk/a11y/gtkimageaccessible.c:97 ../gtk/deprecated/gtkstock.c:406
 msgctxt "Stock label, media"
 msgid "_Play"
 msgstr "S_pill av"
 
 #. Media label, as in  "previous song"
-#: ../gtk/gtkstock.c:398
+#: ../gtk/a11y/gtkimageaccessible.c:98 ../gtk/deprecated/gtkstock.c:408
 msgctxt "Stock label, media"
 msgid "Pre_vious"
 msgstr "_Forrige"
 
 #. Media label
-#: ../gtk/gtkstock.c:400
+#: ../gtk/a11y/gtkimageaccessible.c:99 ../gtk/deprecated/gtkstock.c:410
 msgctxt "Stock label, media"
 msgid "_Record"
 msgstr "_Ta opp"
 
 #. Media label
-#: ../gtk/gtkstock.c:402
+#: ../gtk/a11y/gtkimageaccessible.c:100 ../gtk/deprecated/gtkstock.c:412
 msgctxt "Stock label, media"
 msgid "R_ewind"
 msgstr "Spol tilbak_e"
 
 #. Media label
-#: ../gtk/gtkstock.c:404
+#: ../gtk/a11y/gtkimageaccessible.c:101 ../gtk/deprecated/gtkstock.c:414
 msgctxt "Stock label, media"
 msgid "_Stop"
 msgstr "_Stopp"
 
-#: ../gtk/gtkstock.c:405
+#: ../gtk/a11y/gtkimageaccessible.c:102 ../gtk/deprecated/gtkstock.c:415
 msgctxt "Stock label"
 msgid "_Network"
 msgstr "_Nettverk"
 
-#: ../gtk/gtkstock.c:406
+#: ../gtk/a11y/gtkimageaccessible.c:103 ../gtk/deprecated/gtkstock.c:416
 msgctxt "Stock label"
 msgid "_New"
 msgstr "_Ny"
 
-#: ../gtk/gtkstock.c:407
+#: ../gtk/deprecated/gtkstock.c:417
 msgctxt "Stock label"
 msgid "_No"
 msgstr "_Nei"
 
-#: ../gtk/gtkstock.c:408
+#: ../gtk/deprecated/gtkstock.c:418
 msgctxt "Stock label"
 msgid "_OK"
 msgstr "_OK"
 
-#: ../gtk/gtkstock.c:409
+#: ../gtk/a11y/gtkimageaccessible.c:104 ../gtk/deprecated/gtkstock.c:419
 msgctxt "Stock label"
 msgid "_Open"
 msgstr "_Åpne"
 
 #. Page orientation
-#: ../gtk/gtkstock.c:411
+#: ../gtk/deprecated/gtkstock.c:421
 msgctxt "Stock label"
 msgid "Landscape"
 msgstr "Landskap"
 
 #. Page orientation
-#: ../gtk/gtkstock.c:413
+#: ../gtk/deprecated/gtkstock.c:423
 msgctxt "Stock label"
 msgid "Portrait"
 msgstr "Portrett"
 
 #. Page orientation
-#: ../gtk/gtkstock.c:415
+#: ../gtk/deprecated/gtkstock.c:425
 msgctxt "Stock label"
 msgid "Reverse landscape"
 msgstr "Omvendt landskap"
 
 #. Page orientation
-#: ../gtk/gtkstock.c:417
+#: ../gtk/deprecated/gtkstock.c:427
 msgctxt "Stock label"
 msgid "Reverse portrait"
 msgstr "Omvendt portrett"
 
-#: ../gtk/gtkstock.c:418
+#: ../gtk/deprecated/gtkstock.c:428
 msgctxt "Stock label"
 msgid "Page Set_up"
 msgstr "Side_oppsett"
 
-#: ../gtk/gtkstock.c:419
+#: ../gtk/a11y/gtkimageaccessible.c:105 ../gtk/deprecated/gtkstock.c:429
 msgctxt "Stock label"
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ../gtk/gtkstock.c:420
+#: ../gtk/deprecated/gtkstock.c:430
 msgctxt "Stock label"
 msgid "_Preferences"
 msgstr "_Brukervalg"
 
-#: ../gtk/gtkstock.c:421
+#: ../gtk/a11y/gtkimageaccessible.c:106 ../gtk/deprecated/gtkstock.c:431
 msgctxt "Stock label"
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: ../gtk/gtkstock.c:422
+#: ../gtk/a11y/gtkimageaccessible.c:107 ../gtk/deprecated/gtkstock.c:432
 msgctxt "Stock label"
 msgid "Print Pre_view"
 msgstr "Utskriftsforhånds_visning"
 
-#: ../gtk/gtkstock.c:423
+#: ../gtk/a11y/gtkimageaccessible.c:108 ../gtk/deprecated/gtkstock.c:433
 msgctxt "Stock label"
 msgid "_Properties"
 msgstr "E_genskaper"
 
-#: ../gtk/gtkstock.c:424
+#: ../gtk/a11y/gtkimageaccessible.c:109 ../gtk/deprecated/gtkstock.c:434
 msgctxt "Stock label"
 msgid "_Quit"
 msgstr "A_vslutt"
 
-#: ../gtk/gtkstock.c:425
+#: ../gtk/a11y/gtkimageaccessible.c:110 ../gtk/deprecated/gtkstock.c:435
 msgctxt "Stock label"
 msgid "_Redo"
 msgstr "_Gjenopprett"
 
-#: ../gtk/gtkstock.c:426
+#: ../gtk/a11y/gtkimageaccessible.c:111 ../gtk/deprecated/gtkstock.c:436
 msgctxt "Stock label"
 msgid "_Refresh"
 msgstr "Oppdate_r"
 
-#: ../gtk/gtkstock.c:427
+#: ../gtk/a11y/gtkimageaccessible.c:112 ../gtk/deprecated/gtkstock.c:437
 msgctxt "Stock label"
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../gtk/gtkstock.c:428
+#: ../gtk/a11y/gtkimageaccessible.c:113 ../gtk/deprecated/gtkstock.c:438
 msgctxt "Stock label"
 msgid "_Revert"
 msgstr "Fo_rkast"
 
-#: ../gtk/gtkstock.c:429
+#: ../gtk/a11y/gtkimageaccessible.c:114 ../gtk/deprecated/gtkstock.c:439
 msgctxt "Stock label"
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../gtk/gtkstock.c:430
+#: ../gtk/a11y/gtkimageaccessible.c:115 ../gtk/deprecated/gtkstock.c:440
 msgctxt "Stock label"
 msgid "Save _As"
 msgstr "Lagre s_om"
 
-#: ../gtk/gtkstock.c:431
+#: ../gtk/a11y/gtkimageaccessible.c:116 ../gtk/deprecated/gtkstock.c:441
 msgctxt "Stock label"
 msgid "Select _All"
 msgstr "Velg _alt"
 
-#: ../gtk/gtkstock.c:432
+#: ../gtk/deprecated/gtkstock.c:442
 msgctxt "Stock label"
 msgid "_Color"
 msgstr "_Farge"
 
-#: ../gtk/gtkstock.c:433
+#: ../gtk/deprecated/gtkstock.c:443
 msgctxt "Stock label"
 msgid "_Font"
 msgstr "Skri_ft"
 
 #. Sorting direction
-#: ../gtk/gtkstock.c:435
+#: ../gtk/a11y/gtkimageaccessible.c:117 ../gtk/deprecated/gtkstock.c:445
 msgctxt "Stock label"
 msgid "_Ascending"
 msgstr "_Stigende"
 
 #. Sorting direction
-#: ../gtk/gtkstock.c:437
+#: ../gtk/a11y/gtkimageaccessible.c:118 ../gtk/deprecated/gtkstock.c:447
 msgctxt "Stock label"
 msgid "_Descending"
 msgstr "S_ynkende"
 
-#: ../gtk/gtkstock.c:438
+#: ../gtk/a11y/gtkimageaccessible.c:119 ../gtk/deprecated/gtkstock.c:448
 msgctxt "Stock label"
 msgid "_Spell Check"
 msgstr "_Stavekontroll"
 
-#: ../gtk/gtkstock.c:439
+#: ../gtk/a11y/gtkimageaccessible.c:120 ../gtk/deprecated/gtkstock.c:449
 msgctxt "Stock label"
 msgid "_Stop"
 msgstr "_Stopp"
 
 #. Font variant
-#: ../gtk/gtkstock.c:441
+#: ../gtk/a11y/gtkimageaccessible.c:121 ../gtk/deprecated/gtkstock.c:451
 msgctxt "Stock label"
 msgid "_Strikethrough"
 msgstr "Gjennom_strek"
 
-#: ../gtk/gtkstock.c:442
+#: ../gtk/deprecated/gtkstock.c:452
 msgctxt "Stock label"
 msgid "_Undelete"
 msgstr "_Angre slett"
 
 #. Font variant
-#: ../gtk/gtkstock.c:444
+#: ../gtk/a11y/gtkimageaccessible.c:122 ../gtk/deprecated/gtkstock.c:454
 msgctxt "Stock label"
 msgid "_Underline"
 msgstr "_Understrek"
 
-#: ../gtk/gtkstock.c:445
+#: ../gtk/a11y/gtkimageaccessible.c:123 ../gtk/deprecated/gtkstock.c:455
 msgctxt "Stock label"
 msgid "_Undo"
 msgstr "_Angre"
 
-#: ../gtk/gtkstock.c:446
+#: ../gtk/deprecated/gtkstock.c:456
 msgctxt "Stock label"
 msgid "_Yes"
 msgstr "_Ja"
 
 #. Zoom
-#: ../gtk/gtkstock.c:448
+#: ../gtk/a11y/gtkimageaccessible.c:125 ../gtk/deprecated/gtkstock.c:458
 msgctxt "Stock label"
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
 #. Zoom
-#: ../gtk/gtkstock.c:450
+#: ../gtk/a11y/gtkimageaccessible.c:126 ../gtk/deprecated/gtkstock.c:460
 msgctxt "Stock label"
 msgid "Best _Fit"
 msgstr "Beste _tilpasning"
 
-#: ../gtk/gtkstock.c:451
+#: ../gtk/a11y/gtkimageaccessible.c:127 ../gtk/deprecated/gtkstock.c:461
 msgctxt "Stock label"
 msgid "Zoom _In"
 msgstr "Zoom _inn"
 
-#: ../gtk/gtkstock.c:452
+#: ../gtk/a11y/gtkimageaccessible.c:128 ../gtk/deprecated/gtkstock.c:462
 msgctxt "Stock label"
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
@@ -3102,7 +3085,7 @@
 #. * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
 #. * the state
 #. 
-#: ../gtk/gtkswitch.c:337 ../gtk/gtkswitch.c:392 ../gtk/gtkswitch.c:583
+#: ../gtk/gtkswitch.c:347 ../gtk/gtkswitch.c:403 ../gtk/gtkswitch.c:580
 msgctxt "switch"
 msgid "ON"
 msgstr "PÅ"
@@ -3110,7 +3093,7 @@
 #. Translators: if the "off" state label requires more than three
 #. * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
 #. 
-#: ../gtk/gtkswitch.c:345 ../gtk/gtkswitch.c:393 ../gtk/gtkswitch.c:598
+#: ../gtk/gtkswitch.c:355 ../gtk/gtkswitch.c:404 ../gtk/gtkswitch.c:595
 msgctxt "switch"
 msgid "OFF"
 msgstr "AV"
@@ -3233,93 +3216,93 @@
 "Serialiserte data er feilutformet.Første del er ikke GTKTEXTBUFFERCONTENTS-"
 "0001"
 
-#: ../gtk/gtktextutil.c:58
+#: ../gtk/gtktextutil.c:57
 msgid "LRM _Left-to-right mark"
 msgstr "VHM _Venstre-til-høyre-merke"
 
-#: ../gtk/gtktextutil.c:59
+#: ../gtk/gtktextutil.c:58
 msgid "RLM _Right-to-left mark"
 msgstr "HVM _Høyre-til-venstre-merke"
 
-#: ../gtk/gtktextutil.c:60
+#: ../gtk/gtktextutil.c:59
 msgid "LRE Left-to-right _embedding"
 msgstr "VHI V_enstre-til-høyre-innbygging"
 
-#: ../gtk/gtktextutil.c:61
+#: ../gtk/gtktextutil.c:60
 msgid "RLE Right-to-left e_mbedding"
 msgstr "HVE Høyre-til-venstre-in_nbygging"
 
-#: ../gtk/gtktextutil.c:62
+#: ../gtk/gtktextutil.c:61
 msgid "LRO Left-to-right _override"
 msgstr "VHO Venstre-til-høyre-_overstyring"
 
-#: ../gtk/gtktextutil.c:63
+#: ../gtk/gtktextutil.c:62
 msgid "RLO Right-to-left o_verride"
 msgstr "HVO Høyre-til-venstre-o_verstyring"
 
-#: ../gtk/gtktextutil.c:64
+#: ../gtk/gtktextutil.c:63
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop directional formatting"
 
-#: ../gtk/gtktextutil.c:65
+#: ../gtk/gtktextutil.c:64
 msgid "ZWS _Zero width space"
 msgstr "NBO _Nullbreddeområde"
 
-#: ../gtk/gtktextutil.c:66
+#: ../gtk/gtktextutil.c:65
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Zero width _joiner"
 
-#: ../gtk/gtktextutil.c:67
+#: ../gtk/gtktextutil.c:66
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Zero width _non-joiner"
 
-#: ../gtk/gtkuimanager.c:1781
+#: ../gtk/deprecated/gtkuimanager.c:1803
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
 msgstr "Uventet startmarkering «%s» på linje %d tegn %d"
 
-#: ../gtk/gtkuimanager.c:1871
+#: ../gtk/deprecated/gtkuimanager.c:1893
 #, c-format
 msgid "Unexpected character data on line %d char %d"
 msgstr "Uventet tegndata på linje %d tegn %d"
 
-#: ../gtk/gtkuimanager.c:2694
+#: ../gtk/deprecated/gtkuimanager.c:2748
 msgid "Empty"
 msgstr "Tom"
 
-#: ../gtk/gtkvolumebutton.c:169
+#: ../gtk/gtkvolumebutton.ui.h:1
 msgid "Volume"
 msgstr "Volum"
 
-#: ../gtk/gtkvolumebutton.c:171
+#: gtk/gtkvolumebutton.c:171
 msgid "Turns volume down or up"
 msgstr "Tar volumet ned eller opp"
 
-#: ../gtk/gtkvolumebutton.c:174
+#: ../gtk/gtkvolumebutton.c:177
 msgid "Adjusts the volume"
 msgstr "Justerer volumet"
 
-#: ../gtk/gtkvolumebutton.c:180 ../gtk/gtkvolumebutton.c:183
+#: ../gtk/gtkvolumebutton.ui.h:8 ../gtk/gtkvolumebutton.ui.h:9
 msgid "Volume Down"
 msgstr "Volum ned"
 
-#: ../gtk/gtkvolumebutton.c:182
+#: ../gtk/gtkvolumebutton.ui.h:10
 msgid "Decreases the volume"
-msgstr "Senker volumet"
+msgstr "Tar ned volumet"
 
-#: ../gtk/gtkvolumebutton.c:186 ../gtk/gtkvolumebutton.c:189
+#: ../gtk/gtkvolumebutton.ui.h:4 ../gtk/gtkvolumebutton.ui.h:5
 msgid "Volume Up"
 msgstr "Volum opp"
 
-#: ../gtk/gtkvolumebutton.c:188
+#: ../gtk/gtkvolumebutton.ui.h:6
 msgid "Increases the volume"
-msgstr "Hever volumet"
+msgstr "Øker volumet"
 
-#: ../gtk/gtkvolumebutton.c:246
+#: ../gtk/gtkvolumebutton.c:220
 msgid "Muted"
 msgstr "Dempet"
 
-#: ../gtk/gtkvolumebutton.c:250
+#: ../gtk/gtkvolumebutton.c:224
 msgid "Full Volume"
 msgstr "Fullt volum"
 
@@ -3328,7 +3311,7 @@
 #. * Translate the "%d" to "%Id" if you want to use localised digits,
 #. * or otherwise translate the "%d" to "%d".
 #. 
-#: ../gtk/gtkvolumebutton.c:263
+#: ../gtk/gtkvolumebutton.c:237
 #, c-format
 msgctxt "volume percentage"
 msgid "%d %%"
@@ -4154,101 +4137,101 @@
 msgid "ROC 8k"
 msgstr "ROC 8k"
 
-#: ../gtk/updateiconcache.c:1368
+#: ../gtk/updateiconcache.c:1386
 #, c-format
 msgid "Failed to write header\n"
 msgstr "Klarte ikke å skrive hode\n"
 
-#: ../gtk/updateiconcache.c:1374
+#: ../gtk/updateiconcache.c:1392
 #, c-format
 msgid "Failed to write hash table\n"
 msgstr "Klarte ikke å skrive hash-tabell\n"
 
-#: ../gtk/updateiconcache.c:1380
+#: ../gtk/updateiconcache.c:1398
 #, c-format
 msgid "Failed to write folder index\n"
 msgstr "Klarte ikke å skrive mappeindeks\n"
 
-#: ../gtk/updateiconcache.c:1388
+#: ../gtk/updateiconcache.c:1406
 #, c-format
 msgid "Failed to rewrite header\n"
 msgstr "Klarte ikke skrive om hode\n"
 
-#: ../gtk/updateiconcache.c:1482
+#: ../gtk/updateiconcache.c:1500
 #, c-format
 msgid "Failed to open file %s : %s\n"
 msgstr "Klarte ikke å åpne fil %s: %s\n"
 
-#: ../gtk/updateiconcache.c:1490 ../gtk/updateiconcache.c:1520
+#: ../gtk/updateiconcache.c:1508 ../gtk/updateiconcache.c:1538
 #, c-format
 msgid "Failed to write cache file: %s\n"
 msgstr "Klarte ikke å skrive bufferfil: %s\n"
 
-#: ../gtk/updateiconcache.c:1530
+#: ../gtk/updateiconcache.c:1548
 #, c-format
 msgid "The generated cache was invalid.\n"
 msgstr "Generert buffer var ugyldig.\n"
 
-#: ../gtk/updateiconcache.c:1544
+#: ../gtk/updateiconcache.c:1562
 #, c-format
 msgid "Could not rename %s to %s: %s, removing %s then.\n"
 msgstr "Klarte ikke å endre navn på %s til %s: %s, fjerner %s.\n"
 
-#: ../gtk/updateiconcache.c:1558
+#: ../gtk/updateiconcache.c:1576
 #, c-format
 msgid "Could not rename %s to %s: %s\n"
 msgstr "Klarte ikke å endre navn på %s til %s: %s\n"
 
-#: ../gtk/updateiconcache.c:1568
+#: ../gtk/updateiconcache.c:1586
 #, c-format
 msgid "Could not rename %s back to %s: %s.\n"
 msgstr "Klarte ikke å endre navn på %s tilbake til %s: %s\n"
 
-#: ../gtk/updateiconcache.c:1595
+#: ../gtk/updateiconcache.c:1613
 #, c-format
 msgid "Cache file created successfully.\n"
 msgstr "Oppretting av bufferfil fullført.\n"
 
-#: ../gtk/updateiconcache.c:1634
+#: ../gtk/updateiconcache.c:1652
 msgid "Overwrite an existing cache, even if up to date"
 msgstr "Overskriv en eksisterende buffer, selv om den er oppdatert"
 
-#: ../gtk/updateiconcache.c:1635
+#: ../gtk/updateiconcache.c:1653
 msgid "Don't check for the existence of index.theme"
 msgstr "Ikke sjekk om index.theme eksisterer"
 
-#: ../gtk/updateiconcache.c:1636
+#: ../gtk/updateiconcache.c:1654
 msgid "Don't include image data in the cache"
 msgstr "Ikke ta med bildedata i bufferen"
 
-#: ../gtk/updateiconcache.c:1637
+#: ../gtk/updateiconcache.c:1655
 msgid "Output a C header file"
 msgstr "Skriv ut en C-headerfil"
 
-#: ../gtk/updateiconcache.c:1638
+#: ../gtk/updateiconcache.c:1656
 msgid "Turn off verbose output"
 msgstr "Slå av ekstra utdata"
 
-#: ../gtk/updateiconcache.c:1639
+#: ../gtk/updateiconcache.c:1657
 msgid "Validate existing icon cache"
 msgstr "Valider eksisterende ikonbuffer"
 
-#: ../gtk/updateiconcache.c:1706
+#: ../gtk/updateiconcache.c:1724
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Fil ikke funnet %s\n"
 
-#: ../gtk/updateiconcache.c:1712
+#: ../gtk/updateiconcache.c:1730
 #, c-format
 msgid "Not a valid icon cache: %s\n"
 msgstr "Ikke en gyldig ikonbuffer: %s\n"
 
-#: ../gtk/updateiconcache.c:1725
+#: ../gtk/updateiconcache.c:1743
 #, c-format
 msgid "No theme index file.\n"
 msgstr "Ingen indeksfil for tema.\n"
 
-#: ../gtk/updateiconcache.c:1729
+#: ../gtk/updateiconcache.c:1747
 #, c-format
 msgid ""
 "No theme index file in '%s'.\n"
@@ -4283,7 +4266,7 @@
 msgstr "IPA"
 
 #. ID
-#: ../modules/input/immultipress.c:29
+#: ../modules/input/immultipress.c:30
 msgid "Multipress"
 msgstr "Multipress"
 
@@ -4312,320 +4295,320 @@
 msgid "X Input Method"
 msgstr "X-inndatametode"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:858
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1073
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1007
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1222
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:859
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1082
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1008
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1231
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:898
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1095
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1047
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1244
 #, c-format
 msgid "Authentication is required to print document '%s' on printer %s"
 msgstr "Autentisering kreves for å skrive ut dokument «%s» på skriver %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:900
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1049
 #, c-format
 msgid "Authentication is required to print a document on %s"
 msgstr "Autentisering kreves for å skrive ut et dokument på %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:904
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1053
 #, c-format
 msgid "Authentication is required to get attributes of job '%s'"
 msgstr "Autentisering kreves for å hente attributter for jobb «%s»"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:906
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1055
 msgid "Authentication is required to get attributes of a job"
 msgstr "Autentisering kreves for å hente attributter for en jobb"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:910
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1059
 #, c-format
 msgid "Authentication is required to get attributes of printer %s"
 msgstr "Autentisering kreves for å hente attributter for skriver %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:912
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1061
 msgid "Authentication is required to get attributes of a printer"
 msgstr "Autentisering kreves for å hente attributter for en skriver"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:915
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1064
 #, c-format
 msgid "Authentication is required to get default printer of %s"
 msgstr "Autentisering kreves for å hente forvalgt skriver for %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:918
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1067
 #, c-format
 msgid "Authentication is required to get printers from %s"
 msgstr "Autentisering kreves for å hente skrivere fra %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:923
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1072
 #, c-format
 msgid "Authentication is required to get a file from %s"
 msgstr "Autentisering kreves for å hente en fil fra %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:925
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1074
 #, c-format
 msgid "Authentication is required on %s"
 msgstr "Autentisering kreves på %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1067
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1216
 msgid "Domain:"
 msgstr "Domene:"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1097
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1246
 #, c-format
 msgid "Authentication is required to print document '%s'"
 msgstr "Autentisering kreves for å skrive ut dokument «%s»"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1102
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1251
 #, c-format
 msgid "Authentication is required to print this document on printer %s"
 msgstr "Autentisering kreves for å skrive ut dette dokumentet på skriver %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1104
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1253
 msgid "Authentication is required to print this document"
 msgstr "Autentisering kreves for å skrive ut dette dokumentet"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1666
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1817
 #, c-format
 msgid "Printer '%s' is low on toner."
 msgstr "Skriver «%s» har lite toner."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1667
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1818
 #, c-format
 msgid "Printer '%s' has no toner left."
 msgstr "Skriver «%s» er tom for toner."
 
 #. Translators: "Developer" like on photo development context
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1669
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1820
 #, c-format
 msgid "Printer '%s' is low on developer."
 msgstr "Skriver «%s» har lite framkallingsmiddel."
 
 #. Translators: "Developer" like on photo development context
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1671
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1822
 #, c-format
 msgid "Printer '%s' is out of developer."
 msgstr "Skriver «%s» er tom for framkallingsmiddel."
 
 #. Translators: "marker" is one color bin of the printer
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1673
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1824
 #, c-format
 msgid "Printer '%s' is low on at least one marker supply."
 msgstr "Skriver «%s» har minst en tonerkassett som snart er tom."
 
 #. Translators: "marker" is one color bin of the printer
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1675
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1826
 #, c-format
 msgid "Printer '%s' is out of at least one marker supply."
 msgstr "Skriver «%s» har minst en tom tonerkassett."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1676
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1827
 #, c-format
 msgid "The cover is open on printer '%s'."
 msgstr "Lokket er åpent på skriver «%s»."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1677
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1828
 #, c-format
 msgid "The door is open on printer '%s'."
 msgstr "Døren er åpen på skriver «%s»."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1678
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1829
 #, c-format
 msgid "Printer '%s' is low on paper."
 msgstr "Skriver «%s» har lite papir."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1679
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1830
 #, c-format
 msgid "Printer '%s' is out of paper."
 msgstr "Skriver «%s» er tom for papir."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1680
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1831
 #, c-format
 msgid "Printer '%s' is currently offline."
 msgstr "Skriver «%s» er frakoblet for tiden."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1681
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1832
 #, c-format
 msgid "There is a problem on printer '%s'."
 msgstr "Det er et problem med skriver «%s»."
 
 #. Translators: this is a printer status.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2123
+#: modules/printbackends/cups/gtkprintbackendcups.c:2115
 msgid "Paused ; Rejecting Jobs"
 msgstr "Satt på pause. Avviser jobber"
 
 #. Translators: this is a printer status.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2129
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2296
 msgid "Rejecting Jobs"
 msgstr "Avviser jobber"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2915
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4003
 msgid "Two Sided"
 msgstr "Tosidig"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2916
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4004
 msgid "Paper Type"
 msgstr "Papirtype"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2917
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4005
 msgid "Paper Source"
 msgstr "Papirkilde"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2918
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4006
 msgid "Output Tray"
 msgstr "Utskuff"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2919
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4007
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2920
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4008
 msgid "GhostScript pre-filtering"
 msgstr "Forhåndsfiltrering med GhostScript"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2929
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4017
 msgid "One Sided"
 msgstr "Ensidig"
 
 #. Translators: this is an option of "Two Sided"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2931
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4019
 msgid "Long Edge (Standard)"
 msgstr "Lang kant (standard)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2933
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4021
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (vend)"
 
 #. Translators: this is an option of "Paper Source"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2935
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2937
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2945
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4023
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4025
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4033
 msgid "Auto Select"
 msgstr "Velg automatisk"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2939
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2941
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2943
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2947
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3435
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4027
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4029
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4031
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4035
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4523
 msgid "Printer Default"
 msgstr "Forvalg for skriver"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2949
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4037
 msgid "Embed GhostScript fonts only"
 msgstr "Bygg kun inn GhostScript-skrifter"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2951
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4039
 msgid "Convert to PS level 1"
 msgstr "Konverter til PS nivå 1"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2953
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4041
 msgid "Convert to PS level 2"
 msgstr "Konverter til PS nivå 2"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2955
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4043
 msgid "No pre-filtering"
 msgstr "Ingen forhåndsfiltrering"
 
 #. Translators: "Miscellaneous" is the label for a button, that opens
 #. up an extra panel of settings in a print dialog.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2964
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4052
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
 #. Translators: These strings name the possible values of the
 #. * job priority option in the print dialog
 #. 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4775
 msgid "Urgent"
 msgstr "Haster"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4775
 msgid "High"
 msgstr "Høy"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4775
 msgid "Medium"
 msgstr "Middels"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4775
 msgid "Low"
 msgstr "Lav"
 
 #. Translators, this string is used to label the pages-per-sheet option
 #. * in the print dialog
 #. 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3754
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4842
 msgid "Pages per Sheet"
 msgstr "Sider per ark"
 
 #. Translators, this string is used to label the job priority option
 #. * in the print dialog
 #. 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3717
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4805
 msgid "Job Priority"
 msgstr "Prioritet for jobb"
 
 #. Translators, this string is used to label the billing info entry
 #. * in the print dialog
 #. 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3728
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4816
 msgid "Billing Info"
 msgstr "Faktureringsinformasjon:"
 
 #. Translators, these strings are names for various 'standard' cover
 #. * pages that the printing system may support.
 #. 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3743
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4831
 msgid "None"
 msgstr "Ingen"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3743
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4831
 msgid "Classified"
 msgstr "Klassifisert"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3743
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4831
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3743
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4831
 msgid "Secret"
 msgstr "Hemmelig"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3743
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4831
 msgid "Standard"
 msgstr "Vanlig"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3743
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4831
 msgid "Top Secret"
 msgstr "Topphemmelig"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3743
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4831
 msgid "Unclassified"
 msgstr "Ikke klassifisert"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #. 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3814
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4902
 msgid "Before"
 msgstr "Før"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #. 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3829
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4917
 msgid "After"
 msgstr "Etter"
 
@@ -4633,14 +4616,14 @@
 #. * a print job is printed. Possible values are 'now', a specified time,
 #. * or 'on hold'
 #. 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3849
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4937
 msgid "Print at"
 msgstr "Tidspunkt for utskrift"
 
 #. Translators: this is the name of the option that allows the user
 #. * to specify a time when a print job will be printed.
 #. 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3860
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4948
 msgid "Print at time"
 msgstr "Tidspunkt for utskrift"
 
@@ -4648,33 +4631,33 @@
 #. * size. The two placeholders are replaced with the width and height
 #. * in points. E.g: "Custom 230.4x142.9"
 #. 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3895
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:4983
 #, c-format
 msgid "Custom %sx%s"
 msgstr "Egendefinert %s×%s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3976
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:5064
 msgid "Printer Profile"
 msgstr "Skriverprofil"
 
 #. TRANSLATORS: this is when color profile information is unavailable
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3983
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:5071
 msgid "Unavailable"
 msgstr "Ikke tilgjengelig"
 
 #. TRANSLATORS: when we're running an old CUPS, and
 #. * it hasn't registered the device with colord
-#: ../modules/printbackends/cups/gtkprintercups.c:221
+#: ../modules/printbackends/cups/gtkprintercups.c:241
 msgid "Color management unavailable"
 msgstr "Fargestyring ikke tilgjengelig"
 
 #. TRANSLATORS: when there is no color profile available
-#: ../modules/printbackends/cups/gtkprintercups.c:233
+#: ../modules/printbackends/cups/gtkprintercups.c:253
 msgid "No profile available"
 msgstr "Ingen profil tilgjengelig"
 
 #. TRANSLATORS: when the color profile has no title
-#: ../modules/printbackends/cups/gtkprintercups.c:244
+#: ../modules/printbackends/cups/gtkprintercups.c:264
 msgid "Unspecified profile"
 msgstr "Uspesifisert profil"
 
@@ -4684,32 +4667,32 @@
 msgid "output.%s"
 msgstr "utfil.%s"
 
-#: ../modules/printbackends/file/gtkprintbackendfile.c:521
+#: ../modules/printbackends/file/gtkprintbackendfile.c:537
 msgid "Print to File"
 msgstr "Skriv ut til fil"
 
-#: ../modules/printbackends/file/gtkprintbackendfile.c:647
+#: ../modules/printbackends/file/gtkprintbackendfile.c:663
 msgid "PDF"
 msgstr "PDF"
 
-#: ../modules/printbackends/file/gtkprintbackendfile.c:647
+#: ../modules/printbackends/file/gtkprintbackendfile.c:663
 msgid "Postscript"
 msgstr "Postscript"
 
-#: ../modules/printbackends/file/gtkprintbackendfile.c:647
+#: ../modules/printbackends/file/gtkprintbackendfile.c:663
 msgid "SVG"
 msgstr "SVG"
 
-#: ../modules/printbackends/file/gtkprintbackendfile.c:660
+#: ../modules/printbackends/file/gtkprintbackendfile.c:676
 #: ../modules/printbackends/test/gtkprintbackendtest.c:501
 msgid "Pages per _sheet:"
 msgstr "_Sider per ark:"
 
-#: ../modules/printbackends/file/gtkprintbackendfile.c:719
+#: ../modules/printbackends/file/gtkprintbackendfile.c:735
 msgid "File"
 msgstr "Fil"
 
-#: ../modules/printbackends/file/gtkprintbackendfile.c:729
+#: ../modules/printbackends/file/gtkprintbackendfile.c:745
 msgid "_Output format"
 msgstr "F_ormat"
 
@@ -4726,27 +4709,27 @@
 msgstr "Kommandolinje"
 
 #. SUN_BRANDING
-#: ../modules/printbackends/papi/gtkprintbackendpapi.c:809
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:786
 msgid "printer offline"
 msgstr "skriver er frakoblet"
 
 #. SUN_BRANDING
-#: ../modules/printbackends/papi/gtkprintbackendpapi.c:827
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:804
 msgid "ready to print"
 msgstr "klar til å skrive ut"
 
 #. SUN_BRANDING
-#: ../modules/printbackends/papi/gtkprintbackendpapi.c:830
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:807
 msgid "processing job"
 msgstr "prosesserer jobb"
 
 #. SUN_BRANDING
-#: ../modules/printbackends/papi/gtkprintbackendpapi.c:834
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:811
 msgid "paused"
 msgstr "på pause"
 
 #. SUN_BRANDING
-#: ../modules/printbackends/papi/gtkprintbackendpapi.c:837
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:814
 msgid "unknown"
 msgstr "ukjent"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtkhtml-4.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtkhtml-4.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtkhtml-4.0.po	2013-01-29 09:33:58.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtkhtml-4.0.po	2014-01-07 06:37:38.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:38+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:37+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../a11y/image.c:152
@@ -196,20 +196,20 @@
 msgid "white"
 msgstr "hvit"
 
-#: ../components/editor/gtkhtml-color-combo.c:275
+#: ../components/editor/gtkhtml-color-combo.c:277
 msgid "Choose Custom Color"
 msgstr "Velg en egendefinert farge"
 
-#: ../components/editor/gtkhtml-color-combo.c:785
+#: ../components/editor/gtkhtml-color-combo.c:790
 #: ../components/editor/gtkhtml-color-state.c:224
 msgid "Default"
 msgstr "Forvalg"
 
-#: ../components/editor/gtkhtml-color-combo.c:1009
+#: ../components/editor/gtkhtml-color-combo.c:1022
 msgid "custom"
 msgstr "egendefinert"
 
-#: ../components/editor/gtkhtml-color-combo.c:1017
+#: ../components/editor/gtkhtml-color-combo.c:1030
 msgid "Custom Color..."
 msgstr "Egendefinert farge …"
 
@@ -812,28 +812,28 @@
 msgid "Insert Emoticon"
 msgstr "Sett inn smilefjes"
 
-#: ../components/editor/gtkhtml-editor-actions.c:2200
+#: ../components/editor/gtkhtml-editor-actions.c:2201
 msgid "_Find"
 msgstr "_Finn"
 
-#: ../components/editor/gtkhtml-editor-actions.c:2203
+#: ../components/editor/gtkhtml-editor-actions.c:2204
 msgid "Re_place"
 msgstr "E_rstatt"
 
-#: ../components/editor/gtkhtml-editor-actions.c:2206
+#: ../components/editor/gtkhtml-editor-actions.c:2207
 msgid "_Image"
 msgstr "B_ilde"
 
-#: ../components/editor/gtkhtml-editor-actions.c:2209
+#: ../components/editor/gtkhtml-editor-actions.c:2210
 msgid "_Link"
 msgstr "_Lenke"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../components/editor/gtkhtml-editor-actions.c:2213
+#: ../components/editor/gtkhtml-editor-actions.c:2214
 msgid "_Rule"
 msgstr "_Regel"
 
-#: ../components/editor/gtkhtml-editor-actions.c:2216
+#: ../components/editor/gtkhtml-editor-actions.c:2217
 #: ../components/editor/gtkhtml-editor-builder.ui.h:72
 msgid "_Table"
 msgstr "_Tabell"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtksourceview-3.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtksourceview-3.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtksourceview-3.0.po	2013-01-29 09:33:51.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtksourceview-3.0.po	2014-01-07 06:37:38.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:31+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:27+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../data/glade/gtksourceview.xml.in.h:1
@@ -59,8 +59,8 @@
 msgstr "Innledende"
 
 #: ../data/glade/gtksourceview.xml.in.h:12
-#: ../gtksourceview/gtksourcecompletionitem.c:255
-#: ../gtksourceview/gtksourcegutterrenderertext.c:403
+#: ../gtksourceview/gtksourcecompletionitem.c:262
+#: ../gtksourceview/gtksourcegutterrenderertext.c:399
 msgid "Text"
 msgstr "Tekst"
 
@@ -68,31 +68,31 @@
 msgid "Trailing"
 msgstr "Etterfølgende"
 
-#. Translators: "All" is used as a label in thestatus bar of the
-#. popup, telling that all completion pages are shown
+#. Translators: "All" is used as a label in the status bar of the
+#. popup, telling that all completion pages are shown.
 #: ../data/glade/gtksourceview.xml.in.h:14
-#: ../gtksourceview/gtksourcecompletion.c:647
+#: ../gtksourceview/gtksourcecompletion.c:764
 msgid "All"
 msgstr "Alle"
 
 #: ../data/language-specs/actionscript.lang.h:1
 #: ../data/language-specs/ada.lang.h:1 ../data/language-specs/asp.lang.h:1
 #: ../data/language-specs/automake.lang.h:1
-#: ../data/language-specs/bennugd.lang.h:1 ../data/language-specs/boo.lang.h:1
-#: ../data/language-specs/cg.lang.h:1 ../data/language-specs/chdr.lang.h:1
-#: ../data/language-specs/c.lang.h:1 ../data/language-specs/cobol.lang.h:1
-#: ../data/language-specs/cpp.lang.h:1 ../data/language-specs/csharp.lang.h:1
-#: ../data/language-specs/cuda.lang.h:1 ../data/language-specs/d.lang.h:1
-#: ../data/language-specs/eiffel.lang.h:1
+#: ../data/language-specs/bennugd.lang.h:1
+#: ../data/language-specs/bluespec.lang.h:1
+#: ../data/language-specs/boo.lang.h:1 ../data/language-specs/cg.lang.h:1
+#: ../data/language-specs/chdr.lang.h:1 ../data/language-specs/c.lang.h:1
+#: ../data/language-specs/cobol.lang.h:1 ../data/language-specs/cpp.lang.h:1
+#: ../data/language-specs/csharp.lang.h:1 ../data/language-specs/cuda.lang.h:1
+#: ../data/language-specs/d.lang.h:1 ../data/language-specs/eiffel.lang.h:1
 #: ../data/language-specs/erlang.lang.h:1
 #: ../data/language-specs/forth.lang.h:1
 #: ../data/language-specs/fortran.lang.h:1
 #: ../data/language-specs/fsharp.lang.h:1 ../data/language-specs/glsl.lang.h:1
 #: ../data/language-specs/go.lang.h:1 ../data/language-specs/haskell.lang.h:1
 #: ../data/language-specs/haskell-literate.lang.h:1
-#: ../data/language-specs/idl.lang.h:1 ../data/language-specs/j.lang.h:1
-#: ../data/language-specs/java.lang.h:1
-#: ../data/language-specs/makefile.lang.h:1
+#: ../data/language-specs/idl.lang.h:1 ../data/language-specs/java.lang.h:1
+#: ../data/language-specs/j.lang.h:1 ../data/language-specs/makefile.lang.h:1
 #: ../data/language-specs/nemerle.lang.h:1
 #: ../data/language-specs/netrexx.lang.h:1
 #: ../data/language-specs/objc.lang.h:1 ../data/language-specs/objj.lang.h:1
@@ -100,6 +100,7 @@
 #: ../data/language-specs/opal.lang.h:1 ../data/language-specs/opencl.lang.h:1
 #: ../data/language-specs/pascal.lang.h:1
 #: ../data/language-specs/prolog.lang.h:1
+#: ../data/language-specs/scala.lang.h:1
 #: ../data/language-specs/scheme.lang.h:1 ../data/language-specs/sml.lang.h:1
 #: ../data/language-specs/sparql.lang.h:1 ../data/language-specs/sql.lang.h:1
 #: ../data/language-specs/systemverilog.lang.h:1
@@ -128,10 +129,12 @@
 #: ../data/language-specs/fsharp.lang.h:3 ../data/language-specs/gap.lang.h:3
 #: ../data/language-specs/go.lang.h:3 ../data/language-specs/gtkrc.lang.h:3
 #: ../data/language-specs/haskell.lang.h:4
-#: ../data/language-specs/html.lang.h:3 ../data/language-specs/idl.lang.h:3
-#: ../data/language-specs/ini.lang.h:3 ../data/language-specs/j.lang.h:4
-#: ../data/language-specs/latex.lang.h:3 ../data/language-specs/lua.lang.h:3
-#: ../data/language-specs/matlab.lang.h:3
+#: ../data/language-specs/html.lang.h:3
+#: ../data/language-specs/idl-exelis.lang.h:3
+#: ../data/language-specs/idl.lang.h:3 ../data/language-specs/ini.lang.h:3
+#: ../data/language-specs/j.lang.h:4 ../data/language-specs/latex.lang.h:3
+#: ../data/language-specs/lua.lang.h:3 ../data/language-specs/matlab.lang.h:3
+#: ../data/language-specs/modelica.lang.h:3
 #: ../data/language-specs/nemerle.lang.h:3
 #: ../data/language-specs/netrexx.lang.h:6
 #: ../data/language-specs/nsis.lang.h:4 ../data/language-specs/ocaml.lang.h:3
@@ -140,6 +143,7 @@
 #: ../data/language-specs/pascal.lang.h:3 ../data/language-specs/perl.lang.h:3
 #: ../data/language-specs/php.lang.h:3 ../data/language-specs/po.lang.h:3
 #: ../data/language-specs/prolog.lang.h:3 ../data/language-specs/ruby.lang.h:4
+#: ../data/language-specs/scala.lang.h:5
 #: ../data/language-specs/scheme.lang.h:3
 #: ../data/language-specs/scilab.lang.h:3 ../data/language-specs/sh.lang.h:3
 #: ../data/language-specs/sml.lang.h:3 ../data/language-specs/sql.lang.h:3
@@ -164,11 +168,14 @@
 #: ../data/language-specs/fsharp.lang.h:7
 #: ../data/language-specs/gdb-log.lang.h:8 ../data/language-specs/go.lang.h:5
 #: ../data/language-specs/gtkrc.lang.h:4
-#: ../data/language-specs/haskell.lang.h:9 ../data/language-specs/idl.lang.h:7
-#: ../data/language-specs/imagej.lang.h:10 ../data/language-specs/ini.lang.h:5
-#: ../data/language-specs/j.lang.h:17 ../data/language-specs/java.lang.h:4
+#: ../data/language-specs/haskell.lang.h:9
+#: ../data/language-specs/idl-exelis.lang.h:7
+#: ../data/language-specs/idl.lang.h:7 ../data/language-specs/imagej.lang.h:10
+#: ../data/language-specs/ini.lang.h:5 ../data/language-specs/java.lang.h:4
 #: ../data/language-specs/javascript.lang.h:13
-#: ../data/language-specs/json.lang.h:4 ../data/language-specs/lua.lang.h:4
+#: ../data/language-specs/j.lang.h:17 ../data/language-specs/json.lang.h:4
+#: ../data/language-specs/julia.lang.h:3 ../data/language-specs/lua.lang.h:4
+#: ../data/language-specs/modelica.lang.h:4
 #: ../data/language-specs/nemerle.lang.h:7
 #: ../data/language-specs/netrexx.lang.h:4
 #: ../data/language-specs/nsis.lang.h:5 ../data/language-specs/objc.lang.h:6
@@ -179,9 +186,9 @@
 #: ../data/language-specs/php.lang.h:9 ../data/language-specs/po.lang.h:5
 #: ../data/language-specs/prolog.lang.h:6
 #: ../data/language-specs/protobuf.lang.h:6
-#: ../data/language-specs/python.lang.h:6
 #: ../data/language-specs/python3.lang.h:6
-#: ../data/language-specs/ruby.lang.h:14
+#: ../data/language-specs/python.lang.h:6
+#: ../data/language-specs/ruby.lang.h:14 ../data/language-specs/scala.lang.h:6
 #: ../data/language-specs/scheme.lang.h:5
 #: ../data/language-specs/scilab.lang.h:5 ../data/language-specs/sh.lang.h:5
 #: ../data/language-specs/sml.lang.h:7 ../data/language-specs/sql.lang.h:5
@@ -196,6 +203,7 @@
 #: ../data/language-specs/actionscript.lang.h:10
 #: ../data/language-specs/ada.lang.h:5 ../data/language-specs/asp.lang.h:6
 #: ../data/language-specs/awk.lang.h:3 ../data/language-specs/bennugd.lang.h:7
+#: ../data/language-specs/bluespec.lang.h:7
 #: ../data/language-specs/boo.lang.h:10 ../data/language-specs/cg.lang.h:8
 #: ../data/language-specs/c.lang.h:9 ../data/language-specs/cobol.lang.h:6
 #: ../data/language-specs/cpp.lang.h:3 ../data/language-specs/csharp.lang.h:11
@@ -209,11 +217,14 @@
 #: ../data/language-specs/fsharp.lang.h:8 ../data/language-specs/gap.lang.h:5
 #: ../data/language-specs/glsl.lang.h:5 ../data/language-specs/go.lang.h:7
 #: ../data/language-specs/gtkrc.lang.h:5
-#: ../data/language-specs/haskell.lang.h:7 ../data/language-specs/idl.lang.h:6
-#: ../data/language-specs/imagej.lang.h:8 ../data/language-specs/ini.lang.h:6
-#: ../data/language-specs/java.lang.h:12
+#: ../data/language-specs/haskell.lang.h:7
+#: ../data/language-specs/idl-exelis.lang.h:6
+#: ../data/language-specs/idl.lang.h:6 ../data/language-specs/imagej.lang.h:8
+#: ../data/language-specs/ini.lang.h:6 ../data/language-specs/java.lang.h:12
 #: ../data/language-specs/javascript.lang.h:7
-#: ../data/language-specs/lua.lang.h:5 ../data/language-specs/matlab.lang.h:4
+#: ../data/language-specs/julia.lang.h:10 ../data/language-specs/lua.lang.h:5
+#: ../data/language-specs/matlab.lang.h:4
+#: ../data/language-specs/modelica.lang.h:13
 #: ../data/language-specs/nemerle.lang.h:8
 #: ../data/language-specs/objc.lang.h:3 ../data/language-specs/objj.lang.h:4
 #: ../data/language-specs/ocaml.lang.h:9 ../data/language-specs/ocl.lang.h:5
@@ -224,16 +235,17 @@
 #: ../data/language-specs/php.lang.h:12 ../data/language-specs/po.lang.h:7
 #: ../data/language-specs/prolog.lang.h:5
 #: ../data/language-specs/protobuf.lang.h:4
-#: ../data/language-specs/python.lang.h:4
-#: ../data/language-specs/python3.lang.h:4 ../data/language-specs/R.lang.h:3
-#: ../data/language-specs/ruby.lang.h:7 ../data/language-specs/scheme.lang.h:6
+#: ../data/language-specs/python3.lang.h:4
+#: ../data/language-specs/python.lang.h:4 ../data/language-specs/R.lang.h:3
+#: ../data/language-specs/ruby.lang.h:7 ../data/language-specs/scala.lang.h:10
+#: ../data/language-specs/scheme.lang.h:6
 #: ../data/language-specs/scilab.lang.h:6 ../data/language-specs/sh.lang.h:6
 #: ../data/language-specs/sml.lang.h:4 ../data/language-specs/sparql.lang.h:7
 #: ../data/language-specs/sql.lang.h:6
 #: ../data/language-specs/systemverilog.lang.h:5
 #: ../data/language-specs/tcl.lang.h:4 ../data/language-specs/texinfo.lang.h:7
 #: ../data/language-specs/vala.lang.h:7 ../data/language-specs/vbnet.lang.h:6
-#: ../data/language-specs/verilog.lang.h:10
+#: ../data/language-specs/verilog.lang.h:11
 #: ../data/language-specs/vhdl.lang.h:6
 msgid "Keyword"
 msgstr "Nøkkelord"
@@ -247,11 +259,12 @@
 #: ../data/language-specs/eiffel.lang.h:15
 #: ../data/language-specs/erlang.lang.h:10
 #: ../data/language-specs/fsharp.lang.h:6 ../data/language-specs/go.lang.h:13
+#: ../data/language-specs/idl-exelis.lang.h:9
 #: ../data/language-specs/nemerle.lang.h:13
 #: ../data/language-specs/ocaml.lang.h:7 ../data/language-specs/ooc.lang.h:15
 #: ../data/language-specs/opal.lang.h:10 ../data/language-specs/php.lang.h:19
-#: ../data/language-specs/python.lang.h:13
 #: ../data/language-specs/python3.lang.h:12
+#: ../data/language-specs/python.lang.h:13
 #: ../data/language-specs/ruby.lang.h:11
 msgid "Decimal number"
 msgstr "Desimaltall"
@@ -295,8 +308,10 @@
 #: ../data/language-specs/fsharp.lang.h:11
 #: ../data/language-specs/glsl.lang.h:4 ../data/language-specs/go.lang.h:8
 #: ../data/language-specs/gtkrc.lang.h:7
-#: ../data/language-specs/haskell.lang.h:8 ../data/language-specs/idl.lang.h:4
-#: ../data/language-specs/ini.lang.h:9 ../data/language-specs/java.lang.h:17
+#: ../data/language-specs/haskell.lang.h:8
+#: ../data/language-specs/idl-exelis.lang.h:4
+#: ../data/language-specs/idl.lang.h:4 ../data/language-specs/ini.lang.h:9
+#: ../data/language-specs/java.lang.h:17
 #: ../data/language-specs/javascript.lang.h:8
 #: ../data/language-specs/nemerle.lang.h:9
 #: ../data/language-specs/objc.lang.h:4 ../data/language-specs/objj.lang.h:5
@@ -305,9 +320,9 @@
 #: ../data/language-specs/opencl.lang.h:4
 #: ../data/language-specs/pascal.lang.h:7 ../data/language-specs/php.lang.h:15
 #: ../data/language-specs/protobuf.lang.h:3
-#: ../data/language-specs/sml.lang.h:5 ../data/language-specs/sparql.lang.h:4
-#: ../data/language-specs/sql.lang.h:9 ../data/language-specs/vala.lang.h:5
-#: ../data/language-specs/vbnet.lang.h:7
+#: ../data/language-specs/scala.lang.h:14 ../data/language-specs/sml.lang.h:5
+#: ../data/language-specs/sparql.lang.h:4 ../data/language-specs/sql.lang.h:9
+#: ../data/language-specs/vala.lang.h:5 ../data/language-specs/vbnet.lang.h:7
 msgid "Data Type"
 msgstr "Datatype"
 
@@ -317,8 +332,9 @@
 #: ../data/language-specs/forth.lang.h:5
 #: ../data/language-specs/fsharp.lang.h:20
 #: ../data/language-specs/glsl.lang.h:3
-#: ../data/language-specs/haskell.lang.h:3 ../data/language-specs/idl.lang.h:5
-#: ../data/language-specs/nemerle.lang.h:5
+#: ../data/language-specs/haskell.lang.h:3
+#: ../data/language-specs/idl-exelis.lang.h:5
+#: ../data/language-specs/idl.lang.h:5 ../data/language-specs/nemerle.lang.h:5
 #: ../data/language-specs/objj.lang.h:6 ../data/language-specs/pascal.lang.h:8
 #: ../data/language-specs/vbnet.lang.h:5
 msgid "Preprocessor"
@@ -330,7 +346,7 @@
 
 #: ../data/language-specs/ada.lang.h:12
 #: ../data/language-specs/csharp.lang.h:17
-#: ../data/language-specs/verilog.lang.h:14
+#: ../data/language-specs/verilog.lang.h:15
 #: ../data/language-specs/vhdl.lang.h:10
 msgid "Real number"
 msgstr "Reelt tall"
@@ -347,11 +363,11 @@
 #: ../data/language-specs/netrexx.lang.h:3
 #: ../data/language-specs/ocaml.lang.h:18 ../data/language-specs/ooc.lang.h:5
 #: ../data/language-specs/php.lang.h:8 ../data/language-specs/prolog.lang.h:10
-#: ../data/language-specs/python.lang.h:7
 #: ../data/language-specs/python3.lang.h:7
-#: ../data/language-specs/ruby.lang.h:3 ../data/language-specs/sml.lang.h:8
+#: ../data/language-specs/python.lang.h:7 ../data/language-specs/ruby.lang.h:3
+#: ../data/language-specs/scala.lang.h:7 ../data/language-specs/sml.lang.h:8
 #: ../data/language-specs/texinfo.lang.h:4
-#: ../data/language-specs/verilog.lang.h:5
+#: ../data/language-specs/verilog.lang.h:6
 msgid "Escaped Character"
 msgstr "Escaped-tegn"
 
@@ -361,10 +377,11 @@
 
 #. A function name (also: methods for classes)
 #: ../data/language-specs/asp.lang.h:7 ../data/language-specs/cg.lang.h:18
-#: ../data/language-specs/changelog.lang.h:8
+#: ../data/language-specs/changelog.lang.h:9
 #: ../data/language-specs/css.lang.h:8 ../data/language-specs/def.lang.h:38
 #: ../data/language-specs/gap.lang.h:6 ../data/language-specs/gdb-log.lang.h:7
 #: ../data/language-specs/gtk-doc.lang.h:10
+#: ../data/language-specs/idl-exelis.lang.h:10
 #: ../data/language-specs/javascript.lang.h:9
 #: ../data/language-specs/lua.lang.h:8 ../data/language-specs/scheme.lang.h:7
 #: ../data/language-specs/scilab.lang.h:7 ../data/language-specs/sh.lang.h:4
@@ -377,10 +394,13 @@
 #: ../data/language-specs/c.lang.h:10 ../data/language-specs/cmake.lang.h:6
 #: ../data/language-specs/cobol.lang.h:10 ../data/language-specs/def.lang.h:45
 #: ../data/language-specs/erlang.lang.h:5
-#: ../data/language-specs/imagej.lang.h:9 ../data/language-specs/nsis.lang.h:3
-#: ../data/language-specs/octave.lang.h:5
+#: ../data/language-specs/imagej.lang.h:9
+#: ../data/language-specs/julia.lang.h:9
+#: ../data/language-specs/modelica.lang.h:5
+#: ../data/language-specs/nsis.lang.h:3 ../data/language-specs/octave.lang.h:5
 #: ../data/language-specs/perl.lang.h:12 ../data/language-specs/php.lang.h:14
 #: ../data/language-specs/prolog.lang.h:8
+#: ../data/language-specs/scala.lang.h:13
 #: ../data/language-specs/sparql.lang.h:15
 msgid "Operator"
 msgstr "Operator"
@@ -404,10 +424,11 @@
 #: ../data/language-specs/asp.lang.h:14 ../data/language-specs/boo.lang.h:14
 #: ../data/language-specs/cobol.lang.h:9 ../data/language-specs/def.lang.h:22
 #: ../data/language-specs/desktop.lang.h:8
-#: ../data/language-specs/forth.lang.h:8 ../data/language-specs/j.lang.h:14
-#: ../data/language-specs/java.lang.h:15
+#: ../data/language-specs/forth.lang.h:8 ../data/language-specs/java.lang.h:15
+#: ../data/language-specs/j.lang.h:14 ../data/language-specs/julia.lang.h:5
 #: ../data/language-specs/netrexx.lang.h:16
 #: ../data/language-specs/prolog.lang.h:7
+#: ../data/language-specs/scala.lang.h:12
 #: ../data/language-specs/vhdl.lang.h:11
 msgid "Number"
 msgstr "Tall"
@@ -453,10 +474,9 @@
 #: ../data/language-specs/javascript.lang.h:1
 #: ../data/language-specs/lua.lang.h:1 ../data/language-specs/m4.lang.h:1
 #: ../data/language-specs/perl.lang.h:1 ../data/language-specs/php.lang.h:1
-#: ../data/language-specs/python.lang.h:1
 #: ../data/language-specs/python3.lang.h:1
-#: ../data/language-specs/ruby.lang.h:1 ../data/language-specs/sh.lang.h:1
-#: ../data/language-specs/tcl.lang.h:1
+#: ../data/language-specs/python.lang.h:1 ../data/language-specs/ruby.lang.h:1
+#: ../data/language-specs/sh.lang.h:1 ../data/language-specs/tcl.lang.h:1
 msgid "Scripts"
 msgstr "Skript"
 
@@ -478,7 +498,7 @@
 #: ../data/language-specs/pkgconfig.lang.h:3
 #: ../data/language-specs/prolog.lang.h:4
 #: ../data/language-specs/protobuf.lang.h:2
-#: ../data/language-specs/ruby.lang.h:21 ../data/language-specs/sh.lang.h:7
+#: ../data/language-specs/ruby.lang.h:22 ../data/language-specs/sh.lang.h:7
 #: ../data/language-specs/sparql.lang.h:14 ../data/language-specs/tcl.lang.h:3
 msgid "Variable"
 msgstr "Variabel"
@@ -487,8 +507,8 @@
 #: ../data/language-specs/glsl.lang.h:6 ../data/language-specs/go.lang.h:18
 #: ../data/language-specs/netrexx.lang.h:15
 #: ../data/language-specs/perl.lang.h:8
-#: ../data/language-specs/python.lang.h:18
 #: ../data/language-specs/python3.lang.h:17
+#: ../data/language-specs/python.lang.h:18
 msgid "Builtin Function"
 msgstr "Innebygget funksjon"
 
@@ -506,11 +526,13 @@
 #: ../data/language-specs/bennugd.lang.h:9 ../data/language-specs/cg.lang.h:12
 #: ../data/language-specs/c.lang.h:15 ../data/language-specs/def.lang.h:24
 #: ../data/language-specs/d.lang.h:11 ../data/language-specs/erlang.lang.h:9
-#: ../data/language-specs/go.lang.h:11 ../data/language-specs/json.lang.h:9
+#: ../data/language-specs/go.lang.h:11
+#: ../data/language-specs/idl-exelis.lang.h:8
+#: ../data/language-specs/json.lang.h:9
 #: ../data/language-specs/nemerle.lang.h:12
 #: ../data/language-specs/ooc.lang.h:14 ../data/language-specs/php.lang.h:18
-#: ../data/language-specs/python.lang.h:12
-#: ../data/language-specs/python3.lang.h:11 ../data/language-specs/R.lang.h:10
+#: ../data/language-specs/python3.lang.h:11
+#: ../data/language-specs/python.lang.h:12 ../data/language-specs/R.lang.h:10
 #: ../data/language-specs/ruby.lang.h:10
 msgid "Floating point number"
 msgstr "Flyttall"
@@ -531,11 +553,12 @@
 #: ../data/language-specs/html.lang.h:1 ../data/language-specs/latex.lang.h:1
 #: ../data/language-specs/mallard.lang.h:1
 #: ../data/language-specs/markdown.lang.h:1
+#: ../data/language-specs/mediawiki.lang.h:1
 #: ../data/language-specs/mxml.lang.h:1 ../data/language-specs/t2t.lang.h:1
 #: ../data/language-specs/texinfo.lang.h:1 ../data/language-specs/xml.lang.h:1
 #: ../data/language-specs/xslt.lang.h:1
-#: ../gtksourceview/gtksourcecompletionitem.c:242
-#: ../gtksourceview/gtksourcegutterrenderertext.c:395
+#: ../gtksourceview/gtksourcecompletionitem.c:249
+#: ../gtksourceview/gtksourcegutterrenderertext.c:391
 msgid "Markup"
 msgstr "Merking"
 
@@ -555,14 +578,14 @@
 msgid "Boo"
 msgstr "Boo"
 
-#: ../data/language-specs/boo.lang.h:4 ../data/language-specs/python.lang.h:5
-#: ../data/language-specs/python3.lang.h:5
+#: ../data/language-specs/boo.lang.h:4 ../data/language-specs/python3.lang.h:5
+#: ../data/language-specs/python.lang.h:5
 msgid "Multiline string"
 msgstr "Flerlinjestreng"
 
 #: ../data/language-specs/boo.lang.h:6
 #: ../data/language-specs/javascript.lang.h:14
-#: ../data/language-specs/perl.lang.h:16 ../data/language-specs/ruby.lang.h:24
+#: ../data/language-specs/perl.lang.h:16 ../data/language-specs/ruby.lang.h:25
 msgid "Regular Expression"
 msgstr "Vanlig uttrykk"
 
@@ -576,9 +599,9 @@
 msgstr "Definisjon"
 
 #: ../data/language-specs/boo.lang.h:11
-#: ../data/language-specs/python.lang.h:10
 #: ../data/language-specs/python3.lang.h:9
-#: ../data/language-specs/ruby.lang.h:19
+#: ../data/language-specs/python.lang.h:10
+#: ../data/language-specs/ruby.lang.h:20
 msgid "Special Variable"
 msgstr "Spesiell variabel"
 
@@ -598,10 +621,12 @@
 #: ../data/language-specs/boo.lang.h:13
 #: ../data/language-specs/desktop.lang.h:9 ../data/language-specs/d.lang.h:10
 #: ../data/language-specs/imagej.lang.h:4
+#: ../data/language-specs/julia.lang.h:6
 #: ../data/language-specs/libtool.lang.h:4
+#: ../data/language-specs/modelica.lang.h:9
 #: ../data/language-specs/objj.lang.h:3 ../data/language-specs/octave.lang.h:8
-#: ../data/language-specs/python.lang.h:11
 #: ../data/language-specs/python3.lang.h:10
+#: ../data/language-specs/python.lang.h:11
 #: ../data/language-specs/scheme.lang.h:4
 #: ../data/language-specs/scilab.lang.h:8
 #: ../data/language-specs/sparql.lang.h:9
@@ -625,8 +650,8 @@
 #: ../data/language-specs/ocaml.lang.h:20 ../data/language-specs/ooc.lang.h:4
 #: ../data/language-specs/opal.lang.h:6 ../data/language-specs/perl.lang.h:17
 #: ../data/language-specs/php.lang.h:4 ../data/language-specs/prolog.lang.h:9
-#: ../data/language-specs/vala.lang.h:4
-#: ../data/language-specs/verilog.lang.h:6
+#: ../data/language-specs/scala.lang.h:3 ../data/language-specs/vala.lang.h:4
+#: ../data/language-specs/verilog.lang.h:7
 #: ../data/language-specs/xml.lang.h:13
 msgid "Error"
 msgstr "Feil"
@@ -655,8 +680,9 @@
 #: ../data/language-specs/cg.lang.h:19 ../data/language-specs/erlang.lang.h:12
 #: ../data/language-specs/imagej.lang.h:3
 #: ../data/language-specs/matlab.lang.h:5
+#: ../data/language-specs/modelica.lang.h:14
 #: ../data/language-specs/octave.lang.h:16
-#: ../data/language-specs/ruby.lang.h:16
+#: ../data/language-specs/ruby.lang.h:17
 msgid "Builtin"
 msgstr "Innebygget"
 
@@ -700,24 +726,24 @@
 msgid "Date"
 msgstr "Dato"
 
-#: ../data/language-specs/changelog.lang.h:4
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:455
+#. Translators: the name of a person, not an object.
+#: ../data/language-specs/changelog.lang.h:5
 msgid "Name"
 msgstr "Navn"
 
-#: ../data/language-specs/changelog.lang.h:5
+#: ../data/language-specs/changelog.lang.h:6
 msgid "E-mail address"
 msgstr "E-postadresse"
 
-#: ../data/language-specs/changelog.lang.h:6
+#: ../data/language-specs/changelog.lang.h:7
 msgid "File"
 msgstr "Fil"
 
-#: ../data/language-specs/changelog.lang.h:7
+#: ../data/language-specs/changelog.lang.h:8
 msgid "Bullet"
 msgstr "Kulepunkt"
 
-#: ../data/language-specs/changelog.lang.h:9
+#: ../data/language-specs/changelog.lang.h:10
 msgid "Release"
 msgstr "Utgave"
 
@@ -739,7 +765,7 @@
 #: ../data/language-specs/def.lang.h:15 ../data/language-specs/erlang.lang.h:8
 #: ../data/language-specs/gap.lang.h:4 ../data/language-specs/go.lang.h:6
 #: ../data/language-specs/haskell.lang.h:10
-#: ../data/language-specs/java.lang.h:5
+#: ../data/language-specs/java.lang.h:5 ../data/language-specs/julia.lang.h:4
 #: ../data/language-specs/nemerle.lang.h:6
 #: ../data/language-specs/netrexx.lang.h:5 ../data/language-specs/sml.lang.h:6
 #: ../data/language-specs/vhdl.lang.h:5
@@ -747,6 +773,7 @@
 msgstr "Tegn"
 
 #: ../data/language-specs/c.lang.h:13 ../data/language-specs/go.lang.h:9
+#: ../data/language-specs/verilog.lang.h:5
 msgid "printf Conversion"
 msgstr "printf-konvertering"
 
@@ -775,7 +802,7 @@
 #: ../data/language-specs/def.lang.h:13
 #: ../data/language-specs/gtk-doc.lang.h:8
 #: ../data/language-specs/libtool.lang.h:3
-#: ../data/language-specs/ruby.lang.h:17
+#: ../data/language-specs/ruby.lang.h:18
 msgid "Constant"
 msgstr "Konstant"
 
@@ -827,6 +854,7 @@
 #: ../data/language-specs/gtkrc.lang.h:6
 #: ../data/language-specs/haskell.lang.h:13
 #: ../data/language-specs/ini.lang.h:7 ../data/language-specs/json.lang.h:8
+#: ../data/language-specs/modelica.lang.h:10
 #: ../data/language-specs/octave.lang.h:9
 #: ../data/language-specs/pascal.lang.h:6 ../data/language-specs/sml.lang.h:10
 #: ../data/language-specs/sql.lang.h:8
@@ -902,16 +930,16 @@
 
 #. A base-N number: 0xFFFF
 #: ../data/language-specs/def.lang.h:28
-#: ../data/language-specs/python.lang.h:14
 #: ../data/language-specs/python3.lang.h:13
+#: ../data/language-specs/python.lang.h:14
 #: ../data/language-specs/ruby.lang.h:12
 msgid "Base-N number"
 msgstr "Heltall i base-N"
 
 #. A complex number
 #: ../data/language-specs/def.lang.h:30
-#: ../data/language-specs/python.lang.h:15
 #: ../data/language-specs/python3.lang.h:14
+#: ../data/language-specs/python.lang.h:15
 msgid "Complex number"
 msgstr "Komplekst tall"
 
@@ -922,7 +950,9 @@
 msgstr "Innebygd identifikator"
 
 #. A primitive data type: int, long, char, etc.
-#: ../data/language-specs/def.lang.h:49 ../data/language-specs/octave.lang.h:6
+#: ../data/language-specs/def.lang.h:49
+#: ../data/language-specs/modelica.lang.h:7
+#: ../data/language-specs/octave.lang.h:6
 msgid "Data type"
 msgstr "Datatype"
 
@@ -932,17 +962,17 @@
 msgstr "Preprosessordirektiv"
 
 #. Reserved keywords: like "const" and "goto" in Java
-#: ../data/language-specs/def.lang.h:55
+#: ../data/language-specs/def.lang.h:57
 msgid "Reserved keyword"
 msgstr "Reservert nøkkelord"
 
 #. Anything that needs extra attention; mostly the keywords TODO, FIXME and XXX
-#: ../data/language-specs/def.lang.h:57
+#: ../data/language-specs/def.lang.h:59
 msgid "Note (FIXME, TODO, XXX, etc.)"
 msgstr "Merknad (FIXME, TODO, XXX, etc.)"
 
 #. Text that stands out, HTML links, e-mail addresses, etc.
-#: ../data/language-specs/def.lang.h:59
+#: ../data/language-specs/def.lang.h:61
 msgid "Underlined"
 msgstr "Understreket"
 
@@ -1116,7 +1146,7 @@
 msgstr "Unntakshåndtering"
 
 #: ../data/language-specs/eiffel.lang.h:11
-#: ../data/language-specs/ruby.lang.h:20
+#: ../data/language-specs/ruby.lang.h:21
 msgid "Predefined Variable"
 msgstr "Forhåndsdefinert variabel"
 
@@ -1140,9 +1170,10 @@
 
 #: ../data/language-specs/erlang.lang.h:11
 #: ../data/language-specs/fsharp.lang.h:4
+#: ../data/language-specs/modelica.lang.h:12
 #: ../data/language-specs/ocaml.lang.h:5
 #: ../data/language-specs/octave.lang.h:11 ../data/language-specs/sml.lang.h:9
-#: ../data/language-specs/verilog.lang.h:13
+#: ../data/language-specs/verilog.lang.h:14
 #: ../data/language-specs/vhdl.lang.h:9
 msgid "Base-N Integer"
 msgstr "Heltall i base-N"
@@ -1150,13 +1181,16 @@
 #: ../data/language-specs/erlang.lang.h:13
 #: ../data/language-specs/forth.lang.h:11
 #: ../data/language-specs/systemverilog.lang.h:3
-#: ../data/language-specs/verilog.lang.h:7
+#: ../data/language-specs/verilog.lang.h:8
 msgid "Compiler Directive"
 msgstr "Kompilator-direktiv"
 
 #: ../data/language-specs/fcl.lang.h:1 ../data/language-specs/gap.lang.h:1
+#: ../data/language-specs/idl-exelis.lang.h:1
 #: ../data/language-specs/imagej.lang.h:1
+#: ../data/language-specs/julia.lang.h:1
 #: ../data/language-specs/matlab.lang.h:1
+#: ../data/language-specs/modelica.lang.h:1
 #: ../data/language-specs/octave.lang.h:1 ../data/language-specs/R.lang.h:1
 #: ../data/language-specs/scilab.lang.h:1
 msgid "Scientific"
@@ -1167,7 +1201,9 @@
 msgstr "FCL"
 
 #: ../data/language-specs/fcl.lang.h:4 ../data/language-specs/fortran.lang.h:4
-#: ../data/language-specs/ini.lang.h:4 ../data/language-specs/octave.lang.h:10
+#: ../data/language-specs/ini.lang.h:4
+#: ../data/language-specs/modelica.lang.h:11
+#: ../data/language-specs/octave.lang.h:10
 #: ../data/language-specs/scilab.lang.h:4 ../data/language-specs/sql.lang.h:4
 msgid "Floating Point"
 msgstr "Flyttall"
@@ -1295,8 +1331,8 @@
 msgstr "OpenGL Shading Language"
 
 #: ../data/language-specs/glsl.lang.h:7 ../data/language-specs/go.lang.h:17
-#: ../data/language-specs/python.lang.h:16
 #: ../data/language-specs/python3.lang.h:15
+#: ../data/language-specs/python.lang.h:16
 msgid "Builtin Constant"
 msgstr "Innebygget konstant"
 
@@ -1332,9 +1368,11 @@
 msgid "Parameter"
 msgstr "Parameter"
 
+#: ../data/language-specs/bluespec.lang.h:8
 #: ../data/language-specs/gtk-doc.lang.h:9
+#: ../data/language-specs/julia.lang.h:15
 #: ../data/language-specs/systemverilog.lang.h:6
-#: ../data/language-specs/verilog.lang.h:12
+#: ../data/language-specs/verilog.lang.h:13
 #: ../data/language-specs/vhdl.lang.h:7
 msgid "Type"
 msgstr "Type"
@@ -1385,7 +1423,7 @@
 
 #: ../data/language-specs/haddock.lang.h:7
 msgid "Escape"
-msgstr ""
+msgstr "Escape"
 
 #: ../data/language-specs/haddock.lang.h:8
 #: ../data/language-specs/markdown.lang.h:13
@@ -1406,11 +1444,11 @@
 
 #: ../data/language-specs/haddock.lang.h:12
 msgid "Itemized list"
-msgstr ""
+msgstr "Punktliste"
 
 #: ../data/language-specs/haddock.lang.h:13
 msgid "Enumerated list"
-msgstr ""
+msgstr "Nummerert liste"
 
 #: ../data/language-specs/haddock.lang.h:14
 msgid "Definition list"
@@ -1418,6 +1456,7 @@
 
 #: ../data/language-specs/haddock.lang.h:15
 #: ../data/language-specs/markdown.lang.h:8
+#: ../data/language-specs/mediawiki.lang.h:6
 msgid "URL"
 msgstr "URL"
 
@@ -1431,7 +1470,7 @@
 msgstr "Haskell"
 
 #: ../data/language-specs/haskell.lang.h:6
-#: ../data/language-specs/ruby.lang.h:18
+#: ../data/language-specs/ruby.lang.h:19
 msgid "Symbol"
 msgstr "Symbol"
 
@@ -1501,11 +1540,13 @@
 #. allow to get external functionalities
 #: ../data/language-specs/actionscript.lang.h:6
 #: ../data/language-specs/java.lang.h:8 ../data/language-specs/ooc.lang.h:7
+#: ../data/language-specs/scala.lang.h:4
 msgid "External"
 msgstr "Ekstern"
 
 #: ../data/language-specs/actionscript.lang.h:7
 #: ../data/language-specs/java.lang.h:9 ../data/language-specs/ooc.lang.h:8
+#: ../data/language-specs/scala.lang.h:8
 msgid "Declaration"
 msgstr "Deklarasjon"
 
@@ -1551,7 +1592,7 @@
 
 #: ../data/language-specs/latex.lang.h:6
 msgid "math-bound"
-msgstr ""
+msgstr "math-bound"
 
 #: ../data/language-specs/latex.lang.h:7
 #: ../data/language-specs/texinfo.lang.h:11
@@ -1660,7 +1701,7 @@
 
 #: ../data/language-specs/markdown.lang.h:2
 msgid "Markdown"
-msgstr ""
+msgstr "Markdown"
 
 #: ../data/language-specs/markdown.lang.h:3
 #: ../data/language-specs/rpmspec.lang.h:4 ../data/language-specs/t2t.lang.h:6
@@ -1688,7 +1729,7 @@
 msgstr "Tekst for lenke"
 
 #: ../data/language-specs/markdown.lang.h:10
-#: ../gtksourceview/gtksourcecompletionitem.c:229
+#: ../gtksourceview/gtksourcecompletionitem.c:236
 msgid "Label"
 msgstr "Etikett"
 
@@ -1697,12 +1738,13 @@
 msgstr "Bildemarkør"
 
 #: ../data/language-specs/markdown.lang.h:14
+#: ../data/language-specs/mediawiki.lang.h:3
 msgid "Strong Emphasis"
 msgstr "Sterk utheving"
 
 #: ../data/language-specs/markdown.lang.h:15
 msgid "Backslash Escape"
-msgstr ""
+msgstr "Skiftetegn for omvendt skråstrek"
 
 #: ../data/language-specs/markdown.lang.h:16
 msgid "Line Break"
@@ -1768,8 +1810,9 @@
 msgid "Opal"
 msgstr "Opal"
 
-#: ../data/language-specs/opal.lang.h:3 ../data/language-specs/python.lang.h:3
+#: ../data/language-specs/opal.lang.h:3
 #: ../data/language-specs/python3.lang.h:3
+#: ../data/language-specs/python.lang.h:3
 msgid "Module Handler"
 msgstr "Modulhåndterer"
 
@@ -1791,7 +1834,7 @@
 
 #: ../data/language-specs/opencl.lang.h:7
 msgid "Device Cast"
-msgstr ""
+msgstr "Enhetsoversikt"
 
 #: ../data/language-specs/opencl.lang.h:8
 msgid "OpenCL Constant"
@@ -1818,12 +1861,12 @@
 msgstr "Include-uttrykk"
 
 #: ../data/language-specs/perl.lang.h:9 ../data/language-specs/php.lang.h:10
-#: ../data/language-specs/ruby.lang.h:22
+#: ../data/language-specs/ruby.lang.h:23
 msgid "Heredoc"
 msgstr "Heredoc"
 
 #: ../data/language-specs/perl.lang.h:10 ../data/language-specs/php.lang.h:11
-#: ../data/language-specs/ruby.lang.h:23 ../data/language-specs/sh.lang.h:12
+#: ../data/language-specs/ruby.lang.h:24 ../data/language-specs/sh.lang.h:12
 msgid "Heredoc Bound"
 msgstr "Heredoc-grense"
 
@@ -1887,8 +1930,8 @@
 msgid "Python"
 msgstr "Python"
 
-#: ../data/language-specs/python.lang.h:8
 #: ../data/language-specs/python3.lang.h:8
+#: ../data/language-specs/python.lang.h:8
 msgid "Format"
 msgstr "Format"
 
@@ -1896,8 +1939,8 @@
 msgid "string-conversion"
 msgstr "strengkonvertering"
 
-#: ../data/language-specs/python.lang.h:17
 #: ../data/language-specs/python3.lang.h:16
+#: ../data/language-specs/python.lang.h:17
 msgid "Builtin Object"
 msgstr "Innebygget objekt"
 
@@ -1921,11 +1964,12 @@
 msgid "Delimiter"
 msgstr "Skilletegn"
 
-#: ../data/language-specs/R.lang.h:7
+#: ../data/language-specs/julia.lang.h:8 ../data/language-specs/R.lang.h:7
+#: ../data/language-specs/scala.lang.h:11
 msgid "Special Constant"
 msgstr "Spesiell konstant"
 
-#: ../data/language-specs/R.lang.h:9 ../data/language-specs/verilog.lang.h:15
+#: ../data/language-specs/R.lang.h:9 ../data/language-specs/verilog.lang.h:16
 msgid "Integer Number"
 msgstr "Heltall"
 
@@ -2038,6 +2082,7 @@
 msgid "Individual"
 msgstr "Individuell"
 
+#: ../data/language-specs/ruby.lang.h:15
 #: ../data/language-specs/sparql.lang.h:10
 msgid "Literal"
 msgstr "Literal"
@@ -2066,6 +2111,7 @@
 msgid "SystemVerilog"
 msgstr "SystemVerilog"
 
+#: ../data/language-specs/bluespec.lang.h:3
 #: ../data/language-specs/systemverilog.lang.h:4
 msgid "System Task"
 msgstr "Systemoppgave"
@@ -2102,13 +2148,13 @@
 msgid "Section 5"
 msgstr "Del 5"
 
-#: ../data/language-specs/t2t.lang.h:14 ../gtksourceview/gtksourcestyle.c:112
-#: ../gtksourceview/gtksourcestyle.c:113
+#: ../data/language-specs/t2t.lang.h:14 ../gtksourceview/gtksourcestyle.c:119
+#: ../gtksourceview/gtksourcestyle.c:120
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../data/language-specs/t2t.lang.h:15 ../gtksourceview/gtksourcestyle.c:104
-#: ../gtksourceview/gtksourcestyle.c:105
+#: ../data/language-specs/t2t.lang.h:15 ../gtksourceview/gtksourcestyle.c:111
+#: ../gtksourceview/gtksourcestyle.c:112
 msgid "Bold"
 msgstr "Fet"
 
@@ -2148,15 +2194,15 @@
 msgid "Verilog"
 msgstr "Verilog"
 
-#: ../data/language-specs/verilog.lang.h:8
+#: ../data/language-specs/verilog.lang.h:9
 msgid "IEEE System Task"
 msgstr "IEEE systemoppgave"
 
-#: ../data/language-specs/verilog.lang.h:9
+#: ../data/language-specs/verilog.lang.h:10
 msgid "LRM Additional System Task"
 msgstr "LRM ekstra systemoppgave"
 
-#: ../data/language-specs/verilog.lang.h:11
+#: ../data/language-specs/verilog.lang.h:12
 msgid "Gate"
 msgstr "Port"
 
@@ -2252,209 +2298,210 @@
 msgid "Color scheme using Tango color palette"
 msgstr "Fargeschema som bruker Tango-fargepaletten"
 
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:371
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:327
 msgid "Document Words"
 msgstr "Ord i dokument"
 
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:456
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:430
 msgid "The provider name"
 msgstr "Navn på tilbyder"
 
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:463
-#: ../gtksourceview/gtksourcecompletionitem.c:268
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:437
+#: ../gtksourceview/gtksourcecompletionitem.c:275
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:464
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:438
 msgid "The provider icon"
 msgstr "Tilbyders ikon"
 
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:471
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:445
 msgid "Proposals Batch Size"
-msgstr ""
+msgstr "Størrelse på forslagsbunt"
 
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:472
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:446
 msgid "Number of proposals added in one batch"
-msgstr ""
+msgstr "Antall forslag per bunt"
 
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:481
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:455
 msgid "Scan Batch Size"
-msgstr ""
+msgstr "Størrelse på skanningsbunke"
 
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:482
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:456
 msgid "Number of lines scanned in one batch"
-msgstr ""
+msgstr "Antall linjer som leses gjennom per bunt"
 
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:491
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:465
 msgid "Minimum Word Size"
 msgstr "Minste ordstørrelse"
 
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:492
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:466
 msgid "The minimum word size to complete"
 msgstr "Minimumstørrelse på ord som skal fullføres"
 
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:501
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:475
 msgid "Interactive Delay"
 msgstr "Interaktiv pause"
 
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:502
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:476
 msgid "The delay before initiating interactive completion"
 msgstr "Pause før interaktiv fullføring startes"
 
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:511
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:485
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:512
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:486
 msgid "Provider priority"
 msgstr "Prioritet for tilbyder"
 
-#: ../gtksourceview/gtksourcebuffer.c:234
-#: ../gtksourceview/gtksourceprintcompositor.c:502
+#: ../gtksourceview/gtksourcebuffer.c:293
+#: ../gtksourceview/gtksourceprintcompositor.c:505
 msgid "Highlight Syntax"
 msgstr "Uthev syntaks"
 
-#: ../gtksourceview/gtksourcebuffer.c:235
+#: ../gtksourceview/gtksourcebuffer.c:294
 msgid "Whether to highlight syntax in the buffer"
 msgstr "Om syntaksen i bufferen skal markeres med farger"
 
-#: ../gtksourceview/gtksourcebuffer.c:248
+#: ../gtksourceview/gtksourcebuffer.c:307
 msgid "Highlight Matching Brackets"
 msgstr "Uthev sammenhengende klammer"
 
-#: ../gtksourceview/gtksourcebuffer.c:249
+#: ../gtksourceview/gtksourcebuffer.c:308
 msgid "Whether to highlight matching brackets"
 msgstr "Om sammenhengende klammer skal markeres utheves"
 
-#: ../gtksourceview/gtksourcebuffer.c:262
-#: ../gtksourceview/gtksourceundomanagerdefault.c:418
+#: ../gtksourceview/gtksourcebuffer.c:321
+#: ../gtksourceview/gtksourceundomanagerdefault.c:414
 msgid "Maximum Undo Levels"
 msgstr "Maksimalt antall angrenivåer"
 
-#: ../gtksourceview/gtksourcebuffer.c:263
-#: ../gtksourceview/gtksourceundomanagerdefault.c:419
+#: ../gtksourceview/gtksourcebuffer.c:322
+#: ../gtksourceview/gtksourceundomanagerdefault.c:415
 msgid "Number of undo levels for the buffer"
 msgstr "Antall angrenivåer for bufferen"
 
 #. Translators: throughout GtkSourceView "language" stands
 #. * for "programming language", not "spoken language"
-#: ../gtksourceview/gtksourcebuffer.c:275
+#: ../gtksourceview/gtksourcebuffer.c:334
 msgid "Language"
 msgstr "Språk"
 
-#: ../gtksourceview/gtksourcebuffer.c:276
+#: ../gtksourceview/gtksourcebuffer.c:335
 msgid "Language object to get highlighting patterns from"
 msgstr "Språkobjekt det skal hentes fargemarkeringsmønster fra"
 
-#: ../gtksourceview/gtksourcebuffer.c:284
+#: ../gtksourceview/gtksourcebuffer.c:343
 msgid "Can undo"
 msgstr "Kan angre"
 
-#: ../gtksourceview/gtksourcebuffer.c:285
+#: ../gtksourceview/gtksourcebuffer.c:344
 msgid "Whether Undo operation is possible"
 msgstr "Om angreoperasjonen er mulig"
 
-#: ../gtksourceview/gtksourcebuffer.c:292
+#: ../gtksourceview/gtksourcebuffer.c:351
 msgid "Can redo"
 msgstr "Kan gjenopprette"
 
-#: ../gtksourceview/gtksourcebuffer.c:293
+#: ../gtksourceview/gtksourcebuffer.c:352
 msgid "Whether Redo operation is possible"
 msgstr "Om gjenopprett-operasjonen er mulig"
 
-#: ../gtksourceview/gtksourcebuffer.c:307
-#: ../gtksourceview/gtksourcebuffer.c:308
+#: ../gtksourceview/gtksourcebuffer.c:366
+#: ../gtksourceview/gtksourcebuffer.c:367
 msgid "Style scheme"
 msgstr "Stilschema"
 
-#: ../gtksourceview/gtksourcebuffer.c:315
+#: ../gtksourceview/gtksourcebuffer.c:374
 msgid "Undo manager"
 msgstr "Håndtering av angring"
 
-#: ../gtksourceview/gtksourcebuffer.c:316
+#: ../gtksourceview/gtksourcebuffer.c:375
 msgid "The buffer undo manager"
 msgstr "Angrehåndtering for buffer"
 
-#: ../gtksourceview/gtksourcecompletion.c:934
-#: ../gtksourceview/gtksourcecompletion.c:957
+#: ../gtksourceview/gtksourcecompletion.c:554
+#: ../gtksourceview/gtksourcecompletion.c:585
 msgid "No extra information available"
 msgstr "Ingen ekstra informasjon tilgjengelig"
 
-#: ../gtksourceview/gtksourcecompletion.c:2212
-#: ../gtksourceview/gtksourcegutter.c:547
+#: ../gtksourceview/gtksourcecompletion.c:1789
+#: ../gtksourceview/gtksourcegutter.c:537
 msgid "View"
 msgstr "Vis"
 
-#: ../gtksourceview/gtksourcecompletion.c:2213
+#: ../gtksourceview/gtksourcecompletion.c:1790
 msgid "The GtkSourceView bound to the completion"
 msgstr "GtkSourceView-objekt som er bundet til fullføring"
 
-#: ../gtksourceview/gtksourcecompletion.c:2228
+#: ../gtksourceview/gtksourcecompletion.c:1804
 msgid "Remember Info Visibility"
 msgstr "Husk synlighet for informasjon"
 
-#: ../gtksourceview/gtksourcecompletion.c:2229
+#: ../gtksourceview/gtksourcecompletion.c:1805
 msgid "Remember the last info window visibility state"
 msgstr "Husk synlighetstilstand for siste informasjonsvindu"
 
-#: ../gtksourceview/gtksourcecompletion.c:2242
+#: ../gtksourceview/gtksourcecompletion.c:1817
 msgid "Select on Show"
 msgstr "Velg ved visning"
 
-#: ../gtksourceview/gtksourcecompletion.c:2243
+#: ../gtksourceview/gtksourcecompletion.c:1818
 msgid "Select first proposal when completion is shown"
 msgstr "Velg første forslag når fullføring vises"
 
-#: ../gtksourceview/gtksourcecompletion.c:2257
+#: ../gtksourceview/gtksourcecompletion.c:1831
 msgid "Show Headers"
 msgstr "Vis hoder"
 
-#: ../gtksourceview/gtksourcecompletion.c:2258
+#: ../gtksourceview/gtksourcecompletion.c:1832
 msgid ""
 "Show provider headers when proposals from multiple providers are available"
 msgstr ""
+"Vis tilbyderens hodetekst når forslag fra flere tilbydere er tilgjengelige"
 
-#: ../gtksourceview/gtksourcecompletion.c:2272
+#: ../gtksourceview/gtksourcecompletion.c:1845
 msgid "Show Icons"
 msgstr "Vis ikoner"
 
-#: ../gtksourceview/gtksourcecompletion.c:2273
+#: ../gtksourceview/gtksourcecompletion.c:1846
 msgid "Show provider and proposal icons in the completion popup"
 msgstr "Vis tilbyder og foreslåtte ikoner i fullføringsdialogen"
 
-#: ../gtksourceview/gtksourcecompletion.c:2288
+#: ../gtksourceview/gtksourcecompletion.c:1860
 msgid "Accelerators"
 msgstr "Akselleratorer"
 
-#: ../gtksourceview/gtksourcecompletion.c:2289
+#: ../gtksourceview/gtksourcecompletion.c:1861
 msgid "Number of proposal accelerators to show"
 msgstr "Antall foreslåtte hurtigtaster som skal vises"
 
-#: ../gtksourceview/gtksourcecompletion.c:2305
+#: ../gtksourceview/gtksourcecompletion.c:1876
 msgid "Auto Complete Delay"
 msgstr "Pause før automatisk fullføring"
 
-#: ../gtksourceview/gtksourcecompletion.c:2306
+#: ../gtksourceview/gtksourcecompletion.c:1877
 msgid "Completion popup delay for interactive completion"
-msgstr ""
+msgstr "Forsinkelse av fullført-varslingsboks"
 
-#: ../gtksourceview/gtksourcecompletion.c:2322
+#: ../gtksourceview/gtksourcecompletion.c:1893
 msgid "Provider Page Size"
 msgstr "Sidestørrelse for tilbyder"
 
-#: ../gtksourceview/gtksourcecompletion.c:2323
+#: ../gtksourceview/gtksourcecompletion.c:1894
 msgid "Provider scrolling page size"
-msgstr ""
+msgstr "Størrelse på tilbyderside"
 
-#: ../gtksourceview/gtksourcecompletion.c:2342
+#: ../gtksourceview/gtksourcecompletion.c:1914
 msgid "Proposal Page Size"
 msgstr "Sidestørrelse for forslag"
 
-#: ../gtksourceview/gtksourcecompletion.c:2343
+#: ../gtksourceview/gtksourcecompletion.c:1915
 msgid "Proposal scrolling page size"
-msgstr ""
+msgstr "Størrelse på forslagsside"
 
-#: ../gtksourceview/gtksourcecompletion.c:2704
+#: ../gtksourceview/gtksourcecompletionmodel.c:491
 msgid "Provider"
 msgstr "Tilbyder"
 
@@ -2466,58 +2513,60 @@
 msgid "_Details..."
 msgstr "_Detaljer …"
 
-#: ../gtksourceview/gtksourcecompletioncontext.c:255
-#: ../gtksourceview/gtksourceview.c:306
+#: ../gtksourceview/gtksourcecompletioncontext.c:272
+#: ../gtksourceview/gtksourceview.c:308
 msgid "Completion"
 msgstr "Fullføring"
 
-#: ../gtksourceview/gtksourcecompletioncontext.c:256
+#: ../gtksourceview/gtksourcecompletioncontext.c:273
 msgid "The completion object to which the context belongs"
 msgstr "Fullføringsobjektet konteksten tilhører"
 
 #. Translators: The GtkTextIter at which the completion was invoked
-#: ../gtksourceview/gtksourcecompletioncontext.c:269
+#: ../gtksourceview/gtksourcecompletioncontext.c:286
 msgid "Iterator"
 msgstr "Iterator"
 
-#: ../gtksourceview/gtksourcecompletioncontext.c:270
+#: ../gtksourceview/gtksourcecompletioncontext.c:287
 msgid "The GtkTextIter at which the completion was invoked"
-msgstr ""
+msgstr "GtkTExtlter-en der fullføringen ble kallet"
 
-#: ../gtksourceview/gtksourcecompletioncontext.c:282
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:502
+#: ../gtksourceview/gtksourcecompletioncontext.c:299
 msgid "Activation"
 msgstr "Aktivering"
 
-#: ../gtksourceview/gtksourcecompletioncontext.c:283
+#: ../gtksourceview/completion-providers/words/gtksourcecompletionwords.c:503
+#: ../gtksourceview/gtksourcecompletioncontext.c:300
 msgid "The type of activation"
 msgstr "Type aktivering"
 
 #. Tooltip style
-#: ../gtksourceview/gtksourcecompletioninfo.c:61
+#: ../gtksourceview/gtksourcecompletioninfo.c:253
 msgid "Completion Info"
 msgstr "Informasjon om fullføring"
 
-#: ../gtksourceview/gtksourcecompletionitem.c:230
+#: ../gtksourceview/gtksourcecompletionitem.c:237
 msgid "Label to be shown for this item"
 msgstr "Etikett som skal vises for denne oppføringen"
 
-#: ../gtksourceview/gtksourcecompletionitem.c:243
+#: ../gtksourceview/gtksourcecompletionitem.c:250
 msgid "Markup to be shown for this item"
 msgstr "Merking kan vises for denne oppføringen"
 
-#: ../gtksourceview/gtksourcecompletionitem.c:256
+#: ../gtksourceview/gtksourcecompletionitem.c:263
 msgid "Item text"
 msgstr "Tekst for oppføring"
 
-#: ../gtksourceview/gtksourcecompletionitem.c:269
+#: ../gtksourceview/gtksourcecompletionitem.c:276
 msgid "Icon to be shown for this item"
 msgstr "Ikon skal vises for denne oppføringen"
 
-#: ../gtksourceview/gtksourcecompletionitem.c:281
+#: ../gtksourceview/gtksourcecompletionitem.c:288
 msgid "Info"
 msgstr "Informasjon"
 
-#: ../gtksourceview/gtksourcecompletionitem.c:282
+#: ../gtksourceview/gtksourcecompletionitem.c:289
 msgid "Info to be shown for this item"
 msgstr "Informasjon som skal vises for denne oppføringen"
 
@@ -2525,7 +2574,7 @@
 #. * named sub-patterns with the same name or if resulting regex is
 #. * too long. In this case fixing lang file helps (e.g. renaming
 #. * subpatterns, making huge keywords use bigger prefixes, etc.)
-#: ../gtksourceview/gtksourcecontextengine.c:3120
+#: ../gtksourceview/gtksourcecontextengine.c:3129
 #, c-format
 msgid ""
 "Cannot create a regex for all the transitions, the syntax highlighting "
@@ -2536,7 +2585,7 @@
 "syntaks vil være tregere enn vanlig.\n"
 "Feilen var: %s"
 
-#: ../gtksourceview/gtksourcecontextengine.c:4443
+#: ../gtksourceview/gtksourcecontextengine.c:4452
 msgid ""
 "Highlighting a single line took too much time, syntax highlighting will be "
 "disabled"
@@ -2544,19 +2593,19 @@
 "Utheving av en enkelt linje tok for lang tid. Syntaksutheving vil bli slått "
 "av"
 
-#: ../gtksourceview/gtksourcecontextengine.c:5687
+#: ../gtksourceview/gtksourcecontextengine.c:5696
 #, c-format
 msgid "context '%s' cannot contain a \\%%{...@start} command"
 msgstr "kontekst «%s» kan ikke inneholde en \\%%{...@start}-kommando"
 
-#: ../gtksourceview/gtksourcecontextengine.c:5848
-#: ../gtksourceview/gtksourcecontextengine.c:5937
+#: ../gtksourceview/gtksourcecontextengine.c:5857
+#: ../gtksourceview/gtksourcecontextengine.c:5946
 #, c-format
 msgid "duplicated context id '%s'"
 msgstr "duplisert kontekst-ID «%s»"
 
-#: ../gtksourceview/gtksourcecontextengine.c:6051
-#: ../gtksourceview/gtksourcecontextengine.c:6111
+#: ../gtksourceview/gtksourcecontextengine.c:6060
+#: ../gtksourceview/gtksourcecontextengine.c:6120
 #, c-format
 msgid ""
 "style override used with wildcard context reference in language '%s' in ref "
@@ -2565,148 +2614,151 @@
 "overstyring av stil brukt med «wildcard» kontekstreferanse i språk «%s» i "
 "ref «%s»"
 
-#: ../gtksourceview/gtksourcecontextengine.c:6125
+#: ../gtksourceview/gtksourcecontextengine.c:6134
 #, c-format
 msgid "invalid context reference '%s'"
 msgstr "ugyldig kontekstreferanse «%s»"
 
-#: ../gtksourceview/gtksourcecontextengine.c:6144
-#: ../gtksourceview/gtksourcecontextengine.c:6154
+#: ../gtksourceview/gtksourcecontextengine.c:6153
+#: ../gtksourceview/gtksourcecontextengine.c:6163
 #, c-format
 msgid "unknown context '%s'"
 msgstr "ukjent kontekst «%s»"
 
-#: ../gtksourceview/gtksourcecontextengine.c:6253
+#: ../gtksourceview/gtksourcecontextengine.c:6262
 #, c-format
 msgid "Missing main language definition (id = \"%s\".)"
 msgstr "Mangler hovedspråkdefinisjon (id = «%s».)"
 
-#: ../gtksourceview/gtksourcegutter.c:548
+#. Translators: gutters can be used to display information
+#. * on the left or on the right of the text view. To draw the
+#. * line numbers for example.
+#: ../gtksourceview/gtksourcegutter.c:541
 msgid "The gutters' GtkSourceView"
 msgstr "GtkSourceView for «gutter»"
 
-#: ../gtksourceview/gtksourcegutter.c:560
-#: ../gtksourceview/gtksourcegutterrenderer.c:724
+#: ../gtksourceview/gtksourcegutter.c:553
+#: ../gtksourceview/gtksourcegutterrenderer.c:705
 msgid "Window Type"
 msgstr "Vindustype"
 
-#: ../gtksourceview/gtksourcegutter.c:561
+#: ../gtksourceview/gtksourcegutter.c:562
 msgid "The gutters text window type"
 msgstr "Tekstvindutype for «gutter»"
 
-#: ../gtksourceview/gtksourcegutter.c:572
-#: ../gtksourceview/gtksourcegutterrenderer.c:500
+#: ../gtksourceview/gtksourcegutter.c:562
+#: ../gtksourceview/gtksourcegutterrenderer.c:482
 msgid "X Padding"
 msgstr "X-fyll"
 
-#: ../gtksourceview/gtksourcegutter.c:573
-#: ../gtksourceview/gtksourcegutterrenderer.c:501
+#: ../gtksourceview/gtksourcegutter.c:563
+#: ../gtksourceview/gtksourcegutterrenderer.c:483
 msgid "The x-padding"
 msgstr "X-fyll"
 
-#: ../gtksourceview/gtksourcegutter.c:583
-#: ../gtksourceview/gtksourcegutterrenderer.c:516
+#: ../gtksourceview/gtksourcegutter.c:573
+#: ../gtksourceview/gtksourcegutterrenderer.c:498
 msgid "Y Padding"
 msgstr "Y-fyll"
 
-#: ../gtksourceview/gtksourcegutter.c:584
-#: ../gtksourceview/gtksourcegutterrenderer.c:517
+#: ../gtksourceview/gtksourcegutter.c:574
+#: ../gtksourceview/gtksourcegutterrenderer.c:499
 msgid "The y-padding"
 msgstr "Y-fyll"
 
-#: ../gtksourceview/gtksourcegutterrenderer.c:486
-#: ../gtksourceview/gtksourcegutterrenderer.c:487
+#: ../gtksourceview/gtksourcegutterrenderer.c:468
+#: ../gtksourceview/gtksourcegutterrenderer.c:469
 msgid "Visible"
 msgstr "Synlig"
 
-#: ../gtksourceview/gtksourcegutterrenderer.c:532
+#: ../gtksourceview/gtksourcegutterrenderer.c:514
 msgid "X Alignment"
 msgstr "X-justering"
 
-#: ../gtksourceview/gtksourcegutterrenderer.c:533
+#: ../gtksourceview/gtksourcegutterrenderer.c:515
 msgid "The x-alignment"
 msgstr "X-justering"
 
-#: ../gtksourceview/gtksourcegutterrenderer.c:548
+#: ../gtksourceview/gtksourcegutterrenderer.c:530
 msgid "Y Alignment"
 msgstr "Y-justering"
 
-#: ../gtksourceview/gtksourcegutterrenderer.c:549
+#: ../gtksourceview/gtksourcegutterrenderer.c:531
 msgid "The y-alignment"
 msgstr "Y-justering"
 
-#: ../gtksourceview/gtksourcegutterrenderer.c:691
+#: ../gtksourceview/gtksourcegutterrenderer.c:672
 msgid "The View"
 msgstr "Visningen"
 
-#: ../gtksourceview/gtksourcegutterrenderer.c:692
+#: ../gtksourceview/gtksourcegutterrenderer.c:673
 msgid "The view"
 msgstr "Visningen"
 
-#: ../gtksourceview/gtksourcegutterrenderer.c:708
+#: ../gtksourceview/gtksourcegutterrenderer.c:689
 msgid "Alignment Mode"
 msgstr "Justeringsmodus"
 
-#: ../gtksourceview/gtksourcegutterrenderer.c:709
+#: ../gtksourceview/gtksourcegutterrenderer.c:690
 msgid "The alignment mode"
 msgstr "Justeringsmodus"
 
-#: ../gtksourceview/gtksourcegutterrenderer.c:725
+#: ../gtksourceview/gtksourcegutterrenderer.c:706
 msgid "The window type"
 msgstr "Type vindu"
 
-#: ../gtksourceview/gtksourcegutterrenderer.c:733
+#: ../gtksourceview/gtksourcegutterrenderer.c:714
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../gtksourceview/gtksourcegutterrenderer.c:734
+#: ../gtksourceview/gtksourcegutterrenderer.c:715
 msgid "The size"
 msgstr "Størrelsen"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:293
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:289
 #: ../gtksourceview/gtksourcemarkattributes.c:316
 msgid "Pixbuf"
 msgstr "Pixbuf"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:294
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:290
 #: ../gtksourceview/gtksourcemarkattributes.c:317
 msgid "The pixbuf"
 msgstr "Pixbuf"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:301
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:304
 #: ../gtksourceview/gtksourcemarkattributes.c:303
 msgid "Stock Id"
 msgstr "Standard-ID"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:302
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:305
 #: ../gtksourceview/gtksourcemarkattributes.c:304
 msgid "The stock id"
 msgstr "Standard-ID"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:309
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:312
 #: ../gtksourceview/gtksourcemarkattributes.c:329
 msgid "Icon Name"
 msgstr "Navn på ikon"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:310
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:313
 #: ../gtksourceview/gtksourcemarkattributes.c:330
 msgid "The icon name"
 msgstr "Navn på ikonet"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:317
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:320
 #: ../gtksourceview/gtksourcemarkattributes.c:342
 msgid "GIcon"
 msgstr "GIcon"
 
-#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:318
+#: ../gtksourceview/gtksourcegutterrendererpixbuf.c:321
 msgid "The gicon"
 msgstr "GIcon"
 
-#: ../gtksourceview/gtksourcegutterrenderertext.c:396
+#: ../gtksourceview/gtksourcegutterrenderertext.c:392
 msgid "The markup"
 msgstr "Merking"
 
-#: ../gtksourceview/gtksourcegutterrenderertext.c:404
+#: ../gtksourceview/gtksourcegutterrenderertext.c:400
 msgid "The text"
 msgstr "Teksten"
 
@@ -2733,21 +2785,21 @@
 msgid "Whether the language should be hidden from the user"
 msgstr "Im språke skal skjules fra brukeren"
 
-#: ../gtksourceview/gtksourcelanguagemanager.c:150
+#: ../gtksourceview/gtksourcelanguagemanager.c:149
 msgid "Language specification directories"
 msgstr "Kataloger for språkspesifikasjoner"
 
-#: ../gtksourceview/gtksourcelanguagemanager.c:151
+#: ../gtksourceview/gtksourcelanguagemanager.c:150
 msgid ""
 "List of directories where the language specification files (.lang) are "
 "located"
 msgstr "Liste over kataloger der språkspesifikasjonsfiler (.lang) finnes"
 
-#: ../gtksourceview/gtksourcelanguagemanager.c:160
+#: ../gtksourceview/gtksourcelanguagemanager.c:159
 msgid "Language ids"
 msgstr "Språk-IDer"
 
-#: ../gtksourceview/gtksourcelanguagemanager.c:161
+#: ../gtksourceview/gtksourcelanguagemanager.c:160
 msgid "List of the ids of the available languages"
 msgstr "Liste med IDer for tilgjengelige språk"
 
@@ -2761,12 +2813,12 @@
 msgid "in regex '%s': backreferences are not supported"
 msgstr "i regulært uttrykk «%s»: referanser bakover er ikke støttet"
 
-#: ../gtksourceview/gtksourcemarkattributes.c:290
-#: ../gtksourceview/gtksourcestyle.c:88
+#: ../gtksourceview/gtksourcemarkattributes.c:288
+#: ../gtksourceview/gtksourcestyle.c:95
 msgid "Background"
 msgstr "Bakgrunn"
 
-#: ../gtksourceview/gtksourcemarkattributes.c:291
+#: ../gtksourceview/gtksourcemarkattributes.c:289
 msgid "The background"
 msgstr "Bakgrunnen"
 
@@ -2782,99 +2834,99 @@
 msgid "The mark category"
 msgstr "Kategori for merking"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:442
+#: ../gtksourceview/gtksourceprintcompositor.c:445
 msgid "Source Buffer"
 msgstr "Kildebuffer"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:443
+#: ../gtksourceview/gtksourceprintcompositor.c:446
 msgid "The GtkSourceBuffer object to print"
 msgstr "GtkSourceBuffer-objekt som skal skrives ut"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:460
-#: ../gtksourceview/gtksourceview.c:344
+#: ../gtksourceview/gtksourceprintcompositor.c:463
+#: ../gtksourceview/gtksourceview.c:346
 msgid "Tab Width"
 msgstr "Tabulatorbredde"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:461
-#: ../gtksourceview/gtksourceview.c:345
+#: ../gtksourceview/gtksourceprintcompositor.c:464
+#: ../gtksourceview/gtksourceview.c:347
 msgid "Width of a tab character expressed in spaces"
 msgstr "Bredde på et tabulatortegn uttrykt i mellomrom"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:481
+#: ../gtksourceview/gtksourceprintcompositor.c:484
 msgid "Wrap Mode"
 msgstr "Brytningsmodus"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:482
+#: ../gtksourceview/gtksourceprintcompositor.c:485
 msgid ""
 "Whether to wrap lines never, at word boundaries, or at character boundaries."
-msgstr ""
+msgstr "Om linjer skal brytes: aldri, ved ord eller bokstav."
 
-#: ../gtksourceview/gtksourceprintcompositor.c:503
+#: ../gtksourceview/gtksourceprintcompositor.c:506
 msgid "Whether to print the document with highlighted syntax"
 msgstr "Om dokumentet skal skrives ut med uthevet syntaks"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:524
+#: ../gtksourceview/gtksourceprintcompositor.c:527
 msgid "Print Line Numbers"
 msgstr "Skriv ut linjenummer"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:525
+#: ../gtksourceview/gtksourceprintcompositor.c:528
 msgid "Interval of printed line numbers (0 means no numbers)"
 msgstr "Intervall for visning av linjenummer (0 betyr ingen nummerering)"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:547
+#: ../gtksourceview/gtksourceprintcompositor.c:550
 msgid "Print Header"
 msgstr "Skriv ut topptekst"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:548
+#: ../gtksourceview/gtksourceprintcompositor.c:551
 msgid "Whether to print a header in each page"
 msgstr "Om en topptekst skal settes inn på hver side"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:570
+#: ../gtksourceview/gtksourceprintcompositor.c:573
 msgid "Print Footer"
 msgstr "Skriv ut bunntekst"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:571
+#: ../gtksourceview/gtksourceprintcompositor.c:574
 msgid "Whether to print a footer in each page"
 msgstr "Om bunntekst skal settes inn på hver side"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:593
+#: ../gtksourceview/gtksourceprintcompositor.c:596
 msgid "Body Font Name"
 msgstr "Navn på skrift for kropp"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:594
+#: ../gtksourceview/gtksourceprintcompositor.c:597
 msgid "Name of the font to use for the text body (e.g. \"Monospace 10\")"
 msgstr "Navn på skrift som skal brukes for tekst (f.eks «Monospace 10»)"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:617
+#: ../gtksourceview/gtksourceprintcompositor.c:620
 msgid "Line Numbers Font Name"
 msgstr "Vis skriftnavn for linjenummer"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:618
+#: ../gtksourceview/gtksourceprintcompositor.c:621
 msgid "Name of the font to use for the line numbers (e.g. \"Monospace 10\")"
 msgstr ""
 "Navn på skrift som skal brukes for linjenummer (f.eks «Monospace 10»)"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:641
+#: ../gtksourceview/gtksourceprintcompositor.c:644
 msgid "Header Font Name"
 msgstr "Navn på skrift for topptekst"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:642
+#: ../gtksourceview/gtksourceprintcompositor.c:645
 msgid "Name of the font to use for the page header (e.g. \"Monospace 10\")"
 msgstr "Navn på skrift som skal brukes for topptekst (f.eks «Monospace 10»)"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:665
+#: ../gtksourceview/gtksourceprintcompositor.c:668
 msgid "Footer Font Name"
 msgstr "Navn på skrift for bunntekst"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:666
+#: ../gtksourceview/gtksourceprintcompositor.c:669
 msgid "Name of the font to use for the page footer (e.g. \"Monospace 10\")"
 msgstr "Navn på skrift som skal brukes for bunntekst (f.eks «Monospace 10»)"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:682
+#: ../gtksourceview/gtksourceprintcompositor.c:685
 msgid "Number of pages"
 msgstr "Antall sider"
 
-#: ../gtksourceview/gtksourceprintcompositor.c:683
+#: ../gtksourceview/gtksourceprintcompositor.c:686
 msgid ""
 "The number of pages in the document (-1 means the document has not been "
 "completely paginated)."
@@ -2885,199 +2937,200 @@
 msgid "using \\C is not supported in language definitions"
 msgstr "Bruk av \\C er ikke støttet i språkdefinisjoner"
 
-#: ../gtksourceview/gtksourcestyle.c:80
+#: ../gtksourceview/gtksourcestyle.c:87
 msgid "Line background"
 msgstr "Bakgrunn for linje"
 
-#: ../gtksourceview/gtksourcestyle.c:81
+#: ../gtksourceview/gtksourcestyle.c:88
 msgid "Line background color"
 msgstr "Bakgrunnsfarge for linje"
 
-#: ../gtksourceview/gtksourcestyle.c:89
+#: ../gtksourceview/gtksourcestyle.c:96
 msgid "Background color"
 msgstr "Bakgrunnsfarge"
 
-#: ../gtksourceview/gtksourcestyle.c:96
+#: ../gtksourceview/gtksourcestyle.c:103
 msgid "Foreground"
 msgstr "Forgrunn"
 
-#: ../gtksourceview/gtksourcestyle.c:97
+#: ../gtksourceview/gtksourcestyle.c:104
 msgid "Foreground color"
 msgstr "Forgrunnsfarge"
 
-#: ../gtksourceview/gtksourcestyle.c:120 ../gtksourceview/gtksourcestyle.c:121
+#: ../gtksourceview/gtksourcestyle.c:127 ../gtksourceview/gtksourcestyle.c:128
 msgid "Underline"
 msgstr "Understreket"
 
-#: ../gtksourceview/gtksourcestyle.c:128 ../gtksourceview/gtksourcestyle.c:129
+#: ../gtksourceview/gtksourcestyle.c:135 ../gtksourceview/gtksourcestyle.c:136
 msgid "Strikethrough"
 msgstr "Gjennomstreket"
 
-#: ../gtksourceview/gtksourcestyle.c:136
+#: ../gtksourceview/gtksourcestyle.c:143
 msgid "Line background set"
 msgstr "Bakgrunn for linje satt"
 
-#: ../gtksourceview/gtksourcestyle.c:137
+#: ../gtksourceview/gtksourcestyle.c:144
 msgid "Whether line background color is set"
 msgstr "Om bakgrunnsfarge for linje er satt"
 
-#: ../gtksourceview/gtksourcestyle.c:144
+#: ../gtksourceview/gtksourcestyle.c:151
 msgid "Foreground set"
 msgstr "Forgrunn satt"
 
-#: ../gtksourceview/gtksourcestyle.c:145
+#: ../gtksourceview/gtksourcestyle.c:152
 msgid "Whether foreground color is set"
 msgstr "Om forgrunnsfargen er satt"
 
-#: ../gtksourceview/gtksourcestyle.c:152
+#: ../gtksourceview/gtksourcestyle.c:159
 msgid "Background set"
 msgstr "Bakgrunn satt"
 
-#: ../gtksourceview/gtksourcestyle.c:153
+#: ../gtksourceview/gtksourcestyle.c:160
 msgid "Whether background color is set"
 msgstr "Om bakgrunnsfargen er satt"
 
-#: ../gtksourceview/gtksourcestyle.c:160
+#: ../gtksourceview/gtksourcestyle.c:167
 msgid "Bold set"
 msgstr "Fet satt"
 
-#: ../gtksourceview/gtksourcestyle.c:161
+#: ../gtksourceview/gtksourcestyle.c:168
 msgid "Whether bold attribute is set"
 msgstr "Om attributten fet er satt"
 
-#: ../gtksourceview/gtksourcestyle.c:168
+#: ../gtksourceview/gtksourcestyle.c:175
 msgid "Italic set"
 msgstr "Kursiv satt"
 
-#: ../gtksourceview/gtksourcestyle.c:169
+#: ../gtksourceview/gtksourcestyle.c:176
 msgid "Whether italic attribute is set"
 msgstr "Om attributten kursiv er satt"
 
-#: ../gtksourceview/gtksourcestyle.c:176
+#: ../gtksourceview/gtksourcestyle.c:183
 msgid "Underline set"
 msgstr "Understreket satt"
 
-#: ../gtksourceview/gtksourcestyle.c:177
+#: ../gtksourceview/gtksourcestyle.c:184
 msgid "Whether underline attribute is set"
 msgstr "Om attributten understreket er satt"
 
-#: ../gtksourceview/gtksourcestyle.c:184
+#: ../gtksourceview/gtksourcestyle.c:191
 msgid "Strikethrough set"
 msgstr "Gjennomstreket satt"
 
-#: ../gtksourceview/gtksourcestyle.c:185
+#: ../gtksourceview/gtksourcestyle.c:192
 msgid "Whether strikethrough attribute is set"
 msgstr "Om attributten gjennomstreket er satt"
 
+#: ../gtksourceview/gtksourcestylescheme.c:211
 #: ../gtksourceview/gtksourcestylescheme.c:212
-#: ../gtksourceview/gtksourcestylescheme.c:213
 msgid "Style scheme id"
 msgstr "Schema-ID for stil"
 
+#: ../gtksourceview/gtksourcestylescheme.c:224
 #: ../gtksourceview/gtksourcestylescheme.c:225
-#: ../gtksourceview/gtksourcestylescheme.c:226
 msgid "Style scheme name"
 msgstr "Schemanavn for stil"
 
+#: ../gtksourceview/gtksourcestylescheme.c:237
 #: ../gtksourceview/gtksourcestylescheme.c:238
-#: ../gtksourceview/gtksourcestylescheme.c:239
 msgid "Style scheme description"
 msgstr "Beskrivelse av stilschema"
 
+#: ../gtksourceview/gtksourcestylescheme.c:250
 #: ../gtksourceview/gtksourcestylescheme.c:251
-#: ../gtksourceview/gtksourcestylescheme.c:252
 msgid "Style scheme filename"
 msgstr "Filnavn for schema for stil"
 
-#: ../gtksourceview/gtksourcestyleschememanager.c:152
+#: ../gtksourceview/gtksourcestyleschememanager.c:153
 msgid "Style scheme search path"
 msgstr "Søkesti for stilschema"
 
-#: ../gtksourceview/gtksourcestyleschememanager.c:153
+#: ../gtksourceview/gtksourcestyleschememanager.c:154
 msgid "List of directories and files where the style schemes are located"
 msgstr "Liste med kataloger og filer der schema for stiler finnes"
 
-#: ../gtksourceview/gtksourcestyleschememanager.c:161
+#: ../gtksourceview/gtksourcestyleschememanager.c:162
 msgid "Scheme ids"
 msgstr "Schema-ID"
 
-#: ../gtksourceview/gtksourcestyleschememanager.c:162
+#: ../gtksourceview/gtksourcestyleschememanager.c:163
 msgid "List of the ids of the available style schemes"
 msgstr "Liste med IDer for tilgjengelige stil-schema"
 
-#: ../gtksourceview/gtksourceundomanagerdefault.c:410
+#: ../gtksourceview/gtksourcesearchcontext.c:2740
+#: ../gtksourceview/gtksourceundomanagerdefault.c:406
 msgid "Buffer"
 msgstr "Buffer"
 
-#: ../gtksourceview/gtksourceundomanagerdefault.c:411
+#: ../gtksourceview/gtksourceundomanagerdefault.c:407
 msgid "The text buffer to add undo support on"
-msgstr ""
+msgstr "Tekstbuffer å legge til angrestøtte på"
 
-#: ../gtksourceview/gtksourceview.c:307
+#: ../gtksourceview/gtksourceview.c:309
 msgid "The completion object associated with the view"
 msgstr "Fullføringsobjekt assosiert med visningen"
 
-#: ../gtksourceview/gtksourceview.c:319
+#: ../gtksourceview/gtksourceview.c:321
 msgid "Show Line Numbers"
 msgstr "Vis linjenummer"
 
-#: ../gtksourceview/gtksourceview.c:320
+#: ../gtksourceview/gtksourceview.c:322
 msgid "Whether to display line numbers"
 msgstr "Om linjenummer skal vises"
 
-#: ../gtksourceview/gtksourceview.c:331
+#: ../gtksourceview/gtksourceview.c:333
 msgid "Show Line Marks"
 msgstr "Vis linjemarkører"
 
-#: ../gtksourceview/gtksourceview.c:332
+#: ../gtksourceview/gtksourceview.c:334
 msgid "Whether to display line mark pixbufs"
 msgstr "Om bilder skal vises for linjemarkører"
 
-#: ../gtksourceview/gtksourceview.c:359
+#: ../gtksourceview/gtksourceview.c:361
 msgid "Indent Width"
 msgstr "Bredde for innrykk"
 
-#: ../gtksourceview/gtksourceview.c:360
+#: ../gtksourceview/gtksourceview.c:362
 msgid "Number of spaces to use for each step of indent"
 msgstr "Antall mellomrom som skal brukes for hvert steg med innrykk"
 
-#: ../gtksourceview/gtksourceview.c:369
+#: ../gtksourceview/gtksourceview.c:371
 msgid "Auto Indentation"
 msgstr "Automatisk innrykk"
 
-#: ../gtksourceview/gtksourceview.c:370
+#: ../gtksourceview/gtksourceview.c:372
 msgid "Whether to enable auto indentation"
 msgstr "Om automatisk innrykk skal aktiveres"
 
-#: ../gtksourceview/gtksourceview.c:377
+#: ../gtksourceview/gtksourceview.c:379
 msgid "Insert Spaces Instead of Tabs"
 msgstr "Sett inn mellomrom i stedet for tabulator"
 
-#: ../gtksourceview/gtksourceview.c:378
+#: ../gtksourceview/gtksourceview.c:380
 msgid "Whether to insert spaces instead of tabs"
 msgstr "Om mellomrom skal settes inn i stedet for tabulator"
 
-#: ../gtksourceview/gtksourceview.c:390
+#: ../gtksourceview/gtksourceview.c:392
 msgid "Show Right Margin"
 msgstr "Vis høyre marg"
 
-#: ../gtksourceview/gtksourceview.c:391
+#: ../gtksourceview/gtksourceview.c:393
 msgid "Whether to display the right margin"
 msgstr "Om høyre marg skal vises"
 
-#: ../gtksourceview/gtksourceview.c:403
+#: ../gtksourceview/gtksourceview.c:405
 msgid "Right Margin Position"
 msgstr "Posisjon for høyre marg"
 
-#: ../gtksourceview/gtksourceview.c:404
+#: ../gtksourceview/gtksourceview.c:406
 msgid "Position of the right margin"
 msgstr "Posisjon for høyre marg"
 
-#: ../gtksourceview/gtksourceview.c:420
+#: ../gtksourceview/gtksourceview.c:422
 msgid "Smart Home/End"
 msgstr "Smart home/end"
 
-#: ../gtksourceview/gtksourceview.c:421
+#: ../gtksourceview/gtksourceview.c:423
 msgid ""
 "HOME and END keys move to first/last non whitespace characters on line "
 "before going to the start/end of the line"
@@ -3085,27 +3138,27 @@
 "HOME- og END-tastene flytter til første/siste tegn som ikke er mellomrom på "
 "linjen før de går til begynnelsen/slutten på linjen"
 
-#: ../gtksourceview/gtksourceview.c:431
+#: ../gtksourceview/gtksourceview.c:433
 msgid "Highlight current line"
 msgstr "Uthev aktiv linje"
 
-#: ../gtksourceview/gtksourceview.c:432
+#: ../gtksourceview/gtksourceview.c:434
 msgid "Whether to highlight the current line"
 msgstr "Om aktiv linje skal utheves"
 
-#: ../gtksourceview/gtksourceview.c:439
+#: ../gtksourceview/gtksourceview.c:441
 msgid "Indent on tab"
 msgstr "Rykk inn ved tabulator"
 
-#: ../gtksourceview/gtksourceview.c:440
+#: ../gtksourceview/gtksourceview.c:442
 msgid "Whether to indent the selected text when the tab key is pressed"
 msgstr "Om valgt tekst skal rykkes inn når tabulatortasten trykkes ned"
 
-#: ../gtksourceview/gtksourceview.c:454
+#: ../gtksourceview/gtksourceview.c:456
 msgid "Draw Spaces"
 msgstr "Tegn mellomrom"
 
-#: ../gtksourceview/gtksourceview.c:455
+#: ../gtksourceview/gtksourceview.c:457
 msgid "Set if and how the spaces should be visualized"
 msgstr "Sett hvis og hvordan mellomrom skal visualiseres"
 
@@ -3115,4 +3168,5 @@
 "Kjartan Maraas <kmaraas@gnome.org>\n"
 "\n"
 "Launchpad Contributions:\n"
-"  Kjartan Maraas https://launchpad.net/~kmaraas"
+"  Kjartan Maraas https://launchpad.net/~kmaraas\n"
+"  Åka Sikrom https://launchpad.net/~akrosikam"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtkspell.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtkspell.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtkspell.po	2013-01-29 09:33:51.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtkspell.po	2014-01-07 06:37:06.000000000 +0000
@@ -9,13 +9,13 @@
 "Report-Msgid-Bugs-To: nathan@silverorange.com\n"
 "POT-Creation-Date: 2012-03-22 12:09+0000\n"
 "PO-Revision-Date: 2009-10-04 14:04+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
+"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:53+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:03+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../gtkspell/gtkspell.c:356
 msgid "<i>(no suggestions)</i>"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtkspell3.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtkspell3.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gtkspell3.po	2013-01-29 09:33:51.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gtkspell3.po	2014-01-07 06:37:52.000000000 +0000
@@ -14,34 +14,33 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:37+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 21:08+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
-#: ../gtkspell/gtkspell.c:356
+#: ../gtkspell/gtkspell.c:428
 msgid "<i>(no suggestions)</i>"
 msgstr "<i>(ingen forslag)</i>"
 
-#: ../gtkspell/gtkspell.c:368
+#: ../gtkspell/gtkspell.c:444
 msgid "More..."
 msgstr "Flere..."
 
 #. + Add to Dictionary
-#: ../gtkspell/gtkspell.c:388
+#: ../gtkspell/gtkspell.c:465
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Legg til \"%s\" i ordboken"
 
-#. - Ignore All
-#: ../gtkspell/gtkspell.c:399
+#: ../gtkspell/gtkspell.c:480 ../gtkspell/gtkspell.c:482
 msgid "Ignore All"
 msgstr "Ignorer alle"
 
 #. on top: language selection
-#: ../gtkspell/gtkspell.c:494
+#: ../gtkspell/gtkspell.c:602
 msgid "Languages"
 msgstr ""
 
-#: ../gtkspell/gtkspell.c:584
+#: ../gtkspell/gtkspell.c:702
 #, c-format
 msgid "enchant error for language: %s"
 msgstr ""
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gucharmap.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gucharmap.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gucharmap.po	2013-01-29 09:34:03.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gucharmap.po	2014-01-07 06:37:04.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:41+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:48+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:773
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gvfs.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gvfs.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gvfs.po	2013-01-29 09:33:47.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gvfs.po	2014-01-07 06:37:30.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gvfs 1.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-21 00:32+0000\n"
+"POT-Creation-Date: 2013-03-21 17:03+0000\n"
 "PO-Revision-Date: 2012-02-08 10:38+0000\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -15,104 +15,106 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:19+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:02+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
-#: ../client/gdaemonfile.c:416 ../client/gdaemonfile.c:2774
+#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2828
 msgid "Operation not supported, files on different mounts"
 msgstr "Operasjonen er ikke støttet. Filer på forskjellige monteringspunkter"
 
-#: ../client/gdaemonfile.c:1363
+#: ../client/gdaemonfile.c:1412
 #, c-format
 msgid "Invalid return value from %s"
 msgstr "Ugyldig returverdi fra %s"
 
-#: ../client/gdaemonfile.c:1041 ../client/gdaemonfile.c:3117
-#: ../client/gvfsiconloadable.c:304
+#: ../client/gdaemonfile.c:1090 ../client/gdaemonfile.c:3171
+#: ../client/gvfsiconloadable.c:301 ../daemon/gvfsjobopenforread.c:183
+#: ../daemon/gvfsjobopenforwrite.c:267
 msgid "Couldn't get stream file descriptor"
 msgstr "Kunne ikke finne fildeskriptor for strøm"
 
-#: ../client/gdaemonfile.c:1170 ../client/gdaemonfile.c:1242
-#: ../client/gvfsiconloadable.c:129
+#: ../client/gdaemonfile.c:1219 ../client/gdaemonfile.c:1291
+#: ../client/gvfsiconloadable.c:127
 msgid "Didn't get stream file descriptor"
 msgstr "Fant ikke fildeskriptor for strøm"
 
 #. translators: this is an error message when there is no user visible "mount" object
 #. corresponding to a particular path/uri
-#: ../client/gdaemonfile.c:2248
+#: ../client/gdaemonfile.c:2302
 msgid "Could not find enclosing mount"
 msgstr "Kan ikke finne omsluttende montering"
 
-#: ../client/gdaemonfile.c:2284
+#: ../client/gdaemonfile.c:2338
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Ugyldig filnavn %s"
 
-#: ../client/gdaemonfile.c:2616 ../client/gdaemonvfs.c:1289
-#: ../client/gdaemonvfs.c:1341
+#: ../client/gdaemonfile.c:2670 ../client/gdaemonvfs.c:1288
+#: ../client/gdaemonvfs.c:1340
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "Feil under setting av metadata for fil: %s"
 
-#: ../client/gdaemonfile.c:2617 ../client/gdaemonvfs.c:1342
+#: ../client/gdaemonfile.c:2671 ../client/gdaemonvfs.c:1341
 msgid "values must be string or list of strings"
 msgstr "verdier må være av type streng eller liste med strenger"
 
-#: ../client/gdaemonfileenumerator.c:529 ../client/gdaemonfileenumerator.c:612
-#: ../client/gdaemonfileenumerator.c:663
-#: ../client/gdaemonfileinputstream.c:630
-#: ../client/gdaemonfileinputstream.c:783
-#: ../client/gdaemonfileinputstream.c:901
-#: ../client/gdaemonfileinputstream.c:1149
-#: ../client/gdaemonfileinputstream.c:1391
-#: ../client/gdaemonfileoutputstream.c:506
-#: ../client/gdaemonfileoutputstream.c:681
-#: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:734
-#: ../daemon/gvfsbackendobexftp.c:1111 ../daemon/gvfsbackendobexftp.c:1132
-#: ../daemon/gvfsbackendobexftp.c:1251 ../daemon/gvfsbackendobexftp.c:1388
-#: ../daemon/gvfsbackendobexftp.c:1452 ../daemon/gvfsbackendobexftp.c:1654
-#: ../daemon/gvfsbackendobexftp.c:1761 ../daemon/gvfsbackendobexftp.c:1923
-#: ../daemon/gvfsbackendobexftp.c:1950 ../daemon/gvfsbackendobexftp.c:2009
+#: ../client/gdaemonfileenumerator.c:554 ../client/gdaemonfileenumerator.c:637
+#: ../client/gdaemonfileenumerator.c:688
+#: ../client/gdaemonfileinputstream.c:642
+#: ../client/gdaemonfileinputstream.c:795
+#: ../client/gdaemonfileinputstream.c:915
+#: ../client/gdaemonfileinputstream.c:1166
+#: ../client/gdaemonfileinputstream.c:1411
+#: ../client/gdaemonfileoutputstream.c:517
+#: ../client/gdaemonfileoutputstream.c:695
+#: ../client/gdaemonfileoutputstream.c:890
+#: ../client/gdaemonfileoutputstream.c:1072 ../client/gvfsdaemondbus.c:626
+#: ../daemon/gvfsbackendobexftp.c:1113 ../daemon/gvfsbackendobexftp.c:1134
+#: ../daemon/gvfsbackendobexftp.c:1253 ../daemon/gvfsbackendobexftp.c:1390
+#: ../daemon/gvfsbackendobexftp.c:1454 ../daemon/gvfsbackendobexftp.c:1655
+#: ../daemon/gvfsbackendobexftp.c:1762 ../daemon/gvfsbackendobexftp.c:1924
+#: ../daemon/gvfsbackendobexftp.c:1951 ../daemon/gvfsbackendobexftp.c:2009
 #: ../daemon/gvfsbackendobexftp.c:2031 ../daemon/gvfsbackendobexftp.c:2094
-#: ../daemon/gvfsbackendobexftp.c:2113 ../daemon/gvfsbackendsmb.c:1180
+#: ../daemon/gvfsbackendobexftp.c:2113 ../daemon/gvfsbackendsmb.c:1263
 #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
-#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
+#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:332
 #: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1070
 #: ../monitor/proxy/gproxydrive.c:547 ../monitor/proxy/gproxydrive.c:635
 #: ../monitor/proxy/gproxydrive.c:785 ../monitor/proxy/gproxydrive.c:923
 #: ../monitor/proxy/gproxydrive.c:961 ../monitor/proxy/gproxydrive.c:1086
 #: ../monitor/proxy/gproxymount.c:501 ../monitor/proxy/gproxymount.c:586
-#: ../monitor/proxy/gproxyvolume.c:853 ../monitor/proxy/gproxyvolume.c:916
+#: ../monitor/proxy/gproxyvolume.c:859 ../monitor/proxy/gproxyvolume.c:923
 msgid "Operation was cancelled"
 msgstr "Operasjonen ble avbrutt"
 
-#: ../client/gdaemonfileinputstream.c:527
-#: ../client/gdaemonfileinputstream.c:535
-#: ../client/gdaemonfileinputstream.c:1684
-#: ../client/gdaemonfileinputstream.c:1694
-#: ../client/gdaemonfileoutputstream.c:450
-#: ../client/gdaemonfileoutputstream.c:458
-#: ../client/gdaemonfileoutputstream.c:1236
-#: ../client/gdaemonfileoutputstream.c:1246
+#: ../client/gdaemonfileinputstream.c:537
+#: ../client/gdaemonfileinputstream.c:545
+#: ../client/gdaemonfileinputstream.c:1705
+#: ../client/gdaemonfileinputstream.c:1715
+#: ../client/gdaemonfileoutputstream.c:459
+#: ../client/gdaemonfileoutputstream.c:467
+#: ../client/gdaemonfileoutputstream.c:1257
+#: ../client/gdaemonfileoutputstream.c:1267
 #, c-format
 msgid "Error in stream protocol: %s"
 msgstr "Feil i protokoll for strøm: %s"
 
-#: ../client/gdaemonfileinputstream.c:535
-#: ../client/gdaemonfileinputstream.c:1694
-#: ../client/gdaemonfileoutputstream.c:458
-#: ../client/gdaemonfileoutputstream.c:1246
+#: ../client/gdaemonfileinputstream.c:545
+#: ../client/gdaemonfileinputstream.c:1715
+#: ../client/gdaemonfileoutputstream.c:467
+#: ../client/gdaemonfileoutputstream.c:1267 ../daemon/gvfsbackendmtp.c:1836
+#: ../daemon/gvfsbackendmtp.c:2204
 msgid "End of stream"
 msgstr "Slutt på strømmen"
 
-#: ../client/gdaemonfileinputstream.c:1330
-#: ../client/gdaemonfileoutputstream.c:981
+#: ../client/gdaemonfileinputstream.c:1348
+#: ../client/gdaemonfileoutputstream.c:999
 msgid "Seek not supported on stream"
 msgstr "Søking ikke støttet på strøm"
 
-#: ../client/gdaemonvfs.c:813
+#: ../client/gdaemonvfs.c:812
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "Feil ved henting av informasjon om monteringspunkt: %s"
@@ -243,7 +245,7 @@
 msgid "mountpoint for %s already running"
 msgstr "monteringspunkt for %s kjører allerede"
 
-#: ../daemon/daemon-main.c:327
+#: ../daemon/daemon-main.c:335
 msgid "error starting mount daemon"
 msgstr "feil under oppstart av monteringstjenesten"
 
@@ -287,13 +289,13 @@
 msgid "Failed to connect to server (%s)"
 msgstr "Klarte ikke å koble til gjener (%s)"
 
-#: ../daemon/gvfsafpvolume.c:390 ../daemon/gvfsafpvolume.c:668
-#: ../daemon/gvfsafpvolume.c:821 ../daemon/gvfsafpvolume.c:1015
-#: ../daemon/gvfsafpvolume.c:1215 ../daemon/gvfsafpvolume.c:1398
-#: ../daemon/gvfsafpvolume.c:1555 ../daemon/gvfsafpvolume.c:2001
-#: ../daemon/gvfsafpvolume.c:2127 ../daemon/gvfsafpvolume.c:2289
-#: ../daemon/gvfsafpvolume.c:2509 ../daemon/gvfsbackendafc.c:286
-#: ../daemon/gvfsbackendsftp.c:307 ../daemon/gvfsbackendsftp.c:1827
+#: ../daemon/gvfsafpvolume.c:393 ../daemon/gvfsafpvolume.c:671
+#: ../daemon/gvfsafpvolume.c:824 ../daemon/gvfsafpvolume.c:1018
+#: ../daemon/gvfsafpvolume.c:1220 ../daemon/gvfsafpvolume.c:1403
+#: ../daemon/gvfsafpvolume.c:1560 ../daemon/gvfsafpvolume.c:2006
+#: ../daemon/gvfsafpvolume.c:2134 ../daemon/gvfsafpvolume.c:2296
+#: ../daemon/gvfsafpvolume.c:2516 ../daemon/gvfsbackendafc.c:286
+#: ../daemon/gvfsbackendsftp.c:309 ../daemon/gvfsbackendsftp.c:1831
 #: ../daemon/gvfsftptask.c:399
 msgid "Permission denied"
 msgstr "Tilgang nektet"
@@ -325,8 +327,8 @@
 msgid "Enter password for afp on %s"
 msgstr "Skriv inn passord for afp på %s"
 
-#: ../daemon/gvfsbackendftp.c:518 ../daemon/gvfsbackendsftp.c:981
-#: ../daemon/gvfsbackendsmbbrowse.c:1001 ../daemon/gvfsbackendsmb.c:620
+#: ../daemon/gvfsbackendftp.c:518 ../daemon/gvfsbackendsftp.c:984
+#: ../daemon/gvfsbackendsmbbrowse.c:1042 ../daemon/gvfsbackendsmb.c:667
 msgid "Password dialog cancelled"
 msgstr "Passorddialog avbrutt"
 
@@ -345,131 +347,134 @@
 msgid "Couldn't mount AFP volume %s on %s"
 msgstr "Kunne ikke montere AFP-volum %s på %s"
 
-#: ../daemon/gvfsafpvolume.c:394 ../daemon/gvfsafpvolume.c:1721
-#: ../daemon/gvfsafpvolume.c:2513 ../daemon/gvfsbackendafc.c:977
+#: ../daemon/gvfsafpvolume.c:397 ../daemon/gvfsafpvolume.c:1726
+#: ../daemon/gvfsafpvolume.c:2520 ../daemon/gvfsbackendafc.c:977
 #: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:327
-#: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:652
-#: ../daemon/gvfsbackendarchive.c:700 ../daemon/gvfsbackendarchive.c:752
-#: ../daemon/gvfsbackendarchive.c:781 ../daemon/gvfsbackendcdda.c:1012
+#: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:706
+#: ../daemon/gvfsbackendarchive.c:754 ../daemon/gvfsbackendarchive.c:806
+#: ../daemon/gvfsbackendarchive.c:835 ../daemon/gvfsbackendcdda.c:1022
 #: ../daemon/gvfsbackendcomputer.c:638 ../daemon/gvfsbackenddnssd.c:415
 #: ../daemon/gvfsbackendftp.c:1068 ../daemon/gvfsbackendnetwork.c:696
-#: ../daemon/gvfsbackendsmbbrowse.c:1100 ../daemon/gvfsbackendsmbbrowse.c:1167
-#: ../daemon/gvfsbackendsmbbrowse.c:1354 ../daemon/gvfsbackendsmbbrowse.c:1427
+#: ../daemon/gvfsbackendsmbbrowse.c:1147 ../daemon/gvfsbackendsmbbrowse.c:1214
+#: ../daemon/gvfsbackendsmbbrowse.c:1401 ../daemon/gvfsbackendsmbbrowse.c:1474
 #, c-format
 msgid "File doesn't exist"
 msgstr "Filen eksisterer ikke"
 
-#: ../daemon/gvfsafpvolume.c:398 ../daemon/gvfsafpvolume.c:468
-#: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafp.c:277
-#: ../daemon/gvfsbackendafp.c:478 ../daemon/gvfsbackendafp.c:1310
+#: ../daemon/gvfsafpvolume.c:401 ../daemon/gvfsafpvolume.c:471
+#: ../daemon/gvfsafpvolume.c:2524 ../daemon/gvfsbackendafp.c:277
+#: ../daemon/gvfsbackendafp.c:478 ../daemon/gvfsbackendafp.c:1302
 #: ../daemon/gvfsbackenddav.c:2241 ../daemon/gvfsbackendftp.c:774
-#: ../daemon/gvfsbackendsftp.c:2339 ../daemon/gvfsbackendsftp.c:3055
-#: ../daemon/gvfsbackendsftp.c:3394 ../daemon/gvfsbackendsftp.c:4264
+#: ../daemon/gvfsbackendsftp.c:2343 ../daemon/gvfsbackendsftp.c:3087
+#: ../daemon/gvfsbackendsftp.c:3434 ../daemon/gvfsbackendsftp.c:4333
+#: ../daemon/gvfsbackendsftp.c:5215
 msgid "File is directory"
 msgstr "Filen er en katalog"
 
-#: ../daemon/gvfsafpvolume.c:402
+#: ../daemon/gvfsafpvolume.c:405
 msgid "Too many files open"
 msgstr "For mange åpne filer"
 
-#: ../daemon/gvfsafpvolume.c:672 ../daemon/gvfsafpvolume.c:829
+#: ../daemon/gvfsafpvolume.c:675 ../daemon/gvfsafpvolume.c:832
 msgid "Target file is open"
 msgstr "Målfilen er åpen"
 
-#: ../daemon/gvfsafpvolume.c:676 ../daemon/gvfsbackendburn.c:421
-#: ../daemon/gvfsbackenddav.c:2582 ../daemon/gvfsbackendsftp.c:1821
+#: ../daemon/gvfsafpvolume.c:679 ../daemon/gvfsbackendburn.c:421
+#: ../daemon/gvfsbackenddav.c:2581 ../daemon/gvfsbackendsftp.c:1825
 msgid "Directory not empty"
 msgstr "Katalogen er ikke tom"
 
-#: ../daemon/gvfsafpvolume.c:680
+#: ../daemon/gvfsafpvolume.c:683
 msgid "Target object is marked as not deletable (DeleteInhibit)"
 msgstr "Målobjektet er merket som ikke slettbart (DeleteInhibit)"
 
-#: ../daemon/gvfsafpvolume.c:684 ../daemon/gvfsafpvolume.c:1231
-#: ../daemon/gvfsafpvolume.c:2131
+#: ../daemon/gvfsafpvolume.c:687 ../daemon/gvfsafpvolume.c:1236
+#: ../daemon/gvfsafpvolume.c:2138
 msgid "Target object doesn't exist"
 msgstr "Målobjektet eksisterer ikke"
 
-#: ../daemon/gvfsafpvolume.c:688 ../daemon/gvfsafpvolume.c:841
-#: ../daemon/gvfsafpvolume.c:1035 ../daemon/gvfsafpvolume.c:1235
-#: ../daemon/gvfsafpvolume.c:2135
+#: ../daemon/gvfsafpvolume.c:691 ../daemon/gvfsafpvolume.c:844
+#: ../daemon/gvfsafpvolume.c:1040 ../daemon/gvfsafpvolume.c:1240
+#: ../daemon/gvfsafpvolume.c:2142
 msgid "Volume is read-only"
 msgstr "Volumet er skrivebeskyttet"
 
-#: ../daemon/gvfsafpvolume.c:825 ../daemon/gvfsafpvolume.c:1019
-#: ../daemon/gvfsafpvolume.c:1567 ../daemon/gvfsafpvolume.c:2005
-#: ../daemon/gvfsafpvolume.c:2647
+#: ../daemon/gvfsafpvolume.c:828 ../daemon/gvfsafpvolume.c:1022
+#: ../daemon/gvfsafpvolume.c:1572 ../daemon/gvfsafpvolume.c:2010
+#: ../daemon/gvfsafpvolume.c:2654
 msgid "Not enough space on volume"
 msgstr "Ikke nok plass på volumet"
 
-#: ../daemon/gvfsafpvolume.c:833 ../daemon/gvfsafpvolume.c:1414
-#: ../daemon/gvfsafpvolume.c:1571 ../daemon/gvfsbackendafp.c:284
-#: ../daemon/gvfsbackendafp.c:485 ../daemon/gvfsbackenddav.c:2297
-#: ../daemon/gvfsbackenddav.c:2544 ../daemon/gvfsbackenddav.c:2650
+#: ../daemon/gvfsafpvolume.c:836 ../daemon/gvfsafpvolume.c:1419
+#: ../daemon/gvfsafpvolume.c:1576 ../daemon/gvfsbackendafp.c:284
+#: ../daemon/gvfsbackendafp.c:485 ../daemon/gvfsbackenddav.c:2296
+#: ../daemon/gvfsbackenddav.c:2543 ../daemon/gvfsbackenddav.c:2649
 #: ../daemon/gvfsbackendftp.c:753 ../daemon/gvfsbackendftp.c:934
-#: ../daemon/gvfsbackendftp.c:1373 ../daemon/gvfsbackendftp.c:1553
-#: ../daemon/gvfsbackendsftp.c:4273 ../daemon/gvfsbackendsmb.c:2105
+#: ../daemon/gvfsbackendftp.c:1374 ../daemon/gvfsbackendftp.c:1560
+#: ../daemon/gvfsbackendmtp.c:1391 ../daemon/gvfsbackendmtp.c:1500
+#: ../daemon/gvfsbackendsftp.c:4342 ../daemon/gvfsbackendsmb.c:2193
 msgid "Target file already exists"
 msgstr "Målfilen eksisterer allerede"
 
-#: ../daemon/gvfsafpvolume.c:837 ../daemon/gvfsafpvolume.c:1027
+#: ../daemon/gvfsafpvolume.c:840 ../daemon/gvfsafpvolume.c:1032
 msgid "Ancestor directory doesn't exist"
 msgstr "Opphavskatalogen eksisterer ikke"
 
-#: ../daemon/gvfsafpvolume.c:1023
+#. Translators: flat means volume doesn't support directories
+#. (all files are in the volume root)
+#: ../daemon/gvfsafpvolume.c:1028
 msgid "Volume is flat and doesn't support directories"
 msgstr "Volumet er flatt og støtter ikke kataloger"
 
-#: ../daemon/gvfsafpvolume.c:1031
+#: ../daemon/gvfsafpvolume.c:1036
 msgid "Target directory already exists"
 msgstr "Målkatalogen eksisterer allerede"
 
-#: ../daemon/gvfsafpvolume.c:1219 ../daemon/gvfsbackendafp.c:590
-#: ../daemon/gvfsbackendmtp.c:1382
+#: ../daemon/gvfsafpvolume.c:1224 ../daemon/gvfsbackendafp.c:590
 msgid "Can't rename volume"
 msgstr "Kan ikke endre navn på volumet"
 
-#: ../daemon/gvfsafpvolume.c:1223
+#: ../daemon/gvfsafpvolume.c:1228
 msgid "Object with that name already exists"
 msgstr "Et objekt med dette navnet eksisterer allerede"
 
-#: ../daemon/gvfsafpvolume.c:1227
+#: ../daemon/gvfsafpvolume.c:1232
 msgid "Target object is marked as not renameable (RenameInhibit)"
 msgstr "Kan ikke endre navn på målobjektet (RenameInhibit)"
 
-#: ../daemon/gvfsafpvolume.c:1402
+#: ../daemon/gvfsafpvolume.c:1407
 msgid "Can't move directory into one of its descendants"
 msgstr "Kan ikke flytte katalogen inn i en underkatalog"
 
-#: ../daemon/gvfsafpvolume.c:1406
+#: ../daemon/gvfsafpvolume.c:1411
 msgid "Can't move sharepoint into a shared directory"
 msgstr "Kan ikke flytte delingspunkt inn i en delt katalog"
 
-#: ../daemon/gvfsafpvolume.c:1410
+#: ../daemon/gvfsafpvolume.c:1415
 msgid "Can't move a shared directory into the Trash"
 msgstr "Kan ikke flytte en delt katalog til papirkurven"
 
-#: ../daemon/gvfsafpvolume.c:1418
+#: ../daemon/gvfsafpvolume.c:1423
 msgid "Object being moved is marked as not renameable (RenameInhibit)"
 msgstr "Kan ikke endre navn på objektet som flyttes (RenameInhibit)"
 
-#: ../daemon/gvfsafpvolume.c:1422
+#: ../daemon/gvfsafpvolume.c:1427
 msgid "Object being moved doesn't exist"
 msgstr "Objektet som flyttes eksisterer ikke"
 
-#: ../daemon/gvfsafpvolume.c:1559
+#: ../daemon/gvfsafpvolume.c:1564
 msgid "Server doesn't support the FPCopyFile operation"
 msgstr "Tjener støtter ikke FPCopyFile-operasjonen"
 
-#: ../daemon/gvfsafpvolume.c:1563
+#: ../daemon/gvfsafpvolume.c:1568
 msgid "Unable to open source file for reading"
 msgstr "Kan ikke åpne kildefilen for lesing"
 
-#: ../daemon/gvfsafpvolume.c:1575
+#: ../daemon/gvfsafpvolume.c:1580
 msgid "Source file and/or destination directory doesn't exist"
 msgstr "Kildefil og/eller målkatalog eksisterer ikke"
 
-#: ../daemon/gvfsafpvolume.c:1579
+#: ../daemon/gvfsafpvolume.c:1584
 msgid "Source file is a directory"
 msgstr "Kildefilen er en katalog"
 
@@ -477,23 +482,27 @@
 msgid "ID not found"
 msgstr "ID ikke funnet"
 
-#: ../daemon/gvfsafpvolume.c:2009
+#. Translators: range conflict means
+#. requested data are locked by another user
+#: ../daemon/gvfsafpvolume.c:2016
 msgid "Range lock conflict exists"
 msgstr "Konflikt i områdelås eksisterer"
 
-#: ../daemon/gvfsafpvolume.c:2293
+#: ../daemon/gvfsafpvolume.c:2300 ../daemon/gvfsbackendmtp.c:1181
+#: ../daemon/gvfsbackendmtp.c:1323 ../daemon/gvfsbackendmtp.c:1509
+#: ../daemon/gvfsbackendmtp.c:1957
 msgid "Directory doesn't exist"
 msgstr "Katalogen eksisterer ikke"
 
-#: ../daemon/gvfsafpvolume.c:2297
+#: ../daemon/gvfsafpvolume.c:2304
 msgid "Target object is not a directory"
 msgstr "Målobjektet er ikke en katalog"
 
-#: ../daemon/gvfsafpvolume.c:2643
+#: ../daemon/gvfsafpvolume.c:2650
 msgid "File is not open for write access"
 msgstr "Filen er ikke åpen for skrivetilgang"
 
-#: ../daemon/gvfsafpvolume.c:2790
+#: ../daemon/gvfsafpvolume.c:2796
 msgid "File is not open for read access"
 msgstr "Filen er ikke åpen for lesetilgang"
 
@@ -502,7 +511,9 @@
 msgstr "Intern Apple File Control feil"
 
 #: ../daemon/gvfsbackendafc.c:213 ../daemon/gvfsbackendftp.c:737
-#: ../daemon/gvfsbackendmtp.c:1190
+#: ../daemon/gvfsbackendmtp.c:1366 ../daemon/gvfsbackendmtp.c:1404
+#: ../daemon/gvfsbackendmtp.c:1592 ../daemon/gvfsbackendmtp.c:1637
+#: ../daemon/gvfsbackendmtp.c:1705 ../daemon/gvfsbackendmtp.c:2031
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
@@ -561,39 +572,39 @@
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "Ikke håndtert feil i libimobiledevice (%d)"
 
-#: ../daemon/gvfsbackendafc.c:417
+#: ../daemon/gvfsbackendafc.c:412
 msgid "Try again"
 msgstr "Prøv igjen"
 
-#: ../daemon/gvfsbackendafc.c:417 ../daemon/gvfsbackend.c:968
+#: ../daemon/gvfsbackendafc.c:412 ../daemon/gvfsbackend.c:978
 #: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923
 #: ../monitor/udisks2/gvfsudisks2mount.c:762
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../daemon/gvfsbackendafc.c:435 ../daemon/gvfsbackendarchive.c:554
-#: ../daemon/gvfsbackendarchive.c:583 ../daemon/gvfsbackenddav.c:1825
-#: ../daemon/gvfsbackendhttp.c:316 ../daemon/gvfsbackendobexftp.c:885
-#: ../daemon/gvfsbackendobexftp.c:901 ../daemon/gvfsbackendobexftp.c:920
-#: ../daemon/gvfsbackendsmb.c:663
+#: ../daemon/gvfsbackendafc.c:430 ../daemon/gvfsbackendarchive.c:608
+#: ../daemon/gvfsbackendarchive.c:637 ../daemon/gvfsbackenddav.c:1825
+#: ../daemon/gvfsbackendhttp.c:310 ../daemon/gvfsbackendobexftp.c:887
+#: ../daemon/gvfsbackendobexftp.c:903 ../daemon/gvfsbackendobexftp.c:922
+#: ../daemon/gvfsbackendsmb.c:712
 msgid "Invalid mount spec"
 msgstr "Ugyldige monteringsspesifikasjon"
 
-#: ../daemon/gvfsbackendafc.c:441 ../daemon/gvfsbackendafc.c:471
+#: ../daemon/gvfsbackendafc.c:436 ../daemon/gvfsbackendafc.c:466
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr "Ugyldig AFC-adresse: må være på formen afc://uuid:port-nummer"
 
-#: ../daemon/gvfsbackendafc.c:457
+#: ../daemon/gvfsbackendafc.c:452
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "Apple mobil enhet"
 
-#: ../daemon/gvfsbackendafc.c:462
+#: ../daemon/gvfsbackendafc.c:457
 #, c-format
 msgid "Apple Mobile Device, Jailbroken"
 msgstr "Apple mobil enhet, brutt ut av fengsel"
 
-#: ../daemon/gvfsbackendafc.c:467
+#: ../daemon/gvfsbackendafc.c:462
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "Dokumenter på mobil enhet fra Apple"
@@ -601,7 +612,7 @@
 #. translators:
 #. * This is the device name, with the service being browsed in brackets, eg.:
 #. * Alan Smithee's iPhone (jailbreak)
-#: ../daemon/gvfsbackendafc.c:526
+#: ../daemon/gvfsbackendafc.c:521
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s (fengselsutbrudd)"
@@ -609,7 +620,7 @@
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:533 ../monitor/afc/afcvolume.c:128
+#: ../daemon/gvfsbackendafc.c:528 ../monitor/afc/afcvolume.c:130
 #, c-format
 msgid "Documents on %s"
 msgstr "Dokumenter på %s"
@@ -625,10 +636,10 @@
 msgstr ""
 "Enhet «%s» er låst. Oppgi passord på enheten og klikk på «Prøv igjen»."
 
-#: ../daemon/gvfsbackendafc.c:967 ../daemon/gvfsbackendarchive.c:660
-#: ../daemon/gvfsbackendcomputer.c:656 ../daemon/gvfsbackendgphoto2.c:1854
-#: ../daemon/gvfsbackendobexftp.c:1097 ../daemon/gvfsbackendrecent.c:121
-#: ../daemon/gvfsbackendsmb.c:719 ../daemon/gvfsbackendtrash.c:232
+#: ../daemon/gvfsbackendafc.c:967 ../daemon/gvfsbackendarchive.c:714
+#: ../daemon/gvfsbackendcomputer.c:656 ../daemon/gvfsbackendgphoto2.c:1856
+#: ../daemon/gvfsbackendobexftp.c:1099 ../daemon/gvfsbackendrecent.c:121
+#: ../daemon/gvfsbackendsmb.c:802 ../daemon/gvfsbackendtrash.c:233
 msgid "Can't open directory"
 msgstr "Kan ikke åpne katalog"
 
@@ -640,16 +651,18 @@
 msgid "Invalid seek type"
 msgstr "Ugyldig type søk"
 
-#: ../daemon/gvfsbackendafc.c:2369 ../daemon/gvfsbackendafp.c:1749
+#: ../daemon/gvfsbackendafc.c:2369 ../daemon/gvfsbackendafp.c:1741
 #: ../daemon/gvfsbackendftp.c:1088 ../daemon/gvfsbackendftp.c:1136
-#: ../daemon/gvfsbackendftp.c:1157 ../daemon/gvfsbackendsftp.c:1825
-#: ../daemon/gvfsbackendsftp.c:4621 ../daemon/gvfsbackendsmb.c:1742
+#: ../daemon/gvfsbackendftp.c:1157 ../daemon/gvfsbackendmtp.c:1694
+#: ../daemon/gvfsbackendmtp.c:1933 ../daemon/gvfsbackendmtp.c:2020
+#: ../daemon/gvfsbackendmtp.c:2087 ../daemon/gvfsbackendsftp.c:1829
+#: ../daemon/gvfsbackendsftp.c:4690 ../daemon/gvfsbackendsmb.c:1831
 #: ../daemon/gvfsftptask.c:391
 msgid "Operation unsupported"
 msgstr "Operasjonen støttes ikke"
 
-#: ../daemon/gvfsbackendafpbrowse.c:218 ../daemon/gvfsbackendsmbbrowse.c:1095
-#: ../daemon/gvfsbackendsmbbrowse.c:1141
+#: ../daemon/gvfsbackendafpbrowse.c:218 ../daemon/gvfsbackendsmbbrowse.c:1142
+#: ../daemon/gvfsbackendsmbbrowse.c:1188
 msgid "The file is not a mountable"
 msgstr "Filen er ikke monterbar"
 
@@ -665,48 +678,48 @@
 msgid "AFP volumes on %s"
 msgstr "AFP-volum på %s"
 
-#: ../daemon/gvfsbackendafpbrowse.c:498 ../daemon/gvfsbackendafp.c:2101
-#: ../daemon/gvfsbackendarchive.c:543 ../daemon/gvfsbackendftp.c:668
-#: ../daemon/gvfsbackendsftp.c:1738
+#: ../daemon/gvfsbackendafpbrowse.c:498 ../daemon/gvfsbackendafp.c:2099
+#: ../daemon/gvfsbackendarchive.c:597 ../daemon/gvfsbackendftp.c:668
+#: ../daemon/gvfsbackendsftp.c:1742
 msgid "No hostname specified"
 msgstr "Ingen vertsnavn oppgitt"
 
-#: ../daemon/gvfsbackendafpbrowse.c:568 ../daemon/gvfsbackendafp.c:2192
+#: ../daemon/gvfsbackendafpbrowse.c:568 ../daemon/gvfsbackendafp.c:2190
 msgid "Apple Filing Protocol Service"
 msgstr "Apple Filing Protocol Service"
 
 #: ../daemon/gvfsbackendafp.c:274 ../daemon/gvfsbackendburn.c:875
-#: ../daemon/gvfsbackendftp.c:1545 ../daemon/gvfsbackendobexftp.c:1805
+#: ../daemon/gvfsbackendftp.c:1552 ../daemon/gvfsbackendobexftp.c:1806
 msgid "Can't copy directory over directory"
 msgstr "Kan ikke kopiere katalog over katalog"
 
 #: ../daemon/gvfsbackendafp.c:293 ../daemon/gvfsbackendburn.c:891
-#: ../daemon/gvfsbackendftp.c:1568 ../daemon/gvfsbackendmtp.c:1200
-#: ../daemon/gvfsbackendmtp.c:1276 ../daemon/gvfsbackendobexftp.c:1820
+#: ../daemon/gvfsbackendftp.c:1575 ../daemon/gvfsbackendmtp.c:1414
+#: ../daemon/gvfsbackendmtp.c:1521 ../daemon/gvfsbackendobexftp.c:1821
 msgid "Can't recursively copy directory"
 msgstr "Kan ikke kopiere katalog rekursivt"
 
-#: ../daemon/gvfsbackendafp.c:475 ../daemon/gvfsbackendsftp.c:4259
-#: ../daemon/gvfsbackendsmb.c:2094
+#: ../daemon/gvfsbackendafp.c:475 ../daemon/gvfsbackendsftp.c:4328
+#: ../daemon/gvfsbackendsmb.c:2182
 msgid "Can't move directory over directory"
 msgstr "Kan ikke flytte katalog over katalog"
 
-#: ../daemon/gvfsbackendafp.c:1229 ../daemon/gvfsbackendafp.c:1328
+#: ../daemon/gvfsbackendafp.c:1221 ../daemon/gvfsbackendafp.c:1320
 msgid "backups not supported"
 msgstr "sikkerhetskopier er ikke støttet"
 
-#: ../daemon/gvfsbackendafp.c:1243
+#: ../daemon/gvfsbackendafp.c:1235
 #, c-format
 msgid "Unable to create temporary file (%s)"
 msgstr "Kan ikke opprette midlertidig fil (%s)"
 
-#: ../daemon/gvfsbackendafp.c:1317 ../daemon/gvfsbackenddav.c:2370
-#: ../daemon/gvfsbackendsftp.c:3407 ../daemon/gvfsbackendsmb.c:1149
+#: ../daemon/gvfsbackendafp.c:1309 ../daemon/gvfsbackenddav.c:2369
+#: ../daemon/gvfsbackendsftp.c:3449 ../daemon/gvfsbackendsmb.c:1232
 msgid "The file was externally modified"
 msgstr "Filen er endret eksternt"
 
-#: ../daemon/gvfsbackendafp.c:1733 ../daemon/gvfsbackendftp.c:1129
-#: ../daemon/gvfsbackendsftp.c:4631
+#: ../daemon/gvfsbackendafp.c:1725 ../daemon/gvfsbackendftp.c:1129
+#: ../daemon/gvfsbackendsftp.c:4700
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Ugyldig type attributt (uint32 forventet)"
 
@@ -722,23 +735,23 @@
 msgid "AFP volume %s on %s"
 msgstr "AFP-volum %s på %s"
 
-#: ../daemon/gvfsbackendafp.c:2110
+#: ../daemon/gvfsbackendafp.c:2108
 msgid "No volume specified"
 msgstr "Ingen volumer oppgitt"
 
 #. FIXME: this should really be "/ in %s", but can't change
 #. due to string freeze.
 #. Translators: This is the name of the root of an SFTP share, like "/ on <hostname>"
-#: ../daemon/gvfsbackendarchive.c:331 ../daemon/gvfsbackendsftp.c:2275
+#: ../daemon/gvfsbackendarchive.c:336 ../daemon/gvfsbackendsftp.c:2279
 #: ../daemon/gvfsftpdircache.c:431
 #, c-format
 msgid "/ on %s"
 msgstr "/ på %s"
 
-#: ../daemon/gvfsbackendarchive.c:790 ../daemon/gvfsbackendburn.c:679
+#: ../daemon/gvfsbackendarchive.c:844 ../daemon/gvfsbackendburn.c:679
 #: ../daemon/gvfsbackendcomputer.c:728 ../daemon/gvfsbackenddnssd.c:464
 #: ../daemon/gvfsbackendftp.c:351 ../daemon/gvfsbackendnetwork.c:744
-#: ../daemon/gvfsbackendsftp.c:3867 ../daemon/gvfsftpdircache.c:157
+#: ../daemon/gvfsbackendsftp.c:3936 ../daemon/gvfsftpdircache.c:157
 msgid "The file is not a directory"
 msgstr "Filen er ikke en katalog"
 
@@ -756,17 +769,17 @@
 #: ../daemon/gvfsbackendburn.c:716 ../daemon/gvfsbackendburn.c:742
 #: ../daemon/gvfsbackendburn.c:780 ../daemon/gvfsbackendburn.c:971
 #: ../daemon/gvfsbackendburn.c:1007 ../daemon/gvfsbackendftp.c:794
-#: ../daemon/gvfsbackendgphoto2.c:1238 ../daemon/gvfsbackendgphoto2.c:2175
-#: ../daemon/gvfsbackendgphoto2.c:2894 ../daemon/gvfsbackendrecent.c:105
-#: ../daemon/gvfsbackendrecent.c:259 ../daemon/gvfsbackendsftp.c:1829
-#: ../daemon/gvfsbackendsftp.c:2935 ../daemon/gvfsbackendsftp.c:2948
-#: ../daemon/gvfsbackendsftp.c:2968 ../daemon/gvfsbackendtrash.c:216
+#: ../daemon/gvfsbackendgphoto2.c:1238 ../daemon/gvfsbackendgphoto2.c:2177
+#: ../daemon/gvfsbackendgphoto2.c:2895 ../daemon/gvfsbackendrecent.c:105
+#: ../daemon/gvfsbackendrecent.c:259 ../daemon/gvfsbackendsftp.c:1833
+#: ../daemon/gvfsbackendsftp.c:2967 ../daemon/gvfsbackendsftp.c:2980
+#: ../daemon/gvfsbackendsftp.c:3000 ../daemon/gvfsbackendtrash.c:217
 #, c-format
 msgid "No such file or directory"
 msgstr "Filen eller katalogen finnes ikke"
 
 #: ../daemon/gvfsbackendburn.c:455 ../daemon/gvfsbackendburn.c:903
-#: ../daemon/gvfsbackendobexftp.c:1836
+#: ../daemon/gvfsbackendobexftp.c:1837
 msgid "Can't copy file over directory"
 msgstr "Kan ikke kopiere fil over katalog"
 
@@ -778,7 +791,7 @@
 #: ../daemon/gvfsbackendburn.c:752 ../daemon/gvfsbackendburn.c:788
 #: ../daemon/gvfsbackendburn.c:923 ../daemon/gvfsbackendburn.c:985
 #: ../daemon/gvfsbackendburn.c:989 ../daemon/gvfsbackendburn.c:999
-#: ../daemon/gvfsbackendgphoto2.c:2968
+#: ../daemon/gvfsbackendgphoto2.c:2969
 msgid "File exists"
 msgstr "Filen eksisterer"
 
@@ -803,7 +816,7 @@
 #: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120
 #: ../monitor/gdu/ggdumount.c:1174 ../monitor/gdu/ggdumount.c:1258
 #: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1134
-#: ../monitor/udisks2/gvfsudisks2volume.c:1675
+#: ../monitor/udisks2/gvfsudisks2volume.c:1673
 msgid "Operation not supported by backend"
 msgstr "Operasjonen ikke tillatt av motoren"
 
@@ -811,24 +824,25 @@
 msgid "No such file or directory in target path"
 msgstr "Fil eller katalog finnes ikke i målsti"
 
-#: ../daemon/gvfsbackendburn.c:884 ../daemon/gvfsbackendobexftp.c:1813
-#: ../daemon/gvfsbackendobexftp.c:1844 ../daemon/gvfsbackendsftp.c:1823
-#: ../daemon/gvfsbackendsftp.c:4429
+#: ../daemon/gvfsbackendburn.c:884 ../daemon/gvfsbackendobexftp.c:1814
+#: ../daemon/gvfsbackendobexftp.c:1845 ../daemon/gvfsbackendsftp.c:1827
+#: ../daemon/gvfsbackendsftp.c:4498
 msgid "Target file exists"
 msgstr "Målfilen eksisterer"
 
 #: ../daemon/gvfsbackendburn.c:949 ../daemon/gvfsbackendcomputer.c:811
-#: ../daemon/gvfsbackendgphoto2.c:2548 ../daemon/gvfsbackendgphoto2.c:2757
-#: ../daemon/gvfsbackendgphoto2.c:2854 ../daemon/gvfsbackendgphoto2.c:2947
+#: ../daemon/gvfsbackendgphoto2.c:2545 ../daemon/gvfsbackendgphoto2.c:2758
+#: ../daemon/gvfsbackendgphoto2.c:2855 ../daemon/gvfsbackendgphoto2.c:2948
+#: ../daemon/gvfsbackendsftp.c:5329 ../daemon/gvfsbackendsftp.c:5361
 msgid "Not supported"
 msgstr "Ikke støttet"
 
-#: ../daemon/gvfsbackend.c:967 ../monitor/gdu/ggdumount.c:922
+#: ../daemon/gvfsbackend.c:977 ../monitor/gdu/ggdumount.c:922
 #: ../monitor/udisks2/gvfsudisks2mount.c:760
 msgid "Unmount Anyway"
 msgstr "Avmonter likevel"
 
-#: ../daemon/gvfsbackend.c:970 ../monitor/gdu/ggdumount.c:924
+#: ../daemon/gvfsbackend.c:980 ../monitor/gdu/ggdumount.c:924
 #: ../monitor/udisks2/gvfsudisks2mount.c:763
 msgid ""
 "Volume is busy\n"
@@ -837,81 +851,81 @@
 "Volumet er opptatt\n"
 "Et eller flere programmer holder volumet opptatt."
 
-#: ../daemon/gvfsbackendcdda.c:354 ../daemon/gvfsbackendgphoto2.c:1548
-#: ../daemon/gvfsbackendmtp.c:440
+#: ../daemon/gvfsbackendcdda.c:356 ../daemon/gvfsbackendgphoto2.c:1548
+#: ../daemon/gvfsbackendmtp.c:691
 msgid "Cannot create gudev client"
 msgstr "Kan ikke opprette gudev-klient"
 
-#: ../daemon/gvfsbackendcdda.c:374 ../daemon/gvfsbackendgphoto2.c:1566
+#: ../daemon/gvfsbackendcdda.c:376 ../daemon/gvfsbackendgphoto2.c:1566
 msgid "Cannot connect to the system bus"
 msgstr "Kunne ikke koble til systembussen"
 
-#: ../daemon/gvfsbackendcdda.c:385 ../daemon/gvfsbackendgphoto2.c:1578
+#: ../daemon/gvfsbackendcdda.c:387 ../daemon/gvfsbackendgphoto2.c:1578
 msgid "Cannot create libhal context"
 msgstr "Kan ikke lage libhal-kontekst"
 
-#: ../daemon/gvfsbackendcdda.c:399 ../daemon/gvfsbackendgphoto2.c:1591
+#: ../daemon/gvfsbackendcdda.c:401 ../daemon/gvfsbackendgphoto2.c:1591
 msgid "Cannot initialize libhal"
 msgstr "Kan ikke initiere libhal"
 
-#: ../daemon/gvfsbackendcdda.c:415 ../daemon/gvfsbackendcdda.c:501
+#: ../daemon/gvfsbackendcdda.c:417 ../daemon/gvfsbackendcdda.c:503
 msgid "No drive specified"
 msgstr "Ingen stasjon oppgitt"
 
-#: ../daemon/gvfsbackendcdda.c:439
+#: ../daemon/gvfsbackendcdda.c:441
 #, c-format
 msgid "Cannot find drive %s"
 msgstr "Kan ikke finne stasjon %s"
 
-#: ../daemon/gvfsbackendcdda.c:452
+#: ../daemon/gvfsbackendcdda.c:454
 #, c-format
 msgid "Drive %s does not contain audio files"
 msgstr "Stasjon %s inneholder ikke lydfiler"
 
 #. Translator: %s is the device the disc is inserted into. 'cdda' is the name
 #. name of the backend and shouldn't be translated.
-#: ../daemon/gvfsbackendcdda.c:462
+#: ../daemon/gvfsbackendcdda.c:464
 #, c-format
 msgid "cdda mount on %s"
 msgstr "cdda montert på %s"
 
-#: ../daemon/gvfsbackendcdda.c:463 ../daemon/gvfsbackendcdda.c:984
+#: ../daemon/gvfsbackendcdda.c:465 ../daemon/gvfsbackendcdda.c:986
 #: ../monitor/gdu/ggduvolume.c:349 ../monitor/hal/ghalmount.c:325
 #: ../monitor/hal/ghalvolume.c:225 ../monitor/hal/ghalvolume.c:246
-#: ../monitor/udisks2/gvfsudisks2volume.c:358
+#: ../monitor/udisks2/gvfsudisks2volume.c:356
 #, c-format
 msgid "Audio Disc"
 msgstr "Lyd-plate"
 
-#: ../daemon/gvfsbackendcdda.c:527
+#: ../daemon/gvfsbackendcdda.c:529
 #, c-format
 msgid "File system is busy: %d open file"
 msgid_plural "File system is busy: %d open files"
 msgstr[0] "Filsystemet er opptatt: %d åpen fil"
 msgstr[1] "Filsystemet er opptatt: %d åpne filer"
 
-#: ../daemon/gvfsbackendcdda.c:719
+#: ../daemon/gvfsbackendcdda.c:721
 #, c-format
 msgid "No such file %s on drive %s"
 msgstr "Fil %s finnes ikke på lager %s"
 
 #. Translators: paranoia is the name of the cd audio reading library
-#: ../daemon/gvfsbackendcdda.c:828
+#: ../daemon/gvfsbackendcdda.c:830
 #, c-format
 msgid "Error from 'paranoia' on drive %s"
 msgstr "Feil fra «paranoia» på stasjon %s"
 
-#: ../daemon/gvfsbackendcdda.c:891
+#: ../daemon/gvfsbackendcdda.c:893
 #, c-format
 msgid "Error seeking in stream on drive %s"
 msgstr "Feil ved søking i strøm på stasjon %s"
 
-#: ../daemon/gvfsbackendcdda.c:1005 ../daemon/gvfsbackendgphoto2.c:1862
+#: ../daemon/gvfsbackendcdda.c:1015 ../daemon/gvfsbackendgphoto2.c:1864
 #, c-format
 msgid "No such file"
 msgstr "Filen finnes ikke"
 
-#: ../daemon/gvfsbackendcdda.c:1019
+#: ../daemon/gvfsbackendcdda.c:1029
 #, c-format
 msgid "The file does not exist or isn't an audio track"
 msgstr "Filen eksisterer ikke eller er ikke et lydspor"
@@ -932,30 +946,30 @@
 msgid "Can't open mountable file"
 msgstr "Kan ikke åpne monterbar fil"
 
-#: ../daemon/gvfsbackendcomputer.c:857 ../daemon/gvfsbackendsftp.c:1158
+#: ../daemon/gvfsbackendcomputer.c:857 ../daemon/gvfsbackendsftp.c:1161
 #, c-format
 msgid "Internal error: %s"
 msgstr "Intern feil: %s"
 
-#: ../daemon/gvfsbackendcomputer.c:889 ../daemon/gvfsbackendcomputer.c:1008
+#: ../daemon/gvfsbackendcomputer.c:889 ../daemon/gvfsbackendcomputer.c:1007
 msgid "Can't mount file"
 msgstr "Kan ikke montere fil"
 
-#: ../daemon/gvfsbackendcomputer.c:901
+#: ../daemon/gvfsbackendcomputer.c:900
 msgid "No medium in the drive"
 msgstr "Ikke noe medie i stasjonen"
 
-#: ../daemon/gvfsbackendcomputer.c:958 ../daemon/gvfsbackendcomputer.c:1053
-#: ../daemon/gvfsbackendcomputer.c:1159 ../daemon/gvfsbackendcomputer.c:1249
-#: ../daemon/gvfsbackendcomputer.c:1322 ../daemon/gvfsbackendcomputer.c:1391
+#: ../daemon/gvfsbackendcomputer.c:957 ../daemon/gvfsbackendcomputer.c:1052
+#: ../daemon/gvfsbackendcomputer.c:1158 ../daemon/gvfsbackendcomputer.c:1248
+#: ../daemon/gvfsbackendcomputer.c:1321 ../daemon/gvfsbackendcomputer.c:1390
 msgid "Not a mountable file"
 msgstr "Ikke en monterbar fil"
 
-#: ../daemon/gvfsbackendcomputer.c:1072
+#: ../daemon/gvfsbackendcomputer.c:1071
 msgid "Can't unmount file"
 msgstr "Kan ikke avmontere fil"
 
-#: ../daemon/gvfsbackendcomputer.c:1202
+#: ../daemon/gvfsbackendcomputer.c:1201
 msgid "Can't eject file"
 msgstr "Kan ikke løse ut fil"
 
@@ -967,7 +981,7 @@
 msgid "Can't stop file"
 msgstr "Kan ikke stoppe fil"
 
-#: ../daemon/gvfsbackendcomputer.c:1406 ../daemon/gvfsbackendcomputer.c:1413
+#: ../daemon/gvfsbackendcomputer.c:1405 ../daemon/gvfsbackendcomputer.c:1412
 msgid "Can't poll file"
 msgstr "Kan ikke hente data om fil"
 
@@ -988,7 +1002,7 @@
 msgstr "WebDAV på %s%s"
 
 #: ../daemon/gvfsbackenddav.c:674 ../daemon/gvfsbackenddav.c:1915
-#: ../daemon/gvfsbackendhttp.c:262
+#: ../daemon/gvfsbackendhttp.c:256
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP-feil: %s"
@@ -1017,7 +1031,7 @@
 #. translators: %s here is the hostname
 #. Translators: %s is the hostname
 #: ../daemon/gvfsbackenddav.c:1544 ../daemon/gvfsbackendftp.c:491
-#: ../daemon/gvfsbackendsftp.c:964
+#: ../daemon/gvfsbackendsftp.c:967
 #, c-format
 msgid "Enter password for %s"
 msgstr "Skriv inn passord for %s"
@@ -1035,8 +1049,8 @@
 msgid "Could not create request"
 msgstr "Kan ikke opprette forespørsel"
 
-#: ../daemon/gvfsbackenddav.c:2401 ../daemon/gvfsbackendsmb.c:1185
-#: ../daemon/gvfsbackendsmb.c:2122
+#: ../daemon/gvfsbackenddav.c:2400 ../daemon/gvfsbackendsmb.c:1268
+#: ../daemon/gvfsbackendsmb.c:2210
 msgid "Backup file creation failed"
 msgstr "Oppretting av sikkerhetskopi feilet"
 
@@ -1085,8 +1099,8 @@
 msgid "Insufficient permissions"
 msgstr "Ikke nok rettigheter"
 
-#: ../daemon/gvfsbackendftp.c:982 ../daemon/gvfsbackendftp.c:1336
-#: ../daemon/gvfsbackendsftp.c:3260
+#: ../daemon/gvfsbackendftp.c:982 ../daemon/gvfsbackendftp.c:1337
+#: ../daemon/gvfsbackendsftp.c:3294 ../daemon/gvfsbackendsftp.c:3495
 msgid "backups not supported yet"
 msgstr "sikkerhetskopier er ikke støttet ennå"
 
@@ -1141,7 +1155,7 @@
 msgid "Audio Player"
 msgstr "Lydspiller"
 
-#: ../daemon/gvfsbackendgphoto2.c:1607 ../daemon/gvfsbackendmtp.c:432
+#: ../daemon/gvfsbackendgphoto2.c:1607 ../daemon/gvfsbackendmtp.c:683
 msgid "No device specified"
 msgstr "Ingen enhet oppgitt"
 
@@ -1165,134 +1179,134 @@
 msgid "Error getting device information"
 msgstr "Feil ved henting av enhetsinformasjon"
 
-#: ../daemon/gvfsbackendgphoto2.c:1696
+#: ../daemon/gvfsbackendgphoto2.c:1698
 msgid "Error setting up camera communications port"
 msgstr "Feil ved oppsett av kommunikasjonsport for kamera"
 
-#: ../daemon/gvfsbackendgphoto2.c:1707
+#: ../daemon/gvfsbackendgphoto2.c:1709
 msgid "Error initializing camera"
 msgstr "Feil ved initiering av kamera"
 
 #. Translator: %s represents the device, e.g. usb:001,042. 'gphoto2' is the name of the
 #. backend and shouldn't be translated.
-#: ../daemon/gvfsbackendgphoto2.c:1722
+#: ../daemon/gvfsbackendgphoto2.c:1724
 #, c-format
 msgid "gphoto2 mount on %s"
 msgstr "gphoto2 montert på %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:1808
+#: ../daemon/gvfsbackendgphoto2.c:1810
 msgid "No camera specified"
 msgstr "Ingen kamera oppgitt"
 
-#: ../daemon/gvfsbackendgphoto2.c:1870
+#: ../daemon/gvfsbackendgphoto2.c:1872
 msgid "Error creating file object"
 msgstr "Feil under oppretting av filobjekt"
 
-#: ../daemon/gvfsbackendgphoto2.c:1885
+#: ../daemon/gvfsbackendgphoto2.c:1887
 msgid "Error getting file"
 msgstr "Feil under henting av fil"
 
-#: ../daemon/gvfsbackendgphoto2.c:1895
+#: ../daemon/gvfsbackendgphoto2.c:1897
 msgid "Error getting data from file"
 msgstr "Feil under henting av data fra fil"
 
-#: ../daemon/gvfsbackendgphoto2.c:1953 ../daemon/gvfsbackendmtp.c:1461
+#: ../daemon/gvfsbackendgphoto2.c:1955 ../daemon/gvfsbackendmtp.c:1799
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "Feilutformet ikonidentifikator «%s»"
 
-#: ../daemon/gvfsbackendgphoto2.c:2029 ../daemon/gvfsbackendgphoto2.c:3218
+#: ../daemon/gvfsbackendgphoto2.c:2031 ../daemon/gvfsbackendgphoto2.c:3219
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "Feil ved søking i strøm på kamera %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:2169 ../daemon/gvfsbackendsftp.c:2938
-#: ../daemon/gvfsbackendsmbbrowse.c:1423
+#: ../daemon/gvfsbackendgphoto2.c:2171 ../daemon/gvfsbackendsftp.c:2970
+#: ../daemon/gvfsbackendsmbbrowse.c:1470
 msgid "Not a directory"
 msgstr "Ikke en katalog"
 
-#: ../daemon/gvfsbackendgphoto2.c:2202
+#: ../daemon/gvfsbackendgphoto2.c:2204
 msgid "Failed to get folder list"
 msgstr "Fikk ikke mappeliste"
 
-#: ../daemon/gvfsbackendgphoto2.c:2268
+#: ../daemon/gvfsbackendgphoto2.c:2269
 msgid "Failed to get file list"
 msgstr "Fant ikke filliste"
 
-#: ../daemon/gvfsbackendgphoto2.c:2560
+#: ../daemon/gvfsbackendgphoto2.c:2557
 msgid "Error creating directory"
 msgstr "Feil ved oppretting av katalog"
 
-#: ../daemon/gvfsbackendgphoto2.c:2769
+#: ../daemon/gvfsbackendgphoto2.c:2770
 msgid "Name already exists"
 msgstr "Navnet eksisterer allerede"
 
-#: ../daemon/gvfsbackendgphoto2.c:2780 ../daemon/gvfsbackendgphoto2.c:3409
+#: ../daemon/gvfsbackendgphoto2.c:2781 ../daemon/gvfsbackendgphoto2.c:3414
 msgid "New name too long"
 msgstr "Nytt navn er for langt"
 
-#: ../daemon/gvfsbackendgphoto2.c:2790 ../daemon/gvfsbackendgphoto2.c:3420
+#: ../daemon/gvfsbackendgphoto2.c:2791 ../daemon/gvfsbackendgphoto2.c:3425
 msgid "Error renaming directory"
 msgstr "Feil ved endring av navn på katalog"
 
-#: ../daemon/gvfsbackendgphoto2.c:2803 ../daemon/gvfsbackendgphoto2.c:3433
+#: ../daemon/gvfsbackendgphoto2.c:2804 ../daemon/gvfsbackendgphoto2.c:3438
 msgid "Error renaming file"
 msgstr "Feil under endring av navn på fil"
 
-#: ../daemon/gvfsbackendgphoto2.c:2867
+#: ../daemon/gvfsbackendgphoto2.c:2868
 #, c-format
 msgid "Directory '%s' is not empty"
 msgstr "Katalog «%s» er ikke tom"
 
-#: ../daemon/gvfsbackendgphoto2.c:2878
+#: ../daemon/gvfsbackendgphoto2.c:2879
 msgid "Error deleting directory"
 msgstr "Feil under sletting av katalog"
 
-#: ../daemon/gvfsbackendgphoto2.c:2904
+#: ../daemon/gvfsbackendgphoto2.c:2905
 msgid "Error deleting file"
 msgstr "Feil under sletting av fil"
 
-#: ../daemon/gvfsbackendgphoto2.c:2957
+#: ../daemon/gvfsbackendgphoto2.c:2958
 msgid "Can't write to directory"
 msgstr "Kan ikke skrive til katalog"
 
-#: ../daemon/gvfsbackendgphoto2.c:3004
+#: ../daemon/gvfsbackendgphoto2.c:3005
 msgid "Cannot allocate new file to append to"
 msgstr "Kan ikke lage ny fil å legge til i"
 
-#: ../daemon/gvfsbackendgphoto2.c:3019
+#: ../daemon/gvfsbackendgphoto2.c:3020
 msgid "Cannot read file to append to"
 msgstr "Kan ikke lese fil for å legge til"
 
-#: ../daemon/gvfsbackendgphoto2.c:3030
+#: ../daemon/gvfsbackendgphoto2.c:3031
 msgid "Cannot get data of file to append to"
 msgstr "Kan ikke finne data om filen vi skal legge til"
 
-#: ../daemon/gvfsbackendgphoto2.c:3317
+#: ../daemon/gvfsbackendgphoto2.c:3322
 msgid "Error writing file"
 msgstr "Feil under skriving til fil"
 
-#: ../daemon/gvfsbackendgphoto2.c:3365
+#: ../daemon/gvfsbackendgphoto2.c:3370
 msgid "Not supported (not same directory)"
 msgstr "Ikke støttet (ikke samme katalog)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3377
+#: ../daemon/gvfsbackendgphoto2.c:3382
 msgid ""
 "Not supported (the source is a directory, the destination is a directory too)"
 msgstr "Ikke støttet (kilde er en katalog, mål er også en katalog)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3385
+#: ../daemon/gvfsbackendgphoto2.c:3390
 msgid ""
 "Not supported (the source is a directory, but the destination is an existing "
 "file)"
 msgstr "Ikke støttet (kilde er en katalog, mål er en eksisterende fil)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3397
+#: ../daemon/gvfsbackendgphoto2.c:3402
 msgid ""
 "Not supported (the source is a file, but the destination is a directory)"
 msgstr "Ikke støttet (kilde er fil, mål er katalog)"
 
-#: ../daemon/gvfsbackendhttp.c:258
+#: ../daemon/gvfsbackendhttp.c:252
 #, c-format
 msgid "HTTP Client Error: %s"
 msgstr "HTTP-klientfeil: %s"
@@ -1301,7 +1315,7 @@
 msgid "Directory notification not supported"
 msgstr "Varsling for kataloger er ikke støttet"
 
-#: ../daemon/gvfsbackendnetwork.c:333 ../daemon/gvfsbackendsmbbrowse.c:896
+#: ../daemon/gvfsbackendnetwork.c:333 ../daemon/gvfsbackendsmbbrowse.c:929
 msgid "Windows Network"
 msgstr "Windows nettverk"
 
@@ -1321,27 +1335,27 @@
 #. lead to G_IO_ERROR_NOT_MOUNTED errors
 #. 
 #. Translators: This is "<sharename> on <servername>" and is used as name for an SMB share
-#: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2066
+#: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2064
 #: ../daemon/gvfsbackendftp.c:634 ../daemon/gvfsbackendobexftp.c:705
-#: ../daemon/gvfsbackendsftp.c:1686 ../daemon/gvfsbackendsmb.c:554
-#: ../daemon/gvfsbackendsmb.c:1433
+#: ../daemon/gvfsbackendsftp.c:1690 ../daemon/gvfsbackendsmb.c:584
+#: ../daemon/gvfsbackendsmb.c:1516
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: ../daemon/gvfsbackendobexftp.c:914
+#: ../daemon/gvfsbackendobexftp.c:916
 msgid "USB support missing. Please contact your software vendor"
 msgstr "Støtte for USB mangler. Vennligst kontakt din programvareleverandør"
 
-#: ../daemon/gvfsbackendobexftp.c:1036
+#: ../daemon/gvfsbackendobexftp.c:1038
 msgid "Connection to the device lost"
 msgstr "Mistet forbindelsen til enheten"
 
-#: ../daemon/gvfsbackendobexftp.c:1533
+#: ../daemon/gvfsbackendobexftp.c:1535
 msgid "Device requires a software update"
 msgstr "Enheten krever en programvareoppdatering"
 
-#: ../daemon/gvfsbackendobexftp.c:1881 ../daemon/gvfsbackendsmb.c:1996
+#: ../daemon/gvfsbackendobexftp.c:1882 ../daemon/gvfsbackendsmb.c:2084
 #, c-format
 msgid "Error deleting file: %s"
 msgstr "Feil under sletting av fil: %s"
@@ -1350,19 +1364,19 @@
 msgid "ssh program unexpectedly exited"
 msgstr "SSH-program avsluttet uventet"
 
-#: ../daemon/gvfsbackendsftp.c:314
+#: ../daemon/gvfsbackendsftp.c:316
 msgid "Hostname not known"
 msgstr "Vertsnavn ikke kjent"
 
-#: ../daemon/gvfsbackendsftp.c:321
+#: ../daemon/gvfsbackendsftp.c:323
 msgid "No route to host"
 msgstr "Ingen rute til vert"
 
-#: ../daemon/gvfsbackendsftp.c:328
+#: ../daemon/gvfsbackendsftp.c:330
 msgid "Connection refused by server"
 msgstr "Tilkobling nektet av tjener"
 
-#: ../daemon/gvfsbackendsftp.c:335
+#: ../daemon/gvfsbackendsftp.c:337
 msgid "Host key verification failed"
 msgstr "Verifisering av vertsnøkkel feilet"
 
@@ -1375,7 +1389,7 @@
 msgid "Unable to spawn ssh program: %s"
 msgstr "Kan ikke starte ssh-program: %s"
 
-#: ../daemon/gvfsbackendsftp.c:616 ../daemon/gvfsbackendsftp.c:874
+#: ../daemon/gvfsbackendsftp.c:619 ../daemon/gvfsbackendsftp.c:877
 msgid "Timed out when logging in"
 msgstr "Tidsavbrudd ved innlogging"
 
@@ -1403,15 +1417,15 @@
 msgid "Enter password for ssh on %s"
 msgstr "Skriv inn passord for ssh på %s"
 
-#: ../daemon/gvfsbackendsftp.c:1044
+#: ../daemon/gvfsbackendsftp.c:1047
 msgid "Can't send password"
 msgstr "Kunne ikke sende passord"
 
-#: ../daemon/gvfsbackendsftp.c:1052
+#: ../daemon/gvfsbackendsftp.c:1055
 msgid "Log In Anyway"
 msgstr "Logg inn likevel"
 
-#: ../daemon/gvfsbackendsftp.c:1052
+#: ../daemon/gvfsbackendsftp.c:1055
 msgid "Cancel Login"
 msgstr "Avbryt pålogging"
 
@@ -1431,15 +1445,15 @@
 "systemadministrator hvis du vil være helt sikker på at det er trygt å "
 "fortsette."
 
-#: ../daemon/gvfsbackendsftp.c:1080
+#: ../daemon/gvfsbackendsftp.c:1083
 msgid "Login dialog cancelled"
 msgstr "Påloggingsdialog avbrutt"
 
-#: ../daemon/gvfsbackendsftp.c:1100
+#: ../daemon/gvfsbackendsftp.c:1103
 msgid "Can't send host identity confirmation"
 msgstr "Kan ikke sende bekreftelse på vertsidentifikasjon"
 
-#: ../daemon/gvfsbackendsftp.c:1638 ../daemon/gvfsbackendsftp.c:1661
+#: ../daemon/gvfsbackendsftp.c:1642 ../daemon/gvfsbackendsftp.c:1665
 msgid "Protocol error"
 msgstr "Feil i protokoll"
 
@@ -1459,32 +1473,37 @@
 msgid "Unable to find supported ssh command"
 msgstr "Kan ikke finne støttet ssh-kommando"
 
-#: ../daemon/gvfsbackendsftp.c:2002 ../daemon/gvfsbackendsftp.c:2404
-#: ../daemon/gvfsbackendsftp.c:2463 ../daemon/gvfsbackendsftp.c:2474
-#: ../daemon/gvfsbackendsftp.c:2530 ../daemon/gvfsbackendsftp.c:2616
-#: ../daemon/gvfsbackendsftp.c:2666 ../daemon/gvfsbackendsftp.c:2712
-#: ../daemon/gvfsbackendsftp.c:2787 ../daemon/gvfsbackendsftp.c:2894
-#: ../daemon/gvfsbackendsftp.c:3011 ../daemon/gvfsbackendsftp.c:3092
-#: ../daemon/gvfsbackendsftp.c:3164 ../daemon/gvfsbackendsftp.c:3176
-#: ../daemon/gvfsbackendsftp.c:3232 ../daemon/gvfsbackendsftp.c:3274
-#: ../daemon/gvfsbackendsftp.c:3459 ../daemon/gvfsbackendsftp.c:3491
-#: ../daemon/gvfsbackendsftp.c:3546 ../daemon/gvfsbackendsftp.c:3603
-#: ../daemon/gvfsbackendsftp.c:3900 ../daemon/gvfsbackendsftp.c:3967
-#: ../daemon/gvfsbackendsftp.c:4102 ../daemon/gvfsbackendsftp.c:4162
-#: ../daemon/gvfsbackendsftp.c:4197 ../daemon/gvfsbackendsftp.c:4225
-#: ../daemon/gvfsbackendsftp.c:4333 ../daemon/gvfsbackendsftp.c:4387
-#: ../daemon/gvfsbackendsftp.c:4426 ../daemon/gvfsbackendsftp.c:4460
-#: ../daemon/gvfsbackendsftp.c:4494 ../daemon/gvfsbackendsftp.c:4509
-#: ../daemon/gvfsbackendsftp.c:4524 ../daemon/gvfsbackendsftp.c:4602
+#: ../daemon/gvfsbackendsftp.c:2006 ../daemon/gvfsbackendsftp.c:2408
+#: ../daemon/gvfsbackendsftp.c:2467 ../daemon/gvfsbackendsftp.c:2478
+#: ../daemon/gvfsbackendsftp.c:2534 ../daemon/gvfsbackendsftp.c:2627
+#: ../daemon/gvfsbackendsftp.c:2677 ../daemon/gvfsbackendsftp.c:2730
+#: ../daemon/gvfsbackendsftp.c:2805 ../daemon/gvfsbackendsftp.c:2912
+#: ../daemon/gvfsbackendsftp.c:3043 ../daemon/gvfsbackendsftp.c:3124
+#: ../daemon/gvfsbackendsftp.c:3197 ../daemon/gvfsbackendsftp.c:3209
+#: ../daemon/gvfsbackendsftp.c:3266 ../daemon/gvfsbackendsftp.c:3308
+#: ../daemon/gvfsbackendsftp.c:3521 ../daemon/gvfsbackendsftp.c:3553
+#: ../daemon/gvfsbackendsftp.c:3608 ../daemon/gvfsbackendsftp.c:3665
+#: ../daemon/gvfsbackendsftp.c:3969 ../daemon/gvfsbackendsftp.c:4036
+#: ../daemon/gvfsbackendsftp.c:4171 ../daemon/gvfsbackendsftp.c:4231
+#: ../daemon/gvfsbackendsftp.c:4266 ../daemon/gvfsbackendsftp.c:4294
+#: ../daemon/gvfsbackendsftp.c:4402 ../daemon/gvfsbackendsftp.c:4456
+#: ../daemon/gvfsbackendsftp.c:4495 ../daemon/gvfsbackendsftp.c:4529
+#: ../daemon/gvfsbackendsftp.c:4563 ../daemon/gvfsbackendsftp.c:4578
+#: ../daemon/gvfsbackendsftp.c:4593 ../daemon/gvfsbackendsftp.c:4671
+#: ../daemon/gvfsbackendsftp.c:4832 ../daemon/gvfsbackendsftp.c:4867
+#: ../daemon/gvfsbackendsftp.c:4937 ../daemon/gvfsbackendsftp.c:5021
+#: ../daemon/gvfsbackendsftp.c:5103 ../daemon/gvfsbackendsftp.c:5144
+#: ../daemon/gvfsbackendsftp.c:5148 ../daemon/gvfsbackendsftp.c:5261
+#: ../daemon/gvfsbackendsftp.c:5265
 msgid "Invalid reply received"
 msgstr "Ugyldig svar mottatt"
 
-#: ../daemon/gvfsbackendsftp.c:2263 ../daemon/gvfsbackendsmb.c:1440
+#: ../daemon/gvfsbackendsftp.c:2267 ../daemon/gvfsbackendsmb.c:1523
 #: ../daemon/gvfsdaemonutils.c:136
 msgid " (invalid encoding)"
 msgstr " (ugyldig koding)"
 
-#: ../daemon/gvfsbackendsftp.c:2348
+#: ../daemon/gvfsbackendsftp.c:2352
 msgid "Failure"
 msgstr "Feil"
 
@@ -1493,24 +1512,24 @@
 msgid "Invalid icon_id '%s' in OpenIconForRead"
 msgstr "Ugyldig icon_id «%s» i OpenIconForRead"
 
-#: ../daemon/gvfsbackendsftp.c:2732
+#: ../daemon/gvfsbackendsftp.c:2750
 #, c-format
 msgid "Error creating backup file: %s"
 msgstr "Feil under oppretting av sikkerhetskopi: %s"
 
-#: ../daemon/gvfsbackendsftp.c:3336
+#: ../daemon/gvfsbackendsftp.c:3371 ../daemon/gvfsbackendsftp.c:5172
 msgid "Unable to create temporary file"
 msgstr "Kan ikke opprette midlertidig fil"
 
 #. translators: %s is a server name
-#: ../daemon/gvfsbackendsmbbrowse.c:375
+#: ../daemon/gvfsbackendsmbbrowse.c:380
 #, c-format
 msgid "Password required for %s"
 msgstr "Passord kreves for %s"
 
 #. translators: Name for the location that lists the smb shares
 #. availible on a server (%s is the name of the server)
-#: ../daemon/gvfsbackendsmbbrowse.c:905
+#: ../daemon/gvfsbackendsmbbrowse.c:938
 #, c-format
 msgid "Windows shares on %s"
 msgstr "Delt Windows-ressurs på %s"
@@ -1520,7 +1539,10 @@
 msgid "Failed to retrieve share list from server"
 msgstr "Klarte ikke å hente liste over delte ressurser fra tjener"
 
-#: ../daemon/gvfsbackendmtp.c:1179 ../daemon/gvfsbackendsmbbrowse.c:1163
+#: ../daemon/gvfsbackendmtp.c:1371 ../daemon/gvfsbackendmtp.c:1597
+#: ../daemon/gvfsbackendmtp.c:1642 ../daemon/gvfsbackendmtp.c:1710
+#: ../daemon/gvfsbackendmtp.c:2036 ../daemon/gvfsbackendmtp.c:2101
+#: ../daemon/gvfsbackendsmbbrowse.c:1210
 msgid "Not a regular file"
 msgstr "Ikke en vanlig fil"
 
@@ -1529,12 +1551,14 @@
 msgstr "Filsystemtjeneste for Windows nettverk"
 
 #. translators: First %s is a share name, second is a server name
-#: ../daemon/gvfsbackendsmb.c:238
+#: ../daemon/gvfsbackendsmb.c:261
 #, c-format
 msgid "Password required for share %s on %s"
 msgstr "Passord kreves for delt ressurs %s på %s"
 
-#: ../daemon/gvfsbackendsmb.c:494 ../daemon/gvfsbackendsmb.c:540
+#: ../daemon/gvfsbackendsmbbrowse.c:864 ../daemon/gvfsbackendsmbbrowse.c:911
+#: ../daemon/gvfsbackendsmb.c:524 ../daemon/gvfsbackendsmb.c:570
+#: ../daemon/gvfsbackendsmb.c:748
 #, c-format
 msgid "Internal Error (%s)"
 msgstr "Intern feil (%s)"
@@ -1544,34 +1568,34 @@
 msgid "Failed to mount Windows share"
 msgstr "Klarte ikke å montere Windows-ressurs"
 
-#: ../daemon/gvfsbackendsmb.c:789 ../daemon/gvfsbackendsmb.c:1285
+#: ../daemon/gvfsbackendsmb.c:872 ../daemon/gvfsbackendsmb.c:1368
 msgid "Unsupported seek type"
 msgstr "Søketype ikke støttet"
 
-#: ../daemon/gvfsbackendsmb.c:1377
+#: ../daemon/gvfsbackendsmb.c:1459
 #, c-format
 msgid "Backup file creation failed: %s"
 msgstr "Oppretting av sikkerhetskopi feilet: %s"
 
-#: ../daemon/gvfsbackendsmb.c:1757
+#: ../daemon/gvfsbackendsmb.c:1846
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Ugyldig type attributt (uint64 forventet)"
 
-#: ../daemon/gvfsbackendsmb.c:1945
+#: ../daemon/gvfsbackendsmb.c:2033
 msgid "Can't rename file, filename already exists"
 msgstr "Kan ikke bytte navn på fil. Filnavnet eksisterer allerede"
 
-#: ../daemon/gvfsbackendsmb.c:2070
+#: ../daemon/gvfsbackendsmb.c:2158
 #, c-format
 msgid "Error moving file: %s"
 msgstr "Feil under flytting av fil: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2142
+#: ../daemon/gvfsbackendsmb.c:2230
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Feil under fjerning av målfil: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2166
+#: ../daemon/gvfsbackendsmb.c:2254
 msgid "Can't recursively move directory"
 msgstr "Kan ikke flytte katalog rekursivt"
 
@@ -1579,17 +1603,17 @@
 msgid "Windows Shares Filesystem Service"
 msgstr "Filsystemtjeneste for delte Windows-ressurser"
 
-#: ../daemon/gvfsbackendtrash.c:370 ../daemon/gvfsbackendtrash.c:426
+#: ../daemon/gvfsbackendtrash.c:371 ../daemon/gvfsbackendtrash.c:427
 msgid "The trash folder may not be deleted"
 msgstr "Papirkurven kan ikke slettes"
 
-#: ../daemon/gvfsbackendtrash.c:387 ../daemon/gvfsbackendtrash.c:440
+#: ../daemon/gvfsbackendtrash.c:388 ../daemon/gvfsbackendtrash.c:441
 msgid "Items in the trash may not be modified"
 msgstr "Oppføringer i papirkurven kan ikke endres"
 
 #. Translators: this is the display name of the backend
 #. translators: This is the name of the backend
-#: ../daemon/gvfsbackendtrash.c:755 ../daemon/gvfsbackendtrash.c:867
+#: ../daemon/gvfsbackendtrash.c:740 ../daemon/gvfsbackendtrash.c:852
 msgid "Trash"
 msgstr "Papirkurv"
 
@@ -1662,7 +1686,7 @@
 msgid "Page type unknown"
 msgstr "Ukjent sidetype"
 
-#: ../daemon/gvfsftptask.c:407
+#: ../daemon/gvfsbackendmtp.c:1949 ../daemon/gvfsftptask.c:407
 msgid "Invalid filename"
 msgstr "Ugyldig filnavn"
 
@@ -1678,36 +1702,36 @@
 msgid "Filesystem is busy"
 msgstr "Filsystemet er opptatt"
 
-#: ../daemon/main.c:133 ../metadata/meta-daemon.c:445
+#: ../daemon/main.c:142 ../metadata/meta-daemon.c:511
 msgid "Replace old daemon."
 msgstr "Erstatt kjørende tjeneste."
 
-#: ../daemon/main.c:134
+#: ../daemon/main.c:143
 msgid "Don't start fuse."
 msgstr "Ikke start fuse."
 
-#: ../daemon/main.c:148
+#: ../daemon/main.c:157
 msgid "GVFS Daemon"
 msgstr "GVFS-tjeneste"
 
-#: ../daemon/main.c:151
+#: ../daemon/main.c:160
 msgid "Main daemon for GVFS"
 msgstr "Hovedtjeneste for GVFS"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:166 ../metadata/meta-daemon.c:470
+#: ../daemon/main.c:175 ../metadata/meta-daemon.c:536
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:168 ../metadata/meta-daemon.c:472
+#: ../daemon/main.c:177 ../metadata/meta-daemon.c:538
 #: ../programs/gvfs-cat.c:168 ../programs/gvfs-cat.c:180
-#: ../programs/gvfs-copy.c:131 ../programs/gvfs-info.c:392
-#: ../programs/gvfs-ls.c:414 ../programs/gvfs-mime.c:95
+#: ../programs/gvfs-copy.c:131 ../programs/gvfs-info.c:396
+#: ../programs/gvfs-ls.c:428 ../programs/gvfs-mime.c:95
 #: ../programs/gvfs-mime.c:105 ../programs/gvfs-mime.c:112
 #: ../programs/gvfs-mkdir.c:69 ../programs/gvfs-monitor-dir.c:124
-#: ../programs/gvfs-monitor-file.c:123 ../programs/gvfs-mount.c:1061
+#: ../programs/gvfs-monitor-file.c:123 ../programs/gvfs-mount.c:1055
 #: ../programs/gvfs-move.c:119 ../programs/gvfs-open.c:76
 #: ../programs/gvfs-open.c:88 ../programs/gvfs-rename.c:73
 #: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:176
@@ -1742,34 +1766,34 @@
 msgid "Location is not mountable"
 msgstr "Adressen kan ikke monteres"
 
-#: ../metadata/meta-daemon.c:133 ../metadata/meta-daemon.c:253
-#: ../metadata/meta-daemon.c:302 ../metadata/meta-daemon.c:337
-#: ../metadata/meta-daemon.c:373
+#: ../metadata/meta-daemon.c:158 ../metadata/meta-daemon.c:278
+#: ../metadata/meta-daemon.c:327 ../metadata/meta-daemon.c:362
+#: ../metadata/meta-daemon.c:398
 #, c-format
 msgid "Can't find metadata file %s"
 msgstr "Kan ikke finne metadatafil %s"
 
-#: ../metadata/meta-daemon.c:151 ../metadata/meta-daemon.c:163
+#: ../metadata/meta-daemon.c:176 ../metadata/meta-daemon.c:188
 msgid "Unable to set metadata key"
 msgstr "Kan ikke sette nøkkel for metadata"
 
-#: ../metadata/meta-daemon.c:173 ../metadata/meta-daemon.c:312
+#: ../metadata/meta-daemon.c:198 ../metadata/meta-daemon.c:337
 msgid "Unable to unset metadata key"
 msgstr "Kan ikke nullstille nøkkel for metadata"
 
-#: ../metadata/meta-daemon.c:347
+#: ../metadata/meta-daemon.c:372
 msgid "Unable to remove metadata keys"
 msgstr "Kan ikke fjerne nøkler for metadata"
 
-#: ../metadata/meta-daemon.c:384
+#: ../metadata/meta-daemon.c:409
 msgid "Unable to move metadata keys"
 msgstr "Kan ikke flytte nøkler for metadata"
 
-#: ../metadata/meta-daemon.c:455
+#: ../metadata/meta-daemon.c:521
 msgid "GVFS Metadata Daemon"
 msgstr "GVFS metadatatjeneste"
 
-#: ../metadata/meta-daemon.c:458
+#: ../metadata/meta-daemon.c:524
 msgid "Metadata daemon for GVFS"
 msgstr "Metadatatjeneste for GVFS"
 
@@ -2131,7 +2155,7 @@
 msgid "Mass Storage Drive"
 msgstr "Masselagringsenhet"
 
-#: ../monitor/hal/ghaldrive.c:672
+#: ../monitor/hal/ghaldrive.c:662
 #, c-format
 msgid "Failed to eject media; one or more volumes on the media are busy."
 msgstr ""
@@ -2182,7 +2206,7 @@
 #. Translators: This is used for encrypted volumes.
 #. *              The first %s is the formatted size (e.g. "42.0 MB").
 #. 
-#: ../monitor/udisks2/gvfsudisks2volume.c:278
+#: ../monitor/udisks2/gvfsudisks2volume.c:276
 #, c-format
 msgid "%s Encrypted"
 msgstr "%s kryptert"
@@ -2190,13 +2214,13 @@
 #. Translators: This is used for volume with no filesystem label.
 #. *              The first %s is the formatted size (e.g. "42.0 MB").
 #. 
-#: ../monitor/udisks2/gvfsudisks2volume.c:290
+#: ../monitor/udisks2/gvfsudisks2volume.c:288
 #, c-format
 msgid "%s Volume"
 msgstr "%s volum"
 
 #. Translators: Name used for volume
-#: ../monitor/udisks2/gvfsudisks2volume.c:526
+#: ../monitor/udisks2/gvfsudisks2volume.c:524
 msgid "Volume"
 msgstr "Volum"
 
@@ -2204,7 +2228,7 @@
 msgid "The unlocked device does not have a recognizable filesystem on it"
 msgstr "Kjenner ikke igjen filsystemet på ulåst enhet"
 
-#: ../monitor/udisks2/gvfsudisks2volume.c:1396
+#: ../monitor/udisks2/gvfsudisks2volume.c:1394
 msgid "A passphrase is required to access the volume"
 msgstr "En passordfrase kreves for å aksessere volumet"
 
@@ -2271,10 +2295,10 @@
 "som -n -T eller annet."
 
 #: ../programs/gvfs-cat.c:166 ../programs/gvfs-copy.c:129
-#: ../programs/gvfs-info.c:390 ../programs/gvfs-ls.c:412
+#: ../programs/gvfs-info.c:394 ../programs/gvfs-ls.c:426
 #: ../programs/gvfs-mime.c:92 ../programs/gvfs-mkdir.c:67
 #: ../programs/gvfs-monitor-dir.c:122 ../programs/gvfs-monitor-file.c:121
-#: ../programs/gvfs-mount.c:1059 ../programs/gvfs-move.c:117
+#: ../programs/gvfs-mount.c:1053 ../programs/gvfs-move.c:117
 #: ../programs/gvfs-open.c:74 ../programs/gvfs-rename.c:71
 #: ../programs/gvfs-rm.c:68 ../programs/gvfs-save.c:174
 #: ../programs/gvfs-set-attribute.c:147 ../programs/gvfs-trash.c:102
@@ -2355,7 +2379,7 @@
 msgid "Get filesystem info"
 msgstr "Hent informasjon om filsystem"
 
-#: ../programs/gvfs-info.c:39 ../programs/gvfs-ls.c:39
+#: ../programs/gvfs-info.c:39 ../programs/gvfs-ls.c:40
 msgid "The attributes to get"
 msgstr "Attributter som skal hentes"
 
@@ -2433,25 +2457,25 @@
 msgid "hidden\n"
 msgstr "skjult\n"
 
-#: ../programs/gvfs-info.c:275
+#: ../programs/gvfs-info.c:279
 msgid "Copy with file"
 msgstr "Kopier med fil"
 
-#: ../programs/gvfs-info.c:279
+#: ../programs/gvfs-info.c:283
 msgid "Keep with file when moved"
 msgstr "Behold med filen når den flyttes"
 
-#: ../programs/gvfs-info.c:316
+#: ../programs/gvfs-info.c:320
 #, c-format
 msgid "Error getting writable attributes: %s\n"
 msgstr "Feil under henting av skrivbare attributter: %s\n"
 
-#: ../programs/gvfs-info.c:321
+#: ../programs/gvfs-info.c:325
 #, c-format
 msgid "Settable attributes:\n"
 msgstr "Attributter som kan settes:\n"
 
-#: ../programs/gvfs-info.c:344
+#: ../programs/gvfs-info.c:348
 #, c-format
 msgid "Writable attribute namespaces:\n"
 msgstr "Navneområder for skrivbare attributter:\n"
@@ -2460,19 +2484,19 @@
 msgid "- show info for <location>"
 msgstr "- vis info for <adresse>"
 
-#: ../programs/gvfs-ls.c:40 ../programs/gvfs-tree.c:36
+#: ../programs/gvfs-ls.c:41 ../programs/gvfs-tree.c:36
 msgid "Show hidden files"
 msgstr "Vis skjulte filer"
 
-#: ../programs/gvfs-ls.c:41
+#: ../programs/gvfs-ls.c:42
 msgid "Use a long listing format"
 msgstr "Bruk langt listeformat"
 
-#: ../programs/gvfs-ls.c:42
+#: ../programs/gvfs-ls.c:43
 msgid "Show completions"
 msgstr "Vis fullføring"
 
-#: ../programs/gvfs-ls.c:166 ../programs/gvfs-ls.c:174
+#: ../programs/gvfs-ls.c:180 ../programs/gvfs-ls.c:188
 #: ../programs/gvfs-rename.c:95
 #, c-format
 msgid "Error: %s\n"
@@ -2609,17 +2633,17 @@
 msgid "Error finding enclosing mount: %s\n"
 msgstr "Kan ikke finne omsluttende montering: %s\n"
 
-#: ../programs/gvfs-mount.c:786
+#: ../programs/gvfs-mount.c:781
 #, c-format
 msgid "Error mounting %s: %s\n"
 msgstr "Feil under montering av %s: %s\n"
 
-#: ../programs/gvfs-mount.c:801
+#: ../programs/gvfs-mount.c:796
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "Monterte %s i %s\n"
 
-#: ../programs/gvfs-mount.c:852
+#: ../programs/gvfs-mount.c:846
 #, c-format
 msgid "No volume for device file %s\n"
 msgstr "Ingen volum for enhetsfil %s\n"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gwibber.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gwibber.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/gwibber.po	2013-01-29 09:33:55.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/gwibber.po	2014-01-07 06:37:33.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gwibber\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-05 03:05+0000\n"
+"POT-Creation-Date: 2013-07-11 11:21+0000\n"
 "PO-Revision-Date: 2012-08-06 23:59+0000\n"
 "Last-Translator: Roy S <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:47+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:33+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../data/gwibber.desktop.in.in.h:1
 #: ../gwibber/microblog/util/exceptions.py:44
@@ -33,7 +33,7 @@
 
 #: ../data/gwibber.desktop.in.in.h:4
 msgid "Update your microblog and follow your contacts' statuses"
-msgstr "Oppdater mikrobloggen din og følg dine kontakter"
+msgstr "Oppdater mikrobloggen din og følg kontaktene dine"
 
 #: ../data/gwibber-accounts.desktop.in.h:1
 #: ../data/gwibber-accounts-dialog.ui.h:1
@@ -89,11 +89,11 @@
 
 #: ../data/org.gwibber.gschema.xml.in.in.h:9
 msgid "Check current presence status"
-msgstr ""
+msgstr "Sjekk gjeldende tilstedeværelsesstatus"
 
 #: ../data/org.gwibber.gschema.xml.in.in.h:10
 msgid "Check the current presence status"
-msgstr ""
+msgstr "Sjekk gjeldende status"
 
 #: ../data/org.gwibber.gschema.xml.in.in.h:11
 msgid "Show fullnames in posts"
@@ -133,7 +133,7 @@
 
 #: ../data/org.gwibber.gschema.xml.in.in.h:20
 msgid "Verbose debug logging"
-msgstr ""
+msgstr "Detaljert feilsøkingslogging"
 
 #: ../client/attachments-item.vala:26
 msgid "Attachments"
@@ -231,6 +231,19 @@
 "Gwibber; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr ""
+"Gwibber er fri programvare. Du kan dele det med andre og/eller endre det i "
+"henhold til vilkårene i GNU General Public License, som publiseres av Free "
+"Software Foundation. Gjeldende lisens for Gwibber er lisensens versjon 2, "
+"eller (hvis du ønsker det) hvilken som helst senere versjon av den.\n"
+"\n"
+"Gwibber er utgitt med håp om at det vil komme til nytte, men merk at det "
+"kommer UTEN GARANTI, selv når det gjelder SALGBARHET og å være EGNET TIL "
+"BESTEMTE FORMÅL. Se GNU General Public License for flere detaljer.\n"
+"\n"
+"Du skal ha mottatt en kopi av GNU General Public License sammen med Gwibber. "
+"Hvis du ikke har mottatt en kopi, kan du skrive brev til Free Software "
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 "
+"USA."
 
 #: ../client/gwibber-client.vala:370 ../lens/src/daemon.vala:205
 msgid "Stream"
@@ -302,7 +315,7 @@
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
-msgstr[0] "for %i dag siden"
+msgstr[0] "for %i døgn siden"
 msgstr[1] "for %i dager siden"
 
 #: ../libgwibber-gtk/entry.vala:355
@@ -489,7 +502,7 @@
 "There was an %(kind)s failure from %(service)s for account %(account)s, "
 "error was %(error)s"
 msgstr ""
-"En %(kind)sfeil oppsto fra %(service)s for konto %(account)s - feilen var "
+"En %(kind)sfeil oppsto fra %(service)s for konto %(account)s. Feilen var "
 "%(error)s"
 
 #: ../gwibber/microblog/util/exceptions.py:47
@@ -504,7 +517,7 @@
 #: ../gwibber/microblog/util/exceptions.py:54
 #, python-format
 msgid "There was a network error communicating with %(message)s"
-msgstr "Nettverksfeil ved handling mot %(message)s"
+msgstr "Nettverksfeil ved kommunikasjon med %(message)s"
 
 #: ../gwibber/microblog/util/exceptions.py:55
 msgid "Gwibber Network Error"
@@ -573,7 +586,7 @@
 #: ../gwibber/microblog/plugins/twitter/gtk/twitter/__init__.py:110
 #: ../gwibber/microblog/plugins/foursquare/gtk/foursquare/__init__.py:94
 msgid "Verifying"
-msgstr "Verifiserer"
+msgstr "Godkjenner"
 
 #: ../gwibber/microblog/plugins/facebook/gtk/facebook/__init__.py:167
 #: ../gwibber/microblog/plugins/twitter/gtk/twitter/__init__.py:165
@@ -632,7 +645,7 @@
 #: ../gwibber/microblog/plugins/identica/gtk/identica/__init__.py:201
 #, python-format
 msgid "%s has been authorized by Identi.ca"
-msgstr "%s har blitt godkjent mot Identi.ca"
+msgstr "%s har blitt godkjent av Identi.ca"
 
 #: ../gwibber/microblog/plugins/buzz/gtk/buzz/__init__.py:36
 #: ../gwibber/microblog/plugins/buzz/gtk/buzz/__init__.py:110
@@ -657,8 +670,8 @@
 #, python-format
 msgid "%(day)d day ago"
 msgid_plural "%(day)d days ago"
-msgstr[0] "for %(day)d dag siden"
-msgstr[1] "for %(day)d dager siden"
+msgstr[0] "for %(day)d døgn siden"
+msgstr[1] "for %(day)d døgn siden"
 
 #: ../gwibber/util.py:120
 #, python-format
@@ -726,7 +739,7 @@
 "Only receive notifications when someone replies to one of your messages or "
 "mentions your name"
 msgstr ""
-"Varsle kun når noen svarer på en av dine meldinger eller nevner ditt navn"
+"Varsle kun når noen svarer på en av meldingene dine eller nevner navnet ditt"
 
 #: ../data/gwibber-preferences-dialog.ui.h:9
 msgid "<b>Show notifications for:</b>"
@@ -754,7 +767,7 @@
 
 #: ../data/gwibber-preferences-dialog.ui.h:15
 msgid "Image uploading service:  "
-msgstr ""
+msgstr "Bildeopplastingstjeneste:  "
 
 #: ../data/gwibber-preferences-dialog.ui.h:16
 msgid "<b>Photos</b>"
@@ -921,14 +934,14 @@
 "i</a>\n"
 msgstr ""
 "<span size=\"small\"><b>Eksempel:</b> brukernavn</span>\n"
-"vennestrømmen krever en \"fjernnøkkel\" for tilgang fra gwibber, \n"
-"du kan finne din på <a "
+"vennestrømmen krever en «fjernnøkkel» for tilgang fra gwibber. \n"
+"Du kan finne din på <a "
 "href=\"https://friendfeed.com/account/api\">https://friendfeed.com/account/ap"
 "i</a>\n"
 
 #: ../gwibber/microblog/plugins/identica/ui/gwibber-accounts-identica.ui.h:2
 msgid "Authorize with Identi.ca"
-msgstr "Autoriser mot Identi.ca"
+msgstr "Autoriser hos Identi.ca"
 
 #: ../gwibber/microblog/plugins/identica/ui/gwibber-accounts-identica.ui.h:3
 msgid "Identi.ca authorized"
@@ -942,8 +955,8 @@
 "href=\"http://ping.fm/key/\">http://ping.fm/key/</a>\n"
 msgstr ""
 "\n"
-"Ping.fm må ha en \"godkjenningsnøkkel\" for å få tilgang fra gwibber, \n"
-"du kan skaffe din egen på <a "
+"Ping.fm må ha en «godkjenningsnøkkel» for å få tilgang fra gwibber. \n"
+"Du kan skaffe deg din egen på <a "
 "href=\"http://ping.fm/key/\">http://ping.fm/key/</a>\n"
 
 #: ../gwibber/microblog/plugins/pingfm/ui/gwibber-accounts-pingfm.ui.h:7
@@ -956,11 +969,11 @@
 
 #: ../gwibber/microblog/plugins/statusnet/ui/gwibber-accounts-statusnet.ui.h:3
 msgid "Authorize with Status.Net"
-msgstr "Autoriser med StatusNet"
+msgstr "Autoriser hos Status.Net"
 
 #: ../gwibber/microblog/plugins/statusnet/ui/gwibber-accounts-statusnet.ui.h:4
 msgid "Status.net authorized"
-msgstr "Autorisert med StatusNet"
+msgstr "Autorisert hos Status.net"
 
 #: ../gwibber/microblog/plugins/twitter/ui/gwibber-accounts-twitter.ui.h:2
 msgid "Authorize with twitter"
@@ -983,8 +996,8 @@
 "/</a>"
 msgstr ""
 "<span size=\"small\"><b>Eksempel:</b> brukernavn</span>\n"
-"Du må aktivere \"Api-tilgang\" for å motta \n"
-"en API-nøkkel, <a "
+"Du må aktivere «API-tilgang» for å motta \n"
+"en API-nøkkel. <a "
 "href=\"http://www.qaiku.com/settings/api/\">http://www.qaiku.com/settings/api"
 "/</a>"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/ibus10.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/ibus10.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/ibus10.po	2013-01-29 09:33:54.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/ibus10.po	2014-01-07 06:37:33.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:49+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:36+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../bus/ibus.desktop.in.h:1
 msgid "IBus"
@@ -23,21 +23,21 @@
 
 #: ../bus/ibus.desktop.in.h:2
 msgid "Input Method Framework"
-msgstr ""
+msgstr "Rammeverk for inndatametode"
 
 #: ../bus/ibus.desktop.in.h:3
 msgid "Start IBus Input Method Framework"
-msgstr ""
+msgstr "Start IBus rammeverk for inndatametode"
 
-#: ../ibus/_config.py.in:40
+#: ../ibus/_config.py.in:41
 msgid ""
 "Copyright (c) 2007-2010 Peng Huang\n"
 "Copyright (c) 2007-2010 Red Hat, Inc."
 msgstr ""
-"Opphavsrett (c) 2007-2010 Peng Huang\n"
-"Opphavsrett (c) 2007-2010 Red Hat, Inc."
+"Opphavsrett © 2007-2010 Peng Huang\n"
+"Opphavsrett © 2007-2010 Red Hat, Inc."
 
-#: ../ibus/lang.py:41
+#: ../ibus/lang.py:41 ../src/ibusutil.c:150 ../src/ibusutil.c:152
 msgid "Other"
 msgstr "Annet"
 
@@ -71,7 +71,7 @@
 msgid "IBus input method framework"
 msgstr "IBus inndatametode rammeverk"
 
-#: ../ui/gtk/panel.py:388
+#: ../ui/gtk3/panel.vala:1048
 msgid "Restart"
 msgstr "Start på nytt"
 
@@ -87,22 +87,26 @@
 msgid "No input window"
 msgstr "Ingen inngangsvindu"
 
-#: ../ui/gtk/panel.py:599
+#: ../ui/gtk3/panel.vala:1012
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr "IBus er en intelligent inngang buss for Linux/Unix."
+msgstr "IBus er en intelligent inndatabuss for Linux/Unix."
 
-#: ../ui/gtk/panel.py:603
+#: ../ui/gtk3/panel.vala:1016
 msgid "translator-credits"
 msgstr ""
+"Kjartan Maraas <kmaraas@gnome.org>\n"
+"\n"
 "Launchpad Contributions:\n"
 "  André Savik https://launchpad.net/~asavik\n"
 "  Hans Joachim Desserud https://launchpad.net/~hjd\n"
 "  Henrik Hodne https://launchpad.net/~dvyjones\n"
 "  Kai Arne https://launchpad.net/~kaiarne5\n"
+"  Kjartan Maraas https://launchpad.net/~kmaraas\n"
 "  Kjetil Birkeland Moe https://launchpad.net/~kjetilbmoe\n"
 "  Mathias Bynke https://launchpad.net/~mabynke\n"
 "  Terje Andre Arnøy https://launchpad.net/~terjeaar\n"
-"  rollinroll https://launchpad.net/~haakon55"
+"  rollinroll https://launchpad.net/~haakon55\n"
+"  Åka Sikrom https://launchpad.net/~akrosikam"
 
 #: ../ui/gtk/languagebar.py:106
 msgid "About the input method"
@@ -112,8 +116,7 @@
 msgid "Switch input method"
 msgstr "Bytt inndatametode"
 
-#: ../ui/gtk/languagebar.py:360 ../ui/gtk/engineabout.py:33
-#: ../setup/engineabout.py:33 ../setup/setup.ui.h:61
+#: ../setup/setup.ui.h:61 ../setup/engineabout.py:34
 msgid "About"
 msgstr "Om"
 
@@ -121,22 +124,22 @@
 msgid "About the Input Method"
 msgstr "Om Inndata-metoden"
 
-#: ../ui/gtk/engineabout.py:61 ../setup/engineabout.py:61
+#: ../setup/engineabout.py:68
 #, python-format
 msgid "Language: %s\n"
 msgstr "Språk: %s\n"
 
-#: ../ui/gtk/engineabout.py:63 ../setup/engineabout.py:63
+#: ../setup/engineabout.py:71
 #, python-format
 msgid "Keyboard layout: %s\n"
-msgstr "Tastaturoppsett: %s\n"
+msgstr "Tastaturutforming: %s\n"
 
-#: ../ui/gtk/engineabout.py:65 ../setup/engineabout.py:65
+#: ../setup/engineabout.py:74
 #, python-format
 msgid "Author: %s\n"
 msgstr "Forfatter: %s\n"
 
-#: ../ui/gtk/engineabout.py:67 ../setup/engineabout.py:67
+#: ../setup/engineabout.py:77
 msgid "Description:\n"
 msgstr "Beskrivelse:\n"
 
@@ -146,11 +149,11 @@
 
 #: ../setup/main.py:114
 msgid "enable"
-msgstr "aktiver"
+msgstr "slå på"
 
 #: ../setup/main.py:125
 msgid "disable"
-msgstr "deaktiver"
+msgstr "slå av"
 
 #: ../setup/main.py:136
 msgid "next input method"
@@ -160,7 +163,7 @@
 msgid "previous input method"
 msgstr "forrige inndatametode"
 
-#: ../setup/main.py:359
+#: ../setup/main.py:355
 msgid ""
 "The list of your saved input methods will be cleared immediately and the "
 "list will be configured by the login language every time. Do you agree with "
@@ -173,54 +176,54 @@
 "start it now?"
 msgstr ""
 
-#: ../setup/main.py:402
+#: ../setup/main.py:400
 msgid ""
 "IBus has been started! If you can not use IBus, please open System Menu -> "
 "System Settings -> Language Support and set the \"Keyboard Input Method\" to "
 "\"ibus\", then log out and back in again."
 msgstr ""
 
-#: ../setup/main.py:414
+#: ../setup/main.py:423
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Velg tastatursnarvei for %s"
 
-#: ../setup/keyboardshortcut.py:52
+#: ../setup/keyboardshortcut.py:54
 msgid "Keyboard shortcuts"
 msgstr "Tastatursnarveier"
 
-#: ../setup/keyboardshortcut.py:63
+#: ../setup/keyboardshortcut.py:65
 msgid "Key code:"
-msgstr "Hurtigtast:"
+msgstr "Tastekode:"
 
-#: ../setup/keyboardshortcut.py:78
+#: ../setup/keyboardshortcut.py:80
 msgid "Modifiers:"
-msgstr "Modifikatorer:"
+msgstr "Endringstaster:"
 
-#: ../setup/keyboardshortcut.py:231
+#: ../setup/keyboardshortcut.py:250
 msgid ""
 "Please press a key (or a key combination).\n"
 "The dialog will be closed when the key is released."
 msgstr ""
-"Vennligst trykk på en tast (eller en tastekombinasjon).\n"
+"Vennligst trykk en tast (eller en tastekombinasjon)\n"
 "Dialogen vil lukkes når tasten slippes."
 
-#: ../setup/keyboardshortcut.py:233
+#: ../setup/keyboardshortcut.py:252
 msgid "Please press a key (or a key combination)"
-msgstr "Vennligst trykk en tast (eller tastekombinasjon)"
+msgstr "Vennligst trykk en tast (eller en tastekombinasjon)"
 
-#: ../setup/enginecombobox.py:120
+#: ../setup/enginecombobox.py:223
 msgid "Select an input method"
 msgstr "Velg en inndatametode"
 
 #. create im name & icon column
-#: ../setup/enginetreeview.py:64 ../setup/setup.ui.h:45
+#: ../setup/setup.ui.h:45 ../setup/enginetreeview.py:66
 msgid "Input Method"
 msgstr "Inndatametode"
 
-#: ../setup/enginetreeview.py:92
+#: ../setup/enginetreeview.py:94
 msgid "Kbd"
-msgstr "Kbd"
+msgstr "Tastatur"
 
 #: ../setup/ibus-setup.desktop.in.h:1
 msgid "Keyboard Input Methods"
@@ -230,79 +233,79 @@
 msgid "Adjust methods for keyboard input."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:1
+#: ../data/ibus.schemas.in.h:4
 msgid "Preload engines"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:2
+#: ../data/ibus.schemas.in.h:5
 msgid "Preload engines during ibus starts up"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:3
+#: ../data/ibus.schemas.in.h:1
 msgid "Preload engine mode"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:4
+#: ../data/ibus.schemas.in.h:2
 msgid ""
 "Preload engines are loaded with this mode. 0 = user customized engines. 1 = "
 "language related engines."
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:5
+#: ../data/ibus.schemas.in.h:18
 msgid "Trigger shortcut keys"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:6 ../setup/setup.ui.h:17
+#: ../setup/setup.ui.h:17 ../data/ibus.schemas.in.h:19
 msgid "The shortcut keys for turning input method on or off"
 msgstr "Snarvei for å skru inndata metode av eller på"
 
-#: ../data/ibus.schemas.in.h:7
+#: ../data/ibus.schemas.in.h:23
 msgid "Enable shortcut keys"
 msgstr "Aktiver hurtigtaster"
 
-#: ../data/ibus.schemas.in.h:8
+#: ../data/ibus.schemas.in.h:24
 msgid "The shortcut keys for turning input method on"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:9
+#: ../data/ibus.schemas.in.h:25
 msgid "Disable shortcut keys"
-msgstr "Deaktiver hurtigtaster"
+msgstr "Slå av snarveitaster"
 
-#: ../data/ibus.schemas.in.h:10
+#: ../data/ibus.schemas.in.h:26
 msgid "The shortcut keys for turning input method off"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:11
+#: ../data/ibus.schemas.in.h:27
 msgid "Next engine shortcut keys"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:12
+#: ../data/ibus.schemas.in.h:28
 msgid "The shortcut keys for switching to the next input method in the list"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:13
+#: ../data/ibus.schemas.in.h:29
 msgid "Prev engine shortcut keys"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:14
+#: ../data/ibus.schemas.in.h:30
 msgid "The shortcut keys for switching to the previous input method"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:15
+#: ../data/ibus.schemas.in.h:31
 msgid "Auto hide"
-msgstr "Autoskjul"
+msgstr "Skjul automatisk"
 
-#: ../data/ibus.schemas.in.h:16
+#: ../data/ibus.schemas.in.h:32
 msgid ""
 "The behavior of language panel. 0 = Embedded in menu, 1 = Auto hide, 2 = "
 "Always show"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:17
+#: ../data/ibus.schemas.in.h:33
 msgid "Language panel position"
 msgstr "Språkpanel posisjon"
 
-#: ../data/ibus.schemas.in.h:18
+#: ../data/ibus.schemas.in.h:34
 msgid ""
 "The position of the language panel. 0 = Top left corner, 1 = Top right "
 "corner, 2 = Bottom left corner, 3 = Bottom right corner, 4 = Custom"
@@ -310,119 +313,119 @@
 "Posisjonen av språkpanelet. 0 = Øvre venstre hjørnet, 1 = Øvre høyre "
 "hjørnet, 2 = Nedre venstre hjørne, 3 = Nedre høyre hjørnet, 4 = Selvvalgt"
 
-#: ../data/ibus.schemas.in.h:19
+#: ../data/ibus.schemas.in.h:35
 msgid "Orientation of lookup table"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:20
+#: ../data/ibus.schemas.in.h:36
 msgid "Orientation of lookup table. 0 = Horizontal, 1 = Vertical"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:21 ../setup/setup.ui.h:27
+#: ../setup/setup.ui.h:27 ../data/ibus.schemas.in.h:37
 msgid "Show icon on system tray"
 msgstr "Vis ikon i systemkurv"
 
-#: ../data/ibus.schemas.in.h:22
+#: ../data/ibus.schemas.in.h:38
 msgid "Show input method name"
 msgstr "Vis navn på inndata metode"
 
-#: ../data/ibus.schemas.in.h:23 ../setup/setup.ui.h:28
+#: ../setup/setup.ui.h:28 ../data/ibus.schemas.in.h:39
 msgid "Show input method name on language bar"
 msgstr "Vis inndatametode på språklinjen"
 
-#: ../data/ibus.schemas.in.h:24 ../setup/setup.ui.h:46
+#: ../setup/setup.ui.h:46 ../data/ibus.schemas.in.h:40
 msgid "Use system keyboard layout"
 msgstr "Bruk system-tastaturoppsett"
 
-#: ../data/ibus.schemas.in.h:25 ../setup/setup.ui.h:47
+#: ../setup/setup.ui.h:47 ../data/ibus.schemas.in.h:41
 msgid "Use system keyboard (XKB) layout"
 msgstr "Bruk system-tastaturoppsett (XKB)"
 
-#: ../data/ibus.schemas.in.h:26
+#: ../data/ibus.schemas.in.h:42
 msgid "Use custom font"
 msgstr "Bruk selvvalgt skrifttype"
 
-#: ../data/ibus.schemas.in.h:27
+#: ../data/ibus.schemas.in.h:43
 msgid "Use custom font name for language panel"
 msgstr "Bruk selvvalgt skrifttypenavn på språkpanelet"
 
-#: ../data/ibus.schemas.in.h:28
+#: ../data/ibus.schemas.in.h:49
 msgid "Custom font"
-msgstr "Tilpasset skrifttype"
+msgstr "Egendefinert skrift"
 
-#: ../data/ibus.schemas.in.h:29
+#: ../data/ibus.schemas.in.h:50
 msgid "Custom font name for language panel"
-msgstr "Egendefinert skrifttype for språkpanel"
+msgstr "Egendefinert skriftnavn for språkpanelet"
 
-#: ../data/ibus.schemas.in.h:30
+#: ../data/ibus.schemas.in.h:51
 msgid "Embed Preedit Text"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:31
+#: ../data/ibus.schemas.in.h:52
 msgid "Embed Preedit Text in Application Window"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:32
+#: ../data/ibus.schemas.in.h:53
 msgid "Use global input method"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:33 ../setup/setup.ui.h:49
+#: ../setup/setup.ui.h:49 ../data/ibus.schemas.in.h:54
 msgid "Share the same input method among all applications"
-msgstr ""
+msgstr "Del den samme skrivemetoden på tvers av programmer"
 
-#: ../data/ibus.schemas.in.h:34
+#: ../data/ibus.schemas.in.h:55
 msgid "Enable input method by default"
-msgstr ""
+msgstr "Slå på inndatametode som forvalg"
 
-#: ../data/ibus.schemas.in.h:35
+#: ../data/ibus.schemas.in.h:56
 msgid "Enable input method by default when the application gets input focus"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:36
+#: ../data/ibus.schemas.in.h:57
 msgid "DConf preserve name prefixes"
 msgstr ""
 
-#: ../data/ibus.schemas.in.h:37
+#: ../data/ibus.schemas.in.h:58
 msgid "Prefixes of DConf keys to stop name conversion"
 msgstr ""
 
 #: ../setup/setup.ui.h:1
 msgid "Horizontal"
-msgstr "Vannrett"
+msgstr "Horisontal"
 
 #: ../setup/setup.ui.h:2
 msgid "Vertical"
-msgstr "Loddrett"
+msgstr "Vertikal"
 
-#: ../setup/setup.ui.h:3
+#: ../setup/setup.ui.h:8
 msgid "Embedded in menu"
-msgstr ""
+msgstr "Innebygget i menyen"
 
-#: ../setup/setup.ui.h:4
+#: ../setup/setup.ui.h:9
 msgid "When active"
 msgstr "Når aktiv"
 
-#: ../setup/setup.ui.h:5
+#: ../setup/setup.ui.h:10
 msgid "Always"
 msgstr "Alltid"
 
-#: ../setup/setup.ui.h:6
+#: ../setup/setup.ui.h:3
 msgid "Top left corner"
 msgstr "Øvre venstre hjørne"
 
-#: ../setup/setup.ui.h:7
+#: ../setup/setup.ui.h:4
 msgid "Top right corner"
 msgstr "Øvre høyre hjørne"
 
-#: ../setup/setup.ui.h:8
+#: ../setup/setup.ui.h:5
 msgid "Bottom left corner"
-msgstr "Nedre venstre hjørne"
+msgstr "Nederste venstre hjørne"
 
-#: ../setup/setup.ui.h:9
+#: ../setup/setup.ui.h:6
 msgid "Bottom right corner"
-msgstr "Nedre høyre hjørne"
+msgstr "Nederste høyre hjørne"
 
-#: ../setup/setup.ui.h:10
+#: ../setup/setup.ui.h:7
 msgid "Custom"
 msgstr "Egendefinert"
 
@@ -452,19 +455,19 @@
 
 #: ../setup/setup.ui.h:18
 msgid "Enable or disable:"
-msgstr "Aktivere eller deaktivere:"
+msgstr "Slå på eller av:"
 
 #: ../setup/setup.ui.h:19
 msgid "Enable:"
-msgstr "Aktiver:"
+msgstr "Slå på:"
 
 #: ../setup/setup.ui.h:20
 msgid "Disable:"
-msgstr "Deaktiver:"
+msgstr "Slå av:"
 
 #: ../setup/setup.ui.h:21
 msgid "<b>Keyboard Shortcuts</b>"
-msgstr "<b>Hurtigtaster</b>"
+msgstr "<b>Tastatursnarveier</b>"
 
 #: ../setup/setup.ui.h:22
 msgid "Set the orientation of candidates in lookup table"
@@ -480,11 +483,11 @@
 
 #: ../setup/setup.ui.h:25
 msgid "Show language panel:"
-msgstr "Vis språklinje:"
+msgstr "Vis språkpanel:"
 
 #: ../setup/setup.ui.h:26
 msgid "Language panel position:"
-msgstr "Språkpanel posisjon:"
+msgstr "Posisjon for språkpanel:"
 
 #: ../setup/setup.ui.h:29
 msgid "Show input method's name on language bar when check the checkbox"
@@ -500,11 +503,11 @@
 
 #: ../setup/setup.ui.h:32
 msgid "Use custom font:"
-msgstr "Bruk egen skrift:"
+msgstr "Bruk egendefinert skrift:"
 
 #: ../setup/setup.ui.h:33
 msgid "<b>Font and Style</b>"
-msgstr "<b>Skrifttype og stil</b>"
+msgstr "<b>Skrift og stil</b>"
 
 #: ../setup/setup.ui.h:34
 msgid "General"
@@ -512,11 +515,11 @@
 
 #: ../setup/setup.ui.h:35
 msgid "Customize active input _methods"
-msgstr ""
+msgstr "Tilpass aktive skrive_metoder"
 
 #: ../setup/setup.ui.h:36
 msgid "Customize active input methods"
-msgstr ""
+msgstr "Tilpass aktive skrivemetoder"
 
 #: ../setup/setup.ui.h:37
 msgid "Add the selected input method into the enabled input methods"
@@ -536,11 +539,11 @@
 
 #: ../setup/setup.ui.h:41
 msgid "Show information of the selected input method"
-msgstr "Vis informasjon om valgte inndatametoder"
+msgstr "Vis informasjon om valgt inndatametode"
 
 #: ../setup/setup.ui.h:42
 msgid "Show setup of the selected input method"
-msgstr ""
+msgstr "Vis oppsett for valgt skrivemetode"
 
 #: ../setup/setup.ui.h:43
 msgid ""
@@ -556,7 +559,7 @@
 
 #: ../setup/setup.ui.h:50
 msgid "<b>Global input method settings</b>"
-msgstr ""
+msgstr "<b>Globale innstillinger for inndatametode</b>"
 
 #: ../setup/setup.ui.h:51
 msgid "Advanced"
@@ -580,7 +583,7 @@
 
 #: ../setup/setup.ui.h:59
 msgid "Start ibus on login"
-msgstr "Start ibus ved innlogging"
+msgstr "Start ibus ved pålogging"
 
 #: ../setup/setup.ui.h:60
 msgid "<b>Startup</b>"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/indicator-appmenu.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/indicator-appmenu.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/indicator-appmenu.po	2013-01-29 09:33:55.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/indicator-appmenu.po	2014-01-07 06:37:52.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:38+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 21:09+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../data/com.canonical.indicator.appmenu.gschema.xml.h:1
 msgid "Where the menus displayed"
@@ -23,7 +23,7 @@
 
 #: ../data/com.canonical.indicator.appmenu.gschema.xml.h:2
 msgid "Controls the menu display location. TODO: add more"
-msgstr ""
+msgstr "Kontrollerer menyplasseringen"
 
 #: ../data/com.canonical.indicator.appmenu.hud.gschema.xml.h:1
 msgid "Whether to store usage data"
@@ -41,7 +41,7 @@
 
 #: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:1
 msgid "The penalty given to a menu item being in an indicator"
-msgstr ""
+msgstr "Nedrykk av menyvalg som finnes i en indikator"
 
 #: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:3
 #, no-c-format
@@ -51,10 +51,15 @@
 "represents the percentage of that penalty so a value of '50' is a 50% "
 "additional to the calculated distance."
 msgstr ""
+"For å fremme programmets menyvalg i søkeresultater, rykkes indikator-"
+"menyvalgene ned. Denne verdien angir prosentvis hvor langt nedrykket skal "
+"virke. For eksempel vil en verdi på «50» gi 50 prosent nedprioritering, i "
+"tillegg til beregnet avstand mellom søketreff som er og ikke er indikator-"
+"menyvalg."
 
 #: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:4
 msgid "Penalty for extra characters added to the search"
-msgstr ""
+msgstr "Nedrykk av overflødige søketegn"
 
 #: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:5
 msgid ""
@@ -64,10 +69,13 @@
 "This penalty would be applied if the user typed \"fiile\" when searching "
 "against the menu item \"File\", for example."
 msgstr ""
+"Nedrykk for hvert overflødige tegn i søkestrengen.\n"
+"Et slikt nedrykk blir for eksempel lagt til hvis brukeren søker etter "
+"«fiil», og systemet finner menyvalget «Fil»."
 
 #: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:8
 msgid "Penalty applied if a character is dropped"
-msgstr ""
+msgstr "Kompensasjon for manglende søketegn"
 
 #: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:9
 msgid ""
@@ -78,10 +86,15 @@
 "This penalty would be applied if the user typed \"fle\" when searching "
 "against the menu item \"File\", for example."
 msgstr ""
+"Motvekt for manglende tegn i søkestrengen, der ytterligere presisjon i form "
+"av flere tegn ville gitt nøyaktig treff på et menyvalg. Dette gjelder kun "
+"tegn som ikke utgjør slutten av søkestrengen.\n"
+"Motvekten blir for eksempel lagt til når brukeren skriver «fl», og forsøker "
+"å finne «Fil»."
 
 #: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:12
 msgid "Penalty applied if a character is dropped from the end"
-msgstr ""
+msgstr "Nedrykk når et tegn mangler på slutten"
 
 #: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:13
 msgid ""
@@ -90,10 +103,15 @@
 "This penalty would be applied if the user typed \"fil\" when searching "
 "against the menu item \"File\", for example."
 msgstr ""
+"Nedrykk per tegn som mangler i slutten av en søkestreng for å gi eksakt "
+"treff.\n"
+"\n"
+"Denne vil brukes hvis brukeren for eksempel skriver «fi» når hun søker etter "
+"«fil»."
 
 #: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:16
 msgid "Penalty applied when the characters are not the same"
-msgstr ""
+msgstr "Nedrykk som skal brukes når tegnene ikke samsvarer"
 
 #: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:17
 msgid ""
@@ -102,10 +120,15 @@
 "The penalty would be applied if the user typed \"fike\" when searching "
 "against the menu item \"File\", for example."
 msgstr ""
+"Nedrykk per tegn som ikke stemmer i en søkestreng som ellers ville gitt "
+"eksakt treff.\n"
+"\n"
+"Denne vil brukes hvis brukeren for eksempel skriver «fik» når hun søker "
+"etter «Fil»."
 
 #: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:20
 msgid "The highest distance value that is shown in the results"
-msgstr ""
+msgstr "Den høyeste avstandsverdien som vises i resultatene"
 
 #: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:21
 msgid ""
@@ -113,6 +136,9 @@
 "all values above this max are dropped. This means that the history for those "
 "entries aren't looked up as well."
 msgstr ""
+"Straks avstandene er utregnet (inkludert indikator-nedrykk), vil alle treff "
+"med verdier som overstiger denne maksimumverdien fjernes. Dette betyr også "
+"at historikken for slike elementer ikke blir sjekket."
 
 #. TRANSLATORS:  This is used for Application indicators that
 #. are not providing a title string.  The '%s' represents the
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/indicator-datetime.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/indicator-datetime.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/indicator-datetime.po	2013-01-29 09:33:58.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/indicator-datetime.po	2014-01-07 06:37:36.000000000 +0000
@@ -14,40 +14,38 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:18+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:12+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
-#: ../src/datetime-service.c:352
+#: ../src/datetime-service.c:346
 msgid "Error getting time"
 msgstr "Feil under henting av klokkeslett"
 
-#. eranslators: strftime(3) style date format on top of the menu when you click on the clock
-#: ../src/datetime-service.c:358
+#: ../src/service.c:827
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
-#: ../src/datetime-service.c:567
+#. add the 'Add Event…' menuitem
+#: ../src/service.c:1053
 msgid "Add Event…"
 msgstr "Legg til hendelse..."
 
-#. TRANSLATORS: This is a strftime string for the day for full day events
-#. in the menu.  It should most likely be either '%A' for a full text day
-#. (Wednesday) or '%a' for a shortened one (Wed).  You should only need to
-#. change for '%a' in the case of langauges with very long day names.
-#: ../src/datetime-service.c:871
+#. TRANSLATORS: a strftime(3) format showing full day events.
+#. * "%A" means a full text day (Wednesday), "%a" means abbreviated (Wed).
+#: ../src/service.c:895
 #, c-format
 msgid "%A"
 msgstr "%A"
 
-#: ../src/datetime-service.c:1016
+#: ../src/datetime-service.c:1012
 msgid "No date yet…"
 msgstr "Ingen dato enda..."
 
-#: ../src/datetime-service.c:1054
+#: ../src/datetime-service.c:1050
 msgid "Time & Date Settings…"
 msgstr "Innstillinger for tid og dato..."
 
-#: ../src/datetime-service.c:1328
+#: ../src/datetime-service.c:1323
 msgid ""
 "Unable to get a GeoClue client!  Geolocation based timezone support will not "
 "be available."
@@ -55,57 +53,53 @@
 "Kan ikke hente GeoClue-klient! Tidssonestøtte basert på geoplassering vil "
 "ikke være tilgjengelig."
 
-#: ../src/datetime-prefs.c:658
+#: ../panel/datetime-prefs.c:643
 msgid "You need to choose a location to change the time zone."
 msgstr "Du må velge en plassering for å endre tidssone."
 
-#: ../src/datetime-prefs.c:689
+#: ../panel/datetime-prefs.c:675
 msgid "Unlock to change these settings"
 msgstr "Lås opp for å endre disse innstillingene"
 
-#: ../src/datetime-prefs.c:690
+#: ../panel/datetime-prefs.c:676
 msgid "Lock to prevent further changes"
 msgstr "Lås for å hindre ytterlige endringer"
 
-#: ../src/datetime-prefs-locations.c:383
+#: ../panel/datetime-prefs-locations.c:390
 msgid "You need to complete this location for it to appear in the menu."
 msgstr "Du må fullføre denne plasseringen for at denne skal vises i menyen."
 
-#: ../src/datetime-prefs-locations.c:618
+#: ../panel/datetime-prefs-locations.c:628
 msgid "Location"
 msgstr "Plassering"
 
-#: ../src/datetime-prefs-locations.c:634
+#: ../panel/datetime-prefs-locations.c:644
 msgid "Time"
 msgstr "Tid"
 
-#. TRANSLATORS: A format string for the strftime function for
-#. a clock showing 12-hour time with seconds.
-#: ../src/utils.c:204
+#. TRANSLATORS: a strftime(3) format for 12hr time w/seconds
+#: ../src/utils.c:198
 msgid "%l:%M:%S %p"
 msgstr "%l.%M.%S %p"
 
-#. TRANSLATORS: A format string for the strftime function for
-#. a clock showing 24-hour time with seconds.
-#: ../src/utils.c:212
+#. TRANSLATORS: a strftime(3) format for 24hr time w/seconds
+#: ../src/utils.c:204
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
-#. TRANSLATORS:  This is a format string passed to strftime to represent
-#. the day of the week, the month and the day of the month.
-#: ../src/utils.c:231
+#. TRANSLATORS: a strftime(3) format showing the weekday and date
+#: ../src/utils.c:368
 msgid "%a %b %e"
 msgstr "%a %e. %b"
 
-#. TRANSLATORS:  This is a format string passed to strftime to represent
-#. the month and the day of the month.
-#: ../src/utils.c:235
+#. TRANSLATORS: a strftime(3) format showing the date
+#: ../src/utils.c:380
 msgid "%b %e"
 msgstr "%e %b"
 
-#. TRANSLATORS:  This is a format string passed to strftime to represent
-#. the day of the week.
-#: ../src/utils.c:239
+#. a strftime(3) fmt string for abbreviated day of week
+#. TRANSLATORS: a strftime(3) format showing the weekday.
+#: ../src/utils.c:306 ../src/utils.c:374
 #, c-format
 msgid "%a"
 msgstr "%a"
@@ -118,15 +112,13 @@
 msgid "%s %s"
 msgstr "%s %s"
 
-#. TRANSLATORS: A format string for the strftime function for
-#. a clock showing 12-hour time without seconds.
-#: ../src/settings-shared.h:49
+#. TRANSLATORS: a strftime(3) format for 12hr time
+#: ../src/utils.c:201
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#. TRANSLATORS: A format string for the strftime function for
-#. a clock showing 24-hour time without seconds.
-#: ../src/settings-shared.h:53
+#. TRANSLATORS: a strftime(3) format for 24hr time
+#: ../src/utils.c:207
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -201,50 +193,50 @@
 msgid "_Date and month"
 msgstr "_Dato og måned"
 
-#: ../data/datetime-dialog.ui.h:17
+#: ../data/datetime-dialog.ui.h:18
 msgid "_12-hour time"
 msgstr "_12-timersvisning"
 
-#: ../data/datetime-dialog.ui.h:18
+#: ../data/datetime-dialog.ui.h:19
 msgid "_24-hour time"
 msgstr "_24-timersvisning"
 
-#: ../data/datetime-dialog.ui.h:19
+#: ../data/datetime-dialog.ui.h:20
 msgid "Seco_nds"
 msgstr "Seku_nder"
 
-#: ../data/datetime-dialog.ui.h:20
+#: ../data/datetime-dialog.ui.h:21
 msgid "In the clock’s menu, show:"
 msgstr "Vis i klokkemenyen:"
 
-#: ../data/datetime-dialog.ui.h:21
+#: ../data/datetime-dialog.ui.h:22
 msgid "_Monthly calendar"
 msgstr "_Månedskalender"
 
-#: ../data/datetime-dialog.ui.h:22
+#: ../data/datetime-dialog.ui.h:23
 msgid "Include week num_bers"
 msgstr "Vis ukenumre"
 
-#: ../data/datetime-dialog.ui.h:23
+#: ../data/datetime-dialog.ui.h:24
 msgid "Coming _events from Evolution Calendar"
 msgstr "Kommende _hendelser fra Evolutionkalenderen"
 
-#: ../data/datetime-dialog.ui.h:25
+#: ../data/datetime-dialog.ui.h:26
 msgid "Time in _other locations"
 msgstr "Tiden _andre steder"
 
-#: ../data/datetime-dialog.ui.h:26
+#: ../data/datetime-dialog.ui.h:27
 msgid "Choose _Locations…"
 msgstr "Velg _steder..."
 
-#: ../data/datetime-dialog.ui.h:27
+#: ../data/datetime-dialog.ui.h:28
 msgid "_Clock"
 msgstr "_Klokke"
 
-#: ../data/indicator-datetime-preferences.desktop.in.h:1
+#: ../data/gnome-indicator-datetime-panel.desktop.in.h:1
 msgid "Time & Date"
 msgstr "Tid og dato"
 
-#: ../data/indicator-datetime-preferences.desktop.in.h:2
+#: ../data/gnome-indicator-datetime-panel.desktop.in.h:2
 msgid "Change your clock and date settings"
 msgstr "Endre innstillinger for dato og klokkeslett"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/indicator-messages.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/indicator-messages.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/indicator-messages.po	2013-01-29 09:33:52.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/indicator-messages.po	2014-01-07 06:37:33.000000000 +0000
@@ -9,24 +9,24 @@
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-12 01:30+0000\n"
 "PO-Revision-Date: 2011-08-26 20:16+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
+"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:51+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:38+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
-#: ../src/indicator-messages.c:208 ../src/indicator-messages.c:245
+#: ../src/im-application-list.c:171
 msgid "New Messages"
 msgstr "Nye meldinger"
 
-#: ../src/messages-service.c:329
+#: ../src/im-application-list.c:174
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../src/messages-service.c:659
+#: ../src/im-desktop-menu.c:319
 msgid "Clear"
 msgstr "Fjern"
 
@@ -83,22 +83,22 @@
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: ../src/messages-service.c:552
+#: ../src/im-desktop-menu.c:270
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../src/messages-service.c:553
+#: ../src/im-desktop-menu.c:271
 msgid "Away"
 msgstr "Borte"
 
-#: ../src/messages-service.c:554
+#: ../src/im-desktop-menu.c:272
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/messages-service.c:555
+#: ../src/im-desktop-menu.c:273
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../src/messages-service.c:556
+#: ../src/im-desktop-menu.c:274
 msgid "Offline"
 msgstr "Frakoblet"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/indicator-power.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/indicator-power.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/indicator-power.po	2013-01-29 09:33:56.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/indicator-power.po	2014-01-07 06:37:33.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:49+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:37+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../data/com.canonical.indicator.power.gschema.xml.in.h:1
 msgid "Show time in Menu Bar"
@@ -26,11 +26,11 @@
 msgid "Whether or not to show the time in the menu bar."
 msgstr "Om tiden skal vises på menylinjen."
 
-#: ../data/com.canonical.indicator.power.gschema.xml.in.h:3
+#: ../data/com.canonical.indicator.power.gschema.xml.in.h:5
 msgid "When to show the battery status in the menu bar."
 msgstr "Når batteristatusen skal vises på menylinjen."
 
-#: ../data/com.canonical.indicator.power.gschema.xml.in.h:4
+#: ../data/com.canonical.indicator.power.gschema.xml.in.h:6
 msgid ""
 "Options for when to show battery status. Valid options are \"present\", "
 "\"charge\", and \"never\"."
@@ -38,18 +38,18 @@
 "Innstillinger for når batteristatus skal vises. Gyldige valg er "
 "\"nåværende\", \"lading\" og \"aldri\"."
 
-#: ../src/device.c:444 ../src/device.c:445
+#: ../src/device.c:459 ../src/device.c:460
 msgid "Unknown time"
 msgstr "Ukjent tid"
 
-#: ../src/device.c:453
+#: ../src/device.c:468
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minutt"
 msgstr[1] "%i minutter"
 
-#: ../src/device.c:467
+#: ../src/device.c:482
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -58,18 +58,18 @@
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../src/device.c:475
+#: ../src/device.c:490
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s, %i %s"
 
-#: ../src/device.c:476
+#: ../src/device.c:491
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: ../src/device.c:477
+#: ../src/device.c:492
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
@@ -81,110 +81,109 @@
 msgstr "Strømadapter"
 
 #. TRANSLATORS: laptop primary battery
-#: ../src/device.c:493
+#: ../src/device.c:508 ../src/service.c:333
 msgid "Battery"
 msgstr "Batteri"
 
 #. TRANSLATORS: battery-backed AC power source
-#: ../src/device.c:497
+#: ../src/device.c:512
 msgid "UPS"
 msgstr "UPS"
 
 #. TRANSLATORS: a monitor is a device to measure voltage and current
-#: ../src/device.c:501
+#: ../src/device.c:516
 msgid "Monitor"
 msgstr "Skjerm"
 
 #. TRANSLATORS: wireless mice with internal batteries
-#: ../src/device.c:505
+#: ../src/device.c:520
 msgid "Mouse"
 msgstr "Mus"
 
 #. TRANSLATORS: wireless keyboard with internal battery
-#: ../src/device.c:509
+#: ../src/device.c:524
 msgid "Keyboard"
 msgstr "Tastatur"
 
 #. TRANSLATORS: portable device
-#: ../src/device.c:513
+#: ../src/device.c:528
 msgid "PDA"
 msgstr "PDA"
 
 #. TRANSLATORS: cell phone (mobile...)
-#: ../src/device.c:517
+#: ../src/device.c:532
 msgid "Cell phone"
 msgstr "Mobiltelefon"
 
 #. TRANSLATORS: media player, mp3 etc
-#: ../src/device.c:521
+#: ../src/device.c:536
 msgid "Media player"
 msgstr "Mediespiller"
 
 #. TRANSLATORS: tablet device
-#: ../src/device.c:525
+#: ../src/device.c:540
 msgid "Tablet"
 msgstr "Nettbrett"
 
 #. TRANSLATORS: tablet device
-#: ../src/device.c:529
+#: ../src/device.c:544
 msgid "Computer"
 msgstr "Datamaskin"
 
 #. TRANSLATORS: %2 is a time string, e.g. "1 hour 5 minutes"
-#: ../src/device.c:576
+#: ../src/device.c:597
 #, c-format
 msgid "%s (%s to charge (%.0lf%%))"
 msgstr "%s (%s til fulladet (%.0lf%%))"
 
-#: ../src/device.c:577
+#: ../src/device.c:598
 #, c-format
 msgid "%s (%s to charge)"
 msgstr "%s (%s til fulladet)"
 
-#: ../src/device.c:582 ../src/device.c:583
+#: ../src/device.c:603 ../src/device.c:604
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. TRANSLATORS: %2 is a time string, e.g. "1 hour 5 minutes"
-#: ../src/device.c:589
+#: ../src/device.c:610
 #, c-format
 msgid "%s (%s left (%.0lf%%))"
 msgstr "%s (%s igjen (%.0lf%%))"
 
-#: ../src/device.c:590
+#: ../src/device.c:611
 #, c-format
 msgid "%s (%s left)"
 msgstr "%s (%s gjenstår)"
 
-#: ../src/device.c:599
+#: ../src/device.c:620
 #, c-format
 msgid "%s (charged)"
 msgstr "%s (fulladet)"
 
 #. TRANSLATORS: %2 is a percentage value. Note: this string is only
 #. * used when we don't have a time value
-#: ../src/device.c:607
+#: ../src/device.c:628
 #, c-format
 msgid "%s (%.0lf%%)"
 msgstr "%s (%.0lf%%)"
 
-#: ../src/device.c:609
+#: ../src/device.c:630
 #, c-format
 msgid "(%.0lf%%)"
 msgstr "(%.0lf%%)"
 
-#: ../src/device.c:619
+#: ../src/device.c:640
 #, c-format
 msgid "%s (not present)"
 msgstr "%s (ikke tilgjengelig)"
 
-#: ../src/device.c:621
+#: ../src/device.c:642
 msgid "(not present)"
 msgstr "(ikke tilgjengelig)"
 
-#. options
-#: ../src/indicator-power.c:337
+#: ../src/service.c:513
 msgid "Show Time in Menu Bar"
 msgstr "Vis tid på menylinjen"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/indicator-printers.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/indicator-printers.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/indicator-printers.po	2013-01-29 09:34:06.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/indicator-printers.po	2014-01-07 06:37:52.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:42+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 21:14+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../src/indicator-printers.c:294
 msgid "Printers"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/indicator-session.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/indicator-session.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/indicator-session.po	2013-01-29 09:34:06.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/indicator-session.po	2014-01-07 06:37:36.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:13+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:04+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../data/com.canonical.indicator.session.gschema.xml.in.h:1
 msgid "Suppress the dialog to confirm logout, restart and shutdown action"
@@ -64,27 +64,27 @@
 msgid "Start a guest session using the classic desktop"
 msgstr "Start en gjesteøkt med det et klassisk skrivebordsmiljø"
 
-#: ../src/session-menu-mgr.c:488
+#: ../src/session-menu-mgr.c:503
 msgid "Log Out"
 msgstr "Logg av"
 
-#: ../src/session-menu-mgr.c:494
+#: ../src/session-menu-mgr.c:509
 msgid "Restart"
 msgstr "Start på nytt"
 
-#: ../src/session-menu-mgr.c:491
+#: ../src/session-menu-mgr.c:506
 msgid "Shut Down"
 msgstr "Slå av"
 
-#: ../src/session-menu-mgr.c:487 ../src/session-menu-mgr.c:502
+#: ../src/session-menu-mgr.c:502 ../src/session-menu-mgr.c:517
 msgid "Log Out…"
 msgstr "Logg av..."
 
-#: ../src/session-menu-mgr.c:493 ../src/session-menu-mgr.c:517
+#: ../src/session-menu-mgr.c:508 ../src/session-menu-mgr.c:532
 msgid "Restart…"
 msgstr "Start på nytt..."
 
-#: ../src/session-menu-mgr.c:490 ../src/session-menu-mgr.c:522
+#: ../src/session-menu-mgr.c:505 ../src/session-menu-mgr.c:537
 msgid "Shut Down…"
 msgstr "Slå av..."
 
@@ -110,18 +110,18 @@
 #: ../src/dialog.c:41
 msgid ""
 "Are you sure you want to close all programs and log out of the computer?"
-msgstr "Ønsker du å lukke alle programmer og logge av datamaskinen?"
+msgstr "Vil du lukke alle programmer og logge av datamaskinen?"
 
 #. LOGOUT_DIALOG_RESTART,
 #: ../src/dialog.c:42
 msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr "Ønsker du å lukke alle programmer og starte datamaskinen på nytt?"
+msgstr "Vil du lukke alle programmer og starte datamaskinen på nytt?"
 
 #. LOGOUT_DIALOG_SHUTDOWN,
 #: ../src/dialog.c:43
 msgid ""
 "Are you sure you want to close all programs and shut down the computer?"
-msgstr "Ønsker du å lukke alle programmer og slå av datamaskinen?"
+msgstr "Vil du lukke alle programmer og slå av datamaskinen?"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:47
@@ -197,7 +197,7 @@
 msgid "1"
 msgstr "1"
 
-#: ../src/session-menu-mgr.c:862
+#: ../src/session-menu-mgr.c:875
 msgid "Switch User Account…"
 msgstr "Bytt brukerkonto…"
 
@@ -218,7 +218,7 @@
 msgid "Restart to Complete Updates…"
 msgstr "Oppdatering krever omstart..."
 
-#: ../src/session-menu-mgr.c:421
+#: ../src/session-menu-mgr.c:439
 msgid "System Settings…"
 msgstr "Systeminnstillinger …"
 
@@ -250,19 +250,19 @@
 msgid "Lock Screen"
 msgstr "Lås skjerm"
 
-#: ../src/session-menu-mgr.c:507
+#: ../src/session-menu-mgr.c:522
 msgid "Suspend"
 msgstr "Hvilemodus"
 
-#: ../src/session-menu-mgr.c:512
+#: ../src/session-menu-mgr.c:527
 msgid "Hibernate"
 msgstr "Dvalemodus"
 
-#: ../src/session-menu-mgr.c:889
+#: ../src/session-menu-mgr.c:902
 msgid "Guest Session"
 msgstr "Gjesteøkt"
 
-#: ../src/session-menu-mgr.c:898
+#: ../src/session-menu-mgr.c:911
 msgid "Guest"
 msgstr "Gjest"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/indicator-sound.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/indicator-sound.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/indicator-sound.po	2013-01-29 09:33:56.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/indicator-sound.po	2014-01-07 06:37:36.000000000 +0000
@@ -9,13 +9,13 @@
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-05-04 04:16+0000\n"
 "PO-Revision-Date: 2011-07-04 14:14+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
+"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:17+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:11+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../src/indicator-sound.c:772 ../src/volume-widget.c:153
 #: ../src/volume-widget.c:211
@@ -23,7 +23,7 @@
 msgid "Volume (%'.0f%%)"
 msgstr "Volum (%'.0f%%)"
 
-#: ../src/mute-menu-item.c:116
+#: ../src/sound-menu.vala:36
 msgid "Mute"
 msgstr "Demp"
 
@@ -35,7 +35,6 @@
 msgid "Sound Settings..."
 msgstr "Lydinnstillinger …"
 
-#: ../src/playlists-menu-item.c:414 ../src/playlists-menu-item.c:640
-#: ../src/playlists-menu-item.c:835
+#: ../src/sound-menu.vala:202
 msgid "Choose Playlist"
 msgstr "Velg en spilleliste"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/inkscape.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/inkscape.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/inkscape.po	2013-01-29 09:33:58.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/inkscape.po	2014-01-07 06:37:05.000000000 +0000
@@ -19,8 +19,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:44+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:52+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../inkscape.desktop.in.h:1
 msgid "Inkscape"
@@ -4503,7 +4503,7 @@
 "Det er ingen hjelp tilgjengelig til denne utvidelsen for øyeblikket. Se på "
 "www.inkscape.org eller spør på epostlista hvis du trenger hjelp."
 
-#: ../src/extension/implementation/script.cpp:1005
+#: ../src/extension/implementation/script.cpp:1012
 msgid ""
 "Inkscape has received additional data from the script executed.  The script "
 "did not return an error, but this may indicate the results will not be as "
@@ -5274,6 +5274,7 @@
 #: ../src/extension/internal/filter/filter-file.cpp:148
 #: ../src/extension/internal/filter/snow.h:38
 #: ../src/ui/dialog/inkscape-preferences.cpp:793
+#, c-format
 msgid "Filters"
 msgstr "Filtre"
 
@@ -5319,18 +5320,22 @@
 msgstr "%s GDK pixbuf Inndata"
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:152
+#, c-format
 msgid "Link or embed image:"
 msgstr ""
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:153
+#, c-format
 msgid "embed"
 msgstr ""
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:154
+#, c-format
 msgid "link"
 msgstr ""
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:156
+#, c-format
 msgid ""
 "Embed results in stand-alone, larger SVG files. Link references a file "
 "outside this SVG document and all files must be moved together."
@@ -22639,6 +22644,7 @@
 msgstr ""
 
 #: ../share/extensions/jessyInk_autoTexts.py:55
+#, python-brace-format
 msgid ""
 "Node with id '{0}' is not a suitable text node and was therefore ignored.\n"
 "\n"
@@ -22665,6 +22671,7 @@
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:69
+#, python-brace-format
 msgid "JessyInk script version {0} installed."
 msgstr ""
 
@@ -22685,6 +22692,7 @@
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:94
+#, python-brace-format
 msgid "{0}Layer name: {1}"
 msgstr ""
 
@@ -22693,6 +22701,7 @@
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:104
+#, python-brace-format
 msgid "{0}Transition in: {1}"
 msgstr ""
 
@@ -22701,20 +22710,24 @@
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:113
+#, python-brace-format
 msgid "{0}Transition out: {1}"
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:120
+#, python-brace-format
 msgid ""
 "\n"
 "{0}Auto-texts:"
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:123
+#, python-brace-format
 msgid "{0}\t\"{1}\" (object id \"{2}\") will be replaced by \"{3}\"."
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:168
+#, python-brace-format
 msgid ""
 "\n"
 "{0}Initial effect (order number {1}):"
@@ -22727,10 +22740,12 @@
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:174
+#, python-brace-format
 msgid "{0}\tView will be set according to object \"{1}\""
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:176
+#, python-brace-format
 msgid "{0}\tObject \"{1}\""
 msgstr ""
 
@@ -22743,6 +22758,7 @@
 msgstr ""
 
 #: ../share/extensions/jessyInk_summary.py:184
+#, python-brace-format
 msgid " using effect \"{0}\""
 msgstr ""
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libbonobo-2.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libbonobo-2.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libbonobo-2.0.po	2013-01-29 09:33:48.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libbonobo-2.0.po	2014-01-07 06:37:05.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:47+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:56+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../activation-server/activation-context-corba.c:530
 msgid "Couldn't find which child the server was listed in"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libbonoboui-2.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libbonoboui-2.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libbonoboui-2.0.po	2013-01-29 09:33:59.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libbonoboui-2.0.po	2014-01-07 06:37:05.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:47+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:57+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../bonobo/bonobo-canvas-item.c:680
 msgid "corba factory"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libdbusmenu.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libdbusmenu.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libdbusmenu.po	2013-01-29 09:33:48.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libdbusmenu.po	2014-01-07 06:37:52.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: libdbusmenu\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-06-26 06:29+0000\n"
+"POT-Creation-Date: 2013-06-25 17:59+0000\n"
 "PO-Revision-Date: 2012-06-24 09:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:34+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 21:03+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../libdbusmenu-glib/defaults.c:84
 msgid "Label Empty"
@@ -24,7 +24,7 @@
 #. TRANSLATORS: This is the direction of the text and can
 #. either be the value 'ltr' for left-to-right text (English)
 #. or 'rtl' for right-to-left (Arabic).
-#: ../libdbusmenu-glib/server.c:695
+#: ../libdbusmenu-glib/server.c:690
 msgctxt "default text direction"
 msgid "ltr"
 msgstr "ltr"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgksu.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgksu.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgksu.po	2013-01-29 09:33:56.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgksu.po	2014-01-07 06:37:24.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 14:18+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:49+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../libgksu/libgksu.c:126
 #, c-format
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgnome-2.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgnome-2.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgnome-2.0.po	2013-01-29 09:34:03.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgnome-2.0.po	2014-01-07 06:37:05.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:51+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:59+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../gnome-data/gnome-2.soundlist.in.h:1
 msgid "System events"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgnome-keyring.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgnome-keyring.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgnome-keyring.po	2013-01-29 09:33:53.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgnome-keyring.po	2014-01-07 06:37:36.000000000 +0000
@@ -14,42 +14,42 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:18+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:13+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
-#: ../library/gnome-keyring-utils.c:180
+#: ../library/gnome-keyring-utils.c:182
 msgid "Access Denied"
 msgstr "Tilgang nektet"
 
-#: ../library/gnome-keyring-utils.c:182
+#: ../library/gnome-keyring-utils.c:184
 msgid "The gnome-keyring-daemon application is not running."
 msgstr "Programmet gnome-keyring-daemon kjører ikke."
 
-#: ../library/gnome-keyring-utils.c:184
+#: ../library/gnome-keyring-utils.c:186
 msgid "Error communicating with gnome-keyring-daemon"
 msgstr "Feil under kommunikasjon med gnome-keyring-daemon"
 
-#: ../library/gnome-keyring-utils.c:186
+#: ../library/gnome-keyring-utils.c:188
 msgid "A keyring with that name already exists"
 msgstr "Det finnes allerede En nøkkelring med dette navnet"
 
-#: ../library/gnome-keyring-utils.c:188
+#: ../library/gnome-keyring-utils.c:190
 msgid "Programmer error: The application sent invalid data."
 msgstr "Programfeil: Programmet sendte ugyldige data."
 
-#: ../library/gnome-keyring-utils.c:190
+#: ../library/gnome-keyring-utils.c:192
 msgid "No matching results"
 msgstr "Ingen treff"
 
-#: ../library/gnome-keyring-utils.c:192
+#: ../library/gnome-keyring-utils.c:194
 msgid "A keyring with that name does not exist."
 msgstr "Det finnes ingen nøkkelring med dette navnet."
 
-#: ../library/gnome-keyring-utils.c:199
+#: ../library/gnome-keyring-utils.c:201
 msgid "The keyring has already been unlocked."
 msgstr "Nøkkelringen er allerede låst opp."
 
 #. TRANSLATORS: This is the name of an automatically created default keyring.
-#: ../library/gnome-keyring.c:3040
+#: ../library/gnome-keyring.c:3042
 msgid "Default"
 msgstr "Forvalgt"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgnome-media-profiles.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgnome-media-profiles.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgnome-media-profiles.po	2013-01-29 09:33:55.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgnome-media-profiles.po	2014-01-07 06:37:38.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:31+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:28+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../libgnome-media-profiles/audio-profile-edit.c:121
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgnomecanvas-2.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgnomecanvas-2.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgnomecanvas-2.0.po	2013-01-29 09:34:05.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgnomecanvas-2.0.po	2014-01-07 06:37:05.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:51+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 11:59+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../libgnomecanvas/gnome-canvas.c:1400 ../libgnomecanvas/gnome-canvas.c:1401
 #: ../libgnomecanvas/gnome-canvas-rich-text.c:218
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgnomekbd.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgnomekbd.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgnomekbd.po	2013-01-29 09:34:06.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgnomekbd.po	2014-01-07 06:37:27.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libgnomekbd 3.2.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-06 10:11+0000\n"
+"POT-Creation-Date: 2013-03-28 23:38+0000\n"
 "PO-Revision-Date: 2011-05-18 05:09+0000\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -15,15 +15,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 14:49+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 15:27+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../libgnomekbd/gkbd-indicator.c:422 ../libgnomekbd/gkbd-status.c:560
 msgid "XKB initialization error"
 msgstr "Feil ved initiering av XKB"
 
-#: ../libgnomekbd/gkbd-keyboard-drawing.c:2485
+#: ../libgnomekbd/gkbd-keyboard-drawing.c:2494
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -34,7 +34,7 @@
 "Opphavsrett &#169; X.Org Foundation og XKeyboardConfig-bidragsyterene\n"
 "For lisensdata se pakkens metadata"
 
-#: ../libgnomekbd/gkbd-keyboard-drawing.c:2635
+#: ../libgnomekbd/gkbd-keyboard-drawing.c:2644
 msgid "Unknown"
 msgstr "Ukjent"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgnomeui-2.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgnomeui-2.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgnomeui-2.0.po	2013-01-29 09:33:56.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgnomeui-2.0.po	2014-01-07 06:37:05.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:51+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:01+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../demos/mdi_demo.c:128
 msgid "Child Item 1"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgsf.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgsf.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgsf.po	2013-01-29 09:33:51.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgsf.po	2014-01-07 06:37:06.000000000 +0000
@@ -14,20 +14,20 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:53+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:03+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
-#: ../gsf/gsf-blob.c:115
+#: ../gsf/gsf-blob.c:114
 #, c-format
 msgid "Not enough memory to copy %s bytes of data"
 msgstr "Ikke nok minne til å kopiere %s byte med data"
 
-#: ../gsf/gsf-clip-data.c:166
+#: ../gsf/gsf-clip-data.c:165
 #, c-format
 msgid "The clip_data is in %s, but it is smaller than at least %s bytes"
 msgstr "clip_data er i %s, men er mindre enn minst %s bytes"
 
-#: ../gsf/gsf-clip-data.c:260
+#: ../gsf/gsf-clip-data.c:259
 #, c-format
 msgid ""
 "The clip_data is in Windows clipboard format, but it is smaller than the "
@@ -36,20 +36,20 @@
 "clip_data er i Windows utklippstavleformat, men er mindre enn de "
 "obligatoriske 4 bytes."
 
-#: ../gsf/gsf-clip-data.c:271
+#: ../gsf/gsf-clip-data.c:270
 msgid "Windows Metafile format"
 msgstr "Windows Metafile-format"
 
 #. CF_BITMAP
-#: ../gsf/gsf-clip-data.c:277
+#: ../gsf/gsf-clip-data.c:276
 msgid "Windows DIB or BITMAP format"
 msgstr "Windows DIB- eller BITMAP-format"
 
-#: ../gsf/gsf-clip-data.c:282
+#: ../gsf/gsf-clip-data.c:281
 msgid "Windows Enhanced Metafile format"
 msgstr "Windows Enhanced Metafile-format"
 
-#: ../gsf/gsf-msole-utils.c:315
+#: ../gsf/gsf-msole-utils.c:312
 #, c-format
 msgid ""
 "Missing data when reading the %s property; got %s bytes, but %s bytes at "
@@ -58,7 +58,7 @@
 "Mangler data ved lesing av egenskap %s; fikk %s byte, men må ha minst %s "
 "bytes."
 
-#: ../gsf/gsf-msole-utils.c:366
+#: ../gsf/gsf-msole-utils.c:363
 #, c-format
 msgid ""
 "Corrupt data in the VT_CF property; clipboard data length must be at least 4 "
@@ -67,85 +67,85 @@
 "Korrupte data i VT_CF-egenskap; datalengde for utklippstavledata må være "
 "minst 4 byte, men data sier at kun %s byte er tilgjengelig."
 
-#: ../gsf/gsf-open-pkg-utils.c:355
+#: ../gsf/gsf-open-pkg-utils.c:353
 #, c-format
 msgid "Unable to find part id='%s' for '%s'"
 msgstr "Kan ikke finne del med id='%s' for «%s»"
 
-#: ../gsf/gsf-open-pkg-utils.c:383
+#: ../gsf/gsf-open-pkg-utils.c:381
 #, c-format
 msgid "Unable to find part with type='%s' for '%s'"
 msgstr "Kan ikke finne del med type='%s' for «%s»"
 
-#: ../gsf/gsf-open-pkg-utils.c:413
+#: ../gsf/gsf-open-pkg-utils.c:411
 #, c-format
 msgid "Missing id for part in '%s'"
 msgstr "Mangler id for del i «%s»"
 
-#: ../gsf/gsf-open-pkg-utils.c:422
+#: ../gsf/gsf-open-pkg-utils.c:420
 #, c-format
 msgid "Part '%s' in '%s' from '%s' is corrupt!"
 msgstr "Del «%s» i «%s» fra «%s» er korrupt!"
 
-#: ../tools/gsf.c:27
+#: ../tools/gsf.c:17
 msgid "Display program version"
 msgstr "Vis versjon av programmet"
 
-#: ../tools/gsf.c:54
+#: ../tools/gsf.c:44
 #, c-format
 msgid "%s: Failed to open %s: %s\n"
 msgstr "%s: Klarte ikke å åpne %s: %s\n"
 
-#: ../tools/gsf.c:75
+#: ../tools/gsf.c:65
 #, c-format
 msgid "%s: Failed to recognize %s as an archive\n"
 msgstr "%s: Klarte ikke å gjenkjenne %s som et arkiv\n"
 
-#: ../tools/gsf.c:112
+#: ../tools/gsf.c:102
 #, c-format
 msgid "Available subcommands are...\n"
 msgstr "Tilgjengelige underkommandoer er...\n"
 
-#: ../tools/gsf.c:113
+#: ../tools/gsf.c:103
 #, c-format
 msgid "* cat        output one or more files in archive\n"
 msgstr "* cat        skriv ut en eller flere filer i arkivet\n"
 
-#: ../tools/gsf.c:114
+#: ../tools/gsf.c:104
 #, c-format
 msgid "* dump       dump one or more files in archive as hex\n"
 msgstr "* dump       dump en eller flere filer i arkivet som hex\n"
 
-#: ../tools/gsf.c:115
+#: ../tools/gsf.c:105
 #, c-format
 msgid "* help       list subcommands\n"
 msgstr "* help       vis underkommandoer\n"
 
-#: ../tools/gsf.c:116
+#: ../tools/gsf.c:106
 #, c-format
 msgid "* list       list files in archive\n"
 msgstr "* list       vis filer i arkivet\n"
 
-#: ../tools/gsf.c:117
+#: ../tools/gsf.c:107
 #, c-format
 msgid "* listprops  list document properties in archive\n"
 msgstr "* listprops  vis dokumentegenskaper i arkivet\n"
 
-#: ../tools/gsf.c:118
+#: ../tools/gsf.c:108
 #, c-format
 msgid "* props      print specified document properties\n"
 msgstr "* props      skriv ut spesifiserte dokumentegenskaper\n"
 
-#: ../tools/gsf.c:303
+#: ../tools/gsf.c:302
 #, c-format
 msgid "No property named %s\n"
 msgstr "Ingen egenskap med navn %s\n"
 
-#: ../tools/gsf.c:526
+#: ../tools/gsf.c:504
 msgid "SUBCOMMAND ARCHIVE..."
 msgstr "UNDERKOMMANDO ARKIV …"
 
-#: ../tools/gsf.c:533
+#: ../tools/gsf.c:511
 #, c-format
 msgid ""
 "%s\n"
@@ -155,12 +155,12 @@
 "Kjør «%s --help» for å se en full liste med tilgjengelige "
 "kommandolinjeflagg.\n"
 
-#: ../tools/gsf.c:540
+#: ../tools/gsf.c:518
 #, c-format
 msgid "gsf version %d.%d.%d\n"
 msgstr "gsf versjon %d.%d.%d\n"
 
-#: ../tools/gsf.c:546
+#: ../tools/gsf.c:524
 #, c-format
 msgid "Usage: %s %s\n"
 msgstr "Bruk: %s %s\n"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgtop-2.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgtop-2.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgtop-2.0.po	2013-01-29 09:34:00.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgtop-2.0.po	2014-01-07 06:37:06.000000000 +0000
@@ -14,8 +14,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:53+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:03+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../lib/read.c:51
 #, c-format
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgweather-locations.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgweather-locations.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgweather-locations.po	2013-01-29 09:33:56.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgweather-locations.po	2014-01-07 06:37:30.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:24+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:07+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../data/Locations.xml.in.h:1
@@ -3838,7 +3838,7 @@
 #. PF - French Polynesia, a French territory in the South
 #. Pacific
 #. 
-#: ../data/Locations.xml.in.h:1726
+#: ../data/Locations.xml.in.h:1728
 msgid "French Polynesia"
 msgstr "Fransk polynesia"
 
@@ -3847,7 +3847,7 @@
 #. Tahiti). This string is only used in places where
 #. "French Polynesia" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:1732
+#: ../data/Locations.xml.in.h:1734
 msgid "Tahiti / Society Islands"
 msgstr "Tahiti / Society Islands"
 
@@ -3855,7 +3855,7 @@
 #. French Polynesia. This string is only used in places
 #. where "French Polynesia" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:1737
+#: ../data/Locations.xml.in.h:1739
 msgid "Marquesas Islands"
 msgstr "Marquesas Islands"
 
@@ -3863,85 +3863,85 @@
 #. French Polynesia. This string is only used in places
 #. where "French Polynesia" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:1742
+#: ../data/Locations.xml.in.h:1744
 msgid "Gambier Islands"
 msgstr "Gambier Island"
 
 #. The capital of French Polynesia
-#: ../data/Locations.xml.in.h:1744
+#: ../data/Locations.xml.in.h:1746
 msgid "Papeete"
 msgstr "Papeete"
 
 #. GU - Guam, a territory of the United States in the South
 #. Pacific.
 #. 
-#: ../data/Locations.xml.in.h:1748
+#: ../data/Locations.xml.in.h:1750
 msgid "Guam"
 msgstr "Guam"
 
 #. A city in Guam
-#: ../data/Locations.xml.in.h:1750
+#: ../data/Locations.xml.in.h:1752
 msgid "Asatdas"
 msgstr "Asatdas"
 
 #. A city in Guam
-#: ../data/Locations.xml.in.h:1752
+#: ../data/Locations.xml.in.h:1754
 msgid "Hagåtña"
 msgstr "Hagåtña"
 
 #. ID - Indonesia
-#: ../data/Locations.xml.in.h:1754
+#: ../data/Locations.xml.in.h:1756
 msgid "Indonesia"
 msgstr "Indonesia"
 
 #. The timezone on the western islands of Indonesia. The
 #. name in Indonesian is "Waktu Indonesia Bagian Barat".
 #. 
-#: ../data/Locations.xml.in.h:1758
+#: ../data/Locations.xml.in.h:1760
 msgid "Western Indonesia Time"
 msgstr "Vest-Indonesisk tid"
 
 #. The timezone on the central islands of Indonesia. The
 #. name in Indonesian is "Waktu Indonesia Bagian Tengah".
 #. 
-#: ../data/Locations.xml.in.h:1762
+#: ../data/Locations.xml.in.h:1764
 msgid "Central Indonesia Time"
 msgstr "Sentral-Indonesisk tid"
 
 #. The timezone on the eastern islands of Indonesia. The
 #. name in Indonesian is "Waktu Indonesia Bagian Timur".
 #. 
-#: ../data/Locations.xml.in.h:1766
+#: ../data/Locations.xml.in.h:1768
 msgid "Eastern Indonesia Time"
 msgstr "Øst-Indonesisk tid"
 
 #. The capital of Indonesia
-#: ../data/Locations.xml.in.h:1768
+#: ../data/Locations.xml.in.h:1770
 msgid "Jakarta"
 msgstr "Jakarta"
 
 #. A city in Indonesia
-#: ../data/Locations.xml.in.h:1770
+#: ../data/Locations.xml.in.h:1772
 msgid "Makassar"
 msgstr "Makassar"
 
 #. A city in Indonesia
-#: ../data/Locations.xml.in.h:1772
+#: ../data/Locations.xml.in.h:1774
 msgid "Medan"
 msgstr "Medan"
 
 #. A city in Indonesia
-#: ../data/Locations.xml.in.h:1774
+#: ../data/Locations.xml.in.h:1776
 msgid "Palembang"
 msgstr "Palembang"
 
 #. A city in Indonesia
-#: ../data/Locations.xml.in.h:1776
+#: ../data/Locations.xml.in.h:1778
 msgid "Pekanbaru"
 msgstr "Pekanbaru"
 
 #. KI - Kiribati
-#: ../data/Locations.xml.in.h:1778
+#: ../data/Locations.xml.in.h:1780
 msgid "Kiribati"
 msgstr "Kiribati"
 
@@ -3949,7 +3949,7 @@
 #. main island groups of Kiribati. This string is only used
 #. in places where "Kiribati" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:1783
+#: ../data/Locations.xml.in.h:1785
 msgid "Gilbert Islands"
 msgstr "Gilbert-øyene"
 
@@ -3957,7 +3957,7 @@
 #. main island groups of Kiribati. This string is only used
 #. in places where "Kiribati" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:1788
+#: ../data/Locations.xml.in.h:1790
 msgid "Phoenix Islands"
 msgstr "Phoenix Island"
 
@@ -3965,28 +3965,28 @@
 #. island groups of Kiribati. This string is only used in
 #. places where "Kiribati" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:1793
+#: ../data/Locations.xml.in.h:1795
 msgid "Line Islands"
 msgstr "Line Islands"
 
 #. A city in Kiribati
-#: ../data/Locations.xml.in.h:1795
+#: ../data/Locations.xml.in.h:1797
 msgctxt "City in Kiribati"
 msgid "London"
 msgstr "London"
 
 #. MH - Marshall Islands
-#: ../data/Locations.xml.in.h:1797
+#: ../data/Locations.xml.in.h:1799
 msgid "Marshall Islands"
 msgstr "Marshall Islands"
 
 #. The capital of the Marshall Islands
-#: ../data/Locations.xml.in.h:1799
+#: ../data/Locations.xml.in.h:1801
 msgid "Majuro"
 msgstr "Majuro"
 
 #. FM - Federated States of Micronesia
-#: ../data/Locations.xml.in.h:1801
+#: ../data/Locations.xml.in.h:1803
 msgid "Micronesia, Federated States of"
 msgstr "Micronesia, Federated States of"
 
@@ -3995,7 +3995,7 @@
 #. The string is only used in places where "Micronesia" is
 #. already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:1807
+#: ../data/Locations.xml.in.h:1809
 msgid "Pohnpei / Kosrae"
 msgstr "Pohnpei / Kosrae"
 
@@ -4004,39 +4004,39 @@
 #. string is only used in places where "Micronesia" is
 #. already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:1813
+#: ../data/Locations.xml.in.h:1815
 msgid "Yap / Chuuk"
 msgstr "Yap / Chuuk"
 
 #. The capital of the Federated States of Micronesia
-#: ../data/Locations.xml.in.h:1815
+#: ../data/Locations.xml.in.h:1817
 msgid "Palikir"
 msgstr "Palikir"
 
 #. NR - Nauru
-#: ../data/Locations.xml.in.h:1817
+#: ../data/Locations.xml.in.h:1819
 msgid "Nauru"
 msgstr "Nauru"
 
 #. NC - New Caledonia, a French territory in the South Pacific.
 #. The French name is "Nouvelle-Calédonie".
 #. 
-#: ../data/Locations.xml.in.h:1821
+#: ../data/Locations.xml.in.h:1823
 msgid "New Caledonia"
 msgstr "New Caledonia"
 
 #. A city in New Caledonia
-#: ../data/Locations.xml.in.h:1823
+#: ../data/Locations.xml.in.h:1825
 msgid "Karenga"
 msgstr "Karenga"
 
 #. The capital of New Caledonia
-#: ../data/Locations.xml.in.h:1825
+#: ../data/Locations.xml.in.h:1827
 msgid "Nouméa"
 msgstr "Nouméa"
 
 #. NZ - New Zealand
-#: ../data/Locations.xml.in.h:1827
+#: ../data/Locations.xml.in.h:1829
 msgid "New Zealand"
 msgstr "New Zealand"
 
@@ -4047,49 +4047,49 @@
 #. there a better name for this? "Mainland" seems odd in
 #. reference to an island nation...
 #. 
-#: ../data/Locations.xml.in.h:1835
+#: ../data/Locations.xml.in.h:1837
 msgid "Mainland New Zealand"
 msgstr "Fastlandet New Zealand"
 
 #. This refers to the time zone in the Chatham Islands of
 #. New Zealand.
 #. 
-#: ../data/Locations.xml.in.h:1839
+#: ../data/Locations.xml.in.h:1841
 msgid "Chatham Islands"
 msgstr "Chatham Islands"
 
 #. A city in New Zealand
-#: ../data/Locations.xml.in.h:1841
+#: ../data/Locations.xml.in.h:1843
 msgid "Auckland"
 msgstr "Auckland"
 
 #. A city in New Zealand
-#: ../data/Locations.xml.in.h:1843
+#: ../data/Locations.xml.in.h:1845
 msgid "Christchurch"
 msgstr "Christchurch"
 
 #. The capital of New Zealand
-#: ../data/Locations.xml.in.h:1845
+#: ../data/Locations.xml.in.h:1847
 msgid "Wellington"
 msgstr "Wellington"
 
 #. NU - Niue
-#: ../data/Locations.xml.in.h:1847
+#: ../data/Locations.xml.in.h:1849
 msgid "Niue"
 msgstr "Niue"
 
 #. The capital of Niue
-#: ../data/Locations.xml.in.h:1849
+#: ../data/Locations.xml.in.h:1851
 msgid "Alofi"
 msgstr "Alofi"
 
 #. NF - Norfolk Island, a territory of Australia
-#: ../data/Locations.xml.in.h:1851
+#: ../data/Locations.xml.in.h:1853
 msgid "Norfolk Island"
 msgstr "Norfolkøyene"
 
 #. A city in Norfolk Island
-#: ../data/Locations.xml.in.h:1853
+#: ../data/Locations.xml.in.h:1855
 msgctxt "City in Norfolk Island"
 msgid "Kingston"
 msgstr "Kingston"
@@ -4097,99 +4097,99 @@
 #. MP - Northern Mariana Islands, a semi-independent territory
 #. of the United States in the western Pacific Ocean.
 #. 
-#: ../data/Locations.xml.in.h:1857
+#: ../data/Locations.xml.in.h:1859
 msgid "Northern Mariana Islands"
 msgstr "Northern Mariana Islands"
 
 #. A city in the Northern Mariana Islands
-#: ../data/Locations.xml.in.h:1859
+#: ../data/Locations.xml.in.h:1861
 msgid "Chalan Kanoa"
 msgstr "Chalan Kanoa"
 
 #. PW - Palau
-#: ../data/Locations.xml.in.h:1861
+#: ../data/Locations.xml.in.h:1863
 msgid "Palau"
 msgstr "Palau"
 
 #. The capital of Palau
-#: ../data/Locations.xml.in.h:1863
+#: ../data/Locations.xml.in.h:1865
 msgid "Koror"
 msgstr "Koror"
 
 #. The capital of Palau
-#: ../data/Locations.xml.in.h:1865
+#: ../data/Locations.xml.in.h:1867
 msgid "Melekeok"
 msgstr "Melekeok"
 
 #. PG - Papua New Guinea
-#: ../data/Locations.xml.in.h:1867
+#: ../data/Locations.xml.in.h:1869
 msgid "Papua New Guinea"
 msgstr "Papua New Guinea"
 
 #. The capital of Papua New Guinea
-#: ../data/Locations.xml.in.h:1869
+#: ../data/Locations.xml.in.h:1871
 msgid "Port Moresby"
 msgstr "Port Moresby"
 
 #. PN - Pitcairn, a British territory in the South Pacific
-#: ../data/Locations.xml.in.h:1871
+#: ../data/Locations.xml.in.h:1873
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #. WS - Samoa, an independent nation not to be confused with
 #. "American Samoa"
 #. 
-#: ../data/Locations.xml.in.h:1875
+#: ../data/Locations.xml.in.h:1877
 msgid "Samoa"
 msgstr "Samoa"
 
 #. The capital of Samoa
-#: ../data/Locations.xml.in.h:1877
+#: ../data/Locations.xml.in.h:1879
 msgid "Apia"
 msgstr "Apia"
 
 #. SB - Solomon Islands
-#: ../data/Locations.xml.in.h:1879
+#: ../data/Locations.xml.in.h:1881
 msgid "Solomon Islands"
 msgstr "Solomonøyene"
 
 #. The capital of the Solomon Islands
-#: ../data/Locations.xml.in.h:1881
+#: ../data/Locations.xml.in.h:1883
 msgid "Honiara"
 msgstr "Honiara"
 
 #. TL - Timor-Leste (formerly known as "East Timor")
-#: ../data/Locations.xml.in.h:1883
+#: ../data/Locations.xml.in.h:1885
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
 #. TK - Tokelau, a territory of New Zealand
-#: ../data/Locations.xml.in.h:1885
+#: ../data/Locations.xml.in.h:1887
 msgid "Tokelau"
 msgstr "Tokelau"
 
 #. TO - Tonga
-#: ../data/Locations.xml.in.h:1887
+#: ../data/Locations.xml.in.h:1889
 msgid "Tonga"
 msgstr "Tonga"
 
 #. A city in Tonga
-#: ../data/Locations.xml.in.h:1889
+#: ../data/Locations.xml.in.h:1891
 msgid "Fua'amotu"
 msgstr "Fua'amotu"
 
 #. The capital of Tonga
-#: ../data/Locations.xml.in.h:1891
+#: ../data/Locations.xml.in.h:1893
 msgid "Nuku'alofa"
 msgstr "Nuku'alofa"
 
 #. TV - Tuvalu
-#: ../data/Locations.xml.in.h:1893
+#: ../data/Locations.xml.in.h:1895
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
 #. The capital of Tuvalu
-#: ../data/Locations.xml.in.h:1895
+#: ../data/Locations.xml.in.h:1897
 msgid "Funafuti"
 msgstr "Funafuti"
 
@@ -4197,7 +4197,7 @@
 #. mostly-uninhabited United States territories in the South
 #. Pacific.
 #. 
-#: ../data/Locations.xml.in.h:1900
+#: ../data/Locations.xml.in.h:1902
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
@@ -4207,7 +4207,7 @@
 #. places where "US Minor Outlying Islands" is already
 #. clear from context.
 #. 
-#: ../data/Locations.xml.in.h:1907
+#: ../data/Locations.xml.in.h:1909
 msgid "Johnston Atoll (Hawaii Time)"
 msgstr "Johnston-atollen (Hawaii-tid)"
 
@@ -4218,7 +4218,7 @@
 #. places where "US Minor Outlying Islands" is already
 #. clear from context.
 #. 
-#: ../data/Locations.xml.in.h:1915
+#: ../data/Locations.xml.in.h:1917
 msgid "Midway Atoll (Samoa Time)"
 msgstr "Midway-atollen (Samoisk tid)"
 
@@ -4227,339 +4227,339 @@
 #. where "US Minor Outlying Islands" is already clear from
 #. context.
 #. 
-#: ../data/Locations.xml.in.h:1921
+#: ../data/Locations.xml.in.h:1923
 msgid "Wake Island"
 msgstr "Wake Island"
 
 #. A city in the United States Minor Outlying Islands
-#: ../data/Locations.xml.in.h:1923
+#: ../data/Locations.xml.in.h:1925
 msgid "Wake Island, Wake Island Army Airfield Airport"
 msgstr "Wake Island, Wake Island militærflyplass"
 
 #. VU - Vanuatu
-#: ../data/Locations.xml.in.h:1925
+#: ../data/Locations.xml.in.h:1927
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #. WF - Wallis and Futuna, a French territory in the South
 #. Pacific
 #. 
-#: ../data/Locations.xml.in.h:1929
+#: ../data/Locations.xml.in.h:1931
 msgid "Wallis and Futuna"
 msgstr "Wallis og Futuna"
 
 #. A city in Wallis and Futuna
-#: ../data/Locations.xml.in.h:1931
+#: ../data/Locations.xml.in.h:1933
 msgid "Mata'utu"
 msgstr "Mata'utu"
 
-#: ../data/Locations.xml.in.h:1932
+#: ../data/Locations.xml.in.h:1934
 msgid "Central and South America"
 msgstr "Sentral- og Sør-Amerika"
 
 #. AR - Argentina
-#: ../data/Locations.xml.in.h:1934
+#: ../data/Locations.xml.in.h:1936
 msgid "Argentina"
 msgstr "Argentina"
 
 #. The capital of Argentina
-#: ../data/Locations.xml.in.h:1936
+#: ../data/Locations.xml.in.h:1938
 msgid "Buenos Aires"
 msgstr "Buenos Aires"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1938
+#: ../data/Locations.xml.in.h:1940
 msgid "Comodoro Rivadavia"
 msgstr "Comodoro Rivadavia"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1940
+#: ../data/Locations.xml.in.h:1942
 msgid "Corrientes"
 msgstr "Corrientes"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1942
+#: ../data/Locations.xml.in.h:1944
 msgctxt "City in Argentina"
 msgid "Córdoba"
 msgstr "Córdoba"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1944
+#: ../data/Locations.xml.in.h:1946
 msgid "El Palomar"
 msgstr "El Palomar"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1946
+#: ../data/Locations.xml.in.h:1948
 msgid "Ezeiza"
 msgstr "Ezeiza"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1948
+#: ../data/Locations.xml.in.h:1950
 msgid "Formosa"
 msgstr "Formosa"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1950
+#: ../data/Locations.xml.in.h:1952
 msgid "Mar del Plata"
 msgstr "Mar del Plata"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1952
+#: ../data/Locations.xml.in.h:1954
 msgid "Mendoza"
 msgstr "Mendoza"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1954
+#: ../data/Locations.xml.in.h:1956
 msgid "Neuquén"
 msgstr "Neuquén"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1956
+#: ../data/Locations.xml.in.h:1958
 msgid "Posadas"
 msgstr "Posadas"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1958
+#: ../data/Locations.xml.in.h:1960
 msgid "Puerto Iguazú"
 msgstr "Puerto Iguazú"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1960
+#: ../data/Locations.xml.in.h:1962
 msgid "Reconquista"
 msgstr "Reconquista"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1962
+#: ../data/Locations.xml.in.h:1964
 msgid "Resistencia"
 msgstr "Resistencia"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1964
+#: ../data/Locations.xml.in.h:1966
 msgid "Rosario"
 msgstr "Rosario"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1966
+#: ../data/Locations.xml.in.h:1968
 msgid "Río Gallegos"
 msgstr "Río Gallegos"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1968
+#: ../data/Locations.xml.in.h:1970
 msgid "Río Grande"
 msgstr "Río Grande"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1970
+#: ../data/Locations.xml.in.h:1972
 msgid "Salta"
 msgstr "Salta"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1972
+#: ../data/Locations.xml.in.h:1974
 msgid "San Carlos de Bariloche"
 msgstr "San Carlos de Bariloche"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1974
+#: ../data/Locations.xml.in.h:1976
 msgctxt "City in Argentina"
 msgid "San Fernando"
 msgstr "San Fernando"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1976
+#: ../data/Locations.xml.in.h:1978
 msgid "San Salvador de Jujuy"
 msgstr "San Salvador de Jujuy"
 
 #. A city in Argentina
-#: ../data/Locations.xml.in.h:1978
+#: ../data/Locations.xml.in.h:1980
 msgid "Ushuaia"
 msgstr "Ushuaia"
 
 #. AW - Aruba, a Caribbean island that is one of the three
 #. constituent countries of the Kingdom of the Netherlands.
 #. 
-#: ../data/Locations.xml.in.h:1982
+#: ../data/Locations.xml.in.h:1984
 msgid "Aruba"
 msgstr "Aruba"
 
 #. A city in Aruba
-#: ../data/Locations.xml.in.h:1984
+#: ../data/Locations.xml.in.h:1986
 msgid "Camacuri"
 msgstr "Camacuri"
 
 #. The capital of Aruba
-#: ../data/Locations.xml.in.h:1986
+#: ../data/Locations.xml.in.h:1988
 msgid "Oranjestad"
 msgstr "Oranjestad"
 
 #. BS - Bahamas
-#: ../data/Locations.xml.in.h:1988
+#: ../data/Locations.xml.in.h:1990
 msgid "Bahamas"
 msgstr "Bahamas"
 
 #. A city in the Bahamas
-#: ../data/Locations.xml.in.h:1990
+#: ../data/Locations.xml.in.h:1992
 msgctxt "City in Bahamas"
 msgid "Freeport"
 msgstr "Freeport"
 
 #. A city in the Bahamas
-#: ../data/Locations.xml.in.h:1992
+#: ../data/Locations.xml.in.h:1994
 msgctxt "City in Bahamas"
 msgid "Georgetown"
 msgstr "Georgetown"
 
 #. The capital of the Bahamas
-#: ../data/Locations.xml.in.h:1994
+#: ../data/Locations.xml.in.h:1996
 msgid "Nassau"
 msgstr "Nassau"
 
 #. BZ - Belize
-#: ../data/Locations.xml.in.h:1996
+#: ../data/Locations.xml.in.h:1998
 msgid "Belize"
 msgstr "Belize"
 
 #. A city in Belize
-#: ../data/Locations.xml.in.h:1998
+#: ../data/Locations.xml.in.h:2000
 msgid "Belize City"
 msgstr "Belize City"
 
 #. BO - Bolivia
-#: ../data/Locations.xml.in.h:2000
+#: ../data/Locations.xml.in.h:2002
 msgid "Bolivia"
 msgstr "Bolivia"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2002
+#: ../data/Locations.xml.in.h:2004
 msgid "Camiri"
 msgstr "Camiri"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2004
+#: ../data/Locations.xml.in.h:2006
 msgid "Cobija"
 msgstr "Cobija"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2006
+#: ../data/Locations.xml.in.h:2008
 msgid "Cochabamba"
 msgstr "Cochabamba"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2008
+#: ../data/Locations.xml.in.h:2010
 msgctxt "City in Bolivia"
 msgid "Concepción"
 msgstr "Concepción"
 
 #. The capital of Bolivia
-#: ../data/Locations.xml.in.h:2010
+#: ../data/Locations.xml.in.h:2012
 msgctxt "City in Bolivia"
 msgid "La Paz"
 msgstr "La Paz"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2012
+#: ../data/Locations.xml.in.h:2014
 msgid "Magdalena"
 msgstr "Magdalena"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2014
+#: ../data/Locations.xml.in.h:2016
 msgid "Oruro"
 msgstr "Oruro"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2016
+#: ../data/Locations.xml.in.h:2018
 msgid "Potosí"
 msgstr "Potosí"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2018
+#: ../data/Locations.xml.in.h:2020
 msgid "Puerto Suárez"
 msgstr "Puerto Suárez"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2020
+#: ../data/Locations.xml.in.h:2022
 msgid "Reyes"
 msgstr "Reyes"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2022
+#: ../data/Locations.xml.in.h:2024
 msgid "Riberalta"
 msgstr "Riberalta"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2024
+#: ../data/Locations.xml.in.h:2026
 msgid "Roboré"
 msgstr "Roboré"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2026
+#: ../data/Locations.xml.in.h:2028
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2028
+#: ../data/Locations.xml.in.h:2030
 msgid "San Borja"
 msgstr "San Borja"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2030
+#: ../data/Locations.xml.in.h:2032
 msgid "San Ignacio de Velasco"
 msgstr "San Ignacio de Velasco"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2032
+#: ../data/Locations.xml.in.h:2034
 msgid "San Joaquín"
 msgstr "San Joaquín"
 
 #. A city in Bolivia.
 #. One of several cities in Bolivia called "San José".
 #. 
-#: ../data/Locations.xml.in.h:2036
+#: ../data/Locations.xml.in.h:2038
 msgid "San José de Chiquitos"
 msgstr "San José de Chiquitos"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2038
+#: ../data/Locations.xml.in.h:2040
 msgid "Santa Ana de Yacuma"
 msgstr "Santa Ana de Yacuma"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2040
+#: ../data/Locations.xml.in.h:2042
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
 #. The capital of Bolivia
-#: ../data/Locations.xml.in.h:2042
+#: ../data/Locations.xml.in.h:2044
 msgid "Sucre"
 msgstr "Sucre"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2044
+#: ../data/Locations.xml.in.h:2046
 msgid "Tarija"
 msgstr "Tarija"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2046
+#: ../data/Locations.xml.in.h:2048
 msgctxt "City in Bolivia"
 msgid "Trinidad"
 msgstr "Trinidad"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2048
+#: ../data/Locations.xml.in.h:2050
 msgid "Villamontes"
 msgstr "Villamontes"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2050
+#: ../data/Locations.xml.in.h:2052
 msgid "Viro Viro"
 msgstr "Viro Viro"
 
 #. A city in Bolivia
-#: ../data/Locations.xml.in.h:2052
+#: ../data/Locations.xml.in.h:2054
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
 #. BR - Brazil
-#: ../data/Locations.xml.in.h:2054
+#: ../data/Locations.xml.in.h:2056
 msgid "Brazil"
 msgstr "Brasil"
 
@@ -4568,7 +4568,7 @@
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:2060
+#: ../data/Locations.xml.in.h:2062
 msgid "Tocantins"
 msgstr "Tocantins"
 
@@ -4577,7 +4577,7 @@
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:2066
+#: ../data/Locations.xml.in.h:2068
 msgctxt "Timezone"
 msgid "Bahia"
 msgstr "Bahia"
@@ -4588,7 +4588,7 @@
 #. used in places where "Brazil" is already clear from
 #. context.
 #. 
-#: ../data/Locations.xml.in.h:2073
+#: ../data/Locations.xml.in.h:2075
 msgid "Amapá / East Pará"
 msgstr "Amapá / East Pará"
 
@@ -4597,7 +4597,7 @@
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:2079
+#: ../data/Locations.xml.in.h:2081
 msgctxt "Timezone"
 msgid "Roraima"
 msgstr "Roraima"
@@ -4607,7 +4607,7 @@
 #. for more details. This string is only used in places
 #. where "Brazil" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:2085
+#: ../data/Locations.xml.in.h:2087
 msgctxt "Timezone"
 msgid "Mato Grosso do Sul"
 msgstr "Mato Grosso do Sul"
@@ -4617,7 +4617,7 @@
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:2091
+#: ../data/Locations.xml.in.h:2093
 msgctxt "Timezone"
 msgid "Mato Grosso"
 msgstr "Mato Grosso"
@@ -4628,7 +4628,7 @@
 #. used in places where "Brazil" is already clear from
 #. context.
 #. 
-#: ../data/Locations.xml.in.h:2098
+#: ../data/Locations.xml.in.h:2100
 msgid "West Amazonas"
 msgstr "Vest-Amazonas"
 
@@ -4638,7 +4638,7 @@
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:2105
+#: ../data/Locations.xml.in.h:2107
 msgid "Ceará, Maranhão, Paraíba, Piauí, Rio Grande do Norte"
 msgstr "Ceará, Maranhão, Paraíba, Piauí, Rio Grande do Norte"
 
@@ -4647,7 +4647,7 @@
 #. for more details. This string is only used in places
 #. where "Brazil" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:2111
+#: ../data/Locations.xml.in.h:2113
 msgid "Alagoas, Sergipe"
 msgstr "Alagoas, Sergipe"
 
@@ -4657,7 +4657,7 @@
 #. used in places where "Brazil" is already clear from
 #. context.
 #. 
-#: ../data/Locations.xml.in.h:2118
+#: ../data/Locations.xml.in.h:2120
 msgid "East Amazonas"
 msgstr "Øst-Amazonas"
 
@@ -4666,7 +4666,7 @@
 #. for more details. This string is only used in places
 #. where "Brazil" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:2124
+#: ../data/Locations.xml.in.h:2126
 msgid "Fernando de Noronha"
 msgstr "Fernando de Noronha"
 
@@ -4676,7 +4676,7 @@
 #. used in places where "Brazil" is already clear from
 #. context.
 #. 
-#: ../data/Locations.xml.in.h:2131
+#: ../data/Locations.xml.in.h:2133
 msgid "West Pará, Rondônia"
 msgstr "West Pará, Rondônia"
 
@@ -4685,7 +4685,7 @@
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:2137
+#: ../data/Locations.xml.in.h:2139
 msgctxt "Timezone"
 msgid "Pernambuco"
 msgstr "Pernambuco"
@@ -4695,7 +4695,7 @@
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:2143
+#: ../data/Locations.xml.in.h:2145
 msgctxt "Timezone"
 msgid "Acre"
 msgstr "Acre"
@@ -4718,610 +4718,610 @@
 #. Paulo). This string is only used in places where
 #. "Brazil" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:2162
+#: ../data/Locations.xml.in.h:2164
 msgid "Brasília Time"
 msgstr "Brasília tid"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2164
+#: ../data/Locations.xml.in.h:2166
 msgctxt "State in Brazil"
 msgid "Acre"
 msgstr "Acre"
 
 #. A city in Acre in Brazil
-#: ../data/Locations.xml.in.h:2166
+#: ../data/Locations.xml.in.h:2168
 msgid "Cruzeiro do Sul"
 msgstr "Cruzeiro do Sul"
 
 #. A city in Acre in Brazil
-#: ../data/Locations.xml.in.h:2168
+#: ../data/Locations.xml.in.h:2170
 msgid "Rio Branco"
 msgstr "Rio Branco"
 
 #. A city in Acre in Brazil
-#: ../data/Locations.xml.in.h:2170
+#: ../data/Locations.xml.in.h:2172
 msgid "Tarauacá"
 msgstr "Tarauacá"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2172
+#: ../data/Locations.xml.in.h:2174
 msgid "Alagoas"
 msgstr "Alagoas"
 
 #. A city in Alagoas in Brazil
-#: ../data/Locations.xml.in.h:2174
+#: ../data/Locations.xml.in.h:2176
 msgid "Maceió"
 msgstr "Maceió"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2176
+#: ../data/Locations.xml.in.h:2178
 msgid "Amapá"
 msgstr "Amapá"
 
 #. A city in Amapá in Brazil
-#: ../data/Locations.xml.in.h:2178
+#: ../data/Locations.xml.in.h:2180
 msgid "Oiapoque"
 msgstr "Oiapoque"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2180
+#: ../data/Locations.xml.in.h:2182
 msgid "Amazonas"
 msgstr "Amazonas"
 
 #. A city in Amazonas in Brazil
-#: ../data/Locations.xml.in.h:2182
+#: ../data/Locations.xml.in.h:2184
 msgid "Manaus"
 msgstr "Manaus"
 
 #. A city in Amazonas in Brazil
-#: ../data/Locations.xml.in.h:2184
+#: ../data/Locations.xml.in.h:2186
 msgid "Manicoré"
 msgstr "Manicoré"
 
 #. A city in Amazonas in Brazil
-#: ../data/Locations.xml.in.h:2186
+#: ../data/Locations.xml.in.h:2188
 msgid "São Félix"
 msgstr "São Félix"
 
 #. A city in Amazonas in Brazil
-#: ../data/Locations.xml.in.h:2188
+#: ../data/Locations.xml.in.h:2190
 msgid "São Gabriel"
 msgstr "São Gabriel"
 
 #. A city in Amazonas in Brazil
-#: ../data/Locations.xml.in.h:2190
+#: ../data/Locations.xml.in.h:2192
 msgid "Tefé"
 msgstr "Tefé"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2192
+#: ../data/Locations.xml.in.h:2194
 msgctxt "State in Brazil"
 msgid "Bahia"
 msgstr "Bahia"
 
 #. A city in Bahia in Brazil
-#: ../data/Locations.xml.in.h:2194
+#: ../data/Locations.xml.in.h:2196
 msgid "Bom Jesus da Lapa"
 msgstr "Bom Jesus da Lapa"
 
 #. A city in Bahia in Brazil
-#: ../data/Locations.xml.in.h:2196
+#: ../data/Locations.xml.in.h:2198
 msgid "Ilhéus"
 msgstr "Ilhéus"
 
 #. A city in Bahia in Brazil
-#: ../data/Locations.xml.in.h:2198
+#: ../data/Locations.xml.in.h:2200
 msgid "Paulo Afonso"
 msgstr "Paulo Afonso"
 
 #. A city in Bahia in Brazil
-#: ../data/Locations.xml.in.h:2200
+#: ../data/Locations.xml.in.h:2202
 msgid "Pôrto Seguro"
 msgstr "Pôrto Seguro"
 
 #. A city in Bahia in Brazil
-#: ../data/Locations.xml.in.h:2202
+#: ../data/Locations.xml.in.h:2204
 msgid "Salvador"
 msgstr "Salvador"
 
 #. A city in Bahia in Brazil
-#: ../data/Locations.xml.in.h:2204
+#: ../data/Locations.xml.in.h:2206
 msgid "Vitória da Conquista"
 msgstr "Vitória da Conquista"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2206
+#: ../data/Locations.xml.in.h:2208
 msgid "Ceará"
 msgstr "Ceará"
 
 #. A city in Ceará in Brazil
-#: ../data/Locations.xml.in.h:2208
+#: ../data/Locations.xml.in.h:2210
 msgid "Fortaleza"
 msgstr "Fortaleza"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2210
+#: ../data/Locations.xml.in.h:2212
 msgctxt "State in Brazil"
 msgid "Distrito Federal"
 msgstr "Distrito Federal"
 
 #. The capital of Brazil
-#: ../data/Locations.xml.in.h:2212
+#: ../data/Locations.xml.in.h:2214
 msgid "Brasília"
 msgstr "Brasília"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2214
+#: ../data/Locations.xml.in.h:2216
 msgid "Espírito Santo"
 msgstr "Espírito Santo"
 
 #. A city in Espírito Santo in Brazil
-#: ../data/Locations.xml.in.h:2216
+#: ../data/Locations.xml.in.h:2218
 msgid "Vitória"
 msgstr "Vitória"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2218
+#: ../data/Locations.xml.in.h:2220
 msgid "Goiás"
 msgstr "Goiás"
 
 #. A city in Goiás in Brazil
-#: ../data/Locations.xml.in.h:2220
+#: ../data/Locations.xml.in.h:2222
 msgid "Anápolis"
 msgstr "Anápolis"
 
 #. A city in Goiás in Brazil
-#: ../data/Locations.xml.in.h:2222
+#: ../data/Locations.xml.in.h:2224
 msgid "Goiânia"
 msgstr "Goiânia"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2224
+#: ../data/Locations.xml.in.h:2226
 msgid "Maranhão"
 msgstr "Maranhão"
 
 #. A city in Maranhão in Brazil
-#: ../data/Locations.xml.in.h:2226
+#: ../data/Locations.xml.in.h:2228
 msgid "Imperatriz"
 msgstr "Imperatriz"
 
 #. A city in Maranhão in Brazil
-#: ../data/Locations.xml.in.h:2228
+#: ../data/Locations.xml.in.h:2230
 msgid "São Luís"
 msgstr "São Luís"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2230
+#: ../data/Locations.xml.in.h:2232
 msgctxt "State in Brazil"
 msgid "Mato Grosso"
 msgstr "Mato Grosso"
 
 #. A city in Mato Grosso in Brazil
-#: ../data/Locations.xml.in.h:2232
+#: ../data/Locations.xml.in.h:2234
 msgid "Alta Floresta"
 msgstr "Alta Floresta"
 
 #. A city in Mato Grosso in Brazil
-#: ../data/Locations.xml.in.h:2234
+#: ../data/Locations.xml.in.h:2236
 msgid "Barra do Garças"
 msgstr "Barra do Garças"
 
 #. A city in Mato Grosso in Brazil
-#: ../data/Locations.xml.in.h:2236
+#: ../data/Locations.xml.in.h:2238
 msgid "Cuiabá"
 msgstr "Cuiabá"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2238
+#: ../data/Locations.xml.in.h:2240
 msgctxt "State in Brazil"
 msgid "Mato Grosso do Sul"
 msgstr "Mato Grosso do Sul"
 
 #. A city in Mato Grosso do Sul in Brazil
-#: ../data/Locations.xml.in.h:2240
+#: ../data/Locations.xml.in.h:2242
 msgid "Campo Grande"
 msgstr "Campo Grande"
 
 #. A city in Mato Grosso do Sul in Brazil
-#: ../data/Locations.xml.in.h:2242
+#: ../data/Locations.xml.in.h:2244
 msgid "Corumbá"
 msgstr "Corumbá"
 
 #. A city in Mato Grosso do Sul in Brazil
-#: ../data/Locations.xml.in.h:2244
+#: ../data/Locations.xml.in.h:2246
 msgid "Ponta Porã"
 msgstr "Ponta Porã"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2246
+#: ../data/Locations.xml.in.h:2248
 msgid "Minas Gerais"
 msgstr "Minas Gerais"
 
 #. A city in Minas Gerais in Brazil
-#: ../data/Locations.xml.in.h:2248
+#: ../data/Locations.xml.in.h:2250
 msgid "Barbacena"
 msgstr "Barbacena"
 
 #. A city in Minas Gerais in Brazil
-#: ../data/Locations.xml.in.h:2250
+#: ../data/Locations.xml.in.h:2252
 msgid "Belo Horizonte"
 msgstr "Belo Horizonte"
 
 #. A city in Minas Gerais in Brazil
-#: ../data/Locations.xml.in.h:2252
+#: ../data/Locations.xml.in.h:2254
 msgid "Juiz de Fora"
 msgstr "Juiz de Fora"
 
 #. A city in Minas Gerais in Brazil
-#: ../data/Locations.xml.in.h:2254
+#: ../data/Locations.xml.in.h:2256
 msgid "Montes Claros"
 msgstr "Montes Claros"
 
 #. A city in Minas Gerais in Brazil
-#: ../data/Locations.xml.in.h:2256
+#: ../data/Locations.xml.in.h:2258
 msgid "Poços de Caldas"
 msgstr "Poços de Caldas"
 
 #. A city in Minas Gerais in Brazil
-#: ../data/Locations.xml.in.h:2258
+#: ../data/Locations.xml.in.h:2260
 msgid "Uberaba"
 msgstr "Uberaba"
 
 #. A city in Minas Gerais in Brazil
-#: ../data/Locations.xml.in.h:2260
+#: ../data/Locations.xml.in.h:2262
 msgid "Uberlândia"
 msgstr "Uberlândia"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2262
+#: ../data/Locations.xml.in.h:2264
 msgid "Paraná"
 msgstr "Paraná"
 
 #. A city in Paraná in Brazil
-#: ../data/Locations.xml.in.h:2264
+#: ../data/Locations.xml.in.h:2266
 msgid "Curitiba"
 msgstr "Curitaba"
 
 #. A city in Paraná in Brazil
-#: ../data/Locations.xml.in.h:2266
+#: ../data/Locations.xml.in.h:2268
 msgid "Foz do Iguaçu"
 msgstr "Foz do Iguaçu"
 
 #. A city in Paraná in Brazil
-#: ../data/Locations.xml.in.h:2268
+#: ../data/Locations.xml.in.h:2270
 msgid "Londrina"
 msgstr "Londrina"
 
 #. A city in Paraná in Brazil
-#: ../data/Locations.xml.in.h:2270
+#: ../data/Locations.xml.in.h:2272
 msgid "Maringá"
 msgstr "Maringá"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2272
+#: ../data/Locations.xml.in.h:2274
 msgid "Paraíba"
 msgstr "Paraíba"
 
 #. A city in Paraíba in Brazil
-#: ../data/Locations.xml.in.h:2274
+#: ../data/Locations.xml.in.h:2276
 msgid "Campina Grande"
 msgstr "Campina Grande"
 
 #. A city in Paraíba in Brazil
-#: ../data/Locations.xml.in.h:2276
+#: ../data/Locations.xml.in.h:2278
 msgid "João Pessoa"
 msgstr "João Pessoa"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2278
+#: ../data/Locations.xml.in.h:2280
 msgid "Pará"
 msgstr "Pará"
 
 #. A city in Pará in Brazil
-#: ../data/Locations.xml.in.h:2280
+#: ../data/Locations.xml.in.h:2282
 msgid "Altamira"
 msgstr "Altamira"
 
 #. A city in Pará in Brazil
-#: ../data/Locations.xml.in.h:2282
+#: ../data/Locations.xml.in.h:2284
 msgid "Belém"
 msgstr "Belém"
 
 #. A city in Pará in Brazil
-#: ../data/Locations.xml.in.h:2284
+#: ../data/Locations.xml.in.h:2286
 msgid "Cachimbo"
 msgstr "Cachimbo"
 
 #. A city in Pará in Brazil
-#: ../data/Locations.xml.in.h:2286
+#: ../data/Locations.xml.in.h:2288
 msgid "Conceição do Araguaia"
 msgstr "Conceição do Araguaia"
 
 #. A city in Pará in Brazil
-#: ../data/Locations.xml.in.h:2288
+#: ../data/Locations.xml.in.h:2290
 msgid "Itaituba"
 msgstr "Itaituba"
 
 #. A city in Pará in Brazil
-#: ../data/Locations.xml.in.h:2290
+#: ../data/Locations.xml.in.h:2292
 msgid "Jacareacanga"
 msgstr "Jacareacanga"
 
 #. A city in Pará in Brazil
-#: ../data/Locations.xml.in.h:2292
+#: ../data/Locations.xml.in.h:2294
 msgid "Marabá"
 msgstr "Marabá"
 
 #. A city in Pará in Brazil
-#: ../data/Locations.xml.in.h:2294
+#: ../data/Locations.xml.in.h:2296
 msgid "Piri Grande"
 msgstr "Piri Grande"
 
 #. A city in Pará in Brazil
-#: ../data/Locations.xml.in.h:2296
+#: ../data/Locations.xml.in.h:2298
 msgid "Santarém"
 msgstr "Santarém"
 
 #. A city in Pará in Brazil
-#: ../data/Locations.xml.in.h:2298
+#: ../data/Locations.xml.in.h:2300
 msgid "Tucuruí"
 msgstr "Tucuruí"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2300
+#: ../data/Locations.xml.in.h:2302
 msgctxt "State in Brazil"
 msgid "Pernambuco"
 msgstr "Pernambuco"
 
 #. A city in Pernambuco in Brazil
-#: ../data/Locations.xml.in.h:2302
+#: ../data/Locations.xml.in.h:2304
 msgid "Petrolina"
 msgstr "Petrolina"
 
 #. A city in Pernambuco in Brazil
-#: ../data/Locations.xml.in.h:2304
+#: ../data/Locations.xml.in.h:2306
 msgid "Recife"
 msgstr "Recife"
 
 #. A city in Pernambuco in Brazil
-#: ../data/Locations.xml.in.h:2306
+#: ../data/Locations.xml.in.h:2308
 msgid "Vila dos Remédios"
 msgstr "Vila dos Remédios"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2308
+#: ../data/Locations.xml.in.h:2310
 msgid "Piauí"
 msgstr "Piauí"
 
 #. A city in Piauí in Brazil
-#: ../data/Locations.xml.in.h:2310
+#: ../data/Locations.xml.in.h:2312
 msgid "Parnaíba"
 msgstr "Parnaíba"
 
 #. A city in Piauí in Brazil
-#: ../data/Locations.xml.in.h:2312
+#: ../data/Locations.xml.in.h:2314
 msgid "Teresina"
 msgstr "Teresina"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2314
+#: ../data/Locations.xml.in.h:2316
 msgid "Rio Grande do Norte"
 msgstr "Rio Grande do Norte"
 
 #. A city in Rio Grande do Norte in Brazil
-#: ../data/Locations.xml.in.h:2316
+#: ../data/Locations.xml.in.h:2318
 msgid "Mossoró"
 msgstr "Mossoró"
 
 #. A city in Rio Grande do Norte in Brazil
-#: ../data/Locations.xml.in.h:2318
+#: ../data/Locations.xml.in.h:2320
 msgctxt "City in Rio Grande do Norte, Brazil"
 msgid "Natal"
 msgstr "Natal"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2320
+#: ../data/Locations.xml.in.h:2322
 msgid "Rio Grande do Sul"
 msgstr "Rio Grande do Sul"
 
 #. A city in Rio Grande do Sul in Brazil
-#: ../data/Locations.xml.in.h:2322
+#: ../data/Locations.xml.in.h:2324
 msgid "Pelotas"
 msgstr "Pelotas"
 
 #. A city in Rio Grande do Sul in Brazil
-#: ../data/Locations.xml.in.h:2324
+#: ../data/Locations.xml.in.h:2326
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
 #. A city in Rio Grande do Sul in Brazil
-#: ../data/Locations.xml.in.h:2326
+#: ../data/Locations.xml.in.h:2328
 msgctxt "City in Rio Grande do Sul, Brazil"
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
 #. A city in Rio Grande do Sul in Brazil
-#: ../data/Locations.xml.in.h:2328
+#: ../data/Locations.xml.in.h:2330
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2330
+#: ../data/Locations.xml.in.h:2332
 msgctxt "State in Brazil"
 msgid "Rio de Janeiro"
 msgstr "Rio de Janeiro"
 
 #. A city in Rio de Janeiro in Brazil
-#: ../data/Locations.xml.in.h:2332
+#: ../data/Locations.xml.in.h:2334
 msgid "Campos"
 msgstr "Campos"
 
 #. A city in Rio de Janeiro in Brazil
-#: ../data/Locations.xml.in.h:2334
+#: ../data/Locations.xml.in.h:2336
 msgctxt "City in Rio de Janeiro, Brazil"
 msgid "Rio de Janeiro"
 msgstr "Rio de Janeiro"
 
 #. A city in Rio de Janeiro in Brazil
-#: ../data/Locations.xml.in.h:2336
+#: ../data/Locations.xml.in.h:2338
 msgid "São Pedro da Aldeia"
 msgstr "São Pedro da Aldeia"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2338
+#: ../data/Locations.xml.in.h:2340
 msgid "Rondônia"
 msgstr "Rondônia"
 
 #. A city in Rondônia in Brazil
-#: ../data/Locations.xml.in.h:2340
+#: ../data/Locations.xml.in.h:2342
 msgid "Pôrto Velho"
 msgstr "Pôrto Velho"
 
 #. A city in Rondônia in Brazil
-#: ../data/Locations.xml.in.h:2342
+#: ../data/Locations.xml.in.h:2344
 msgid "Vilhena"
 msgstr "Vilhena"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2344
+#: ../data/Locations.xml.in.h:2346
 msgctxt "State in Brazil"
 msgid "Roraima"
 msgstr "Roraima"
 
 #. A city in Roraima in Brazil
-#: ../data/Locations.xml.in.h:2346
+#: ../data/Locations.xml.in.h:2348
 msgid "Boa Vista"
 msgstr "Boa Vista"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2348
+#: ../data/Locations.xml.in.h:2350
 msgid "Santa Catarina"
 msgstr "Santa Catarina"
 
 #. A city in Santa Catarina in Brazil
-#: ../data/Locations.xml.in.h:2350
+#: ../data/Locations.xml.in.h:2352
 msgid "Florianópolis"
 msgstr "Florianópolis"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2352
+#: ../data/Locations.xml.in.h:2354
 msgid "Sergipe"
 msgstr "Sergipe"
 
 #. A city in Sergipe in Brazil
-#: ../data/Locations.xml.in.h:2354
+#: ../data/Locations.xml.in.h:2356
 msgid "Aracaju"
 msgstr "Aracaju"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2356
+#: ../data/Locations.xml.in.h:2358
 msgctxt "State in Brazil"
 msgid "São Paulo"
 msgstr "São Paulo"
 
 #. A city in São Paulo in Brazil
-#: ../data/Locations.xml.in.h:2358
+#: ../data/Locations.xml.in.h:2360
 msgid "Bauru"
 msgstr "Bauru"
 
 #. A city in São Paulo in Brazil
-#: ../data/Locations.xml.in.h:2360
+#: ../data/Locations.xml.in.h:2362
 msgid "Campinas"
 msgstr "Campinas"
 
 #. A city in São Paulo in Brazil
-#: ../data/Locations.xml.in.h:2362
+#: ../data/Locations.xml.in.h:2364
 msgid "Guaratinguetá"
 msgstr "Guaratinguetá"
 
 #. A city in São Paulo in Brazil
-#: ../data/Locations.xml.in.h:2364
+#: ../data/Locations.xml.in.h:2366
 msgid "Guarulhos"
 msgstr "Guarulhos"
 
 #. A city in São Paulo in Brazil
-#: ../data/Locations.xml.in.h:2366
+#: ../data/Locations.xml.in.h:2368
 msgid "Palmeiras"
 msgstr "Palmerias"
 
 #. A city in São Paulo in Brazil
-#: ../data/Locations.xml.in.h:2368
+#: ../data/Locations.xml.in.h:2370
 msgid "Piraçununga"
 msgstr "Piraçununga"
 
 #. A city in São Paulo in Brazil
-#: ../data/Locations.xml.in.h:2370
+#: ../data/Locations.xml.in.h:2372
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
 #. A city in São Paulo in Brazil
-#: ../data/Locations.xml.in.h:2372
+#: ../data/Locations.xml.in.h:2374
 msgid "Santos"
 msgstr "Santos"
 
 #. A city in São Paulo in Brazil
-#: ../data/Locations.xml.in.h:2374
+#: ../data/Locations.xml.in.h:2376
 msgid "São José dos Campos"
 msgstr "São José dos Campos"
 
 #. A city in São Paulo in Brazil
-#: ../data/Locations.xml.in.h:2376
+#: ../data/Locations.xml.in.h:2378
 msgctxt "City in São Paulo, Brazil"
 msgid "São Paulo"
 msgstr "São Paulo"
 
 #. A state/province/territory in Brazil
-#: ../data/Locations.xml.in.h:2378
+#: ../data/Locations.xml.in.h:2380
 msgid "Tocantis"
 msgstr "Tocantis"
 
 #. VG - British Virgin Islands, a British territory in the
 #. Caribbean
 #. 
-#: ../data/Locations.xml.in.h:2382
+#: ../data/Locations.xml.in.h:2384
 msgid "British Virgin Islands"
 msgstr "De britiske jomfruøyer"
 
 #. The capital of the British Virgin Islands
-#: ../data/Locations.xml.in.h:2384
+#: ../data/Locations.xml.in.h:2386
 msgid "Road Town"
 msgstr "Road Town"
 
 #. A city in the British Virgin Islands
-#: ../data/Locations.xml.in.h:2386
+#: ../data/Locations.xml.in.h:2388
 msgid "The Mill"
 msgstr "The Mill"
 
 #. KY - Cayman Islands, a British territory in the Caribbean
-#: ../data/Locations.xml.in.h:2388
+#: ../data/Locations.xml.in.h:2390
 msgid "Cayman Islands"
 msgstr "Caymanøyene"
 
 #. The capital of the Cayman Islands
-#: ../data/Locations.xml.in.h:2390
+#: ../data/Locations.xml.in.h:2392
 msgctxt "City in Cayman Islands"
 msgid "George Town"
 msgstr "George Town"
 
 #. A city in the Cayman Islands
-#: ../data/Locations.xml.in.h:2392
+#: ../data/Locations.xml.in.h:2394
 msgid "Knob Hill"
 msgstr "Knob Hill"
 
 #. A city in the Cayman Islands
-#: ../data/Locations.xml.in.h:2394
+#: ../data/Locations.xml.in.h:2396
 msgid "Red Bay Estate"
 msgstr "Red Bay Estate"
 
 #. CL - Chile
-#: ../data/Locations.xml.in.h:2396
+#: ../data/Locations.xml.in.h:2398
 msgid "Chile"
 msgstr "Chile"
 
 #. This refers to the time zone for mainland Chile (as
 #. opposed to the time zone for Easter Island).
 #. 
-#: ../data/Locations.xml.in.h:2400
+#: ../data/Locations.xml.in.h:2402
 msgid "Mainland Chile"
 msgstr "Fastlandet Chile"
 
@@ -5329,225 +5329,225 @@
 #. string is only used in places where "Chile" is already
 #. understood from context.
 #. 
-#: ../data/Locations.xml.in.h:2405
+#: ../data/Locations.xml.in.h:2407
 msgid "Easter Island"
 msgstr "Påskeøya"
 
 #. A city in Chile
-#: ../data/Locations.xml.in.h:2407
+#: ../data/Locations.xml.in.h:2409
 msgid "Antofagasta"
 msgstr "Antofagasta"
 
 #. A city in Chile
-#: ../data/Locations.xml.in.h:2409
+#: ../data/Locations.xml.in.h:2411
 msgid "Arica"
 msgstr "Arica"
 
 #. A city in Chile
-#: ../data/Locations.xml.in.h:2411
+#: ../data/Locations.xml.in.h:2413
 msgid "Balmaceda"
 msgstr "Balmaceda"
 
 #. A city in Chile
-#: ../data/Locations.xml.in.h:2413
+#: ../data/Locations.xml.in.h:2415
 msgctxt "City in Chile"
 msgid "Concepción"
 msgstr "Concepción"
 
 #. A city in Chile
-#: ../data/Locations.xml.in.h:2415
+#: ../data/Locations.xml.in.h:2417
 msgid "Hanga Roa"
 msgstr "Hanga Roa"
 
 #. A city in Chile
-#: ../data/Locations.xml.in.h:2417
+#: ../data/Locations.xml.in.h:2419
 msgid "Iquique"
 msgstr "Iquique"
 
 #. A city in Chile
-#: ../data/Locations.xml.in.h:2419
+#: ../data/Locations.xml.in.h:2421
 msgid "La Serena"
 msgstr "La Serana"
 
 #. A city in Chile
-#: ../data/Locations.xml.in.h:2421
+#: ../data/Locations.xml.in.h:2423
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
 #. A city in Chile
-#: ../data/Locations.xml.in.h:2423
+#: ../data/Locations.xml.in.h:2425
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
 #. A city in Chile
-#: ../data/Locations.xml.in.h:2425
+#: ../data/Locations.xml.in.h:2427
 msgid "Santa Teresa de Lo Ovalle"
 msgstr "Santa Teresa de Lo Ovalle"
 
 #. The capital of Chile
-#: ../data/Locations.xml.in.h:2427
+#: ../data/Locations.xml.in.h:2429
 msgctxt "City in Chile"
 msgid "Santiago"
 msgstr "Santiago"
 
 #. A city in Chile
-#: ../data/Locations.xml.in.h:2429
+#: ../data/Locations.xml.in.h:2431
 msgid "Temuco"
 msgstr "Temuco"
 
 #. CO - Colombia
-#: ../data/Locations.xml.in.h:2431
+#: ../data/Locations.xml.in.h:2433
 msgid "Colombia"
 msgstr "Colombia"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2433
+#: ../data/Locations.xml.in.h:2435
 msgid "Barranquilla"
 msgstr "Barranquilla"
 
 #. The capital of Colombia
-#: ../data/Locations.xml.in.h:2435
+#: ../data/Locations.xml.in.h:2437
 msgid "Bogotá"
 msgstr "Bogotá"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2437
+#: ../data/Locations.xml.in.h:2439
 msgid "Bucaramanga"
 msgstr "Bucaramanga"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2439
+#: ../data/Locations.xml.in.h:2441
 msgid "Cali"
 msgstr "Cali"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2441
+#: ../data/Locations.xml.in.h:2443
 msgid "Cartagena"
 msgstr "Cartagena"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2443
+#: ../data/Locations.xml.in.h:2445
 msgid "Cúcuta"
 msgstr "Cúcuta"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2445
+#: ../data/Locations.xml.in.h:2447
 msgid "Ibagué"
 msgstr "Ibagué"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2447
+#: ../data/Locations.xml.in.h:2449
 msgid "Ipiales"
 msgstr "Ipiales"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2449
+#: ../data/Locations.xml.in.h:2451
 msgid "Leticia"
 msgstr "Leticia"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2451
+#: ../data/Locations.xml.in.h:2453
 msgid "Medellín"
 msgstr "Medellín"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2453
+#: ../data/Locations.xml.in.h:2455
 msgid "Monteria"
 msgstr "Monteria"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2455
+#: ../data/Locations.xml.in.h:2457
 msgid "Pasto"
 msgstr "Pasto"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2457
+#: ../data/Locations.xml.in.h:2459
 msgid "Pereira"
 msgstr "Pereira"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2459
+#: ../data/Locations.xml.in.h:2461
 msgid "Popayán"
 msgstr "Popayán"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2461
+#: ../data/Locations.xml.in.h:2463
 msgid "Quibdó"
 msgstr "Quibdó"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2463
+#: ../data/Locations.xml.in.h:2465
 msgid "Riohacha"
 msgstr "Riohacha"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2465
+#: ../data/Locations.xml.in.h:2467
 msgid "Rionegro"
 msgstr "Rionegro"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2467
+#: ../data/Locations.xml.in.h:2469
 msgid "San Andrés"
 msgstr "San Andrés"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2469
+#: ../data/Locations.xml.in.h:2471
 msgid "Santa Marta"
 msgstr "Santa Marta"
 
 #. A city in Colombia
-#: ../data/Locations.xml.in.h:2471
+#: ../data/Locations.xml.in.h:2473
 msgid "Villavicencio"
 msgstr "Villavicencio"
 
 #. CR - Costa Rica
-#: ../data/Locations.xml.in.h:2473
+#: ../data/Locations.xml.in.h:2475
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
 #. A city in Costa Rica
-#: ../data/Locations.xml.in.h:2475
+#: ../data/Locations.xml.in.h:2477
 msgid "Alajuela"
 msgstr "Alajuela"
 
 #. A city in Costa Rica
-#: ../data/Locations.xml.in.h:2477
+#: ../data/Locations.xml.in.h:2479
 msgctxt "City in Costa Rica"
 msgid "Liberia"
 msgstr "Liberia"
 
 #. A city in Costa Rica
-#: ../data/Locations.xml.in.h:2479
+#: ../data/Locations.xml.in.h:2481
 msgid "Mata de Palo"
 msgstr "Mata de Palo"
 
 #. A city in Costa Rica
-#: ../data/Locations.xml.in.h:2481
+#: ../data/Locations.xml.in.h:2483
 msgid "Puerto Limón"
 msgstr "Puerto Limón"
 
 #. The capital of Costa Rica
-#: ../data/Locations.xml.in.h:2483
+#: ../data/Locations.xml.in.h:2485
 msgid "San José"
 msgstr "San José"
 
 #. CU - Cuba
-#: ../data/Locations.xml.in.h:2485
+#: ../data/Locations.xml.in.h:2487
 msgid "Cuba"
 msgstr "Kuba"
 
 #. A city in Cuba
-#: ../data/Locations.xml.in.h:2487
+#: ../data/Locations.xml.in.h:2489
 msgid "Camagüey"
 msgstr "Camagüey"
 
 #. A city in Cuba
-#: ../data/Locations.xml.in.h:2489
+#: ../data/Locations.xml.in.h:2491
 msgid "Cienfuegos"
 msgstr "Cienfuegos"
 
 #. A city in Cuba
-#: ../data/Locations.xml.in.h:2491
+#: ../data/Locations.xml.in.h:2493
 msgid "Guantánamo"
 msgstr "Guantánamo"
 
@@ -5555,126 +5555,126 @@
 #. "Havana" is the traditional English name.
 #. The local name in Spanish is "La Habana".
 #. 
-#: ../data/Locations.xml.in.h:2496
+#: ../data/Locations.xml.in.h:2498
 msgid "Havana"
 msgstr "Havana"
 
 #. A city in Cuba
-#: ../data/Locations.xml.in.h:2498
+#: ../data/Locations.xml.in.h:2500
 msgid "Holguín"
 msgstr "Holguín"
 
 #. A city in Cuba
-#: ../data/Locations.xml.in.h:2500
+#: ../data/Locations.xml.in.h:2502
 msgctxt "City in Cuba"
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
 #. A city in Cuba
-#: ../data/Locations.xml.in.h:2502
+#: ../data/Locations.xml.in.h:2504
 msgid "Matanzas"
 msgstr "Matanzas"
 
 #. A city in Cuba
-#: ../data/Locations.xml.in.h:2504
+#: ../data/Locations.xml.in.h:2506
 msgid "Santiago de Cuba"
 msgstr "Santiago De Cuba"
 
 #. DO - Dominican Republic
-#: ../data/Locations.xml.in.h:2506
+#: ../data/Locations.xml.in.h:2508
 msgid "Dominican Republic"
 msgstr "Dominikanske republikk"
 
 #. A city in the Dominican Republic
-#: ../data/Locations.xml.in.h:2508
+#: ../data/Locations.xml.in.h:2510
 msgid "Barahona"
 msgstr "Barahona"
 
 #. A city in the Dominican Republic
-#: ../data/Locations.xml.in.h:2510
+#: ../data/Locations.xml.in.h:2512
 msgid "La Romana"
 msgstr "La Romana"
 
 #. A city in the Dominican Republic
-#: ../data/Locations.xml.in.h:2512
+#: ../data/Locations.xml.in.h:2514
 msgid "Mancha Nueva"
 msgstr "Mancha Nueva"
 
 #. A city in the Dominican Republic
-#: ../data/Locations.xml.in.h:2514
+#: ../data/Locations.xml.in.h:2516
 msgid "Pantanal"
 msgstr "Pantanal"
 
 #. A city in the Dominican Republic
-#: ../data/Locations.xml.in.h:2516
+#: ../data/Locations.xml.in.h:2518
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
 #. A city in the Dominican Republic
-#: ../data/Locations.xml.in.h:2518
+#: ../data/Locations.xml.in.h:2520
 msgctxt "City in Dominican Republic"
 msgid "Santiago"
 msgstr "Santiago"
 
 #. The capital of the Dominican Republic
-#: ../data/Locations.xml.in.h:2520
+#: ../data/Locations.xml.in.h:2522
 msgid "Santo Domingo"
 msgstr "Santo Domingo"
 
 #. EC - Ecuador
-#: ../data/Locations.xml.in.h:2522
+#: ../data/Locations.xml.in.h:2524
 msgid "Ecuador"
 msgstr "Ecuador"
 
 #. This refers to the time zone for mainland Ecuador (as
 #. opposed to the time zone for the Galapagos Islands).
 #. 
-#: ../data/Locations.xml.in.h:2526
+#: ../data/Locations.xml.in.h:2528
 msgid "Mainland Ecuador"
 msgstr "Fastlandet Ecuador"
 
 #. The time zone for the Galapagos Islands.
-#: ../data/Locations.xml.in.h:2528
+#: ../data/Locations.xml.in.h:2530
 msgid "Galapagos Islands"
 msgstr "Galapagos øyene"
 
 #. A city in Ecuador
-#: ../data/Locations.xml.in.h:2530
+#: ../data/Locations.xml.in.h:2532
 msgid "Guayaquil"
 msgstr "Guayaquil"
 
 #. A city in Ecuador
-#: ../data/Locations.xml.in.h:2532
+#: ../data/Locations.xml.in.h:2534
 msgid "Latacunga"
 msgstr "Latacunga"
 
 #. A city in Ecuador
-#: ../data/Locations.xml.in.h:2534
+#: ../data/Locations.xml.in.h:2536
 msgid "Manta"
 msgstr "Manta"
 
 #. The capital of Ecuador
-#: ../data/Locations.xml.in.h:2536
+#: ../data/Locations.xml.in.h:2538
 msgid "Quito"
 msgstr "Quito"
 
 #. SV - El Salvador
-#: ../data/Locations.xml.in.h:2538
+#: ../data/Locations.xml.in.h:2540
 msgid "El Salvador"
 msgstr "El Salvador"
 
 #. A city in El Salvador
-#: ../data/Locations.xml.in.h:2540
+#: ../data/Locations.xml.in.h:2542
 msgid "Comalapa"
 msgstr "Comalapa"
 
 #. A city in El Salvador
-#: ../data/Locations.xml.in.h:2542
+#: ../data/Locations.xml.in.h:2544
 msgid "Ilopango"
 msgstr "Ilopango"
 
 #. The capital of El Salvador
-#: ../data/Locations.xml.in.h:2544
+#: ../data/Locations.xml.in.h:2546
 msgid "San Salvador"
 msgstr "San Salvador"
 
@@ -5684,12 +5684,12 @@
 #. Malvinas". The parenthesized form is the compromise used by
 #. ISO and the UN.)
 #. 
-#: ../data/Locations.xml.in.h:2551
+#: ../data/Locations.xml.in.h:2553
 msgid "Falkland Islands (Malvinas)"
 msgstr "Falklandsøyene (Malvinas)"
 
 #. The capital of the Falkland Islands (Malvinas)
-#: ../data/Locations.xml.in.h:2553
+#: ../data/Locations.xml.in.h:2555
 msgctxt "City in Falkland Islands (Malvinas)"
 msgid "Stanley"
 msgstr "Stanley"
@@ -5697,215 +5697,215 @@
 #. GF - French Guiana, an overseas department of France on the
 #. northern coast of South America.
 #. 
-#: ../data/Locations.xml.in.h:2557
+#: ../data/Locations.xml.in.h:2559
 msgid "French Guiana"
 msgstr "Fransk Guyana"
 
 #. The capital of French Guiana
-#: ../data/Locations.xml.in.h:2559
+#: ../data/Locations.xml.in.h:2561
 msgid "Cayenne"
 msgstr "Cayenne"
 
 #. GD - Grenada
-#: ../data/Locations.xml.in.h:2561
+#: ../data/Locations.xml.in.h:2563
 msgid "Grenada"
 msgstr "Grenada"
 
 #. A city in Grenada
-#: ../data/Locations.xml.in.h:2563
+#: ../data/Locations.xml.in.h:2565
 msgid "Bamboo"
 msgstr "Bamboo"
 
 #. The capital of Grenada
-#: ../data/Locations.xml.in.h:2565
+#: ../data/Locations.xml.in.h:2567
 msgid "Saint George's"
 msgstr "Saint George's"
 
 #. GP - Guadeloupe, an overseas department of France in the
 #. Caribbean.
 #. 
-#: ../data/Locations.xml.in.h:2569
+#: ../data/Locations.xml.in.h:2571
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
 #. The capital of Guadeloupe
-#: ../data/Locations.xml.in.h:2571
+#: ../data/Locations.xml.in.h:2573
 msgid "Basse-Terre"
 msgstr "Basse-Terre"
 
 #. A city in Guadeloupe
-#: ../data/Locations.xml.in.h:2573
+#: ../data/Locations.xml.in.h:2575
 msgid "Les Abymes"
 msgstr "Les Abymes"
 
 #. GT - Guatemala
-#: ../data/Locations.xml.in.h:2575
+#: ../data/Locations.xml.in.h:2577
 msgctxt "Country"
 msgid "Guatemala"
 msgstr "Guatemala"
 
 #. The capital of Guatemala
-#: ../data/Locations.xml.in.h:2577
+#: ../data/Locations.xml.in.h:2579
 msgctxt "City in Guatemala"
 msgid "Guatemala"
 msgstr "Guatemala"
 
 #. A city in Guatemala
-#: ../data/Locations.xml.in.h:2579
+#: ../data/Locations.xml.in.h:2581
 msgid "Huehuetenango"
 msgstr "Huehuetenango"
 
 #. A city in Guatemala
-#: ../data/Locations.xml.in.h:2581
+#: ../data/Locations.xml.in.h:2583
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
 #. A city in Guatemala
-#: ../data/Locations.xml.in.h:2583
+#: ../data/Locations.xml.in.h:2585
 msgid "Puerto San José"
 msgstr "Puerto San José"
 
 #. A city in Guatemala
-#: ../data/Locations.xml.in.h:2585
+#: ../data/Locations.xml.in.h:2587
 msgid "Retalhuleu"
 msgstr "Retalhuleu"
 
 #. A city in Guatemala
-#: ../data/Locations.xml.in.h:2587
+#: ../data/Locations.xml.in.h:2589
 msgid "Tikal"
 msgstr "Tikal"
 
 #. GY - Guyana
-#: ../data/Locations.xml.in.h:2589
+#: ../data/Locations.xml.in.h:2591
 msgid "Guyana"
 msgstr "Guyana"
 
 #. The capital of Guyana
-#: ../data/Locations.xml.in.h:2591
+#: ../data/Locations.xml.in.h:2593
 msgctxt "City in Guyana"
 msgid "Georgetown"
 msgstr "Georgetown"
 
 #. HT - Haiti
-#: ../data/Locations.xml.in.h:2593
+#: ../data/Locations.xml.in.h:2595
 msgid "Haiti"
 msgstr "Haiti"
 
 #. Capital of Haiti
-#: ../data/Locations.xml.in.h:2595
+#: ../data/Locations.xml.in.h:2597
 msgid "Port-au-Prince"
 msgstr "Port-au-Prince"
 
 #. HN - Honduras
-#: ../data/Locations.xml.in.h:2597
+#: ../data/Locations.xml.in.h:2599
 msgid "Honduras"
 msgstr "Honduras"
 
 #. A city in Honduras
-#: ../data/Locations.xml.in.h:2599
+#: ../data/Locations.xml.in.h:2601
 msgid "Amapala"
 msgstr "Amapala"
 
 #. A city in Honduras
-#: ../data/Locations.xml.in.h:2601
+#: ../data/Locations.xml.in.h:2603
 msgid "Catacamas"
 msgstr "Catacamas"
 
 #. A city in Honduras
-#: ../data/Locations.xml.in.h:2603
+#: ../data/Locations.xml.in.h:2605
 msgid "Ciudad Choluteca"
 msgstr "Ciudad Choluteca"
 
 #. A city in Honduras
-#: ../data/Locations.xml.in.h:2605
+#: ../data/Locations.xml.in.h:2607
 msgid "Comayagua"
 msgstr "Comayagua"
 
 #. A city in Honduras
-#: ../data/Locations.xml.in.h:2607
+#: ../data/Locations.xml.in.h:2609
 msgid "Guanaja"
 msgstr "Guanaja"
 
 #. A city in Honduras
-#: ../data/Locations.xml.in.h:2609
+#: ../data/Locations.xml.in.h:2611
 msgid "La Ceiba"
 msgstr "La Ceiba"
 
 #. A city in Honduras
-#: ../data/Locations.xml.in.h:2611
+#: ../data/Locations.xml.in.h:2613
 msgid "La Esperanza"
 msgstr "La Esperanza"
 
 #. A city in Honduras
-#: ../data/Locations.xml.in.h:2613
+#: ../data/Locations.xml.in.h:2615
 msgid "La Mesa"
 msgstr "La Mesa"
 
 #. A city in Honduras
-#: ../data/Locations.xml.in.h:2615
+#: ../data/Locations.xml.in.h:2617
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
 #. A city in Honduras
-#: ../data/Locations.xml.in.h:2617
+#: ../data/Locations.xml.in.h:2619
 msgid "Roatán"
 msgstr "Roatán"
 
 #. A city in Honduras
-#: ../data/Locations.xml.in.h:2619
+#: ../data/Locations.xml.in.h:2621
 msgid "Santa Rosa de Copán"
 msgstr "Santa Rosa de Copán"
 
 #. The capital of Honduras
-#: ../data/Locations.xml.in.h:2621
+#: ../data/Locations.xml.in.h:2623
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
 #. A city in Honduras
-#: ../data/Locations.xml.in.h:2623
+#: ../data/Locations.xml.in.h:2625
 msgid "Tela"
 msgstr "Tela"
 
 #. A city in Honduras
-#: ../data/Locations.xml.in.h:2625
+#: ../data/Locations.xml.in.h:2627
 msgid "Yoro"
 msgstr "Yoro"
 
 #. JM - Jamaica
-#: ../data/Locations.xml.in.h:2627
+#: ../data/Locations.xml.in.h:2629
 msgid "Jamaica"
 msgstr "Jamaica"
 
 #. The capital of Jamaica
-#: ../data/Locations.xml.in.h:2629
+#: ../data/Locations.xml.in.h:2631
 msgctxt "City in Jamaica"
 msgid "Kingston"
 msgstr "Kingston"
 
 #. A city in Jamaica
-#: ../data/Locations.xml.in.h:2631
+#: ../data/Locations.xml.in.h:2633
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
 #. MQ - Martinique, an overseas department of France in the
 #. Caribbean.
 #. 
-#: ../data/Locations.xml.in.h:2635
+#: ../data/Locations.xml.in.h:2637
 msgid "Martinique"
 msgstr "Martinique"
 
 #. The capital of Martinique
-#: ../data/Locations.xml.in.h:2637
+#: ../data/Locations.xml.in.h:2639
 msgid "Fort-de-France"
 msgstr "Fort-de-France"
 
 #. A city in Martinique
-#: ../data/Locations.xml.in.h:2639
+#: ../data/Locations.xml.in.h:2641
 msgid "Le Lamentin"
 msgstr "Le Lamentin"
 
 #. MS - Montserrat, a British territory in the Caribbean.
-#: ../data/Locations.xml.in.h:2641
+#: ../data/Locations.xml.in.h:2643
 msgid "Montserrat"
 msgstr "Montserrat"
 
@@ -5913,216 +5913,216 @@
 #. of the three constituent countries of the Kingdom of the
 #. Netherlands.
 #. 
-#: ../data/Locations.xml.in.h:2646
+#: ../data/Locations.xml.in.h:2648
 msgid "Netherlands Antilles"
 msgstr "Nederlandske antiller"
 
 #. A city in the Netherlands Antilles
-#: ../data/Locations.xml.in.h:2648
+#: ../data/Locations.xml.in.h:2650
 msgid "Benners"
 msgstr "Benners"
 
 #. A city in the Netherlands Antilles
-#: ../data/Locations.xml.in.h:2650
+#: ../data/Locations.xml.in.h:2652
 msgid "Cupe Coy"
 msgstr "Cupe Coy"
 
 #. A city in the Netherlands Antilles
-#: ../data/Locations.xml.in.h:2652
+#: ../data/Locations.xml.in.h:2654
 msgid "Dorp Nikiboko"
 msgstr "Dorp Nikiboko"
 
 #. A city in the Netherlands Antilles
-#: ../data/Locations.xml.in.h:2654
+#: ../data/Locations.xml.in.h:2656
 msgid "Gato"
 msgstr "Gato"
 
 #. NI - Nicaragua
-#: ../data/Locations.xml.in.h:2656
+#: ../data/Locations.xml.in.h:2658
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
 #. A city in Nicaragua
-#: ../data/Locations.xml.in.h:2658
+#: ../data/Locations.xml.in.h:2660
 msgid "Bluefields"
 msgstr "Bluefields"
 
 #. A city in Nicaragua
-#: ../data/Locations.xml.in.h:2660
+#: ../data/Locations.xml.in.h:2662
 msgid "Chinandega"
 msgstr "Chinandega"
 
 #. A city in Nicaragua
-#: ../data/Locations.xml.in.h:2662
+#: ../data/Locations.xml.in.h:2664
 msgid "Jinotega"
 msgstr "Jinotega"
 
 #. A city in Nicaragua
-#: ../data/Locations.xml.in.h:2664
+#: ../data/Locations.xml.in.h:2666
 msgid "Juigalpa"
 msgstr "Juigalpa"
 
 #. The capital of Nicaragua
-#: ../data/Locations.xml.in.h:2666
+#: ../data/Locations.xml.in.h:2668
 msgid "Managua"
 msgstr "Managua"
 
 #. A city in Nicaragua
-#: ../data/Locations.xml.in.h:2668
+#: ../data/Locations.xml.in.h:2670
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
 #. A city in Nicaragua
-#: ../data/Locations.xml.in.h:2670
+#: ../data/Locations.xml.in.h:2672
 msgid "Rivas"
 msgstr "Rivas"
 
 #. PA - Panama. The local (Spanish) name is "Panamá". In common
 #. English usage (and in ISO 3166) it does not have the accent.
 #. 
-#: ../data/Locations.xml.in.h:2674
+#: ../data/Locations.xml.in.h:2676
 msgid "Panama"
 msgstr "Panama"
 
 #. A city in Panama
-#: ../data/Locations.xml.in.h:2676
+#: ../data/Locations.xml.in.h:2678
 msgid "David"
 msgstr "David"
 
 #. A city in Panama
-#: ../data/Locations.xml.in.h:2678
+#: ../data/Locations.xml.in.h:2680
 msgid "Fuerte Kobbe"
 msgstr "Fuerte Kobbe"
 
 #. The capital of Panama
-#: ../data/Locations.xml.in.h:2680
+#: ../data/Locations.xml.in.h:2682
 msgid "Panamá"
 msgstr "Panamá"
 
 #. A city in Panama
-#: ../data/Locations.xml.in.h:2682
+#: ../data/Locations.xml.in.h:2684
 msgid "Tocumen"
 msgstr "Tocumen"
 
 #. PY - Paraguay
-#: ../data/Locations.xml.in.h:2684
+#: ../data/Locations.xml.in.h:2686
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #. The capital of Paraguay
-#: ../data/Locations.xml.in.h:2686
+#: ../data/Locations.xml.in.h:2688
 msgid "Asunción"
 msgstr "Asunción"
 
 #. A city in Paraguay
-#: ../data/Locations.xml.in.h:2688
+#: ../data/Locations.xml.in.h:2690
 msgid "Colonia Félix de Azara"
 msgstr "Colonia Félix de Azara"
 
 #. PE - Peru
-#: ../data/Locations.xml.in.h:2690
+#: ../data/Locations.xml.in.h:2692
 msgctxt "Country"
 msgid "Peru"
 msgstr "Peru"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2692
+#: ../data/Locations.xml.in.h:2694
 msgid "Andahuaylas"
 msgstr "Andahuaylas"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2694
+#: ../data/Locations.xml.in.h:2696
 msgid "Arequipa"
 msgstr "Arequipa"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2696
+#: ../data/Locations.xml.in.h:2698
 msgid "Ayacucho"
 msgstr "Ayacucho"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2698
+#: ../data/Locations.xml.in.h:2700
 msgid "Chiclayo"
 msgstr "Chiclayo"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2700
+#: ../data/Locations.xml.in.h:2702
 msgid "Cusco"
 msgstr "Cusco"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2702
+#: ../data/Locations.xml.in.h:2704
 msgid "Iquitos"
 msgstr "Iquitos"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2704
+#: ../data/Locations.xml.in.h:2706
 msgid "Juliaca"
 msgstr "Juliaca"
 
 #. The capital of Peru
-#: ../data/Locations.xml.in.h:2706
+#: ../data/Locations.xml.in.h:2708
 msgctxt "City in Peru"
 msgid "Lima"
 msgstr "Lima"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2708
+#: ../data/Locations.xml.in.h:2710
 msgid "Pisco"
 msgstr "Pisco"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2710
+#: ../data/Locations.xml.in.h:2712
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2712
+#: ../data/Locations.xml.in.h:2714
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2714
+#: ../data/Locations.xml.in.h:2716
 msgid "Tacna"
 msgstr "Tacna"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2716
+#: ../data/Locations.xml.in.h:2718
 msgid "Talara"
 msgstr "Talara"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2718
+#: ../data/Locations.xml.in.h:2720
 msgid "Tarapoto"
 msgstr "Tarapoto"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2720
+#: ../data/Locations.xml.in.h:2722
 msgid "Trujillo"
 msgstr "Trujillo"
 
 #. A city in Peru
-#: ../data/Locations.xml.in.h:2722
+#: ../data/Locations.xml.in.h:2724
 msgid "Tumbes"
 msgstr "Tumbes"
 
 #. LC - Saint Lucia
-#: ../data/Locations.xml.in.h:2724
+#: ../data/Locations.xml.in.h:2726
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
 #. The capital of Saint Lucia
-#: ../data/Locations.xml.in.h:2726
+#: ../data/Locations.xml.in.h:2728
 msgid "Castries"
 msgstr "Castries"
 
 #. A city in Saint Lucia
-#: ../data/Locations.xml.in.h:2728
+#: ../data/Locations.xml.in.h:2730
 msgid "Pointe Sable"
 msgstr "Pointe Sable"
 
 #. A city in Saint Lucia
-#: ../data/Locations.xml.in.h:2730
+#: ../data/Locations.xml.in.h:2732
 msgid "Vigie"
 msgstr "Vigie"
 
@@ -6130,280 +6130,280 @@
 #. Martin / Sint Maarten. (The Dutch half is considered part of
 #. the Netherlands Antilles.)
 #. 
-#: ../data/Locations.xml.in.h:2735
+#: ../data/Locations.xml.in.h:2737
 msgid "Saint Martin"
 msgstr "Saint Martin"
 
 #. VC - Saint Vincent and the Grenadines
-#: ../data/Locations.xml.in.h:2737
+#: ../data/Locations.xml.in.h:2739
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent and the Grenadines"
 
 #. A city in Saint Vincent and the Grenadines
-#: ../data/Locations.xml.in.h:2739
+#: ../data/Locations.xml.in.h:2741
 msgid "Arnos Vale"
 msgstr "Arnos Vale"
 
 #. The capital of Saint Vincent and the Grenadines
-#: ../data/Locations.xml.in.h:2741
+#: ../data/Locations.xml.in.h:2743
 msgid "Kingstown"
 msgstr "Kingstown"
 
 #. GS - South Georgia and the South Sandwich Islands, a British
 #. territory in the South Atlantic.
 #. 
-#: ../data/Locations.xml.in.h:2745
+#: ../data/Locations.xml.in.h:2747
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "South Georgia and the South Sandwich Islands"
 
 #. SR - Suriname
-#: ../data/Locations.xml.in.h:2747
+#: ../data/Locations.xml.in.h:2749
 msgid "Suriname"
 msgstr "Surinam"
 
 #. The capital of Suriname
-#: ../data/Locations.xml.in.h:2749
+#: ../data/Locations.xml.in.h:2751
 msgid "Paramaribo"
 msgstr "Paramaribo"
 
 #. A city in Suriname
-#: ../data/Locations.xml.in.h:2751
+#: ../data/Locations.xml.in.h:2753
 msgid "Zanderij"
 msgstr "Zanderij"
 
 #. TT - Trinidad and Tobago
-#: ../data/Locations.xml.in.h:2753
+#: ../data/Locations.xml.in.h:2755
 msgid "Trinidad and Tobago"
 msgstr "Trinidad and Tobago"
 
 #. A city in Trinidad and Tobago
-#: ../data/Locations.xml.in.h:2755
+#: ../data/Locations.xml.in.h:2757
 msgid "Bon Accord"
 msgstr "Bon Accord"
 
 #. A city in Trinidad and Tobago
-#: ../data/Locations.xml.in.h:2757
+#: ../data/Locations.xml.in.h:2759
 msgid "Piarco"
 msgstr "Piarco"
 
 #. The capital of Trinidad and Tobago
-#: ../data/Locations.xml.in.h:2759
+#: ../data/Locations.xml.in.h:2761
 msgid "Port-of-Spain"
 msgstr "Port-of-Spain"
 
 #. TC - Turks and Caicos Islands, a British territory in the
 #. Caribbean
 #. 
-#: ../data/Locations.xml.in.h:2763
+#: ../data/Locations.xml.in.h:2765
 msgid "Turks and Caicos Islands"
 msgstr "Turks and Caicos Islands"
 
 #. UY - Uruguay
-#: ../data/Locations.xml.in.h:2765
+#: ../data/Locations.xml.in.h:2767
 msgid "Uruguay"
 msgstr "Uruguay"
 
 #. A city in Uruguay
-#: ../data/Locations.xml.in.h:2767
+#: ../data/Locations.xml.in.h:2769
 msgid "Carrasco"
 msgstr "Carrasco"
 
 #. A city in Uruguay
-#: ../data/Locations.xml.in.h:2769
+#: ../data/Locations.xml.in.h:2771
 msgid "Colonia"
 msgstr "Colonia"
 
 #. A city in Uruguay
-#: ../data/Locations.xml.in.h:2771
+#: ../data/Locations.xml.in.h:2773
 msgid "Durazno"
 msgstr "Durazno"
 
 #. A city in Uruguay
-#: ../data/Locations.xml.in.h:2773
+#: ../data/Locations.xml.in.h:2775
 msgid "Maldonado"
 msgstr "Maldonado"
 
 #. The capital of Uruguay
-#: ../data/Locations.xml.in.h:2775
+#: ../data/Locations.xml.in.h:2777
 msgctxt "City in Uruguay"
 msgid "Montevideo"
 msgstr "Montevideo"
 
 #. VE - Venezuela
-#: ../data/Locations.xml.in.h:2777
+#: ../data/Locations.xml.in.h:2779
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2779
+#: ../data/Locations.xml.in.h:2781
 msgid "Acarigua"
 msgstr "Acarigua"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2781
+#: ../data/Locations.xml.in.h:2783
 msgctxt "City in Venezuela"
 msgid "Barcelona"
 msgstr "Barcelona"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2783
+#: ../data/Locations.xml.in.h:2785
 msgid "Barinas"
 msgstr "Barinas"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2785
+#: ../data/Locations.xml.in.h:2787
 msgid "Barquisimeto"
 msgstr "Barquisimeto"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2787
+#: ../data/Locations.xml.in.h:2789
 msgid "Calabozo"
 msgstr "Calabozo"
 
 #. The capital of Venezuela
-#: ../data/Locations.xml.in.h:2789
+#: ../data/Locations.xml.in.h:2791
 msgid "Caracas"
 msgstr "Caracas"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2791
+#: ../data/Locations.xml.in.h:2793
 msgid "Ciudad Bolívar"
 msgstr "Ciudad Bolívar"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2793
+#: ../data/Locations.xml.in.h:2795
 msgid "Coro"
 msgstr "Coro"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2795
+#: ../data/Locations.xml.in.h:2797
 msgid "El Variante"
 msgstr "El Variante"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2797
+#: ../data/Locations.xml.in.h:2799
 msgid "El Vigía"
 msgstr "El Vigía"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2799
+#: ../data/Locations.xml.in.h:2801
 msgid "Guanare"
 msgstr "Guanare"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2801
+#: ../data/Locations.xml.in.h:2803
 msgid "Guaricure"
 msgstr "Guaricure"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2803
+#: ../data/Locations.xml.in.h:2805
 msgid "Guasdalito"
 msgstr "Guasdalito"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2805
+#: ../data/Locations.xml.in.h:2807
 msgid "Güiria"
 msgstr "Güiria"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2807
+#: ../data/Locations.xml.in.h:2809
 msgid "La Chica"
 msgstr "La Chica"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2809
+#: ../data/Locations.xml.in.h:2811
 msgid "Maracaibo"
 msgstr "Maracaibo"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2811
+#: ../data/Locations.xml.in.h:2813
 msgid "Maracay"
 msgstr "Maracay"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2813
+#: ../data/Locations.xml.in.h:2815
 msgid "Maturín"
 msgstr "Maturín"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2815
+#: ../data/Locations.xml.in.h:2817
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2817
+#: ../data/Locations.xml.in.h:2819
 msgid "Morocure"
 msgstr "Morocure"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2819
+#: ../data/Locations.xml.in.h:2821
 msgctxt "City in Venezuela"
 msgid "Mérida"
 msgstr "Mérida"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2821
+#: ../data/Locations.xml.in.h:2823
 msgid "Paramillo"
 msgstr "Paramillo"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2823
+#: ../data/Locations.xml.in.h:2825
 msgid "Puerto Ayacucho"
 msgstr "Puerto Ayacucho"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2825
+#: ../data/Locations.xml.in.h:2827
 msgid "Puerto Borburata"
 msgstr "Puerto Borburata"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2827
+#: ../data/Locations.xml.in.h:2829
 msgid "San Antonio del Táchira"
 msgstr "San Antonio del Táchira"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2829
+#: ../data/Locations.xml.in.h:2831
 msgid "San Felipe"
 msgstr "San Felipe"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2831
+#: ../data/Locations.xml.in.h:2833
 msgctxt "City in Venezuela"
 msgid "San Fernando"
 msgstr "San Fernando"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2833
+#: ../data/Locations.xml.in.h:2835
 msgid "San Juan de los Morros"
 msgstr "San Juan de Los Morros"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2835
+#: ../data/Locations.xml.in.h:2837
 msgid "San Tomé"
 msgstr "San Tomé"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2837
+#: ../data/Locations.xml.in.h:2839
 msgid "Santa Bárbara"
 msgstr "Santa Bárbara"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2839
+#: ../data/Locations.xml.in.h:2841
 msgctxt "City in Venezuela"
 msgid "Valencia"
 msgstr "Valencia"
 
 #. A city in Venezuela
-#: ../data/Locations.xml.in.h:2841
+#: ../data/Locations.xml.in.h:2843
 msgid "Valera"
 msgstr "Valera"
 
-#: ../data/Locations.xml.in.h:2842
+#: ../data/Locations.xml.in.h:2844
 msgid "Europe"
 msgstr "Europa"
 
 #. AL - Albania
-#: ../data/Locations.xml.in.h:2844
+#: ../data/Locations.xml.in.h:2846
 msgid "Albania"
 msgstr "Albania"
 
@@ -6411,64 +6411,64 @@
 #. "Tirana" is the traditional English name.
 #. The local name is "Tiranë".
 #. 
-#: ../data/Locations.xml.in.h:2849
+#: ../data/Locations.xml.in.h:2851
 msgid "Tirana"
 msgstr "Tirana"
 
 #. AD - Andorra
-#: ../data/Locations.xml.in.h:2851
+#: ../data/Locations.xml.in.h:2853
 msgid "Andorra"
 msgstr "Andorra"
 
 #. AT - Austria
-#: ../data/Locations.xml.in.h:2853
+#: ../data/Locations.xml.in.h:2855
 msgid "Austria"
 msgstr "Østerrike"
 
 #. A city in Austria.
 #. One of several cities in Austria called "Aigen".
 #. 
-#: ../data/Locations.xml.in.h:2857
+#: ../data/Locations.xml.in.h:2859
 msgid "Aigen im Ennstal"
 msgstr "Aigen im Ennstal"
 
 #. A city in Austria
-#: ../data/Locations.xml.in.h:2859
+#: ../data/Locations.xml.in.h:2861
 msgid "Graz"
 msgstr "Graz"
 
 #. A city in Austria
-#: ../data/Locations.xml.in.h:2861
+#: ../data/Locations.xml.in.h:2863
 msgid "Hohenems"
 msgstr "Hohenems"
 
 #. A city in Austria
-#: ../data/Locations.xml.in.h:2863
+#: ../data/Locations.xml.in.h:2865
 msgid "Innsbruck"
 msgstr "Innsbruck"
 
 #. A city in Austria
-#: ../data/Locations.xml.in.h:2865
+#: ../data/Locations.xml.in.h:2867
 msgid "Klagenfurt"
 msgstr "Klagenfurt"
 
 #. A city in Austria
-#: ../data/Locations.xml.in.h:2867
+#: ../data/Locations.xml.in.h:2869
 msgid "Linz"
 msgstr "Linz"
 
 #. A city in Austria
-#: ../data/Locations.xml.in.h:2869
+#: ../data/Locations.xml.in.h:2871
 msgid "Salzburg"
 msgstr "Salzburg"
 
 #. A city in Austria
-#: ../data/Locations.xml.in.h:2871
+#: ../data/Locations.xml.in.h:2873
 msgid "Teesdorf"
 msgstr "Teesdorf"
 
 #. A city in Austria
-#: ../data/Locations.xml.in.h:2873
+#: ../data/Locations.xml.in.h:2875
 msgid "Tulln"
 msgstr "Tulln"
 
@@ -6476,67 +6476,67 @@
 #. "Vienna" is the traditional English name.
 #. The local name in German is "Wien".
 #. 
-#: ../data/Locations.xml.in.h:2878
+#: ../data/Locations.xml.in.h:2880
 msgid "Vienna"
 msgstr "Wien"
 
 #. A city in Austria
-#: ../data/Locations.xml.in.h:2880
+#: ../data/Locations.xml.in.h:2882
 msgid "Wiener Neustadt"
 msgstr "Wiener Neustadt"
 
 #. A city in Austria
-#: ../data/Locations.xml.in.h:2882
+#: ../data/Locations.xml.in.h:2884
 msgid "Zell am See"
 msgstr "Zell am See"
 
 #. A city in Austria
-#: ../data/Locations.xml.in.h:2884
+#: ../data/Locations.xml.in.h:2886
 msgid "Zeltweg"
 msgstr "Zeltweg"
 
 #. BY - Belarus
-#: ../data/Locations.xml.in.h:2886
+#: ../data/Locations.xml.in.h:2888
 msgid "Belarus"
 msgstr "Hviterussland"
 
 #. A city in Belarus
-#: ../data/Locations.xml.in.h:2888
+#: ../data/Locations.xml.in.h:2890
 msgctxt "City in Belarus"
 msgid "Brest"
 msgstr "Brest"
 
 #. A city in Belarus
-#: ../data/Locations.xml.in.h:2890
+#: ../data/Locations.xml.in.h:2892
 msgid "Homyel'"
 msgstr "Homyel'"
 
 #. A city in Belarus
-#: ../data/Locations.xml.in.h:2892
+#: ../data/Locations.xml.in.h:2894
 msgid "Hrodna"
 msgstr "Hrodna"
 
 #. The capital of Belarus
-#: ../data/Locations.xml.in.h:2894
+#: ../data/Locations.xml.in.h:2896
 msgid "Minsk"
 msgstr "Minsk"
 
 #. A city in Belarus
-#: ../data/Locations.xml.in.h:2896
+#: ../data/Locations.xml.in.h:2898
 msgid "Vitsyebsk"
 msgstr "Vitsyebsk"
 
 #. BE - Belgium. The local names for the country are "België"
 #. (Dutch), Belgique (French), and Belgien (German).
 #. 
-#: ../data/Locations.xml.in.h:2900
+#: ../data/Locations.xml.in.h:2902
 msgid "Belgium"
 msgstr "Belgia"
 
 #. A state in Belgium. local name (nl): Antwerpen. local name
 #. (fr): Anvers. local name (de): Antwerpen.
 #. 
-#: ../data/Locations.xml.in.h:2904
+#: ../data/Locations.xml.in.h:2906
 msgctxt "State in Belgium"
 msgid "Antwerp"
 msgstr "Antwerpen"
@@ -6545,7 +6545,7 @@
 #. "Antwerp" is the traditional English name.
 #. The local name is "Antwerpen".
 #. 
-#: ../data/Locations.xml.in.h:2909
+#: ../data/Locations.xml.in.h:2911
 msgctxt "City in Antwerp, Belgium"
 msgid "Antwerp"
 msgstr "Antwerpen"
@@ -6555,14 +6555,14 @@
 #. et wallon. local name (de): Brüssel, Flämish- und
 #. Wallonisch-Brabant.
 #. 
-#: ../data/Locations.xml.in.h:2915
+#: ../data/Locations.xml.in.h:2917
 msgid "Brussels, Flemish and Walloon Brabant"
 msgstr "Brüssel, Flämish og Wallonish-Brabant"
 
 #. A city in Brussels, Flemish and Walloon Brabant in
 #. Belgium
 #. 
-#: ../data/Locations.xml.in.h:2919
+#: ../data/Locations.xml.in.h:2921
 msgid "Beauvechain"
 msgstr "Beauvechain"
 
@@ -6571,19 +6571,19 @@
 #. The local name in French is "Bruxelles".
 #. The local name in Dutch is "Brussel".
 #. 
-#: ../data/Locations.xml.in.h:2925
+#: ../data/Locations.xml.in.h:2927
 msgid "Brussels"
 msgstr "Brussels"
 
 #. A city in Brussels, Flemish and Walloon Brabant in
 #. Belgium
 #. 
-#: ../data/Locations.xml.in.h:2929
+#: ../data/Locations.xml.in.h:2931
 msgid "Schaffen"
 msgstr "Schaffen"
 
 #. A state/province/territory in Belgium
-#: ../data/Locations.xml.in.h:2931
+#: ../data/Locations.xml.in.h:2933
 msgid "East-Flanders"
 msgstr "Øst-Flandern"
 
@@ -6591,29 +6591,29 @@
 #. (fr_BE): Hinnot. local name (nl): Henegouwen. local name
 #. (de): Hennegau.
 #. 
-#: ../data/Locations.xml.in.h:2936
+#: ../data/Locations.xml.in.h:2938
 msgid "Hainaut"
 msgstr "Hennegau"
 
 #. A city in Hainaut in Belgium
-#: ../data/Locations.xml.in.h:2938
+#: ../data/Locations.xml.in.h:2940
 msgid "Chièvres"
 msgstr "Chièvres"
 
 #. A city in Hainaut in Belgium
-#: ../data/Locations.xml.in.h:2940
+#: ../data/Locations.xml.in.h:2942
 msgid "Gosselies"
 msgstr "Gosselies"
 
 #. A state in Belgium. local name (nl): Limburg. local name
 #. (fr): Limbourg. local name (de): Limburg.
 #. 
-#: ../data/Locations.xml.in.h:2944
+#: ../data/Locations.xml.in.h:2946
 msgid "Limburg"
 msgstr "Limburg"
 
 #. A city in Limburg in Belgium
-#: ../data/Locations.xml.in.h:2946
+#: ../data/Locations.xml.in.h:2948
 msgid "Kleine-Brogel"
 msgstr "Kleine-Brogel"
 
@@ -6621,33 +6621,33 @@
 #. (fr_BE): Lîdje. local name (nl): Luik. local name (de):
 #. Lüttich.
 #. 
-#: ../data/Locations.xml.in.h:2951
+#: ../data/Locations.xml.in.h:2953
 msgid "Liège"
 msgstr "Liège"
 
 #. A city in Liège in Belgium
-#: ../data/Locations.xml.in.h:2953
+#: ../data/Locations.xml.in.h:2955
 msgid "Bierset"
 msgstr "Bierset"
 
 #. A city in Liège in Belgium
-#: ../data/Locations.xml.in.h:2955
+#: ../data/Locations.xml.in.h:2957
 msgid "Elsenborn"
 msgstr "Elsenborn"
 
 #. A state/province/territory in Belgium
-#: ../data/Locations.xml.in.h:2957
+#: ../data/Locations.xml.in.h:2959
 msgctxt "State in Belgium"
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
 #. A state/province/territory in Belgium
-#: ../data/Locations.xml.in.h:2959
+#: ../data/Locations.xml.in.h:2961
 msgid "Namur"
 msgstr "Namur"
 
 #. A city in Namur in Belgium
-#: ../data/Locations.xml.in.h:2961
+#: ../data/Locations.xml.in.h:2963
 msgid "Florennes"
 msgstr "Florennes"
 
@@ -6655,57 +6655,57 @@
 #. local name (fr): Flandre occidentale. local name (de):
 #. Westflandern.
 #. 
-#: ../data/Locations.xml.in.h:2966
+#: ../data/Locations.xml.in.h:2968
 msgid "West-Flanders"
 msgstr "Westflandern"
 
 #. A city in West-Flanders in Belgium
-#: ../data/Locations.xml.in.h:2968
+#: ../data/Locations.xml.in.h:2970
 msgid "Koksijde"
 msgstr "Koksijde"
 
 #. A city in West-Flanders in Belgium
-#: ../data/Locations.xml.in.h:2970
+#: ../data/Locations.xml.in.h:2972
 msgid "Oostende"
 msgstr "Oostende"
 
 #. BA - Bosnia and Herzegovina
-#: ../data/Locations.xml.in.h:2972
+#: ../data/Locations.xml.in.h:2974
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia og Hercegovina"
 
 #. A city in Bosnia and Herzegovina
-#: ../data/Locations.xml.in.h:2974
+#: ../data/Locations.xml.in.h:2976
 msgid "Banja Luka"
 msgstr "Banja Luka"
 
 #. A city in Bosnia and Herzegovina
-#: ../data/Locations.xml.in.h:2976
+#: ../data/Locations.xml.in.h:2978
 msgid "Mostar"
 msgstr "Mostar"
 
 #. The capital of Bosnia and Herzegovina
-#: ../data/Locations.xml.in.h:2978
+#: ../data/Locations.xml.in.h:2980
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
 #. BG - Bulgaria
-#: ../data/Locations.xml.in.h:2980
+#: ../data/Locations.xml.in.h:2982
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. A city in Bulgaria
-#: ../data/Locations.xml.in.h:2982
+#: ../data/Locations.xml.in.h:2984
 msgid "Burgas"
 msgstr "Burgas"
 
 #. A city in Bulgaria
-#: ../data/Locations.xml.in.h:2984
+#: ../data/Locations.xml.in.h:2986
 msgid "Gorna Oryakhovitsa"
 msgstr "Gorna Oryakhovitsa"
 
 #. A city in Bulgaria
-#: ../data/Locations.xml.in.h:2986
+#: ../data/Locations.xml.in.h:2988
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
@@ -6713,122 +6713,122 @@
 #. "Sofia" is the traditional English name.
 #. The local name is "Sofiya".
 #. 
-#: ../data/Locations.xml.in.h:2991
+#: ../data/Locations.xml.in.h:2993
 msgid "Sofia"
 msgstr "Sofia"
 
 #. A city in Bulgaria
-#: ../data/Locations.xml.in.h:2993
+#: ../data/Locations.xml.in.h:2995
 msgid "Varna"
 msgstr "Varna"
 
 #. HR - Croatia
-#: ../data/Locations.xml.in.h:2995
+#: ../data/Locations.xml.in.h:2997
 msgid "Croatia"
 msgstr "Kroatia"
 
 #. A city in Croatia
-#: ../data/Locations.xml.in.h:2997
+#: ../data/Locations.xml.in.h:2999
 msgid "Bol"
 msgstr "Bol"
 
 #. A city in Croatia
-#: ../data/Locations.xml.in.h:2999
+#: ../data/Locations.xml.in.h:3001
 msgid "Dubrovnik"
 msgstr "Dubrovnik"
 
 #. A city in Croatia
-#: ../data/Locations.xml.in.h:3001
+#: ../data/Locations.xml.in.h:3003
 msgid "Jelovice"
 msgstr "Jelovice"
 
 #. A city in Croatia
-#: ../data/Locations.xml.in.h:3003
+#: ../data/Locations.xml.in.h:3005
 msgid "Liška"
 msgstr "Liška"
 
 #. A city in Croatia
-#: ../data/Locations.xml.in.h:3005
+#: ../data/Locations.xml.in.h:3007
 msgid "Osijek"
 msgstr "Osijek"
 
 #. A city in Croatia
-#: ../data/Locations.xml.in.h:3007
+#: ../data/Locations.xml.in.h:3009
 msgid "Rijeka"
 msgstr "Rijeka"
 
 #. A city in Croatia
-#: ../data/Locations.xml.in.h:3009
+#: ../data/Locations.xml.in.h:3011
 msgid "Split"
 msgstr "Split"
 
 #. A city in Croatia
-#: ../data/Locations.xml.in.h:3011
+#: ../data/Locations.xml.in.h:3013
 msgid "Zadar"
 msgstr "Zadar"
 
 #. The capital of Croatia
-#: ../data/Locations.xml.in.h:3013
+#: ../data/Locations.xml.in.h:3015
 msgid "Zagreb"
 msgstr "Zagreb"
 
 #. CY - Cyprus
-#: ../data/Locations.xml.in.h:3015
+#: ../data/Locations.xml.in.h:3017
 msgid "Cyprus"
 msgstr "Kypros"
 
 #. A city in Cyprus
-#: ../data/Locations.xml.in.h:3017
+#: ../data/Locations.xml.in.h:3019
 msgid "Akrotiri"
 msgstr "Akrotiri"
 
 #. A city in Cyprus
-#: ../data/Locations.xml.in.h:3019
+#: ../data/Locations.xml.in.h:3021
 msgid "Larnaca"
 msgstr "Larnaca"
 
 #. The capital of Cyprus
-#: ../data/Locations.xml.in.h:3021
+#: ../data/Locations.xml.in.h:3023
 msgid "Nicosia"
 msgstr "Nicosia"
 
 #. A city in Cyprus
-#: ../data/Locations.xml.in.h:3023
+#: ../data/Locations.xml.in.h:3025
 msgid "Paphos"
 msgstr "Paphos"
 
 #. A city in Cyprus
-#: ../data/Locations.xml.in.h:3025
+#: ../data/Locations.xml.in.h:3027
 msgid "Tymbou"
 msgstr "Tymbou"
 
 #. CZ - Czech Republic
-#: ../data/Locations.xml.in.h:3027
+#: ../data/Locations.xml.in.h:3029
 msgid "Czech Republic"
 msgstr "Tsjekkia"
 
 #. A city in the Czech Republic
-#: ../data/Locations.xml.in.h:3029
+#: ../data/Locations.xml.in.h:3031
 msgid "Brno"
 msgstr "Brno"
 
 #. A city in the Czech Republic
-#: ../data/Locations.xml.in.h:3031
+#: ../data/Locations.xml.in.h:3033
 msgid "Holešov"
 msgstr "Holešov"
 
 #. A city in the Czech Republic
-#: ../data/Locations.xml.in.h:3033
+#: ../data/Locations.xml.in.h:3035
 msgid "Karlovy Vary"
 msgstr "Karlovy Vary"
 
 #. A city in the Czech Republic
-#: ../data/Locations.xml.in.h:3035
+#: ../data/Locations.xml.in.h:3037
 msgid "Liberec"
 msgstr "Liberec"
 
 #. A city in the Czech Republic
-#: ../data/Locations.xml.in.h:3037
+#: ../data/Locations.xml.in.h:3039
 msgid "Ostrava"
 msgstr "Ostrava"
 
@@ -6836,17 +6836,17 @@
 #. "Prague" is the traditional English name.
 #. The local name in Czech is "Praha".
 #. 
-#: ../data/Locations.xml.in.h:3042
+#: ../data/Locations.xml.in.h:3044
 msgid "Prague"
 msgstr "Prague"
 
 #. DK - Denmark. The Danish name is "Danmark"
-#: ../data/Locations.xml.in.h:3044
+#: ../data/Locations.xml.in.h:3046
 msgid "Denmark"
 msgstr "Danmark"
 
 #. A city in Denmark
-#: ../data/Locations.xml.in.h:3046
+#: ../data/Locations.xml.in.h:3048
 msgid "Billund"
 msgstr "Billund"
 
@@ -6854,798 +6854,798 @@
 #. "Copenhagen" is the traditional English name.
 #. The local name is "København".
 #. 
-#: ../data/Locations.xml.in.h:3051
+#: ../data/Locations.xml.in.h:3053
 msgid "Copenhagen"
 msgstr "København"
 
 #. A city in Denmark
-#: ../data/Locations.xml.in.h:3053
+#: ../data/Locations.xml.in.h:3055
 msgid "Esbjerg"
 msgstr "Esbjerg"
 
 #. A city in Denmark
-#: ../data/Locations.xml.in.h:3055
+#: ../data/Locations.xml.in.h:3057
 msgid "Karup"
 msgstr "Karup"
 
 #. A city in Denmark
-#: ../data/Locations.xml.in.h:3057
+#: ../data/Locations.xml.in.h:3059
 msgid "Kastrup"
 msgstr "Kastrup"
 
 #. A city in Denmark
-#: ../data/Locations.xml.in.h:3059
+#: ../data/Locations.xml.in.h:3061
 msgid "Mejlby"
 msgstr "Mejlby"
 
 #. A city in Denmark
-#: ../data/Locations.xml.in.h:3061
+#: ../data/Locations.xml.in.h:3063
 msgid "Odense"
 msgstr "Odense"
 
 #. A city in Denmark
-#: ../data/Locations.xml.in.h:3063
+#: ../data/Locations.xml.in.h:3065
 msgid "Roskilde"
 msgstr "Roskilde"
 
 #. A city in Denmark
-#: ../data/Locations.xml.in.h:3065
+#: ../data/Locations.xml.in.h:3067
 msgid "Rønne"
 msgstr "Rønne"
 
 #. A city in Denmark
-#: ../data/Locations.xml.in.h:3067
+#: ../data/Locations.xml.in.h:3069
 msgid "Skrydstrup"
 msgstr "Skrydstrup"
 
 #. A city in Denmark
-#: ../data/Locations.xml.in.h:3069
+#: ../data/Locations.xml.in.h:3071
 msgid "Sottrupskov"
 msgstr "Sottrupskov"
 
 #. A city in Denmark
-#: ../data/Locations.xml.in.h:3071
+#: ../data/Locations.xml.in.h:3073
 msgid "Tirstrup"
 msgstr "Tirstrup"
 
 #. A city in Denmark
-#: ../data/Locations.xml.in.h:3073
+#: ../data/Locations.xml.in.h:3075
 msgid "Vamdrup"
 msgstr "Vamdrup"
 
 #. A city in Denmark
-#: ../data/Locations.xml.in.h:3075
+#: ../data/Locations.xml.in.h:3077
 msgid "Ålborg"
 msgstr "Ålborg"
 
 #. EE - Estonia
-#: ../data/Locations.xml.in.h:3077
+#: ../data/Locations.xml.in.h:3079
 msgid "Estonia"
 msgstr "Estland"
 
 #. A city in Estonia
-#: ../data/Locations.xml.in.h:3079
+#: ../data/Locations.xml.in.h:3081
 msgid "Kuressaare"
 msgstr "Kuressaare"
 
 #. A city in Estonia
-#: ../data/Locations.xml.in.h:3081
+#: ../data/Locations.xml.in.h:3083
 msgid "Kärdla"
 msgstr "Kärdla"
 
 #. A city in Estonia
-#: ../data/Locations.xml.in.h:3083
+#: ../data/Locations.xml.in.h:3085
 msgid "Pärnu"
 msgstr "Pärnu"
 
 #. The capital of Estonia
-#: ../data/Locations.xml.in.h:3085
+#: ../data/Locations.xml.in.h:3087
 msgid "Tallinn"
 msgstr "Tallinn"
 
 #. A city in Estonia
-#: ../data/Locations.xml.in.h:3087
+#: ../data/Locations.xml.in.h:3089
 msgid "Tartu"
 msgstr "Tartu"
 
 #. FO - Faroe Islands, an autonomous province of Denmark in the
 #. north Atlantic.
 #. 
-#: ../data/Locations.xml.in.h:3091
+#: ../data/Locations.xml.in.h:3093
 msgid "Faroe Islands"
 msgstr "Færøyene"
 
 #. A city in the Faroe Islands
-#: ../data/Locations.xml.in.h:3093
+#: ../data/Locations.xml.in.h:3095
 msgid "Sørvágur"
 msgstr "Sørvágur"
 
 #. The capital of the Faroe Islands
-#: ../data/Locations.xml.in.h:3095
+#: ../data/Locations.xml.in.h:3097
 msgid "Tórshavn"
 msgstr "Tórshavn"
 
 #. FI - Finland
-#: ../data/Locations.xml.in.h:3097
+#: ../data/Locations.xml.in.h:3099
 msgid "Finland"
 msgstr "Finland"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3099
+#: ../data/Locations.xml.in.h:3101
 msgid "Enontekiö"
 msgstr "Enontekiö"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3101
+#: ../data/Locations.xml.in.h:3103
 msgid "Halli"
 msgstr "Halli"
 
 #. The capital of Finland.
 #. The local name in Swedish is "Helsingfors".
 #. 
-#: ../data/Locations.xml.in.h:3105
+#: ../data/Locations.xml.in.h:3107
 msgid "Helsinki"
 msgstr "Helsinki"
 
 #. A city in Finland.
 #. The local name in Swedish is "Vanda".
 #. 
-#: ../data/Locations.xml.in.h:3109
+#: ../data/Locations.xml.in.h:3111
 msgid "Vantaa"
 msgstr "Vantaa"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3111
+#: ../data/Locations.xml.in.h:3113
 msgid "Ivalo"
 msgstr "Ivalo"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3113
+#: ../data/Locations.xml.in.h:3115
 msgid "Joensuu"
 msgstr "Joensuu"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3115
+#: ../data/Locations.xml.in.h:3117
 msgid "Jyväskylä"
 msgstr "Jyväskylä"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3117
+#: ../data/Locations.xml.in.h:3119
 msgid "Kajaani"
 msgstr "Kajaani"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3119
+#: ../data/Locations.xml.in.h:3121
 msgid "Kauhava"
 msgstr "Kauhava"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3121
+#: ../data/Locations.xml.in.h:3123
 msgid "Kemi"
 msgstr "Kemi"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3123
+#: ../data/Locations.xml.in.h:3125
 msgid "Kittilä"
 msgstr "Kittilä"
 
 #. A city in Finland.
 #. The local name in Swedish is "Kronoby".
 #. 
-#: ../data/Locations.xml.in.h:3127
+#: ../data/Locations.xml.in.h:3129
 msgid "Kruunupyy"
 msgstr "Kruunupyy"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3129
+#: ../data/Locations.xml.in.h:3131
 msgid "Kuopio"
 msgstr "Kuopio"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3131
+#: ../data/Locations.xml.in.h:3133
 msgid "Kuusamo"
 msgstr "Kuusamo"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3133
+#: ../data/Locations.xml.in.h:3135
 msgid "Lappeenranta"
 msgstr "Lappeenranta"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3135
+#: ../data/Locations.xml.in.h:3137
 msgid "Mikkeli"
 msgstr "Mikkeli"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3137
+#: ../data/Locations.xml.in.h:3139
 msgid "Oulu"
 msgstr "Oulu"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3139
+#: ../data/Locations.xml.in.h:3141
 msgid "Pori"
 msgstr "Pori"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3141
+#: ../data/Locations.xml.in.h:3143
 msgid "Rovaniemi"
 msgstr "Rovaniemi"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3143
+#: ../data/Locations.xml.in.h:3145
 msgid "Savonlinna"
 msgstr "Savonlinna"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3145
+#: ../data/Locations.xml.in.h:3147
 msgid "Seinäjoki"
 msgstr "Seinäjoki"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3147
+#: ../data/Locations.xml.in.h:3149
 msgid "Tampere"
 msgstr "Tampere"
 
 #. A city in Finland.
 #. The local name in Swedish is "Åbo".
 #. 
-#: ../data/Locations.xml.in.h:3151
+#: ../data/Locations.xml.in.h:3153
 msgid "Turku"
 msgstr "Turku"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3153
+#: ../data/Locations.xml.in.h:3155
 msgid "Utti"
 msgstr "Utti"
 
 #. A city in Finland.
 #. The local name in Swedish is "Vasa".
 #. 
-#: ../data/Locations.xml.in.h:3157
+#: ../data/Locations.xml.in.h:3159
 msgid "Vaasa"
 msgstr "Vaasa"
 
 #. A city in Finland
-#: ../data/Locations.xml.in.h:3159
+#: ../data/Locations.xml.in.h:3161
 msgid "Varkaus"
 msgstr "Varkaus"
 
 #. FR - France
-#: ../data/Locations.xml.in.h:3161
+#: ../data/Locations.xml.in.h:3163
 msgid "France"
 msgstr "Frankrike"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3163
+#: ../data/Locations.xml.in.h:3165
 msgid "Abbeville"
 msgstr "Abbeville"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3165
+#: ../data/Locations.xml.in.h:3167
 msgid "Acon"
 msgstr "Acon"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3167
+#: ../data/Locations.xml.in.h:3169
 msgid "Agen"
 msgstr "Agen"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3169
+#: ../data/Locations.xml.in.h:3171
 msgid "Ajaccio"
 msgstr "Ajaccio"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3171
+#: ../data/Locations.xml.in.h:3173
 msgid "Alençon"
 msgstr "Alençon"
 
 #. A city in France.
 #. One of several cities in France called "Ambérieu".
 #. 
-#: ../data/Locations.xml.in.h:3175
+#: ../data/Locations.xml.in.h:3177
 msgid "Ambérieu-en-Bugey"
 msgstr "Ambérieu-en-Bugey"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3177
+#: ../data/Locations.xml.in.h:3179
 msgid "Auch"
 msgstr "Auch"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3179
+#: ../data/Locations.xml.in.h:3181
 msgid "Aurillac"
 msgstr "Aurillac"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3181
+#: ../data/Locations.xml.in.h:3183
 msgid "Avord"
 msgstr "Avord"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3183
+#: ../data/Locations.xml.in.h:3185
 msgid "Bastia"
 msgstr "Bastia"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3185
+#: ../data/Locations.xml.in.h:3187
 msgid "Beauvais"
 msgstr "Beauvais"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3187
+#: ../data/Locations.xml.in.h:3189
 msgid "Bergerac"
 msgstr "Bergerac"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3189
+#: ../data/Locations.xml.in.h:3191
 msgid "Biarritz"
 msgstr "Biarritz"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3191
+#: ../data/Locations.xml.in.h:3193
 msgctxt "City in France"
 msgid "Bordeaux"
 msgstr "Bordeaux"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3193
+#: ../data/Locations.xml.in.h:3195
 msgid "Bourges"
 msgstr "Bourges"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3195
+#: ../data/Locations.xml.in.h:3197
 msgctxt "City in France"
 msgid "Brest"
 msgstr "Brest"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3197
+#: ../data/Locations.xml.in.h:3199
 msgid "Brive"
 msgstr "Brive"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3199
+#: ../data/Locations.xml.in.h:3201
 msgid "Béziers"
 msgstr "Béziers"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3201
+#: ../data/Locations.xml.in.h:3203
 msgid "Caen"
 msgstr "Caen"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3203
+#: ../data/Locations.xml.in.h:3205
 msgid "Calvi"
 msgstr "Calvi"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3205
+#: ../data/Locations.xml.in.h:3207
 msgid "Cambrai"
 msgstr "Cambrai"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3207
+#: ../data/Locations.xml.in.h:3209
 msgid "Cannes"
 msgstr "Cannes"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3209
+#: ../data/Locations.xml.in.h:3211
 msgid "Carcassonne"
 msgstr "Carcassonne"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3211
+#: ../data/Locations.xml.in.h:3213
 msgid "Cazaux"
 msgstr "Cazaux"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3213
+#: ../data/Locations.xml.in.h:3215
 msgid "Chambéry"
 msgstr "Chambéry"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3215
+#: ../data/Locations.xml.in.h:3217
 msgid "Chartres"
 msgstr "Chartres"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3217
+#: ../data/Locations.xml.in.h:3219
 msgid "Cherbourg"
 msgstr "Cherbourg"
 
 #. A city in France.
 #. One of several cities in France called "Châlons".
 #. 
-#: ../data/Locations.xml.in.h:3221
+#: ../data/Locations.xml.in.h:3223
 msgid "Châlons-en-Champagne"
 msgstr "Châlons-en-Champagne"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3223
+#: ../data/Locations.xml.in.h:3225
 msgid "Châteaudun"
 msgstr "Châteaudun"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3225
+#: ../data/Locations.xml.in.h:3227
 msgid "Châteauroux"
 msgstr "Châteauroux"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3227
+#: ../data/Locations.xml.in.h:3229
 msgid "Clermont-Ferrand"
 msgstr "Clermont-Ferrand"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3229
+#: ../data/Locations.xml.in.h:3231
 msgid "Cognac"
 msgstr "Cognac"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3231
+#: ../data/Locations.xml.in.h:3233
 msgid "Colmar"
 msgstr "Colmar"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3233
+#: ../data/Locations.xml.in.h:3235
 msgid "Creil"
 msgstr "Creil"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3235
+#: ../data/Locations.xml.in.h:3237
 msgid "Dax"
 msgstr "Dax"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3237
+#: ../data/Locations.xml.in.h:3239
 msgid "Dijon"
 msgstr "Dijon"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3239
+#: ../data/Locations.xml.in.h:3241
 msgid "Dinard"
 msgstr "Dinard"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3241
+#: ../data/Locations.xml.in.h:3243
 msgid "Dole"
 msgstr "Dole"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3243
+#: ../data/Locations.xml.in.h:3245
 msgid "Dollemard"
 msgstr "Dollemard"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3245
+#: ../data/Locations.xml.in.h:3247
 msgid "Grenoble"
 msgstr "Grenoble"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3247
+#: ../data/Locations.xml.in.h:3249
 msgid "Hoëricourt"
 msgstr "Hoëricourt"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3249
+#: ../data/Locations.xml.in.h:3251
 msgid "Hyères"
 msgstr "Hyères"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3251
+#: ../data/Locations.xml.in.h:3253
 msgid "Mulhouse"
 msgstr "Mulhouse"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3253
+#: ../data/Locations.xml.in.h:3255
 msgid "Istres"
 msgstr "Istres"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3255
+#: ../data/Locations.xml.in.h:3257
 msgid "La Roche-sur-Yon"
 msgstr "La Roche-sur-Yon"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3257
+#: ../data/Locations.xml.in.h:3259
 msgid "La Rochelle"
 msgstr "La Rochelle"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3259
+#: ../data/Locations.xml.in.h:3261
 msgid "Lannion"
 msgstr "Lannion"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3261
+#: ../data/Locations.xml.in.h:3263
 msgid "Le Mans"
 msgstr "Le Mans"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3263
+#: ../data/Locations.xml.in.h:3265
 msgid "Le Puy"
 msgstr "Le Puy"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3265
+#: ../data/Locations.xml.in.h:3267
 msgid "Lille"
 msgstr "Lille"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3267
+#: ../data/Locations.xml.in.h:3269
 msgid "Limoges"
 msgstr "Limoges"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3269
+#: ../data/Locations.xml.in.h:3271
 msgid "Luxeuil-les-Bains"
 msgstr "Luxeuil-les-Bains"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3271
+#: ../data/Locations.xml.in.h:3273
 msgid "Lyon"
 msgstr "Lyon"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3273
+#: ../data/Locations.xml.in.h:3275
 msgid "Marseille"
 msgstr "Marseille"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3275
+#: ../data/Locations.xml.in.h:3277
 msgid "Melun"
 msgstr "Melun"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3277
+#: ../data/Locations.xml.in.h:3279
 msgid "Metz"
 msgstr "Metz"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3279
+#: ../data/Locations.xml.in.h:3281
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3281
+#: ../data/Locations.xml.in.h:3283
 msgid "Montgauch"
 msgstr "Montgauch"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3283
+#: ../data/Locations.xml.in.h:3285
 msgid "Montpellier"
 msgstr "Montpellier"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3285
+#: ../data/Locations.xml.in.h:3287
 msgid "Montélimar"
 msgstr "Montélimar"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3287
+#: ../data/Locations.xml.in.h:3289
 msgid "Mâcon"
 msgstr "Mâcon"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3289
+#: ../data/Locations.xml.in.h:3291
 msgid "Méné Guen"
 msgstr "Méné Guen"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3291
+#: ../data/Locations.xml.in.h:3293
 msgid "Nancy"
 msgstr "Nancy"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3293
+#: ../data/Locations.xml.in.h:3295
 msgid "Nantes"
 msgstr "Nantes"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3295
+#: ../data/Locations.xml.in.h:3297
 msgid "Nevers"
 msgstr "Nevers"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3297
+#: ../data/Locations.xml.in.h:3299
 msgid "Nice"
 msgstr "Nice"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3299
+#: ../data/Locations.xml.in.h:3301
 msgid "Nîmes"
 msgstr "Nîmes"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3301
+#: ../data/Locations.xml.in.h:3303
 msgctxt "City in France"
 msgid "Orange"
 msgstr "Orange"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3303
+#: ../data/Locations.xml.in.h:3305
 msgid "Orléans"
 msgstr "Orléans"
 
 #. The capital of France
-#: ../data/Locations.xml.in.h:3305
+#: ../data/Locations.xml.in.h:3307
 msgctxt "City in France"
 msgid "Paris"
 msgstr "Paris"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3307
+#: ../data/Locations.xml.in.h:3309
 msgid "Pau"
 msgstr "Pau"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3309
+#: ../data/Locations.xml.in.h:3311
 msgid "Perpignan"
 msgstr "Perpignan"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3311
+#: ../data/Locations.xml.in.h:3313
 msgid "Poggiale"
 msgstr "Poggiale"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3313
+#: ../data/Locations.xml.in.h:3315
 msgid "Poitiers"
 msgstr "Poitiers"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3315
+#: ../data/Locations.xml.in.h:3317
 msgid "Quimper"
 msgstr "Quimper"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3317
+#: ../data/Locations.xml.in.h:3319
 msgid "Reims"
 msgstr "Reims"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3319
+#: ../data/Locations.xml.in.h:3321
 msgid "Rennes"
 msgstr "Rennes"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3321
+#: ../data/Locations.xml.in.h:3323
 msgid "Rodez"
 msgstr "Rodez"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3323
+#: ../data/Locations.xml.in.h:3325
 msgid "Romorantin"
 msgstr "Romorantin"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3325
+#: ../data/Locations.xml.in.h:3327
 msgid "Rouen"
 msgstr "Rouen"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3327
+#: ../data/Locations.xml.in.h:3329
 msgid "Saint-Brieuc"
 msgstr "Saint-Brieuc"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3329
+#: ../data/Locations.xml.in.h:3331
 msgid "Saint-Quentin"
 msgstr "Saint-Quentin"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3331
+#: ../data/Locations.xml.in.h:3333
 msgid "Saint-Yan"
 msgstr "Saint-Yan"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3333
+#: ../data/Locations.xml.in.h:3335
 msgid "Salon"
 msgstr "Salon"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3335
+#: ../data/Locations.xml.in.h:3337
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3337
+#: ../data/Locations.xml.in.h:3339
 msgid "Tarbes"
 msgstr "Tarbes"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3339
+#: ../data/Locations.xml.in.h:3341
 msgid "Toulouse"
 msgstr "Toulouse"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3341
+#: ../data/Locations.xml.in.h:3343
 msgid "Tours"
 msgstr "Tours"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3343
+#: ../data/Locations.xml.in.h:3345
 msgid "Trignac"
 msgstr "Trignac"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3345
+#: ../data/Locations.xml.in.h:3347
 msgid "Troyes"
 msgstr "Troyes"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3347
+#: ../data/Locations.xml.in.h:3349
 msgid "Veauche"
 msgstr "Veauche"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3349
+#: ../data/Locations.xml.in.h:3351
 msgctxt "City in France"
 msgid "Vichy"
 msgstr "Vichy"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3351
+#: ../data/Locations.xml.in.h:3353
 msgid "Vélizy"
 msgstr "Vélizy"
 
 #. A city in France
-#: ../data/Locations.xml.in.h:3353
+#: ../data/Locations.xml.in.h:3355
 msgid "Évreux"
 msgstr "Évreux"
 
 #. DE - Germany
-#: ../data/Locations.xml.in.h:3355
+#: ../data/Locations.xml.in.h:3357
 msgid "Germany"
 msgstr "Tyskland"
 
 #. A state/province/territory in Germany
-#: ../data/Locations.xml.in.h:3357
+#: ../data/Locations.xml.in.h:3359
 msgid "Baden-Württemberg"
 msgstr "Baden-Württemberg"
 
 #. A city in Baden-Württemberg in Germany
-#: ../data/Locations.xml.in.h:3359
+#: ../data/Locations.xml.in.h:3361
 msgid "Donaueschingen"
 msgstr "Donaueschingen"
 
 #. A city in Baden-Württemberg in Germany
-#: ../data/Locations.xml.in.h:3361
+#: ../data/Locations.xml.in.h:3363
 msgid "Friedrichshafen"
 msgstr "Friedrichshafen"
 
 #. A city in Baden-Württemberg in Germany
-#: ../data/Locations.xml.in.h:3363
+#: ../data/Locations.xml.in.h:3365
 msgid "Karlsruhe"
 msgstr "Karlsruhe"
 
 #. A city in Baden-Württemberg in Germany
-#: ../data/Locations.xml.in.h:3365
+#: ../data/Locations.xml.in.h:3367
 msgid "Lahr"
 msgstr "Lahr"
 
 #. A city in Baden-Württemberg in Germany
-#: ../data/Locations.xml.in.h:3367
+#: ../data/Locations.xml.in.h:3369
 msgid "Laupheim"
 msgstr "Laupheim"
 
 #. A city in Baden-Württemberg in Germany
-#: ../data/Locations.xml.in.h:3369
+#: ../data/Locations.xml.in.h:3371
 msgid "Meßstetten"
 msgstr "Messstetten"
 
 #. A city in Baden-Württemberg in Germany
-#: ../data/Locations.xml.in.h:3371
+#: ../data/Locations.xml.in.h:3373
 msgid "Neuostheim"
 msgstr "Neuostheim"
 
 #. A city in Baden-Württemberg in Germany
-#: ../data/Locations.xml.in.h:3373
+#: ../data/Locations.xml.in.h:3375
 msgid "Niederstetten"
 msgstr "Niederstetten"
 
 #. A city in Baden-Württemberg in Germany
-#: ../data/Locations.xml.in.h:3375
+#: ../data/Locations.xml.in.h:3377
 msgctxt "City in Baden-Württemberg, Germany"
 msgid "Stuttgart"
 msgstr "Stuttgart"
@@ -7654,42 +7654,42 @@
 #. use that unless you know that it has a different name in
 #. your language.
 #. 
-#: ../data/Locations.xml.in.h:3380
+#: ../data/Locations.xml.in.h:3382
 msgid "Bavaria"
 msgstr "Bayern"
 
 #. A city in Bavaria in Germany
-#: ../data/Locations.xml.in.h:3382
+#: ../data/Locations.xml.in.h:3384
 msgid "Augsburg"
 msgstr "Augsburg"
 
 #. A city in Bavaria in Germany
-#: ../data/Locations.xml.in.h:3384
+#: ../data/Locations.xml.in.h:3386
 msgid "Dorfgmünd"
 msgstr "Dorfgmünd"
 
 #. A city in Bavaria in Germany
-#: ../data/Locations.xml.in.h:3386
+#: ../data/Locations.xml.in.h:3388
 msgid "Hof"
 msgstr "Hof"
 
 #. A city in Bavaria in Germany
-#: ../data/Locations.xml.in.h:3388
+#: ../data/Locations.xml.in.h:3390
 msgid "Illesheim"
 msgstr "Illesheim"
 
 #. A city in Bavaria in Germany
-#: ../data/Locations.xml.in.h:3390
+#: ../data/Locations.xml.in.h:3392
 msgid "Katterbach"
 msgstr "Katterbach"
 
 #. A city in Bavaria in Germany
-#: ../data/Locations.xml.in.h:3392
+#: ../data/Locations.xml.in.h:3394
 msgid "Lager Lechfeld"
 msgstr "Lager Lechfeld"
 
 #. A city in Bavaria in Germany
-#: ../data/Locations.xml.in.h:3394
+#: ../data/Locations.xml.in.h:3396
 msgid "Landsberg"
 msgstr "Landsberg"
 
@@ -7697,14 +7697,14 @@
 #. "Munich" is the traditional English name.
 #. The local name is "München".
 #. 
-#: ../data/Locations.xml.in.h:3399
+#: ../data/Locations.xml.in.h:3401
 msgid "Munich"
 msgstr "München"
 
 #. A city in Bavaria in Germany.
 #. One of several cities in Germany called "Neuburg".
 #. 
-#: ../data/Locations.xml.in.h:3403
+#: ../data/Locations.xml.in.h:3405
 msgid "Neuburg an der Donau"
 msgstr "Neuburg an der Donau"
 
@@ -7712,62 +7712,62 @@
 #. "Nuremberg" is the traditional English name.
 #. The local name is "Nürnberg".
 #. 
-#: ../data/Locations.xml.in.h:3408
+#: ../data/Locations.xml.in.h:3410
 msgid "Nuremberg"
 msgstr "Nürnberg"
 
 #. A city in Bavaria in Germany
-#: ../data/Locations.xml.in.h:3410
+#: ../data/Locations.xml.in.h:3412
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
 #. A city in Bavaria in Germany
-#: ../data/Locations.xml.in.h:3412
+#: ../data/Locations.xml.in.h:3414
 msgid "Roth"
 msgstr "Roth"
 
 #. A city in Bavaria in Germany
-#: ../data/Locations.xml.in.h:3414
+#: ../data/Locations.xml.in.h:3416
 msgid "Würzburg"
 msgstr "Würzburg"
 
 #. A state/province/territory in Germany
-#: ../data/Locations.xml.in.h:3416
+#: ../data/Locations.xml.in.h:3418
 msgctxt "State in Germany"
 msgid "Berlin"
 msgstr "Berlin"
 
 #. The capital of Germany
-#: ../data/Locations.xml.in.h:3418
+#: ../data/Locations.xml.in.h:3420
 msgctxt "City in Berlin, Germany"
 msgid "Berlin"
 msgstr "Berlin"
 
 #. A state/province/territory in Germany
-#: ../data/Locations.xml.in.h:3420
+#: ../data/Locations.xml.in.h:3422
 msgid "Brandenburg"
 msgstr "Brandenburg"
 
 #. A state/province/territory in Germany
-#: ../data/Locations.xml.in.h:3422
+#: ../data/Locations.xml.in.h:3424
 msgctxt "State in Germany"
 msgid "Bremen"
 msgstr "Bremen"
 
 #. A city in Bremen in Germany
-#: ../data/Locations.xml.in.h:3424
+#: ../data/Locations.xml.in.h:3426
 msgctxt "City in Bremen, Germany"
 msgid "Bremen"
 msgstr "Bremen"
 
 #. A state/province/territory in Germany
-#: ../data/Locations.xml.in.h:3426
+#: ../data/Locations.xml.in.h:3428
 msgctxt "State in Germany"
 msgid "Hamburg"
 msgstr "Hamburg"
 
 #. A city in Hamburg in Germany
-#: ../data/Locations.xml.in.h:3428
+#: ../data/Locations.xml.in.h:3430
 msgctxt "City in Hamburg, Germany"
 msgid "Hamburg"
 msgstr "Hamburg"
@@ -7776,27 +7776,27 @@
 #. use that unless you know that it has a different name in
 #. your language.
 #. 
-#: ../data/Locations.xml.in.h:3433
+#: ../data/Locations.xml.in.h:3435
 msgid "Hesse"
 msgstr "Hessen"
 
 #. A city in Hesse in Germany
-#: ../data/Locations.xml.in.h:3435
+#: ../data/Locations.xml.in.h:3437
 msgid "Frankfurt"
 msgstr "Frankfurt"
 
 #. A city in Hesse in Germany
-#: ../data/Locations.xml.in.h:3437
+#: ../data/Locations.xml.in.h:3439
 msgid "Fritzlar"
 msgstr "Fritzlar"
 
 #. A city in Hesse in Germany
-#: ../data/Locations.xml.in.h:3439
+#: ../data/Locations.xml.in.h:3441
 msgid "Kassel"
 msgstr "Kassel"
 
 #. A city in Hesse in Germany
-#: ../data/Locations.xml.in.h:3441
+#: ../data/Locations.xml.in.h:3443
 msgid "Wiesbaden"
 msgstr "Wiesbaden"
 
@@ -7804,47 +7804,47 @@
 #. Please use that unless you know that it has a different
 #. name in your language.
 #. 
-#: ../data/Locations.xml.in.h:3446
+#: ../data/Locations.xml.in.h:3448
 msgid "Lower Saxony"
 msgstr "Niedersachsen"
 
 #. A city in Lower Saxony in Germany
-#: ../data/Locations.xml.in.h:3448
+#: ../data/Locations.xml.in.h:3450
 msgid "Achum"
 msgstr "Achum"
 
 #. A city in Lower Saxony in Germany
-#: ../data/Locations.xml.in.h:3450
+#: ../data/Locations.xml.in.h:3452
 msgid "Braunschweig"
 msgstr "Braunschweig"
 
 #. A city in Lower Saxony in Germany
-#: ../data/Locations.xml.in.h:3452
+#: ../data/Locations.xml.in.h:3454
 msgid "Celle"
 msgstr "Celle"
 
 #. A city in Lower Saxony in Germany
-#: ../data/Locations.xml.in.h:3454
+#: ../data/Locations.xml.in.h:3456
 msgid "Faßberg"
 msgstr "Fassberg"
 
 #. A city in Lower Saxony in Germany
-#: ../data/Locations.xml.in.h:3456
+#: ../data/Locations.xml.in.h:3458
 msgid "Hannover"
 msgstr "Hannover"
 
 #. A city in Lower Saxony in Germany
-#: ../data/Locations.xml.in.h:3458
+#: ../data/Locations.xml.in.h:3460
 msgid "Nordholz"
 msgstr "Nordholz"
 
 #. A city in Lower Saxony in Germany
-#: ../data/Locations.xml.in.h:3460
+#: ../data/Locations.xml.in.h:3462
 msgid "Webershausen"
 msgstr "Webershausen"
 
 #. A city in Lower Saxony in Germany
-#: ../data/Locations.xml.in.h:3462
+#: ../data/Locations.xml.in.h:3464
 msgid "Wunstorf"
 msgstr "Wunstorf"
 
@@ -7852,27 +7852,27 @@
 #. "Mecklenburg-Vorpommern". Please use that unless you know
 #. that it has a different name in your language.
 #. 
-#: ../data/Locations.xml.in.h:3467
+#: ../data/Locations.xml.in.h:3469
 msgid "Mecklenburg-Western Pomerania"
 msgstr "Meclenburg-Vorpommern"
 
 #. A city in Mecklenburg-Western Pomerania in Germany
-#: ../data/Locations.xml.in.h:3469
+#: ../data/Locations.xml.in.h:3471
 msgid "Laage"
 msgstr "Laage"
 
 #. A city in Mecklenburg-Western Pomerania in Germany
-#: ../data/Locations.xml.in.h:3471
+#: ../data/Locations.xml.in.h:3473
 msgid "Parchim"
 msgstr "Parchim"
 
 #. A city in Mecklenburg-Western Pomerania in Germany
-#: ../data/Locations.xml.in.h:3473
+#: ../data/Locations.xml.in.h:3475
 msgid "Seebad Heringsdorf"
 msgstr "Seebad Heringsdorf"
 
 #. A city in Mecklenburg-Western Pomerania in Germany
-#: ../data/Locations.xml.in.h:3475
+#: ../data/Locations.xml.in.h:3477
 msgid "Trollenhagen"
 msgstr "Trollenhagen"
 
@@ -7880,67 +7880,67 @@
 #. "Nordrhein-Westfalen". Please use that unless you know
 #. that it has a different name in your language.
 #. 
-#: ../data/Locations.xml.in.h:3480
+#: ../data/Locations.xml.in.h:3482
 msgid "North Rhine-Westphalia"
 msgstr "Nordrhein-Westfalen"
 
 #. A city in North Rhine-Westphalia in Germany
-#: ../data/Locations.xml.in.h:3482
+#: ../data/Locations.xml.in.h:3484
 msgid "Baal"
 msgstr "Baal"
 
 #. A city in North Rhine-Westphalia in Germany
-#: ../data/Locations.xml.in.h:3484
+#: ../data/Locations.xml.in.h:3486
 msgid "Bonn"
 msgstr "Bonn"
 
 #. A city in North Rhine-Westphalia in Germany
-#: ../data/Locations.xml.in.h:3486
+#: ../data/Locations.xml.in.h:3488
 msgid "Bredeck"
 msgstr "Bredeck"
 
 #. A city in North Rhine-Westphalia in Germany
-#: ../data/Locations.xml.in.h:3488
+#: ../data/Locations.xml.in.h:3490
 msgid "Dortmund"
 msgstr "Dortmund"
 
 #. A city in North Rhine-Westphalia in Germany
-#: ../data/Locations.xml.in.h:3490
+#: ../data/Locations.xml.in.h:3492
 msgid "Geilenkirchen"
 msgstr "Geilenkirchen"
 
 #. A city in North Rhine-Westphalia in Germany
-#: ../data/Locations.xml.in.h:3492
+#: ../data/Locations.xml.in.h:3494
 msgid "Kalkar"
 msgstr "Kalkar"
 
 #. A city in North Rhine-Westphalia in Germany
-#: ../data/Locations.xml.in.h:3494
+#: ../data/Locations.xml.in.h:3496
 msgid "Kalkum"
 msgstr "Kalkum"
 
 #. A city in North Rhine-Westphalia in Germany
-#: ../data/Locations.xml.in.h:3496
+#: ../data/Locations.xml.in.h:3498
 msgid "Klemenshof"
 msgstr "Klemenshof"
 
 #. A city in North Rhine-Westphalia in Germany
-#: ../data/Locations.xml.in.h:3498
+#: ../data/Locations.xml.in.h:3500
 msgid "Mönchengladbach"
 msgstr "Mönchengladbach"
 
 #. A city in North Rhine-Westphalia in Germany
-#: ../data/Locations.xml.in.h:3500
+#: ../data/Locations.xml.in.h:3502
 msgid "Münster"
 msgstr "Münster"
 
 #. A city in North Rhine-Westphalia in Germany
-#: ../data/Locations.xml.in.h:3502
+#: ../data/Locations.xml.in.h:3504
 msgid "Paderborn"
 msgstr "Paderborn"
 
 #. A city in North Rhine-Westphalia in Germany
-#: ../data/Locations.xml.in.h:3504
+#: ../data/Locations.xml.in.h:3506
 msgid "Rheine"
 msgstr "Rheine"
 
@@ -7948,47 +7948,47 @@
 #. Please use that unless you know that it has a different
 #. name in your language.
 #. 
-#: ../data/Locations.xml.in.h:3509
+#: ../data/Locations.xml.in.h:3511
 msgid "Rhineland-Palatinate"
 msgstr "Rheinland-Pfalz"
 
 #. A city in Rhineland-Palatinate in Germany
-#: ../data/Locations.xml.in.h:3511
+#: ../data/Locations.xml.in.h:3513
 msgid "Büchel"
 msgstr "Büchel"
 
 #. A city in Rhineland-Palatinate in Germany
-#: ../data/Locations.xml.in.h:3513
+#: ../data/Locations.xml.in.h:3515
 msgid "Hahn"
 msgstr "Hahn"
 
 #. A city in Rhineland-Palatinate in Germany
-#: ../data/Locations.xml.in.h:3515
+#: ../data/Locations.xml.in.h:3517
 msgid "Liebenscheid"
 msgstr "Liebenscheid"
 
 #. A city in Rhineland-Palatinate in Germany
-#: ../data/Locations.xml.in.h:3517
+#: ../data/Locations.xml.in.h:3519
 msgid "Ramstein"
 msgstr "Ramstein"
 
 #. A city in Rhineland-Palatinate in Germany
-#: ../data/Locations.xml.in.h:3519
+#: ../data/Locations.xml.in.h:3521
 msgid "Spangdahlem"
 msgstr "Spangdahlem"
 
 #. A city in Rhineland-Palatinate in Germany
-#: ../data/Locations.xml.in.h:3521
+#: ../data/Locations.xml.in.h:3523
 msgid "Zweibrücken"
 msgstr "Zweibrücken"
 
 #. A state/province/territory in Germany
-#: ../data/Locations.xml.in.h:3523
+#: ../data/Locations.xml.in.h:3525
 msgid "Saarland"
 msgstr "Saarland"
 
 #. A city in Saarland in Germany
-#: ../data/Locations.xml.in.h:3525
+#: ../data/Locations.xml.in.h:3527
 msgid "Ensheim"
 msgstr "Ensheim"
 
@@ -7996,17 +7996,17 @@
 #. use that unless you know that it has a different name in
 #. your language.
 #. 
-#: ../data/Locations.xml.in.h:3530
+#: ../data/Locations.xml.in.h:3532
 msgid "Saxony"
 msgstr "Sachsen"
 
 #. A city in Saxony in Germany
-#: ../data/Locations.xml.in.h:3532
+#: ../data/Locations.xml.in.h:3534
 msgid "Dresden"
 msgstr "Dresden"
 
 #. A city in Saxony in Germany
-#: ../data/Locations.xml.in.h:3534
+#: ../data/Locations.xml.in.h:3536
 msgid "Leipzig"
 msgstr "Leipzig"
 
@@ -8014,47 +8014,47 @@
 #. Please use that unless you know that it has a different
 #. name in your language.
 #. 
-#: ../data/Locations.xml.in.h:3539
+#: ../data/Locations.xml.in.h:3541
 msgid "Saxony-Anhalt"
 msgstr "Sachsen-Anhalt"
 
 #. A city in Saxony-Anhalt in Germany
-#: ../data/Locations.xml.in.h:3541
+#: ../data/Locations.xml.in.h:3543
 msgid "Holzdorf"
 msgstr "Holzdorf"
 
 #. A state in Germany. The Danish name is "Slesvig-Holsten".
-#: ../data/Locations.xml.in.h:3543
+#: ../data/Locations.xml.in.h:3545
 msgid "Schleswig-Holstein"
 msgstr "Schleswig-Holstein"
 
 #. A city in Schleswig-Holstein in Germany
-#: ../data/Locations.xml.in.h:3545
+#: ../data/Locations.xml.in.h:3547
 msgid "Hohn"
 msgstr "Hohn"
 
 #. A city in Schleswig-Holstein in Germany
-#: ../data/Locations.xml.in.h:3547
+#: ../data/Locations.xml.in.h:3549
 msgid "Kiel"
 msgstr "Kiel"
 
 #. A city in Schleswig-Holstein in Germany
-#: ../data/Locations.xml.in.h:3549
+#: ../data/Locations.xml.in.h:3551
 msgid "Schleswig"
 msgstr "Schleswig"
 
 #. A city in Schleswig-Holstein in Germany
-#: ../data/Locations.xml.in.h:3551
+#: ../data/Locations.xml.in.h:3553
 msgid "Ulstrupfeld"
 msgstr "Ulstrupfeld"
 
 #. A city in Schleswig-Holstein in Germany
-#: ../data/Locations.xml.in.h:3553
+#: ../data/Locations.xml.in.h:3555
 msgid "Vorrade"
 msgstr "Vorrade"
 
 #. A city in Schleswig-Holstein in Germany
-#: ../data/Locations.xml.in.h:3555
+#: ../data/Locations.xml.in.h:3557
 msgid "Westerland"
 msgstr "Westerland"
 
@@ -8062,51 +8062,51 @@
 #. use that unless you know that it has a different name in
 #. your language.
 #. 
-#: ../data/Locations.xml.in.h:3560
+#: ../data/Locations.xml.in.h:3562
 msgid "Thuringia"
 msgstr "Thüringen"
 
 #. A city in Thuringia in Germany
-#: ../data/Locations.xml.in.h:3562
+#: ../data/Locations.xml.in.h:3564
 msgid "Altenburg"
 msgstr "Altenburg"
 
 #. A city in Thuringia in Germany
-#: ../data/Locations.xml.in.h:3564
+#: ../data/Locations.xml.in.h:3566
 msgid "Bindersleben"
 msgstr "Bindersleben"
 
 #. GI - Gibraltar, a British overseas territory on the southern
 #. tip of Spain.
 #. 
-#: ../data/Locations.xml.in.h:3568
+#: ../data/Locations.xml.in.h:3570
 msgctxt "Country"
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
 #. The capital of Gibraltar
-#: ../data/Locations.xml.in.h:3570
+#: ../data/Locations.xml.in.h:3572
 msgctxt "City in Gibraltar"
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
 #. GR - Greece
-#: ../data/Locations.xml.in.h:3572
+#: ../data/Locations.xml.in.h:3574
 msgid "Greece"
 msgstr "Hellas"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3574
+#: ../data/Locations.xml.in.h:3576
 msgid "Alexandroúpolis"
 msgstr "Alexandroúpolis"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3576
+#: ../data/Locations.xml.in.h:3578
 msgid "Andravída"
 msgstr "Andravída"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3578
+#: ../data/Locations.xml.in.h:3580
 msgid "Argostólion"
 msgstr "Argostólion"
 
@@ -8114,271 +8114,271 @@
 #. "Athens" is the traditional English name.
 #. The local name in Greek is "Athína / Αθήνα".
 #. 
-#: ../data/Locations.xml.in.h:3583
+#: ../data/Locations.xml.in.h:3585
 msgctxt "City in Greece"
 msgid "Athens"
 msgstr "Athen"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3585
+#: ../data/Locations.xml.in.h:3587
 msgid "Chrysoúpolis"
 msgstr "Chrysoúpolis"
 
 #. A city in Greece.
 #. The name is also written "Χίος".
 #. 
-#: ../data/Locations.xml.in.h:3589
+#: ../data/Locations.xml.in.h:3591
 msgid "Chíos"
 msgstr "Chíos"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3591
+#: ../data/Locations.xml.in.h:3593
 msgid "Elefsís"
 msgstr "Elefsís"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3593
+#: ../data/Locations.xml.in.h:3595
 msgid "Irákleion"
 msgstr "Irákleion"
 
 #. A city in Greece.
 #. The name is also written "Καλαμάτα".
 #. 
-#: ../data/Locations.xml.in.h:3597
+#: ../data/Locations.xml.in.h:3599
 msgid "Kalamáta"
 msgstr "Kalamáta"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3599
+#: ../data/Locations.xml.in.h:3601
 msgid "Karpásion"
 msgstr "Karpásion"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3601
+#: ../data/Locations.xml.in.h:3603
 msgid "Katomérion"
 msgstr "Katomérion"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3603
+#: ../data/Locations.xml.in.h:3605
 msgid "Kos"
 msgstr "Kos"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3605
+#: ../data/Locations.xml.in.h:3607
 msgid "Kozáni"
 msgstr "Kozáni"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3607
+#: ../data/Locations.xml.in.h:3609
 msgid "Kárpathos"
 msgstr "Kárpathos"
 
 #. A city in Greece.
 #. The name is also written "Κέρκυρα".
 #. 
-#: ../data/Locations.xml.in.h:3611
+#: ../data/Locations.xml.in.h:3613
 msgid "Kérkyra"
 msgstr "Kérkyra"
 
 #. A city in Greece.
 #. The name is also written "Κύθηρα".
 #. 
-#: ../data/Locations.xml.in.h:3615
+#: ../data/Locations.xml.in.h:3617
 msgid "Kýthira"
 msgstr "Kýthira"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3617
+#: ../data/Locations.xml.in.h:3619
 msgid "Lárisa"
 msgstr "Lárisa"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3619
+#: ../data/Locations.xml.in.h:3621
 msgid "Monólithos"
 msgstr "Monólithos"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3621
+#: ../data/Locations.xml.in.h:3623
 msgid "Mytilíni"
 msgstr "Mytilíni"
 
 #. A city in Greece.
 #. The name is also written "Μύκονος".
 #. 
-#: ../data/Locations.xml.in.h:3625
+#: ../data/Locations.xml.in.h:3627
 msgid "Mýkonos"
 msgstr "Mýkonos"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3627
+#: ../data/Locations.xml.in.h:3629
 msgid "Náxos"
 msgstr "Náxos"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3629
+#: ../data/Locations.xml.in.h:3631
 msgid "Paradeísion"
 msgstr "Paradeísion"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3631
+#: ../data/Locations.xml.in.h:3633
 msgid "Páros"
 msgstr "Páros"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3633
+#: ../data/Locations.xml.in.h:3635
 msgid "Skíathos"
 msgstr "Skíathos"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3635
+#: ../data/Locations.xml.in.h:3637
 msgid "Soúda"
 msgstr "Soúda"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3637
+#: ../data/Locations.xml.in.h:3639
 msgid "Sámos"
 msgstr "Sámos"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3639
+#: ../data/Locations.xml.in.h:3641
 msgid "Tanágra"
 msgstr "Tanágra"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3641
+#: ../data/Locations.xml.in.h:3643
 msgid "Thessaloníki"
 msgstr "Thessaloníki"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3643
+#: ../data/Locations.xml.in.h:3645
 msgid "Zákynthos"
 msgstr "Zákynthos"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3645
+#: ../data/Locations.xml.in.h:3647
 msgid "Áno Síros"
 msgstr "Áno Síros"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3647
+#: ../data/Locations.xml.in.h:3649
 msgid "Áraxos"
 msgstr "Áraxos"
 
 #. A city in Greece
-#: ../data/Locations.xml.in.h:3649
+#: ../data/Locations.xml.in.h:3651
 msgid "Áyios Athanásios"
 msgstr "Áyios Athanásios"
 
 #. GG - The Bailiwick of Guernsey, a British Crown dependency
-#: ../data/Locations.xml.in.h:3651
+#: ../data/Locations.xml.in.h:3653
 msgid "Guernsey"
 msgstr "Guernsey"
 
 #. The time zone in the UK (GMT in the winter, and British
 #. Summer Time in the summer.)
 #. 
-#: ../data/Locations.xml.in.h:3655
+#: ../data/Locations.xml.in.h:3657
 msgid "GMT/BST"
 msgstr "GMT/BST"
 
 #. A city in Guernsey
-#: ../data/Locations.xml.in.h:3657
+#: ../data/Locations.xml.in.h:3659
 msgid "Hautnez"
 msgstr "Hautnez"
 
 #. The capital of Guernsey
-#: ../data/Locations.xml.in.h:3659
+#: ../data/Locations.xml.in.h:3661
 msgid "Saint Peter Port"
 msgstr "Saint Peter Port"
 
 #. HU - Hungary
-#: ../data/Locations.xml.in.h:3661
+#: ../data/Locations.xml.in.h:3663
 msgid "Hungary"
 msgstr "Ungarn"
 
 #. The capital of Hungary
-#: ../data/Locations.xml.in.h:3663
+#: ../data/Locations.xml.in.h:3665
 msgid "Budapest"
 msgstr "Budapest"
 
 #. A city in Hungary
-#: ../data/Locations.xml.in.h:3665
+#: ../data/Locations.xml.in.h:3667
 msgid "Debrecen"
 msgstr "Debrecen"
 
 #. A city in Hungary
-#: ../data/Locations.xml.in.h:3667
+#: ../data/Locations.xml.in.h:3669
 msgid "Kecskemét"
 msgstr "Kecskemét"
 
 #. A city in Hungary
-#: ../data/Locations.xml.in.h:3669
+#: ../data/Locations.xml.in.h:3671
 msgid "Pápa"
 msgstr "Pápa"
 
 #. A city in Hungary
-#: ../data/Locations.xml.in.h:3671
+#: ../data/Locations.xml.in.h:3673
 msgid "Pécs"
 msgstr "Pécs"
 
 #. A city in Hungary
-#: ../data/Locations.xml.in.h:3673
+#: ../data/Locations.xml.in.h:3675
 msgid "Szeged"
 msgstr "Szeged"
 
 #. A city in Hungary
-#: ../data/Locations.xml.in.h:3675
+#: ../data/Locations.xml.in.h:3677
 msgid "Szolnok"
 msgstr "Szolnok"
 
 #. IS - Iceland
-#: ../data/Locations.xml.in.h:3677
+#: ../data/Locations.xml.in.h:3679
 msgid "Iceland"
 msgstr "Island"
 
 #. A city in Iceland
-#: ../data/Locations.xml.in.h:3679
+#: ../data/Locations.xml.in.h:3681
 msgid "Akureyri"
 msgstr "Akureyri"
 
 #. A city in Iceland
-#: ../data/Locations.xml.in.h:3681
+#: ../data/Locations.xml.in.h:3683
 msgid "Eiðar"
 msgstr "Eiðar"
 
 #. The capital of Iceland
-#: ../data/Locations.xml.in.h:3683
+#: ../data/Locations.xml.in.h:3685
 msgid "Reykjavík"
 msgstr "Reykjavík"
 
 #. A city in Iceland
-#: ../data/Locations.xml.in.h:3685
+#: ../data/Locations.xml.in.h:3687
 msgid "Ytri-Njarðvík"
 msgstr "Ytri-Njarðvík"
 
 #. IE - Ireland
-#: ../data/Locations.xml.in.h:3687
+#: ../data/Locations.xml.in.h:3689
 msgid "Ireland"
 msgstr "Irland"
 
 #. The time zone in Ireland (GMT in the winter, and Irish
 #. Summer Time in the summer.)
 #. 
-#: ../data/Locations.xml.in.h:3691
+#: ../data/Locations.xml.in.h:3693
 msgid "GMT/IST"
 msgstr "GMT/IST"
 
 #. A city in Ireland.
 #. The local name in Irish is "Corcaigh".
 #. 
-#: ../data/Locations.xml.in.h:3695
+#: ../data/Locations.xml.in.h:3697
 msgid "Cork"
 msgstr "Cork"
 
 #. The capital of Ireland.
 #. The local name in Irish is "Baile Átha Cliath".
 #. 
-#: ../data/Locations.xml.in.h:3699
+#: ../data/Locations.xml.in.h:3701
 msgctxt "City in Ireland"
 msgid "Dublin"
 msgstr "Dublin"
@@ -8386,140 +8386,140 @@
 #. A city in Ireland.
 #. The local name in Irish is "Dún Laoghaire".
 #. 
-#: ../data/Locations.xml.in.h:3703
+#: ../data/Locations.xml.in.h:3705
 msgid "Dunleary"
 msgstr "Dunleary"
 
 #. A city in Ireland
-#: ../data/Locations.xml.in.h:3705
+#: ../data/Locations.xml.in.h:3707
 msgid "Glentavraun"
 msgstr "Glentavraun"
 
 #. A city in Ireland.
 #. The local name in Irish is "Sionainn".
 #. 
-#: ../data/Locations.xml.in.h:3709
+#: ../data/Locations.xml.in.h:3711
 msgid "Shannon"
 msgstr "Shannon"
 
 #. IM - Isle of Man, a British Crown dependency
-#: ../data/Locations.xml.in.h:3711
+#: ../data/Locations.xml.in.h:3713
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
 #. The capital of the Isle of Man
-#: ../data/Locations.xml.in.h:3713
+#: ../data/Locations.xml.in.h:3715
 msgctxt "City in Isle of Man"
 msgid "Douglas"
 msgstr "Douglas"
 
 #. A city in the Isle of Man
-#: ../data/Locations.xml.in.h:3715
+#: ../data/Locations.xml.in.h:3717
 msgid "Ronaldsway"
 msgstr "Ronaldsway"
 
 #. IT - Italy
-#: ../data/Locations.xml.in.h:3717
+#: ../data/Locations.xml.in.h:3719
 msgid "Italy"
 msgstr "Italia"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3719
+#: ../data/Locations.xml.in.h:3723
 msgid "Albenga"
 msgstr "Albenga"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3721
+#: ../data/Locations.xml.in.h:3736
 msgid "Alghero"
 msgstr "Alghero"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3723
+#: ../data/Locations.xml.in.h:3750
 msgid "Aviano"
 msgstr "Aviano"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3725
+#: ../data/Locations.xml.in.h:3760
 msgid "Bari"
 msgstr "Bari"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3727
+#: ../data/Locations.xml.in.h:3776
 msgid "Bergamo"
 msgstr "Bergamo"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3729
+#: ../data/Locations.xml.in.h:3787
 msgid "Bologna"
 msgstr "Bologna"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3731
+#: ../data/Locations.xml.in.h:3803
 msgid "Bolzano"
 msgstr "Bolzano"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3733
+#: ../data/Locations.xml.in.h:3778
 msgid "Brescia"
 msgstr "Brescia"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3735
+#: ../data/Locations.xml.in.h:3815
 msgid "Breuil-Cervinia"
 msgstr "Breuil-Cervinia"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3737
+#: ../data/Locations.xml.in.h:3762
 msgid "Brindisi"
 msgstr "Brindisi"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3739
+#: ../data/Locations.xml.in.h:3738
 msgid "Cagliari"
 msgstr "Cagliari"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3741
+#: ../data/Locations.xml.in.h:3819
 msgid "Capri"
 msgstr "Capri"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3743
+#: ../data/Locations.xml.in.h:3834
 msgid "Case Arfel"
 msgstr "Case Arfel"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3745
+#: ../data/Locations.xml.in.h:3845
 msgid "Catania"
 msgstr "Catania"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3747
+#: ../data/Locations.xml.in.h:3789
 msgid "Cervia"
 msgstr "Cervia"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3749
+#: ../data/Locations.xml.in.h:3859
 msgid "Crotone"
 msgstr "Crotone"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3751
+#: ../data/Locations.xml.in.h:3836
 msgid "Cuneo"
 msgstr "Cuneo"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3753
+#: ../data/Locations.xml.in.h:3740
 msgid "Decimomannu"
 msgstr "Decimomannu"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3755
+#: ../data/Locations.xml.in.h:3805
 msgid "Dobbiaco"
 msgstr "Dobbiaco"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3757
+#: ../data/Locations.xml.in.h:3791
 msgid "Ferrara"
 msgstr "Ferrara"
 
@@ -8527,18 +8527,18 @@
 #. "Florence" is the traditional English name.
 #. The local name in Italian is "Firenze".
 #. 
-#: ../data/Locations.xml.in.h:3762
+#: ../data/Locations.xml.in.h:3870
 msgctxt "City in Italy"
 msgid "Florence"
 msgstr "Firenze"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3764
+#: ../data/Locations.xml.in.h:3793
 msgid "Forlì"
 msgstr "Forlì"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3766
+#: ../data/Locations.xml.in.h:3880
 msgid "Frosinone"
 msgstr "Frosinone"
 
@@ -8546,62 +8546,62 @@
 #. "Genoa" is the traditional English name.
 #. The local name in Italian is "Genova".
 #. 
-#: ../data/Locations.xml.in.h:3771
+#: ../data/Locations.xml.in.h:3728
 msgid "Genoa"
 msgstr "Genoa"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3773
+#: ../data/Locations.xml.in.h:3764
 msgid "Ginosa Marina"
 msgstr "Ginosa Marina"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3775
+#: ../data/Locations.xml.in.h:3766
 msgid "Gioia del Colle"
 msgstr "Gioia del Colle"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3777
+#: ../data/Locations.xml.in.h:3821
 msgid "Grazzanise"
 msgstr "Grazzanise"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3779
+#: ../data/Locations.xml.in.h:3872
 msgid "Grosseto"
 msgstr "Grosseto"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3781
+#: ../data/Locations.xml.in.h:3768
 msgid "Grottaglie"
 msgstr "Grottaglie"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3783
+#: ../data/Locations.xml.in.h:3730
 msgid "Isola del Cantone"
 msgstr "Isola del Cantone"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3785
+#: ../data/Locations.xml.in.h:3732
 msgid "Laigueglia"
 msgstr "Laigueglia"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3787
+#: ../data/Locations.xml.in.h:3847
 msgid "Lampedusa"
 msgstr "Lampedusa"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3789
+#: ../data/Locations.xml.in.h:3882
 msgid "Latina"
 msgstr "Latina"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3791
+#: ../data/Locations.xml.in.h:3770
 msgid "Lecce"
 msgstr "Lecce"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3793
+#: ../data/Locations.xml.in.h:3849
 msgid "Messina"
 msgstr "Messina"
 
@@ -8609,7 +8609,7 @@
 #. "Milan" is the traditional English name.
 #. The local name in Italian is "Milano".
 #. 
-#: ../data/Locations.xml.in.h:3798
+#: ../data/Locations.xml.in.h:3783
 msgid "Milan"
 msgstr "Milano"
 
@@ -8622,88 +8622,88 @@
 #. "Naples" is the traditional English name.
 #. The local name in Italian is "Napoli".
 #. 
-#: ../data/Locations.xml.in.h:3805
+#: ../data/Locations.xml.in.h:3826
 msgctxt "City in Italy"
 msgid "Naples"
 msgstr "Napoli"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3807
+#: ../data/Locations.xml.in.h:3742
 msgid "Olbia"
 msgstr "Olbia"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3809
+#: ../data/Locations.xml.in.h:3874
 msgid "Palazzo"
 msgstr "Palazzo"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3811
+#: ../data/Locations.xml.in.h:3851
 msgid "Palermo"
 msgstr "Palermo"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3813
+#: ../data/Locations.xml.in.h:3807
 msgid "Paneveggio"
 msgstr "Paneveggio"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3815
+#: ../data/Locations.xml.in.h:3853
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3817
+#: ../data/Locations.xml.in.h:3795
 msgid "Parma"
 msgstr "Parma"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3819
+#: ../data/Locations.xml.in.h:3901
 msgid "Perugia"
 msgstr "Perugia"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3821
+#: ../data/Locations.xml.in.h:3907
 msgid "Pescara"
 msgstr "Pescara"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3823
+#: ../data/Locations.xml.in.h:3797
 msgid "Piacenza"
 msgstr "Piacenza"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3825
+#: ../data/Locations.xml.in.h:3876
 msgid "Pisa"
 msgstr "Pisa"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3827
+#: ../data/Locations.xml.in.h:3828
 msgid "Pontecagnano"
 msgstr "Pontecagnano"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3829
+#: ../data/Locations.xml.in.h:3884
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3831
+#: ../data/Locations.xml.in.h:3861
 msgid "Reggio di Calabria"
 msgstr "Reggio di Calabria"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3833
+#: ../data/Locations.xml.in.h:3809
 msgid "Resia"
 msgstr "Resia"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3835
+#: ../data/Locations.xml.in.h:3886
 msgid "Rieti"
 msgstr "Rieti"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3837
+#: ../data/Locations.xml.in.h:3799
 msgid "Rimini"
 msgstr "Rimini"
 
@@ -8711,63 +8711,63 @@
 #. "Rome" is the traditional English name.
 #. The local name in Italian is "Roma".
 #. 
-#: ../data/Locations.xml.in.h:3842
+#: ../data/Locations.xml.in.h:3891
 msgctxt "City in Italy"
 msgid "Rome"
 msgstr "Roma"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3844
+#: ../data/Locations.xml.in.h:3752
 msgid "Ronchi dei Legionari"
 msgstr "Ronchi dei Legionari"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3846
+#: ../data/Locations.xml.in.h:3903
 msgid "Salignano"
 msgstr "Salignano"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3848
+#: ../data/Locations.xml.in.h:3744
 msgid "San Stèfano"
 msgstr "San Stèfano"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3850
+#: ../data/Locations.xml.in.h:3863
 msgid "Sant'Eufemia Lamezia"
 msgstr "Sant'Eufemia Lamezia"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3852
+#: ../data/Locations.xml.in.h:3811
 msgid "Sporminore"
 msgstr "Sporminore"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3854
+#: ../data/Locations.xml.in.h:3772
 msgid "Tamaricciola"
 msgstr "Tamaricciola"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3856
+#: ../data/Locations.xml.in.h:3754
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3858
+#: ../data/Locations.xml.in.h:3855
 msgid "Trapani"
 msgstr "Trapani"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3860
+#: ../data/Locations.xml.in.h:3830
 msgid "Trevico"
 msgstr "Trevico"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3862
+#: ../data/Locations.xml.in.h:3911
 msgid "Treviso"
 msgstr "Treviso"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3864
+#: ../data/Locations.xml.in.h:3756
 msgid "Trieste"
 msgstr "Trieste"
 
@@ -8775,7 +8775,7 @@
 #. "Turin" is the traditional English name.
 #. The local name is "Torino".
 #. 
-#: ../data/Locations.xml.in.h:3869
+#: ../data/Locations.xml.in.h:3841
 msgid "Turin"
 msgstr "Turin"
 
@@ -8783,222 +8783,222 @@
 #. "Venice" is the traditional English name.
 #. The local name in Italian is "Venezia".
 #. 
-#: ../data/Locations.xml.in.h:3874
+#: ../data/Locations.xml.in.h:3916
 msgid "Venice"
 msgstr "Venezia"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3876
+#: ../data/Locations.xml.in.h:3918
 msgid "Verona"
 msgstr "Verona"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3878
+#: ../data/Locations.xml.in.h:3893
 msgid "Viterbo"
 msgstr "Viterbo"
 
 #. A city in Italy
-#: ../data/Locations.xml.in.h:3880
+#: ../data/Locations.xml.in.h:3746
 msgid "Àrbatax"
 msgstr "Àrbatax"
 
 #. JE - The Bailiwick of Jersey, a British Crown dependency
-#: ../data/Locations.xml.in.h:3882
+#: ../data/Locations.xml.in.h:3920
 msgid "Jersey"
 msgstr "Jersey"
 
 #. A city in Jersey
-#: ../data/Locations.xml.in.h:3884
+#: ../data/Locations.xml.in.h:3922
 msgid "La Hougue"
 msgstr "La Hougue"
 
 #. The capital of Jersey
-#: ../data/Locations.xml.in.h:3886
+#: ../data/Locations.xml.in.h:3924
 msgid "Saint Helier"
 msgstr "Saint Helier"
 
 #. LV - Latvia
-#: ../data/Locations.xml.in.h:3888
+#: ../data/Locations.xml.in.h:3926
 msgid "Latvia"
 msgstr "Latvia"
 
 #. A city in Latvia
-#: ../data/Locations.xml.in.h:3890
+#: ../data/Locations.xml.in.h:3928
 msgid "Liepāja"
 msgstr "Liepāja"
 
 #. The capital of Latvia
-#: ../data/Locations.xml.in.h:3892
+#: ../data/Locations.xml.in.h:3930
 msgid "Rīga"
 msgstr "Rīga"
 
 #. LI - Liechtenstien
-#: ../data/Locations.xml.in.h:3894
+#: ../data/Locations.xml.in.h:3932
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #. The capital of Liechtenstein
-#: ../data/Locations.xml.in.h:3896
+#: ../data/Locations.xml.in.h:3934
 msgid "Vaduz"
 msgstr "Vaduz"
 
 #. LT - Lithuania
-#: ../data/Locations.xml.in.h:3898
+#: ../data/Locations.xml.in.h:3936
 msgid "Lithuania"
 msgstr "Litauen"
 
 #. A city in Lithuania
-#: ../data/Locations.xml.in.h:3900
+#: ../data/Locations.xml.in.h:3938
 msgid "Kaunas"
 msgstr "Kaunas"
 
 #. A city in Lithuania
-#: ../data/Locations.xml.in.h:3902
+#: ../data/Locations.xml.in.h:3940
 msgid "Palanga"
 msgstr "Palanga"
 
 #. The capital of Lithuania
-#: ../data/Locations.xml.in.h:3904
+#: ../data/Locations.xml.in.h:3942
 msgid "Vilnius"
 msgstr "Vilnius"
 
 #. A city in Lithuania
-#: ../data/Locations.xml.in.h:3906
+#: ../data/Locations.xml.in.h:3944
 msgid "Šiauliai"
 msgstr "Šiauliai"
 
 #. LU - Luxembourg
-#: ../data/Locations.xml.in.h:3908
+#: ../data/Locations.xml.in.h:3946
 msgctxt "Country"
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
 #. The capital of Luxembourg
-#: ../data/Locations.xml.in.h:3910
+#: ../data/Locations.xml.in.h:3948
 msgctxt "City in Luxembourg"
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
 #. MK - The Former Yugoslav Republic of Macedonia
-#: ../data/Locations.xml.in.h:3912
+#: ../data/Locations.xml.in.h:3950
 msgid "Macedonia"
 msgstr "Makedonia"
 
 #. A city in Macedonia
-#: ../data/Locations.xml.in.h:3914
+#: ../data/Locations.xml.in.h:3952
 msgid "Ohrid"
 msgstr "Ohrid"
 
 #. The capital of Macedonia
-#: ../data/Locations.xml.in.h:3916
+#: ../data/Locations.xml.in.h:3954
 msgid "Skopje"
 msgstr "Skopje"
 
 #. MT - Malta
-#: ../data/Locations.xml.in.h:3918
+#: ../data/Locations.xml.in.h:3956
 msgctxt "Country"
 msgid "Malta"
 msgstr "Malta"
 
 #. A city in Malta
-#: ../data/Locations.xml.in.h:3920
+#: ../data/Locations.xml.in.h:3958
 msgid "Luqa"
 msgstr "Luqa"
 
 #. The capital of Malta
-#: ../data/Locations.xml.in.h:3922
+#: ../data/Locations.xml.in.h:3960
 msgid "Valletta"
 msgstr "Valletta"
 
 #. MD - Moldova
-#: ../data/Locations.xml.in.h:3924
+#: ../data/Locations.xml.in.h:3962
 msgid "Moldova"
 msgstr "Moldova"
 
 #. The capital of Moldova
-#: ../data/Locations.xml.in.h:3926
+#: ../data/Locations.xml.in.h:3964
 msgid "Chişinău"
 msgstr "Chişinău"
 
 #. MC - Monaco
-#: ../data/Locations.xml.in.h:3928
+#: ../data/Locations.xml.in.h:3966
 msgctxt "Country"
 msgid "Monaco"
 msgstr "Monaco"
 
 #. The capital of Monaco
-#: ../data/Locations.xml.in.h:3930
+#: ../data/Locations.xml.in.h:3968
 msgctxt "City in Monaco"
 msgid "Monaco"
 msgstr "Monaco"
 
 #. ME - Montenegro
-#: ../data/Locations.xml.in.h:3932
+#: ../data/Locations.xml.in.h:3970
 msgid "Montenegro"
 msgstr "Montenegro"
 
 #. A city in Montenegro
-#: ../data/Locations.xml.in.h:3934
+#: ../data/Locations.xml.in.h:3972
 msgid "Podgorica"
 msgstr "Podgorica"
 
 #. A city in Montenegro
-#: ../data/Locations.xml.in.h:3936
+#: ../data/Locations.xml.in.h:3974
 msgid "Tivat"
 msgstr "Tivat"
 
 #. NL - Netherlands
-#: ../data/Locations.xml.in.h:3938
+#: ../data/Locations.xml.in.h:3976
 msgid "Netherlands"
 msgstr "Nederland"
 
 #. The capital of the Netherlands
-#: ../data/Locations.xml.in.h:3940
+#: ../data/Locations.xml.in.h:3978
 msgid "Amsterdam"
 msgstr "Amsterdam"
 
 #. A city in the Netherlands
-#: ../data/Locations.xml.in.h:3942
+#: ../data/Locations.xml.in.h:3980
 msgid "De Kooy"
 msgstr "De Kooy"
 
 #. A city in the Netherlands
-#: ../data/Locations.xml.in.h:3944
+#: ../data/Locations.xml.in.h:3982
 msgid "Deelen"
 msgstr "Deelen"
 
 #. A city in the Netherlands
-#: ../data/Locations.xml.in.h:3946
+#: ../data/Locations.xml.in.h:3984
 msgid "Eindhoven"
 msgstr "Eindhoven"
 
 #. A city in the Netherlands
-#: ../data/Locations.xml.in.h:3948
+#: ../data/Locations.xml.in.h:3986
 msgid "Gilze"
 msgstr "Gilze"
 
 #. A city in the Netherlands
-#: ../data/Locations.xml.in.h:3950
+#: ../data/Locations.xml.in.h:3988
 msgid "Groningen"
 msgstr "Groningen"
 
 #. A city in the Netherlands
-#: ../data/Locations.xml.in.h:3952
+#: ../data/Locations.xml.in.h:3990
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
 #. A city in the Netherlands
-#: ../data/Locations.xml.in.h:3954
+#: ../data/Locations.xml.in.h:3992
 msgid "Maastricht"
 msgstr "Maastricht"
 
 #. A city in the Netherlands
-#: ../data/Locations.xml.in.h:3956
+#: ../data/Locations.xml.in.h:3994
 msgid "Oost-Vlieland"
 msgstr "Oost-Vlieland"
 
 #. A city in the Netherlands
-#: ../data/Locations.xml.in.h:3958
+#: ../data/Locations.xml.in.h:3996
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
@@ -9006,322 +9006,322 @@
 #. "The Hague" is the traditional English name.
 #. The local name in Dutch is "'s-Gravenhage".
 #. 
-#: ../data/Locations.xml.in.h:3963
+#: ../data/Locations.xml.in.h:4001
 msgid "The Hague"
 msgstr "The Hague"
 
 #. A city in the Netherlands
-#: ../data/Locations.xml.in.h:3965
+#: ../data/Locations.xml.in.h:4003
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
 #. A city in the Netherlands
-#: ../data/Locations.xml.in.h:3967
+#: ../data/Locations.xml.in.h:4005
 msgid "Volkel"
 msgstr "Volkel"
 
 #. A city in the Netherlands
-#: ../data/Locations.xml.in.h:3969
+#: ../data/Locations.xml.in.h:4007
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
 #. NO - Norway
-#: ../data/Locations.xml.in.h:3971
+#: ../data/Locations.xml.in.h:4009
 msgid "Norway"
 msgstr "Norge"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:3973
+#: ../data/Locations.xml.in.h:4011
 msgid "Alta"
 msgstr "Alta"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:3975
+#: ../data/Locations.xml.in.h:4013
 msgid "Berlevåg"
 msgstr "Berlevåg"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:3977
+#: ../data/Locations.xml.in.h:4015
 msgid "Bodø"
 msgstr "Bodø"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:3979
+#: ../data/Locations.xml.in.h:4017
 msgid "Bolle"
 msgstr "Bolle"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:3981
+#: ../data/Locations.xml.in.h:4019
 msgid "Boltåsen"
 msgstr "Boltåsen"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:3983
+#: ../data/Locations.xml.in.h:4021
 msgid "Brønnøysund"
 msgstr "Brønnøysund"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:3985
+#: ../data/Locations.xml.in.h:4023
 msgid "Båtsfjord"
 msgstr "Båtsfjord"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:3987
+#: ../data/Locations.xml.in.h:4025
 msgid "Dalem"
 msgstr "Dalem"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:3989
+#: ../data/Locations.xml.in.h:4027
 msgid "Djupdalen"
 msgstr "Djupdalen"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:3991
+#: ../data/Locations.xml.in.h:4029
 msgid "Eldskog"
 msgstr "Eldskog"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:3993
+#: ../data/Locations.xml.in.h:4031
 msgid "Fagernes"
 msgstr "Fagernes"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:3995
+#: ../data/Locations.xml.in.h:4033
 msgid "Fiskenes"
 msgstr "Fiskenes"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:3997
+#: ../data/Locations.xml.in.h:4035
 msgid "Flesland"
 msgstr "Flesland"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:3999
+#: ../data/Locations.xml.in.h:4037
 msgid "Florø"
 msgstr "Florø"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4001
+#: ../data/Locations.xml.in.h:4039
 msgid "Førde"
 msgstr "Førde"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4003
+#: ../data/Locations.xml.in.h:4041
 msgid "Gardermoen"
 msgstr "Gardermoen"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4005
+#: ../data/Locations.xml.in.h:4043
 msgid "Hammerfest"
 msgstr "Hammerfest"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4007
+#: ../data/Locations.xml.in.h:4045
 msgid "Hasvik"
 msgstr "Hasvik"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4009
+#: ../data/Locations.xml.in.h:4047
 msgid "Haugesund"
 msgstr "Haugesund"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4011
+#: ../data/Locations.xml.in.h:4049
 msgid "Holm"
 msgstr "Holm"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4013
+#: ../data/Locations.xml.in.h:4051
 msgid "Honningsvåg"
 msgstr "Honningsvåg"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4015
+#: ../data/Locations.xml.in.h:4053
 msgid "Kirkenes"
 msgstr "Kirkenes"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4017
+#: ../data/Locations.xml.in.h:4055
 msgid "Kjevik"
 msgstr "Kjevik"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4019
+#: ../data/Locations.xml.in.h:4057
 msgid "Kristiansund"
 msgstr "Kristiansund"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4021
+#: ../data/Locations.xml.in.h:4059
 msgid "Tromsø"
 msgstr "Tromsø"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4023
+#: ../data/Locations.xml.in.h:4061
 msgid "Mehamn"
 msgstr "Mehamn"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4025
+#: ../data/Locations.xml.in.h:4063
 msgid "Molde"
 msgstr "Molde"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4027
+#: ../data/Locations.xml.in.h:4065
 msgid "Mosjøen"
 msgstr "Mosjøen"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4029
+#: ../data/Locations.xml.in.h:4067
 msgid "Namsos"
 msgstr "Namsos"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4031
+#: ../data/Locations.xml.in.h:4069
 msgid "Narvik"
 msgstr "Narvik"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4033
+#: ../data/Locations.xml.in.h:4071
 msgid "Notodden"
 msgstr "Notodden"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4035
+#: ../data/Locations.xml.in.h:4073
 msgid "Oseberg"
 msgstr "Oseberg"
 
 #. The capital of Norway
-#: ../data/Locations.xml.in.h:4037
+#: ../data/Locations.xml.in.h:4075
 msgid "Oslo"
 msgstr "Oslo"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4039
+#: ../data/Locations.xml.in.h:4077
 msgid "Rygge"
 msgstr "Rygge"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4041
+#: ../data/Locations.xml.in.h:4079
 msgid "Røros"
 msgstr "Røros"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4043
+#: ../data/Locations.xml.in.h:4081
 msgid "Rørvik"
 msgstr "Rørvik"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4045
+#: ../data/Locations.xml.in.h:4083
 msgid "Røssvoll"
 msgstr "Røssvoll"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4047
+#: ../data/Locations.xml.in.h:4085
 msgid "Røst"
 msgstr "Røst"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4049
+#: ../data/Locations.xml.in.h:4087
 msgid "Sandane"
 msgstr "Sandane"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4051
+#: ../data/Locations.xml.in.h:4089
 msgid "Skagen"
 msgstr "Skagen"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4053
+#: ../data/Locations.xml.in.h:4091
 msgid "Skien"
 msgstr "Skien"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4055
+#: ../data/Locations.xml.in.h:4093
 msgid "Sola"
 msgstr "Sola"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4057
+#: ../data/Locations.xml.in.h:4095
 msgid "Stokka"
 msgstr "Stokka"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4059
+#: ../data/Locations.xml.in.h:4097
 msgid "Svartnes"
 msgstr "Svartnes"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4061
+#: ../data/Locations.xml.in.h:4099
 msgid "Svolvær"
 msgstr "Svolvær"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4063
+#: ../data/Locations.xml.in.h:4101
 msgid "Sørkjosen"
 msgstr "Sørkjosen"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4065
+#: ../data/Locations.xml.in.h:4103
 msgid "Torp"
 msgstr "Torp"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4067
+#: ../data/Locations.xml.in.h:4105
 msgid "Trondheim"
 msgstr "Trondheim"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4069
+#: ../data/Locations.xml.in.h:4107
 msgid "Vadsø"
 msgstr "Vadsø"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4071
+#: ../data/Locations.xml.in.h:4109
 msgid "Ålesund"
 msgstr "Ålesund"
 
 #. A city in Norway
-#: ../data/Locations.xml.in.h:4073
+#: ../data/Locations.xml.in.h:4111
 msgid "Ørsta"
 msgstr "Ørsta"
 
 #. PL - Poland
-#: ../data/Locations.xml.in.h:4075
+#: ../data/Locations.xml.in.h:4113
 msgid "Poland"
 msgstr "Polen"
 
 #. A city in Poland
-#: ../data/Locations.xml.in.h:4077
+#: ../data/Locations.xml.in.h:4115
 msgid "Gdańsk"
 msgstr "Gdańsk"
 
 #. A city in Poland
-#: ../data/Locations.xml.in.h:4079
+#: ../data/Locations.xml.in.h:4117
 msgid "Katowice"
 msgstr "Katowice"
 
 #. A city in Poland
-#: ../data/Locations.xml.in.h:4081
+#: ../data/Locations.xml.in.h:4119
 msgid "Kraków"
 msgstr "Kraków"
 
 #. A city in Poland
-#: ../data/Locations.xml.in.h:4083
+#: ../data/Locations.xml.in.h:4121
 msgid "Łódź"
 msgstr "Łódź"
 
 #. A city in Poland
-#: ../data/Locations.xml.in.h:4085
+#: ../data/Locations.xml.in.h:4123
 msgid "Poznań"
 msgstr "Poznań"
 
 #. A city in Poland
-#: ../data/Locations.xml.in.h:4087
+#: ../data/Locations.xml.in.h:4125
 msgid "Rzeszów"
 msgstr "Rzeszów"
 
 #. A city in Poland
-#: ../data/Locations.xml.in.h:4089
+#: ../data/Locations.xml.in.h:4127
 msgid "Szczecin"
 msgstr "Szczecin"
 
@@ -9329,18 +9329,18 @@
 #. "Warsaw" is the traditional English name.
 #. The local name in Polish is "Warszawa".
 #. 
-#: ../data/Locations.xml.in.h:4094
+#: ../data/Locations.xml.in.h:4132
 msgctxt "City in Poland"
 msgid "Warsaw"
 msgstr "Warszawa"
 
 #. A city in Poland
-#: ../data/Locations.xml.in.h:4096
+#: ../data/Locations.xml.in.h:4134
 msgid "Wrocław"
 msgstr "Wrocław"
 
 #. PT - Portugal
-#: ../data/Locations.xml.in.h:4098
+#: ../data/Locations.xml.in.h:4136
 msgid "Portugal"
 msgstr "Portugal"
 
@@ -9348,7 +9348,7 @@
 #. is only used in places where "Portugal" is already
 #. understood from context.
 #. 
-#: ../data/Locations.xml.in.h:4103
+#: ../data/Locations.xml.in.h:4141
 msgid "Azores"
 msgstr "Azorene"
 
@@ -9356,39 +9356,39 @@
 #. of Madeira. The string is only used in places where
 #. "Portugal" is already understood from context.
 #. 
-#: ../data/Locations.xml.in.h:4108
+#: ../data/Locations.xml.in.h:4146
 msgid "Madeira"
 msgstr "Madeira"
 
 #. This refers to the time zone for mainland Portugal (as
 #. opposed to the time zone for the Azores).
 #. 
-#: ../data/Locations.xml.in.h:4112
+#: ../data/Locations.xml.in.h:4150
 msgid "Mainland Portugal"
 msgstr "Fastlandet Portugal"
 
 #. A city in Portugal
-#: ../data/Locations.xml.in.h:4114
+#: ../data/Locations.xml.in.h:4152
 msgid "Beja"
 msgstr "Beja"
 
 #. A city in Portugal
-#: ../data/Locations.xml.in.h:4116
+#: ../data/Locations.xml.in.h:4154
 msgid "Castelo Branco"
 msgstr "Castelo Branco"
 
 #. A city in Portugal
-#: ../data/Locations.xml.in.h:4118
+#: ../data/Locations.xml.in.h:4156
 msgid "Faro"
 msgstr "Faro"
 
 #. A city in Portugal
-#: ../data/Locations.xml.in.h:4120
+#: ../data/Locations.xml.in.h:4158
 msgid "Flor da Rosa"
 msgstr "Flor da Rosa"
 
 #. A city in Portugal
-#: ../data/Locations.xml.in.h:4122
+#: ../data/Locations.xml.in.h:4160
 msgid "Lajes"
 msgstr "Lajes"
 
@@ -9396,74 +9396,74 @@
 #. "Lisbon" is the traditional English name.
 #. The local name in Portuguese is "Lisboa".
 #. 
-#: ../data/Locations.xml.in.h:4127
+#: ../data/Locations.xml.in.h:4165
 msgid "Lisbon"
 msgstr "Lisbon"
 
 #. A city in Portugal
-#: ../data/Locations.xml.in.h:4129
+#: ../data/Locations.xml.in.h:4167
 msgid "Monte Real"
 msgstr "Monte Real"
 
 #. A city in Portugal
-#: ../data/Locations.xml.in.h:4131
+#: ../data/Locations.xml.in.h:4169
 msgid "Montijo"
 msgstr "Montijo"
 
 #. A city in Portugal
-#: ../data/Locations.xml.in.h:4133
+#: ../data/Locations.xml.in.h:4171
 msgid "Ovar"
 msgstr "Ovar"
 
 #. A city in Portugal
-#: ../data/Locations.xml.in.h:4135
+#: ../data/Locations.xml.in.h:4173
 msgid "Ponta Delgada"
 msgstr "Ponta Delgada"
 
 #. A city in Portugal
-#: ../data/Locations.xml.in.h:4137
+#: ../data/Locations.xml.in.h:4175
 msgid "Porto"
 msgstr "Porto"
 
 #. A city in Portugal
-#: ../data/Locations.xml.in.h:4139
+#: ../data/Locations.xml.in.h:4177
 msgid "Porto Santo"
 msgstr "Porto Samto"
 
 #. A city in Portugal.
 #. One of several cities in Portugal called "Santa Cruz".
 #. 
-#: ../data/Locations.xml.in.h:4143
+#: ../data/Locations.xml.in.h:4181
 msgid "Santa Cruz das Flores"
 msgstr "Santa Cruz das Flores"
 
 #. A city in Portugal
-#: ../data/Locations.xml.in.h:4145
+#: ../data/Locations.xml.in.h:4183
 msgid "Sintra"
 msgstr "Sintra"
 
 #. A city in Portugal
-#: ../data/Locations.xml.in.h:4147
+#: ../data/Locations.xml.in.h:4185
 msgid "Água de Pena"
 msgstr "Água de Pena"
 
 #. RO - Romania
-#: ../data/Locations.xml.in.h:4149
+#: ../data/Locations.xml.in.h:4187
 msgid "Romania"
 msgstr "Romania"
 
 #. A city in Romania
-#: ../data/Locations.xml.in.h:4151
+#: ../data/Locations.xml.in.h:4189
 msgid "Arad"
 msgstr "Arad"
 
 #. A city in Romania
-#: ../data/Locations.xml.in.h:4153
+#: ../data/Locations.xml.in.h:4191
 msgid "Bacău"
 msgstr "Bacǎu"
 
 #. A city in Romania
-#: ../data/Locations.xml.in.h:4155
+#: ../data/Locations.xml.in.h:4193
 msgid "Baia Mare"
 msgstr "Bahia Mare"
 
@@ -9471,67 +9471,67 @@
 #. "Bucharest" is the traditional English name.
 #. The local name in Romanian is "Bucureşti".
 #. 
-#: ../data/Locations.xml.in.h:4160
+#: ../data/Locations.xml.in.h:4198
 msgid "Bucharest"
 msgstr "Bucharest"
 
 #. A city in Romania
-#: ../data/Locations.xml.in.h:4162
+#: ../data/Locations.xml.in.h:4200
 msgid "Cluj-Napoca"
 msgstr "Cluj-Napoca"
 
 #. A city in Romania
-#: ../data/Locations.xml.in.h:4164
+#: ../data/Locations.xml.in.h:4202
 msgid "Craiova"
 msgstr "Craiova"
 
 #. A city in Romania
-#: ../data/Locations.xml.in.h:4166
+#: ../data/Locations.xml.in.h:4204
 msgid "Iaşi"
 msgstr "Iaşi"
 
 #. A city in Romania
-#: ../data/Locations.xml.in.h:4168
+#: ../data/Locations.xml.in.h:4206
 msgid "Mihail Kogălniceanu"
 msgstr "Mihail Kogălniceanu"
 
 #. A city in Romania
-#: ../data/Locations.xml.in.h:4170
+#: ../data/Locations.xml.in.h:4208
 msgid "Oradea"
 msgstr "Oradea"
 
 #. A city in Romania
-#: ../data/Locations.xml.in.h:4172
+#: ../data/Locations.xml.in.h:4210
 msgid "Satu Mare"
 msgstr "Satu Mare"
 
 #. A city in Romania
-#: ../data/Locations.xml.in.h:4174
+#: ../data/Locations.xml.in.h:4212
 msgid "Sibiu"
 msgstr "Sibiu"
 
 #. A city in Romania
-#: ../data/Locations.xml.in.h:4176
+#: ../data/Locations.xml.in.h:4214
 msgid "Suceava"
 msgstr "Suceava"
 
 #. A city in Romania
-#: ../data/Locations.xml.in.h:4178
+#: ../data/Locations.xml.in.h:4216
 msgid "Timişoara"
 msgstr "Timişoara"
 
 #. A city in Romania
-#: ../data/Locations.xml.in.h:4180
+#: ../data/Locations.xml.in.h:4218
 msgid "Tulcea"
 msgstr "Tulcea"
 
 #. A city in Romania
-#: ../data/Locations.xml.in.h:4182
+#: ../data/Locations.xml.in.h:4220
 msgid "Târgu-Mureş"
 msgstr "Târgu-Mureş"
 
 #. RU - Russian Federation
-#: ../data/Locations.xml.in.h:4184
+#: ../data/Locations.xml.in.h:4222
 msgid "Russia"
 msgstr "Ryssland"
 
@@ -9540,7 +9540,7 @@
 #. "Калининградское время". This string is only used in
 #. places where "Russia" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:4190
+#: ../data/Locations.xml.in.h:4228
 msgid "Kaliningrad Time"
 msgstr "Kaliningrad-tid"
 
@@ -9549,7 +9549,7 @@
 #. "Московское время". This string is only used in places
 #. where "Russia" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:4196
+#: ../data/Locations.xml.in.h:4234
 msgid "Moscow Time"
 msgstr "Moskva tid"
 
@@ -9559,7 +9559,7 @@
 #. used in places where "Russia" is already clear from
 #. context.
 #. 
-#: ../data/Locations.xml.in.h:4203
+#: ../data/Locations.xml.in.h:4241
 msgid "Samara Time"
 msgstr "Samara tid"
 
@@ -9568,7 +9568,7 @@
 #. "Екатеринбургское время". This string is only used in
 #. places where "Russia" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:4209
+#: ../data/Locations.xml.in.h:4247
 msgid "Yekaterinburg Time"
 msgstr "Ekaterinburg tid"
 
@@ -9578,7 +9578,7 @@
 #. used in places where "Russia" is already clear from
 #. context.
 #. 
-#: ../data/Locations.xml.in.h:4216
+#: ../data/Locations.xml.in.h:4254
 msgid "Omsk Time"
 msgstr "Omsk tid"
 
@@ -9587,7 +9587,7 @@
 #. "Красноярское время". This string is only used in places
 #. where "Russia" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:4222
+#: ../data/Locations.xml.in.h:4260
 msgid "Krasnoyarsk Time"
 msgstr "Krasnoyarsk tid"
 
@@ -9596,7 +9596,7 @@
 #. name is "Иркутское время". This string is only used in
 #. places where "Russia" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:4228
+#: ../data/Locations.xml.in.h:4266
 msgid "Irkutsk Time"
 msgstr "Irkutsk-tid"
 
@@ -9605,7 +9605,7 @@
 #. name is "Якутское время". This string is only used in
 #. places where "Russia" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:4234
+#: ../data/Locations.xml.in.h:4272
 msgid "Yakutsk Time"
 msgstr "Jakutsk tid"
 
@@ -9614,7 +9614,7 @@
 #. "Владивостокское время". This string is only used in
 #. places where "Russia" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:4240
+#: ../data/Locations.xml.in.h:4278
 msgid "Vladivostok Time"
 msgstr "Vladivostok-tid"
 
@@ -9623,7 +9623,7 @@
 #. "Магаданское время". This string is only used in places
 #. where "Russia" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:4246
+#: ../data/Locations.xml.in.h:4284
 msgid "Magadan Time"
 msgstr "Magadan tid"
 
@@ -9632,175 +9632,175 @@
 #. is "Камчатское время". This string is only used in
 #. places where "Russia" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:4252
+#: ../data/Locations.xml.in.h:4290
 msgid "Kamchatka Time"
 msgstr "Kamchatka-tid"
 
 #. A city in Russia.
 #. The local name in Russian is "Абакан".
 #. 
-#: ../data/Locations.xml.in.h:4256
+#: ../data/Locations.xml.in.h:4294
 msgid "Abakan"
 msgstr "Abakan"
 
 #. A city in Russia.
 #. The local name in Russian is "Адлер".
 #. 
-#: ../data/Locations.xml.in.h:4260
+#: ../data/Locations.xml.in.h:4298
 msgid "Adler"
 msgstr "Adler"
 
 #. A city in Russia.
 #. The local name in Russian is "Анадырь".
 #. 
-#: ../data/Locations.xml.in.h:4264
+#: ../data/Locations.xml.in.h:4302
 msgid "Anadyr'"
 msgstr "Anadyr'"
 
 #. A city in Russia.
 #. The local name in Russian is "Анапа".
 #. 
-#: ../data/Locations.xml.in.h:4268
+#: ../data/Locations.xml.in.h:4306
 msgid "Anapa"
 msgstr "Anapa"
 
 #. A city in Russia.
 #. The local name in Russian is "Архангельск".
 #. 
-#: ../data/Locations.xml.in.h:4272
+#: ../data/Locations.xml.in.h:4310
 msgid "Arkhangel'sk"
 msgstr "Arkhangel'sk"
 
 #. A city in Russia.
 #. The local name in Russian is "Астрахань".
 #. 
-#: ../data/Locations.xml.in.h:4276
+#: ../data/Locations.xml.in.h:4314
 msgid "Astrakhan'"
 msgstr "Astrakhan'"
 
 #. A city in Russia.
 #. The local name in Russian is "Барнаул".
 #. 
-#: ../data/Locations.xml.in.h:4280
+#: ../data/Locations.xml.in.h:4318
 msgid "Barnaul"
 msgstr "Barnaul"
 
 #. A city in Russia.
 #. The local name in Russian is "Брацк".
 #. 
-#: ../data/Locations.xml.in.h:4284
+#: ../data/Locations.xml.in.h:4322
 msgid "Bratsk"
 msgstr "Bratsk"
 
 #. A city in Russia.
 #. The local name in Russian is "Брянск".
 #. 
-#: ../data/Locations.xml.in.h:4288
+#: ../data/Locations.xml.in.h:4326
 msgid "Bryansk"
 msgstr "Bryansk"
 
 #. A city in Russia.
 #. The local name in Russian is "Челябинск".
 #. 
-#: ../data/Locations.xml.in.h:4292
+#: ../data/Locations.xml.in.h:4330
 msgid "Chelyabinsk"
 msgstr "Chelyabinsk"
 
 #. A city in Russia.
 #. The local name in Russian is "Чита".
 #. 
-#: ../data/Locations.xml.in.h:4296
+#: ../data/Locations.xml.in.h:4334
 msgid "Chita"
 msgstr "Chita"
 
 #. A city in Russia.
 #. The local name in Russian is "Чульман".
 #. 
-#: ../data/Locations.xml.in.h:4300
+#: ../data/Locations.xml.in.h:4338
 msgid "Chul'man"
 msgstr "Chul'Man"
 
 #. A city in Russia.
 #. The local name in Russian is "Энгельс".
 #. 
-#: ../data/Locations.xml.in.h:4304
+#: ../data/Locations.xml.in.h:4342
 msgid "Engel's"
 msgstr "Engel's"
 
 #. A city in Russia.
 #. The local name in Russian is "Иркуцк".
 #. 
-#: ../data/Locations.xml.in.h:4308
+#: ../data/Locations.xml.in.h:4346
 msgid "Irkutsk"
 msgstr "Irkutsk"
 
 #. A city in Russia.
 #. The local name in Russian is "Калининград".
 #. 
-#: ../data/Locations.xml.in.h:4312
+#: ../data/Locations.xml.in.h:4350
 msgid "Kaliningrad"
 msgstr "Kaliningrad"
 
 #. A city in Russia.
 #. The local name in Russian is "Казань".
 #. 
-#: ../data/Locations.xml.in.h:4316
+#: ../data/Locations.xml.in.h:4354
 msgid "Kazan'"
 msgstr "Kazan'"
 
 #. A city in Russia.
 #. The local name in Russian is "Кемерово".
 #. 
-#: ../data/Locations.xml.in.h:4320
+#: ../data/Locations.xml.in.h:4358
 msgid "Kemerovo"
 msgstr "Kemerovo"
 
 #. A city in Russia.
 #. The local name in Russian is "Хабаровск".
 #. 
-#: ../data/Locations.xml.in.h:4324
+#: ../data/Locations.xml.in.h:4362
 msgid "Khabarovsk"
 msgstr "Khabarovsk"
 
 #. A city in Russia.
 #. The local name in Russian is "Ханты-Мансийск".
 #. 
-#: ../data/Locations.xml.in.h:4328
+#: ../data/Locations.xml.in.h:4366
 msgid "Khanty-Mansiysk"
 msgstr "Khanty-Mansiysk"
 
 #. A city in Russia.
 #. The local name in Russian is "Краснодар".
 #. 
-#: ../data/Locations.xml.in.h:4332
+#: ../data/Locations.xml.in.h:4370
 msgid "Krasnodar"
 msgstr "Krasnodar"
 
 #. A city in Russia.
 #. The local name in Russian is "Красноярск".
 #. 
-#: ../data/Locations.xml.in.h:4336
+#: ../data/Locations.xml.in.h:4374
 msgid "Krasnoyarsk"
 msgstr "Krasnoyarsk"
 
 #. A city in Russia.
 #. The local name in Russian is "Магадан".
 #. 
-#: ../data/Locations.xml.in.h:4340
+#: ../data/Locations.xml.in.h:4378
 msgid "Magadan"
 msgstr "Magadan"
 
 #. A city in Russia.
 #. The local name in Russian is "Минеральные Воды".
 #. 
-#: ../data/Locations.xml.in.h:4344
+#: ../data/Locations.xml.in.h:4382
 msgid "Mineral'nyye Vody"
 msgstr "Mineral'nyye Vody"
 
 #. A city in Russia.
 #. The local name in Russian is "Мирный".
 #. 
-#: ../data/Locations.xml.in.h:4348
+#: ../data/Locations.xml.in.h:4386
 msgid "Mirnyy"
 msgstr "Mirnyy"
 
@@ -9808,7 +9808,7 @@
 #. "Moscow" is the traditional English name.
 #. The local name in Russian is "Moskva / Москва".
 #. 
-#: ../data/Locations.xml.in.h:4353
+#: ../data/Locations.xml.in.h:4391
 msgctxt "City in Russia"
 msgid "Moscow"
 msgstr "Moskva"
@@ -9816,77 +9816,77 @@
 #. A city in Russia.
 #. The local name in Russian is "Мурманск".
 #. 
-#: ../data/Locations.xml.in.h:4357
+#: ../data/Locations.xml.in.h:4395
 msgid "Murmansk"
 msgstr "Murmansk"
 
 #. A city in Russia.
 #. The local name in Russian is "Нальчик".
 #. 
-#: ../data/Locations.xml.in.h:4361
+#: ../data/Locations.xml.in.h:4399
 msgid "Nal'chik"
 msgstr "Nal'chik"
 
 #. A city in Russia.
 #. The local name in Russian is "Нижневартовск".
 #. 
-#: ../data/Locations.xml.in.h:4365
+#: ../data/Locations.xml.in.h:4403
 msgid "Nizhnevartovsk"
 msgstr "Nizhnevartovsk"
 
 #. A city in Russia.
 #. The local name in Russian is "Новокузнецк".
 #. 
-#: ../data/Locations.xml.in.h:4369
+#: ../data/Locations.xml.in.h:4407
 msgid "Novokuznetsk"
 msgstr "Novokuznetsk"
 
 #. A city in Russia.
 #. The local name in Russian is "Новосибирск".
 #. 
-#: ../data/Locations.xml.in.h:4373
+#: ../data/Locations.xml.in.h:4411
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
 #. A city in Russia.
 #. The local name in Russian is "Омск".
 #. 
-#: ../data/Locations.xml.in.h:4377
+#: ../data/Locations.xml.in.h:4415
 msgid "Omsk"
 msgstr "Omsk"
 
 #. A city in Russia.
 #. The local name in Russian is "Оренбург".
 #. 
-#: ../data/Locations.xml.in.h:4381
+#: ../data/Locations.xml.in.h:4419
 msgid "Orenburg"
 msgstr "Orenburg"
 
 #. A city in Russia.
 #. The local name in Russian is "Пенза".
 #. 
-#: ../data/Locations.xml.in.h:4385
+#: ../data/Locations.xml.in.h:4423
 msgid "Penza"
 msgstr "Penza"
 
 #. A city in Russia.
 #. The local name in Russian is "Пермь".
 #. 
-#: ../data/Locations.xml.in.h:4389
+#: ../data/Locations.xml.in.h:4427
 msgid "Perm'"
 msgstr "Perm'"
 
 #. A city in Russia.
 #. The local name in Russian is "Петропавловск-Камчатский".
 #. 
-#: ../data/Locations.xml.in.h:4393
+#: ../data/Locations.xml.in.h:4431
 msgid "Petropavlovsk"
 msgstr "Petropavlovsk"
 
 #. A city in Russia.
 #. The local name in Russian is "Ростов-на-Дону".
 #. 
-#: ../data/Locations.xml.in.h:4397
+#: ../data/Locations.xml.in.h:4435
 msgid "Rostov"
 msgstr "Rostov"
 
@@ -9895,127 +9895,127 @@
 #. The local name in Russian is "Sankt-Peterburg /
 #. Санкт-Петербург".
 #. 
-#: ../data/Locations.xml.in.h:4403
+#: ../data/Locations.xml.in.h:4441
 msgid "Saint Petersburg"
 msgstr "St. Petersburg"
 
 #. A city in Russia.
 #. The local name in Russian is "Самара".
 #. 
-#: ../data/Locations.xml.in.h:4407
+#: ../data/Locations.xml.in.h:4445
 msgid "Samara"
 msgstr "Samara"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4409
+#: ../data/Locations.xml.in.h:4447
 msgid "Saratov"
 msgstr "Saratov"
 
 #. A city in Russia.
 #. The local name in Russian is "Ставрополь".
 #. 
-#: ../data/Locations.xml.in.h:4413
+#: ../data/Locations.xml.in.h:4451
 msgid "Stavropol'"
 msgstr "Stavropol'"
 
 #. A city in Russia.
 #. The local name in Russian is "Стригино".
 #. 
-#: ../data/Locations.xml.in.h:4417
+#: ../data/Locations.xml.in.h:4455
 msgid "Strigino"
 msgstr "Strigino"
 
 #. A city in Russia.
 #. The local name in Russian is "Сургут".
 #. 
-#: ../data/Locations.xml.in.h:4421
+#: ../data/Locations.xml.in.h:4459
 msgid "Surgut"
 msgstr "Surgut"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4423
+#: ../data/Locations.xml.in.h:4461
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4425
+#: ../data/Locations.xml.in.h:4463
 msgid "Tiksi"
 msgstr "Tiksi"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4427
+#: ../data/Locations.xml.in.h:4465
 msgid "Tyumen"
 msgstr "Tyumen"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4429
+#: ../data/Locations.xml.in.h:4467
 msgid "Udachnyy"
 msgstr "Udachnyy"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4431
+#: ../data/Locations.xml.in.h:4469
 msgid "Ufa"
 msgstr "Ufa"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4433
+#: ../data/Locations.xml.in.h:4471
 msgid "Ul'yanovsk"
 msgstr "Ul'yanovsk"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4435
+#: ../data/Locations.xml.in.h:4473
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4437
+#: ../data/Locations.xml.in.h:4475
 msgid "Velikiye Luki"
 msgstr "Velikiye Luki"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4439
+#: ../data/Locations.xml.in.h:4477
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4441
+#: ../data/Locations.xml.in.h:4479
 msgid "Volgograd"
 msgstr "Volgograd"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4443
+#: ../data/Locations.xml.in.h:4481
 msgid "Voronezh"
 msgstr "Voronezh"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4445
+#: ../data/Locations.xml.in.h:4483
 msgid "Yakutsk"
 msgstr "Jakutsk"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4447
+#: ../data/Locations.xml.in.h:4485
 msgid "Yekaterinburg"
 msgstr "Ekaterinburg"
 
 #. A city in Russia
-#: ../data/Locations.xml.in.h:4449
+#: ../data/Locations.xml.in.h:4487
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
 #. SM - San Marino
-#: ../data/Locations.xml.in.h:4451
+#: ../data/Locations.xml.in.h:4489
 msgctxt "Country"
 msgid "San Marino"
 msgstr "San Marino"
 
 #. The capital of San Marino
-#: ../data/Locations.xml.in.h:4453
+#: ../data/Locations.xml.in.h:4491
 msgctxt "City in San Marino"
 msgid "San Marino"
 msgstr "San Marino"
 
 #. RS - Serbia
-#: ../data/Locations.xml.in.h:4455
+#: ../data/Locations.xml.in.h:4493
 msgid "Serbia"
 msgstr "Serbia"
 
@@ -10023,102 +10023,102 @@
 #. "Belgrade" is the traditional English name.
 #. The local name in Serbian is "Beograd".
 #. 
-#: ../data/Locations.xml.in.h:4460
+#: ../data/Locations.xml.in.h:4498
 msgid "Belgrade"
 msgstr "Belgrade"
 
 #. A city in Serbia
-#: ../data/Locations.xml.in.h:4462
+#: ../data/Locations.xml.in.h:4500
 msgid "Niš"
 msgstr "Niš"
 
 #. A city in Serbia
-#: ../data/Locations.xml.in.h:4464
+#: ../data/Locations.xml.in.h:4502
 msgid "Vršac"
 msgstr "Vršac"
 
 #. A city in Serbia
-#: ../data/Locations.xml.in.h:4466
+#: ../data/Locations.xml.in.h:4504
 msgid "Zemun"
 msgstr "Zemun"
 
 #. SK - Slovakia
-#: ../data/Locations.xml.in.h:4468
+#: ../data/Locations.xml.in.h:4506
 msgid "Slovakia"
 msgstr "Slovakia"
 
 #. The capital of Slovakia
-#: ../data/Locations.xml.in.h:4470
+#: ../data/Locations.xml.in.h:4508
 msgid "Bratislava"
 msgstr "Bratislava"
 
 #. A city in Slovakia
-#: ../data/Locations.xml.in.h:4472
+#: ../data/Locations.xml.in.h:4510
 msgid "Dolný Hričov"
 msgstr "Dolný Hričov"
 
 #. A city in Slovakia
-#: ../data/Locations.xml.in.h:4474
+#: ../data/Locations.xml.in.h:4512
 msgid "Kamenica nad Cirochou"
 msgstr "Kamenica nad Cirochou"
 
 #. A city in Slovakia
-#: ../data/Locations.xml.in.h:4476
+#: ../data/Locations.xml.in.h:4514
 msgid "Košice"
 msgstr "Košice"
 
 #. A city in Slovakia
-#: ../data/Locations.xml.in.h:4478
+#: ../data/Locations.xml.in.h:4516
 msgid "Lučenec"
 msgstr "Lučenec"
 
 #. A city in Slovakia
-#: ../data/Locations.xml.in.h:4480
+#: ../data/Locations.xml.in.h:4518
 msgid "Nitra"
 msgstr "Nitra"
 
 #. A city in Slovakia
-#: ../data/Locations.xml.in.h:4482
+#: ../data/Locations.xml.in.h:4520
 msgid "Piešťany"
 msgstr "Piešťany"
 
 #. A city in Slovakia
-#: ../data/Locations.xml.in.h:4484
+#: ../data/Locations.xml.in.h:4522
 msgid "Poprad"
 msgstr "Poprad"
 
 #. A city in Slovakia
-#: ../data/Locations.xml.in.h:4486
+#: ../data/Locations.xml.in.h:4524
 msgid "Prievidza"
 msgstr "Prievidza"
 
 #. A city in Slovakia
-#: ../data/Locations.xml.in.h:4488
+#: ../data/Locations.xml.in.h:4526
 msgid "Sliač"
 msgstr "Sliač"
 
 #. SI - Slovenia
-#: ../data/Locations.xml.in.h:4490
+#: ../data/Locations.xml.in.h:4528
 msgid "Slovenia"
 msgstr "Slovenia"
 
 #. The capital of Slovenia
-#: ../data/Locations.xml.in.h:4492
+#: ../data/Locations.xml.in.h:4530
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
 #. A city in Slovenia
-#: ../data/Locations.xml.in.h:4494
+#: ../data/Locations.xml.in.h:4532
 msgid "Maribor"
 msgstr "Maribor"
 
 #. A city in Slovenia
-#: ../data/Locations.xml.in.h:4496
+#: ../data/Locations.xml.in.h:4534
 msgid "Portorož"
 msgstr "Portorož"
 
 #. ES - Spain
-#: ../data/Locations.xml.in.h:4498
+#: ../data/Locations.xml.in.h:4536
 msgid "Spain"
 msgstr "Spania"
 
@@ -10126,14 +10126,14 @@
 #. string is only used in places where "Spain" is already
 #. clear from context.
 #. 
-#: ../data/Locations.xml.in.h:4503
+#: ../data/Locations.xml.in.h:4541
 msgid "Canary Islands"
 msgstr "Kanariøyene"
 
 #. This refers to the time zone for mainland Spain (as
 #. opposed to the time zone for the Canary Islands).
 #. 
-#: ../data/Locations.xml.in.h:4507
+#: ../data/Locations.xml.in.h:4545
 msgid "Mainland Spain"
 msgstr "Fastlandet Spania"
 
@@ -10141,262 +10141,262 @@
 #. Melilla, on the coast of Africa. The string is only used
 #. in places where "Spain" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:4512
+#: ../data/Locations.xml.in.h:4550
 msgid "Ceuta and Melilla"
 msgstr "Ceuta og Melilla"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4514
+#: ../data/Locations.xml.in.h:4552
 msgid "A Coruña"
 msgstr "A Coruña"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4516
+#: ../data/Locations.xml.in.h:4554
 msgid "Agoncillo"
 msgstr "Agoncillo"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4518
+#: ../data/Locations.xml.in.h:4556
 msgid "Alcantarilla"
 msgstr "Alcantarilla"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4520
+#: ../data/Locations.xml.in.h:4558
 msgid "Alicante"
 msgstr "Alicante"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4522
+#: ../data/Locations.xml.in.h:4560
 msgid "Almería"
 msgstr "Almería"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4524
+#: ../data/Locations.xml.in.h:4562
 msgid "Armilla"
 msgstr "Armilla"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4526
+#: ../data/Locations.xml.in.h:4564
 msgid "Atogo"
 msgstr "Atogo"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4528
+#: ../data/Locations.xml.in.h:4566
 msgid "Avilés"
 msgstr "Avilés"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4530
+#: ../data/Locations.xml.in.h:4568
 msgid "Barajas"
 msgstr "Barajas"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4532
+#: ../data/Locations.xml.in.h:4570
 msgctxt "City in Spain"
 msgid "Barcelona"
 msgstr "Barcelona"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4534
+#: ../data/Locations.xml.in.h:4572
 msgid "Bilbao"
 msgstr "Bilbao"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4536
+#: ../data/Locations.xml.in.h:4574
 msgid "Colmenar Viejo"
 msgstr "Colmenar Viejo"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4538
+#: ../data/Locations.xml.in.h:4576
 msgid "Corcovados"
 msgstr "Corcovados"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4540
+#: ../data/Locations.xml.in.h:4578
 msgid "Cuatro Vientos"
 msgstr "Cuatro Vientos"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4542
+#: ../data/Locations.xml.in.h:4580
 msgctxt "City in Spain"
 msgid "Córdoba"
 msgstr "Córdoba"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4544
+#: ../data/Locations.xml.in.h:4582
 msgid "El Matorral"
 msgstr "El Matorral"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4546
+#: ../data/Locations.xml.in.h:4584
 msgid "Fuenterrabía"
 msgstr "Fuenterrabía"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4548
+#: ../data/Locations.xml.in.h:4586
 msgid "Gando"
 msgstr "Gando"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4550
+#: ../data/Locations.xml.in.h:4588
 msgid "Gerona"
 msgstr "Gerona"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4552
+#: ../data/Locations.xml.in.h:4590
 msgid "Getafe"
 msgstr "Getafe"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4554
+#: ../data/Locations.xml.in.h:4592
 msgid "Granada"
 msgstr "Granada"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4556
+#: ../data/Locations.xml.in.h:4594
 msgid "Güime"
 msgstr "Güime"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4558
+#: ../data/Locations.xml.in.h:4596
 msgid "Ibiza"
 msgstr "Ibiza"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4560
+#: ../data/Locations.xml.in.h:4598
 msgid "Jerez"
 msgstr "Jerez"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4562
+#: ../data/Locations.xml.in.h:4600
 msgctxt "City in Spain"
 msgid "León"
 msgstr "León"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4564
+#: ../data/Locations.xml.in.h:4602
 msgid "Los Baldíos"
 msgstr "Los Baldíos"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4566
+#: ../data/Locations.xml.in.h:4604
 msgid "Los Llanos"
 msgstr "Los Llanos"
 
 #. The capital of Spain
-#: ../data/Locations.xml.in.h:4568
+#: ../data/Locations.xml.in.h:4606
 msgid "Madrid"
 msgstr "Madrid"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4570
+#: ../data/Locations.xml.in.h:4608
 msgid "Mahón"
 msgstr "Mahón"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4572
+#: ../data/Locations.xml.in.h:4610
 msgid "Melilla"
 msgstr "Melilla"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4574
+#: ../data/Locations.xml.in.h:4612
 msgid "Morón"
 msgstr "Morón"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4576
+#: ../data/Locations.xml.in.h:4614
 msgid "Málaga"
 msgstr "Málaga"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4578
+#: ../data/Locations.xml.in.h:4616
 msgid "Noáin"
 msgstr "Noáin"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4580
+#: ../data/Locations.xml.in.h:4618
 msgid "Palma"
 msgstr "Palma"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4582
+#: ../data/Locations.xml.in.h:4620
 msgid "Reus"
 msgstr "Reus"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4584
+#: ../data/Locations.xml.in.h:4622
 msgid "Rota"
 msgstr "Rota"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4586
+#: ../data/Locations.xml.in.h:4624
 msgid "Sabadell"
 msgstr "Sabadell"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4588
+#: ../data/Locations.xml.in.h:4626
 msgid "Salamanca"
 msgstr "Salamanca"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4590
+#: ../data/Locations.xml.in.h:4628
 msgid "San Javier"
 msgstr "San Javier"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4592
+#: ../data/Locations.xml.in.h:4630
 msgid "San Pablo"
 msgstr "San Pablo"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4594
+#: ../data/Locations.xml.in.h:4632
 msgid "Santander"
 msgstr "Santander"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4596
+#: ../data/Locations.xml.in.h:4634
 msgctxt "City in Spain"
 msgid "Santiago"
 msgstr "Santiago"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4598
+#: ../data/Locations.xml.in.h:4636
 msgid "Talavera la Real"
 msgstr "Talavera la Real"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4600
+#: ../data/Locations.xml.in.h:4638
 msgid "Tamaduste"
 msgstr "Tamaduste"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4602
+#: ../data/Locations.xml.in.h:4640
 msgid "Torrejón del Rey"
 msgstr "Torrejón del Rey"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4604
+#: ../data/Locations.xml.in.h:4642
 msgctxt "City in Spain"
 msgid "Valencia"
 msgstr "Valencia"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4606
+#: ../data/Locations.xml.in.h:4644
 msgid "Vigo"
 msgstr "Vigo"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4608
+#: ../data/Locations.xml.in.h:4646
 msgid "Villanubla"
 msgstr "Villanubla"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4610
+#: ../data/Locations.xml.in.h:4648
 msgid "Vitoria-Gasteiz"
 msgstr "Vitoria-Gasteiz"
 
 #. A city in Spain
-#: ../data/Locations.xml.in.h:4612
+#: ../data/Locations.xml.in.h:4650
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
@@ -10404,182 +10404,182 @@
 #. Arctic Ocean which is a part of Norway with unusual status
 #. internationally.
 #. 
-#: ../data/Locations.xml.in.h:4617
+#: ../data/Locations.xml.in.h:4655
 msgid "Svalbard and Jan Mayen"
 msgstr "Svalbard og Jan Mayen"
 
 #. The capital of Svalbard and Jan Mayen
-#: ../data/Locations.xml.in.h:4619
+#: ../data/Locations.xml.in.h:4657
 msgid "Longyearbyen"
 msgstr "Longyearbyen"
 
 #. SE - Sweden
-#: ../data/Locations.xml.in.h:4621
+#: ../data/Locations.xml.in.h:4659
 msgid "Sweden"
 msgstr "Sverige"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4623
+#: ../data/Locations.xml.in.h:4661
 msgid "Borlänge"
 msgstr "Borlänge"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4625
+#: ../data/Locations.xml.in.h:4663
 msgid "Gällivare"
 msgstr "Gällivare"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4627
+#: ../data/Locations.xml.in.h:4665
 msgid "Göteborg"
 msgstr "Gøteborg"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4629
+#: ../data/Locations.xml.in.h:4667
 msgid "Halmstad"
 msgstr "Halmstad"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4631
+#: ../data/Locations.xml.in.h:4669
 msgid "Jönköping"
 msgstr "Jönköping"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4633
+#: ../data/Locations.xml.in.h:4671
 msgid "Kalmar"
 msgstr "Kalmar"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4635
+#: ../data/Locations.xml.in.h:4673
 msgid "Karlstad"
 msgstr "Karlstad"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4637
+#: ../data/Locations.xml.in.h:4675
 msgid "Kiruna"
 msgstr "Kiruna"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4639
+#: ../data/Locations.xml.in.h:4677
 msgid "Kramfors"
 msgstr "Kramfors"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4641
+#: ../data/Locations.xml.in.h:4679
 msgid "Kristianstad"
 msgstr "Kristianstad"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4643
+#: ../data/Locations.xml.in.h:4681
 msgid "Linköping"
 msgstr "Linköping"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4645
+#: ../data/Locations.xml.in.h:4683
 msgid "Ljungbyhed"
 msgstr "Ljungbyhed"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4647
+#: ../data/Locations.xml.in.h:4685
 msgid "Luleå"
 msgstr "Luleå"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4649
+#: ../data/Locations.xml.in.h:4687
 msgid "Lycksele"
 msgstr "Lycksele"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4651
+#: ../data/Locations.xml.in.h:4689
 msgid "Malmö"
 msgstr "Malmö"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4653
+#: ../data/Locations.xml.in.h:4691
 msgid "Norrköping"
 msgstr "Norrköping"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4655
+#: ../data/Locations.xml.in.h:4693
 msgid "Nyköping"
 msgstr "Nyköping"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4657
+#: ../data/Locations.xml.in.h:4695
 msgid "Ronneby"
 msgstr "Ronneby"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4659
+#: ../data/Locations.xml.in.h:4697
 msgid "Skellefteå"
 msgstr "Skellefteå"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4661
+#: ../data/Locations.xml.in.h:4699
 msgid "Skövde"
 msgstr "Skövde"
 
 #. The capital of Sweden
-#: ../data/Locations.xml.in.h:4663
+#: ../data/Locations.xml.in.h:4701
 msgid "Stockholm"
 msgstr "Stockholm"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4665
+#: ../data/Locations.xml.in.h:4703
 msgid "Sundsvall"
 msgstr "Sunsvall"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4667
+#: ../data/Locations.xml.in.h:4705
 msgid "Söderhamn"
 msgstr "Söderhamn"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4669
+#: ../data/Locations.xml.in.h:4707
 msgid "Umeå"
 msgstr "Umeå"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4671
+#: ../data/Locations.xml.in.h:4709
 msgid "Visby"
 msgstr "Visby"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4673
+#: ../data/Locations.xml.in.h:4711
 msgid "Västerås"
 msgstr "Västerås"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4675
+#: ../data/Locations.xml.in.h:4713
 msgid "Växjö"
 msgstr "Växjö"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4677
+#: ../data/Locations.xml.in.h:4715
 msgid "Ängelholm"
 msgstr "Ängelholm"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4679
+#: ../data/Locations.xml.in.h:4717
 msgid "Örebro"
 msgstr "Örebro"
 
 #. A city in Sweden
-#: ../data/Locations.xml.in.h:4681
+#: ../data/Locations.xml.in.h:4719
 msgid "Örnsköldsvik"
 msgstr "Örnskoldsvik"
 
 #. CH - Switzerland
-#: ../data/Locations.xml.in.h:4683
+#: ../data/Locations.xml.in.h:4721
 msgid "Switzerland"
 msgstr "Schweiz"
 
 #. The capital of Switzerland
-#: ../data/Locations.xml.in.h:4685
+#: ../data/Locations.xml.in.h:4723
 msgid "Bern"
 msgstr "Bern"
 
 #. A city in Switzerland
-#: ../data/Locations.xml.in.h:4687
+#: ../data/Locations.xml.in.h:4725
 msgid "Basel"
 msgstr "Basel"
 
@@ -10587,222 +10587,222 @@
 #. "Geneva" is the traditional English name.
 #. The local name is "Genève".
 #. 
-#: ../data/Locations.xml.in.h:4692
+#: ../data/Locations.xml.in.h:4730
 msgid "Geneva"
 msgstr "Geneva"
 
 #. A city in Switzerland
-#: ../data/Locations.xml.in.h:4694
+#: ../data/Locations.xml.in.h:4732
 msgid "Grenchen"
 msgstr "Grenchen"
 
 #. A city in Switzerland
-#: ../data/Locations.xml.in.h:4696
+#: ../data/Locations.xml.in.h:4734
 msgid "Lugano"
 msgstr "Lugano"
 
 #. A city in Switzerland
-#: ../data/Locations.xml.in.h:4698
+#: ../data/Locations.xml.in.h:4736
 msgid "Neuchâtel"
 msgstr "Neuchâtel"
 
 #. A city in Switzerland
-#: ../data/Locations.xml.in.h:4700
+#: ../data/Locations.xml.in.h:4738
 msgid "Sankt Gallen"
 msgstr "Sankt Gallen"
 
 #. A city in Switzerland
-#: ../data/Locations.xml.in.h:4702
+#: ../data/Locations.xml.in.h:4740
 msgid "St. Moritz"
 msgstr "St. Moritz"
 
 #. A city in Switzerland
-#: ../data/Locations.xml.in.h:4704
+#: ../data/Locations.xml.in.h:4742
 msgid "Sion"
 msgstr "Sion"
 
 #. A city in Switzerland
-#: ../data/Locations.xml.in.h:4706
+#: ../data/Locations.xml.in.h:4744
 msgid "Zürich"
 msgstr "Zürich"
 
 #. TR - Turkey
-#: ../data/Locations.xml.in.h:4708
+#: ../data/Locations.xml.in.h:4746
 msgid "Turkey"
 msgstr "Turkiet"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4710
+#: ../data/Locations.xml.in.h:4748
 msgid "Adana"
 msgstr "Adana"
 
 #. The capital of Turkey
-#: ../data/Locations.xml.in.h:4712
+#: ../data/Locations.xml.in.h:4750
 msgid "Ankara"
 msgstr "Ankara"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4714
+#: ../data/Locations.xml.in.h:4752
 msgid "Antalya"
 msgstr "Antalya"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4716
+#: ../data/Locations.xml.in.h:4754
 msgid "Balikesir"
 msgstr "Balikesir"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4718
+#: ../data/Locations.xml.in.h:4756
 msgid "Bandirma"
 msgstr "Bandirma"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4720
+#: ../data/Locations.xml.in.h:4758
 msgid "Bodrum"
 msgstr "Bodrum"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4722
+#: ../data/Locations.xml.in.h:4760
 msgid "Burdur"
 msgstr "Burdur"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4724
+#: ../data/Locations.xml.in.h:4762
 msgid "Bursa"
 msgstr "Bursa"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4726
+#: ../data/Locations.xml.in.h:4764
 msgid "Corlu"
 msgstr "Corlu"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4728
+#: ../data/Locations.xml.in.h:4766
 msgid "Dalaman"
 msgstr "Dalaman"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4730
+#: ../data/Locations.xml.in.h:4768
 msgid "Diyarbakir"
 msgstr "Diyarbakir"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4732
+#: ../data/Locations.xml.in.h:4770
 msgid "Erzurum"
 msgstr "Erzurum"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4734
+#: ../data/Locations.xml.in.h:4772
 msgid "Eskisehir"
 msgstr "Eskisehir"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4736
+#: ../data/Locations.xml.in.h:4774
 msgid "Gaziantep"
 msgstr "Gaziantep"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4738
+#: ../data/Locations.xml.in.h:4776
 msgid "Istanbul"
 msgstr "Istanbul"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4740
+#: ../data/Locations.xml.in.h:4778
 msgid "Izmir"
 msgstr "Izmir"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4742
+#: ../data/Locations.xml.in.h:4780
 msgid "Kars"
 msgstr "Kars"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4744
+#: ../data/Locations.xml.in.h:4782
 msgid "Kayseri"
 msgstr "Kayseri"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4746
+#: ../data/Locations.xml.in.h:4784
 msgid "Kislakoy"
 msgstr "Kislakoy"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4748
+#: ../data/Locations.xml.in.h:4786
 msgid "Konya"
 msgstr "Konya"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4750
+#: ../data/Locations.xml.in.h:4788
 msgid "Malatya"
 msgstr "Malatya"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4752
+#: ../data/Locations.xml.in.h:4790
 msgid "Merzifon"
 msgstr "Merzifon"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4754
+#: ../data/Locations.xml.in.h:4792
 msgid "Nevsehir"
 msgstr "Nevsehir"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4756
+#: ../data/Locations.xml.in.h:4794
 msgid "Samsun"
 msgstr "Samsun"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4758
+#: ../data/Locations.xml.in.h:4796
 msgid "Tepetarla"
 msgstr "Tepetarla"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4760
+#: ../data/Locations.xml.in.h:4798
 msgid "Trabzon"
 msgstr "Trabzon"
 
 #. A city in Turkey
-#: ../data/Locations.xml.in.h:4762
+#: ../data/Locations.xml.in.h:4800
 msgid "Van"
 msgstr "Van"
 
 #. UA - Ukraine
-#: ../data/Locations.xml.in.h:4764
+#: ../data/Locations.xml.in.h:4802
 msgid "Ukraine"
 msgstr "Ukraina"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4766
+#: ../data/Locations.xml.in.h:4804
 msgid "Boryspil'"
 msgstr "Boryspil'"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4768
+#: ../data/Locations.xml.in.h:4806
 msgid "Chagor"
 msgstr "Chagor"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4770
+#: ../data/Locations.xml.in.h:4808
 msgid "Dnipropetrovs'k"
 msgstr "Dnipropetrovs'k"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4772
+#: ../data/Locations.xml.in.h:4810
 msgid "Donets'k"
 msgstr "Donets'k"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4774
+#: ../data/Locations.xml.in.h:4812
 msgid "Hostomel'"
 msgstr "Hostomel'"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4776
+#: ../data/Locations.xml.in.h:4814
 msgid "Ivano-Frankivs'k"
 msgstr "Ivano-Frankivs'k"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4778
+#: ../data/Locations.xml.in.h:4816
 msgid "Kharkiv"
 msgstr "Kharkiv"
 
@@ -10810,69 +10810,69 @@
 #. "Kiev" is the traditional English name.
 #. The local name in Ukrainian is "Kyyiv".
 #. 
-#: ../data/Locations.xml.in.h:4783
+#: ../data/Locations.xml.in.h:4821
 msgid "Kiev"
 msgstr "Kiev"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4785
+#: ../data/Locations.xml.in.h:4823
 msgid "Kryvyy Rih"
 msgstr "Kryvyy Rih"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4787
+#: ../data/Locations.xml.in.h:4825
 msgid "L'viv"
 msgstr "L'viv"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4789
+#: ../data/Locations.xml.in.h:4827
 msgid "Mokroye"
 msgstr "Mokroye"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4791
+#: ../data/Locations.xml.in.h:4829
 msgid "Mykolayiv"
 msgstr "Mykolayiv"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4793
+#: ../data/Locations.xml.in.h:4831
 msgid "Odesa"
 msgstr "Odessa"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4795
+#: ../data/Locations.xml.in.h:4833
 msgid "Rivne"
 msgstr "Rivne"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4797
+#: ../data/Locations.xml.in.h:4835
 msgid "Simferopol'"
 msgstr "Simferopol'"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4799
+#: ../data/Locations.xml.in.h:4837
 msgid "Telichka"
 msgstr "Telichka"
 
 #. A city in Ukraine
-#: ../data/Locations.xml.in.h:4801
+#: ../data/Locations.xml.in.h:4839
 msgid "Uzhhorod"
 msgstr "Uzhhorod"
 
 #. GB - United Kingdom
-#: ../data/Locations.xml.in.h:4803
+#: ../data/Locations.xml.in.h:4841
 msgid "United Kingdom"
 msgstr "Storbritannia"
 
 #. A state/province/territory in United Kingdom
-#: ../data/Locations.xml.in.h:4805
+#: ../data/Locations.xml.in.h:4843
 msgid "East and South East England"
 msgstr "Øst- og sydøst-england"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4809
+#: ../data/Locations.xml.in.h:4847
 msgctxt "City in East and South East England, United Kingdom"
 msgid "Benson"
 msgstr "Benson"
@@ -10880,21 +10880,21 @@
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4813
+#: ../data/Locations.xml.in.h:4851
 msgid "Biggin Hill"
 msgstr "Biggin Hill"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4817
+#: ../data/Locations.xml.in.h:4855
 msgid "Brize Norton"
 msgstr "Brize Norton"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4821
+#: ../data/Locations.xml.in.h:4859
 msgctxt "City in East and South East England, United Kingdom"
 msgid "Cambridge"
 msgstr "Cambridge"
@@ -10902,19 +10902,19 @@
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4825
+#: ../data/Locations.xml.in.h:4863
 msgid "Farnborough"
 msgstr "Farnborough"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4829
+#: ../data/Locations.xml.in.h:4867
 msgid "Lakenheath"
 msgstr "Lakenheath"
 
 #. The capital of the United Kingdom
-#: ../data/Locations.xml.in.h:4831
+#: ../data/Locations.xml.in.h:4869
 msgctxt "City in East and South East England, United Kingdom"
 msgid "London"
 msgstr "London"
@@ -10922,77 +10922,77 @@
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4835
+#: ../data/Locations.xml.in.h:4873
 msgid "Luton"
 msgstr "Luton"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4839
+#: ../data/Locations.xml.in.h:4877
 msgid "Lydd"
 msgstr "Lydd"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4843
+#: ../data/Locations.xml.in.h:4881
 msgid "Manston"
 msgstr "Manston"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4847
+#: ../data/Locations.xml.in.h:4885
 msgid "Marham"
 msgstr "Marham"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4851
+#: ../data/Locations.xml.in.h:4889
 msgid "Mildenhall"
 msgstr "Mildenhall"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4855
+#: ../data/Locations.xml.in.h:4893
 msgid "Northolt"
 msgstr "Northolt"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4859
+#: ../data/Locations.xml.in.h:4897
 msgid "Norwich"
 msgstr "Norwich"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4863
+#: ../data/Locations.xml.in.h:4901
 msgid "Odiham"
 msgstr "Odiham"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4867
+#: ../data/Locations.xml.in.h:4905
 msgid "Shoreham-by-Sea"
 msgstr "Shoreham-by-Sea"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4871
+#: ../data/Locations.xml.in.h:4909
 msgid "Southampton"
 msgstr "Southampton"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4875
+#: ../data/Locations.xml.in.h:4913
 msgctxt "City in East and South East England, United Kingdom"
 msgid "Southend"
 msgstr "Southend"
@@ -11000,357 +11000,357 @@
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4879
+#: ../data/Locations.xml.in.h:4917
 msgid "Stansted Mountfitchet"
 msgstr "Stansted Mountfitchet"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4883
+#: ../data/Locations.xml.in.h:4921
 msgid "Wainfleet"
 msgstr "Wainfleet"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4887
+#: ../data/Locations.xml.in.h:4925
 msgid "Wattisham"
 msgstr "Wattisham"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4891
+#: ../data/Locations.xml.in.h:4929
 msgid "Wittering"
 msgstr "Wittering"
 
 #. A city in the United Kingdom
-#: ../data/Locations.xml.in.h:4893
+#: ../data/Locations.xml.in.h:4931
 msgid "Fairford"
 msgstr "Fairford"
 
 #. A state/province/territory in United Kingdom
-#: ../data/Locations.xml.in.h:4895
+#: ../data/Locations.xml.in.h:4933
 msgid "Midlands"
 msgstr "Midlands"
 
 #. A city in Midlands in the United Kingdom
-#: ../data/Locations.xml.in.h:4897
+#: ../data/Locations.xml.in.h:4935
 msgctxt "City in Midlands, United Kingdom"
 msgid "Birmingham"
 msgstr "Birmingham"
 
 #. A city in Midlands in the United Kingdom
-#: ../data/Locations.xml.in.h:4899
+#: ../data/Locations.xml.in.h:4937
 msgid "Castle Donington"
 msgstr "Castle Donington"
 
 #. A city in Midlands in the United Kingdom
-#: ../data/Locations.xml.in.h:4901
+#: ../data/Locations.xml.in.h:4939
 msgid "Cottesmore"
 msgstr "Cottesmore"
 
 #. A city in Midlands in the United Kingdom
-#: ../data/Locations.xml.in.h:4903
+#: ../data/Locations.xml.in.h:4941
 msgid "Coventry"
 msgstr "Coventry"
 
 #. A city in Midlands in the United Kingdom
-#: ../data/Locations.xml.in.h:4905
+#: ../data/Locations.xml.in.h:4943
 msgid "Cranfield"
 msgstr "Cranfield"
 
 #. A state/province/territory in United Kingdom
-#: ../data/Locations.xml.in.h:4907
+#: ../data/Locations.xml.in.h:4945
 msgid "North East England"
 msgstr "Nordøst england"
 
 #. A city in North East England in the United Kingdom
-#: ../data/Locations.xml.in.h:4909
+#: ../data/Locations.xml.in.h:4947
 msgid "Coningsby"
 msgstr "Coningsby"
 
 #. A city in North East England in the United Kingdom
-#: ../data/Locations.xml.in.h:4911
+#: ../data/Locations.xml.in.h:4949
 msgid "Cranwell"
 msgstr "Cranwell"
 
 #. A city in North East England in the United Kingdom
-#: ../data/Locations.xml.in.h:4913
+#: ../data/Locations.xml.in.h:4951
 msgid "Dishforth"
 msgstr "Dishforth"
 
 #. A city in North East England in the United Kingdom
-#: ../data/Locations.xml.in.h:4915
+#: ../data/Locations.xml.in.h:4953
 msgctxt "City in North East England, United Kingdom"
 msgid "Newcastle"
 msgstr "Newcastle"
 
 #. A city in North East England in the United Kingdom
-#: ../data/Locations.xml.in.h:4917
+#: ../data/Locations.xml.in.h:4955
 msgctxt "City in North East England, United Kingdom"
 msgid "Stockton"
 msgstr "Stockton"
 
 #. A city in North East England in the United Kingdom
-#: ../data/Locations.xml.in.h:4919
+#: ../data/Locations.xml.in.h:4957
 msgid "Topcliffe"
 msgstr "Topcliffe"
 
 #. A city in North East England in the United Kingdom
-#: ../data/Locations.xml.in.h:4921
+#: ../data/Locations.xml.in.h:4959
 msgid "Waddington"
 msgstr "Waddington"
 
 #. A state/province/territory in United Kingdom
-#: ../data/Locations.xml.in.h:4923
+#: ../data/Locations.xml.in.h:4961
 msgid "North West England"
 msgstr "Nordvest-England"
 
 #. A city in North West England in the United Kingdom
-#: ../data/Locations.xml.in.h:4925
+#: ../data/Locations.xml.in.h:4963
 msgid "Blackpool"
 msgstr "Blackpool"
 
 #. A city in North West England in the United Kingdom
-#: ../data/Locations.xml.in.h:4927
+#: ../data/Locations.xml.in.h:4965
 msgid "Carlisle"
 msgstr "Carlisle"
 
 #. A city in North West England in the United Kingdom
-#: ../data/Locations.xml.in.h:4929
+#: ../data/Locations.xml.in.h:4967
 msgid "Church Fenton"
 msgstr "Church Fenton"
 
 #. A city in North West England in the United Kingdom
-#: ../data/Locations.xml.in.h:4931
+#: ../data/Locations.xml.in.h:4969
 msgid "Kirmington"
 msgstr "Kirmington"
 
 #. A city in North West England in the United Kingdom
-#: ../data/Locations.xml.in.h:4933
+#: ../data/Locations.xml.in.h:4971
 msgid "Leeds"
 msgstr "Leeds"
 
 #. A city in North West England in the United Kingdom
-#: ../data/Locations.xml.in.h:4935
+#: ../data/Locations.xml.in.h:4973
 msgid "Leeming Bar"
 msgstr "Leeming Bar"
 
 #. A city in North West England in the United Kingdom
-#: ../data/Locations.xml.in.h:4937
+#: ../data/Locations.xml.in.h:4975
 msgid "Linton upon Ouse"
 msgstr "Linton upon Ouse"
 
 #. A city in North West England in the United Kingdom
-#: ../data/Locations.xml.in.h:4939
+#: ../data/Locations.xml.in.h:4977
 msgctxt "City in North West England, United Kingdom"
 msgid "Liverpool"
 msgstr "Liverpool"
 
 #. A city in North West England in the United Kingdom
-#: ../data/Locations.xml.in.h:4941
+#: ../data/Locations.xml.in.h:4979
 msgctxt "City in North West England, United Kingdom"
 msgid "Manchester"
 msgstr "Manchester"
 
 #. A city in North West England in the United Kingdom
-#: ../data/Locations.xml.in.h:4943
+#: ../data/Locations.xml.in.h:4981
 msgid "Shawbury"
 msgstr "Shawbury"
 
 #. A state/province/territory in United Kingdom
-#: ../data/Locations.xml.in.h:4945
+#: ../data/Locations.xml.in.h:4983
 msgid "Northern Ireland"
 msgstr "Nord-Irland"
 
 #. A city in Northern Ireland in the United Kingdom
-#: ../data/Locations.xml.in.h:4947
+#: ../data/Locations.xml.in.h:4985
 msgid "Belfast"
 msgstr "Belfast"
 
 #. A city in Northern Ireland in the United Kingdom
-#: ../data/Locations.xml.in.h:4949
+#: ../data/Locations.xml.in.h:4987
 msgid "Eglinton"
 msgstr "Eglinton"
 
 #. A state/province/territory in United Kingdom
-#: ../data/Locations.xml.in.h:4951
+#: ../data/Locations.xml.in.h:4989
 msgid "Scotland"
 msgstr "Skottland"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4953
+#: ../data/Locations.xml.in.h:4991
 msgctxt "City in Scotland, United Kingdom"
 msgid "Aberdeen"
 msgstr "Aberdeen"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4955
+#: ../data/Locations.xml.in.h:4993
 msgid "Campbeltown"
 msgstr "Campbeltown"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4957
+#: ../data/Locations.xml.in.h:4995
 msgid "Dundee"
 msgstr "Dundee"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4959
+#: ../data/Locations.xml.in.h:4997
 msgid "Edinburgh"
 msgstr "Edinburgh"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4961
+#: ../data/Locations.xml.in.h:4999
 msgctxt "City in Scotland, United Kingdom"
 msgid "Glasgow"
 msgstr "Glasgow"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4963
+#: ../data/Locations.xml.in.h:5001
 msgid "Gramisdale"
 msgstr "Gramisdale"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4965
+#: ../data/Locations.xml.in.h:5003
 msgid "Inverness"
 msgstr "Inverness"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4967
+#: ../data/Locations.xml.in.h:5005
 msgid "Kilmoluag"
 msgstr "Kilmoluag"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4969
+#: ../data/Locations.xml.in.h:5007
 msgid "Kinloss"
 msgstr "Kinloss"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4971
+#: ../data/Locations.xml.in.h:5009
 msgid "Kintra"
 msgstr "Kintra"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4973
+#: ../data/Locations.xml.in.h:5011
 msgid "Kirkwall"
 msgstr "Kirkwall"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4975
+#: ../data/Locations.xml.in.h:5013
 msgid "Leuchars"
 msgstr "Leuchars"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4977
+#: ../data/Locations.xml.in.h:5015
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4979
+#: ../data/Locations.xml.in.h:5017
 msgid "Mossbank"
 msgstr "Mossbank"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4981
+#: ../data/Locations.xml.in.h:5019
 msgid "Prestwick"
 msgstr "Prestwick"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4983
+#: ../data/Locations.xml.in.h:5021
 msgid "Stornoway"
 msgstr "Stornoway"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4985
+#: ../data/Locations.xml.in.h:5023
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
 #. A city in Scotland in the United Kingdom
-#: ../data/Locations.xml.in.h:4987
+#: ../data/Locations.xml.in.h:5025
 msgid "Wick"
 msgstr "Wick"
 
 #. A state/province/territory in United Kingdom
-#: ../data/Locations.xml.in.h:4989
+#: ../data/Locations.xml.in.h:5027
 msgid "South and South West England"
 msgstr "Syd- og sydvest-england"
 
 #. A city in South and South West England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4993
+#: ../data/Locations.xml.in.h:5031
 msgid "Boscombe"
 msgstr "Boscombe"
 
 #. A city in South and South West England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:4997
+#: ../data/Locations.xml.in.h:5035
 msgid "Bournemouth"
 msgstr "Bournemouth"
 
 #. A city in South and South West England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:5001
+#: ../data/Locations.xml.in.h:5039
 msgid "Bristol"
 msgstr "Bristol"
 
 #. A city in South and South West England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:5005
+#: ../data/Locations.xml.in.h:5043
 msgid "Butes"
 msgstr "Butes"
 
 #. A city in South and South West England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:5009
+#: ../data/Locations.xml.in.h:5047
 msgid "Exeter"
 msgstr "Exeter"
 
 #. A city in South and South West England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:5013
+#: ../data/Locations.xml.in.h:5051
 msgid "Filton"
 msgstr "Filton"
 
 #. A city in South and South West England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:5017
+#: ../data/Locations.xml.in.h:5055
 msgid "Helston"
 msgstr "Helston"
 
 #. A city in South and South West England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:5021
+#: ../data/Locations.xml.in.h:5059
 msgid "Hugh Town"
 msgstr "Hugh Town"
 
 #. A city in South and South West England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:5025
+#: ../data/Locations.xml.in.h:5063
 msgid "Lyneham"
 msgstr "Lyneham"
 
 #. A city in South and South West England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:5029
+#: ../data/Locations.xml.in.h:5067
 msgid "Middle Wallop"
 msgstr "Middle Wallop"
 
 #. A city in South and South West England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:5033
+#: ../data/Locations.xml.in.h:5071
 msgctxt "City in South and South West England, United Kingdom"
 msgid "Plymouth"
 msgstr "Plymouth"
@@ -11358,80 +11358,80 @@
 #. A city in South and South West England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:5037
+#: ../data/Locations.xml.in.h:5075
 msgid "Staverton"
 msgstr "Staverton"
 
 #. A city in South and South West England in the United
 #. Kingdom
 #. 
-#: ../data/Locations.xml.in.h:5041
+#: ../data/Locations.xml.in.h:5079
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
 #. A state/province/territory in United Kingdom
-#: ../data/Locations.xml.in.h:5043
+#: ../data/Locations.xml.in.h:5081
 msgid "Wales"
 msgstr "Wales"
 
 #. A city in Wales in the United Kingdom.
 #. The local name in Welsh is "Caerdydd".
 #. 
-#: ../data/Locations.xml.in.h:5047
+#: ../data/Locations.xml.in.h:5085
 msgctxt "City in Wales, United Kingdom"
 msgid "Cardiff"
 msgstr "Cardiff"
 
 #. A city in Wales in the United Kingdom
-#: ../data/Locations.xml.in.h:5049
+#: ../data/Locations.xml.in.h:5087
 msgid "Hawarden"
 msgstr "Hawarden"
 
 #. A city in Wales in the United Kingdom
-#: ../data/Locations.xml.in.h:5051
+#: ../data/Locations.xml.in.h:5089
 msgid "Pembrey"
 msgstr "Pembrey"
 
 #. A city in Wales in the United Kingdom
-#: ../data/Locations.xml.in.h:5053
+#: ../data/Locations.xml.in.h:5091
 msgid "Saint Athan"
 msgstr "Saint Athan"
 
 #. A city in Wales in the United Kingdom
-#: ../data/Locations.xml.in.h:5055
+#: ../data/Locations.xml.in.h:5093
 msgid "Valley"
 msgstr "Valley"
 
 #. VA - Holy See (Vatican City State)
-#: ../data/Locations.xml.in.h:5057
+#: ../data/Locations.xml.in.h:5095
 msgid "Vatican City"
 msgstr "Vatikanet"
 
 #. AX - Åland Islands, an autonomous province of Finland
-#: ../data/Locations.xml.in.h:5059
+#: ../data/Locations.xml.in.h:5097
 msgid "Åland Islands"
 msgstr "Åland-øyene"
 
 #. A city in the Åland Islands.
 #. The local name in Finnish is "Maarianhamina".
 #. 
-#: ../data/Locations.xml.in.h:5063
+#: ../data/Locations.xml.in.h:5101
 msgid "Mariehamn"
 msgstr "Mariehamn"
 
-#: ../data/Locations.xml.in.h:5064
+#: ../data/Locations.xml.in.h:5102
 msgid "Middle East"
 msgstr "Midtøsten"
 
 #. BH - Bahrain
-#: ../data/Locations.xml.in.h:5066
+#: ../data/Locations.xml.in.h:5104
 msgid "Bahrain"
 msgstr "Bahrain"
 
 #. A city in Bahrain.
 #. The name is also written "الحد".
 #. 
-#: ../data/Locations.xml.in.h:5070
+#: ../data/Locations.xml.in.h:5108
 msgid "Al Hadd"
 msgstr "Al Hadd"
 
@@ -11439,376 +11439,376 @@
 #. "Manama" is the traditional English name.
 #. The local name in Arabic is "Al Manamah / المنامة".
 #. 
-#: ../data/Locations.xml.in.h:5075
+#: ../data/Locations.xml.in.h:5113
 msgid "Manama"
 msgstr "Manama"
 
 #. IR - Islamic Republic of Iran
-#: ../data/Locations.xml.in.h:5077
+#: ../data/Locations.xml.in.h:5115
 msgid "Iran"
 msgstr "Iran"
 
 #. A city in Iran.
 #. The name is also written "آبادان".
 #. 
-#: ../data/Locations.xml.in.h:5081
+#: ../data/Locations.xml.in.h:5119
 msgid "Abadan"
 msgstr "Abadan"
 
 #. A city in Iran
-#: ../data/Locations.xml.in.h:5083
+#: ../data/Locations.xml.in.h:5121
 msgid "Abadeh"
 msgstr "Abadeh"
 
 #. A city in Iran
-#: ../data/Locations.xml.in.h:5085
+#: ../data/Locations.xml.in.h:5123
 msgid "Abū Mūsā"
 msgstr "Abū Mūsā"
 
 #. A city in Iran.
 #. The name is also written "آغاجاری".
 #. 
-#: ../data/Locations.xml.in.h:5089
+#: ../data/Locations.xml.in.h:5127
 msgid "Aghajari"
 msgstr "Aghajari"
 
 #. A city in Iran.
 #. The name is also written "اهواز".
 #. 
-#: ../data/Locations.xml.in.h:5093
+#: ../data/Locations.xml.in.h:5131
 msgid "Ahvaz"
 msgstr "Ahvaz"
 
 #. A city in Iran.
 #. The name is also written "اردبيل".
 #. 
-#: ../data/Locations.xml.in.h:5097
+#: ../data/Locations.xml.in.h:5135
 msgid "Ardabil"
 msgstr "Ardabil"
 
 #. A city in Iran.
 #. The name is also written "بندر عباس".
 #. 
-#: ../data/Locations.xml.in.h:5101
+#: ../data/Locations.xml.in.h:5139
 msgid "Bandar 'Abbas"
 msgstr "Bandar 'Abbas"
 
 #. A city in Iran.
 #. The name is also written "بندر بوشهر".
 #. 
-#: ../data/Locations.xml.in.h:5105
+#: ../data/Locations.xml.in.h:5143
 msgid "Bandar-e Bushehr"
 msgstr "Bandar-e Bushehr"
 
 #. A city in Iran.
 #. The name is also written "بندر لنگه".
 #. 
-#: ../data/Locations.xml.in.h:5109
+#: ../data/Locations.xml.in.h:5147
 msgid "Bandar-e Lengeh"
 msgstr "Bandar-e Lengeh"
 
 #. A city in Iran.
 #. The name is also written "بندر ماهشهر".
 #. 
-#: ../data/Locations.xml.in.h:5113
+#: ../data/Locations.xml.in.h:5151
 msgid "Bandar-e Mahshahr"
 msgstr "Bandar-e Mahshahr"
 
 #. A city in Iran
-#: ../data/Locations.xml.in.h:5115
+#: ../data/Locations.xml.in.h:5153
 msgid "Birjand"
 msgstr "Birjand"
 
 #. A city in Iran.
 #. The name is also written "چاه بهار".
 #. 
-#: ../data/Locations.xml.in.h:5119
+#: ../data/Locations.xml.in.h:5157
 msgid "Chah Bahar"
 msgstr "Chah Bahar"
 
 #. A city in Iran.
 #. The name is also written "ديرستان".
 #. 
-#: ../data/Locations.xml.in.h:5123
+#: ../data/Locations.xml.in.h:5161
 msgid "Dayrestan"
 msgstr "Dayrestan"
 
 #. A city in Iran.
 #. The name is also written "دو گنبدان".
 #. 
-#: ../data/Locations.xml.in.h:5127
+#: ../data/Locations.xml.in.h:5165
 msgid "Do Gonbadan"
 msgstr "Do Gonbadan"
 
 #. A city in Iran
-#: ../data/Locations.xml.in.h:5129
+#: ../data/Locations.xml.in.h:5167
 msgid "Esfahan"
 msgstr "Esfahan"
 
 #. A city in Iran.
 #. The name is also written "فسا".
 #. 
-#: ../data/Locations.xml.in.h:5133
+#: ../data/Locations.xml.in.h:5171
 msgid "Fasa"
 msgstr "Fasa"
 
 #. A city in Iran.
 #. The name is also written "گرگان".
 #. 
-#: ../data/Locations.xml.in.h:5137
+#: ../data/Locations.xml.in.h:5175
 msgid "Gorgan"
 msgstr "Gorgan"
 
 #. A city in Iran.
 #. The name is also written "گوشه شاهزاده قاسم".
 #. 
-#: ../data/Locations.xml.in.h:5141
+#: ../data/Locations.xml.in.h:5179
 msgid "Gusheh Shahzadeh Qasem"
 msgstr "Gusheh Shahzadeh Qasem"
 
 #. A city in Iran.
 #. The name is also written "همدان".
 #. 
-#: ../data/Locations.xml.in.h:5145
+#: ../data/Locations.xml.in.h:5183
 msgid "Hamadan"
 msgstr "Hamadan"
 
 #. A city in Iran.
 #. The name is also written "يلام".
 #. 
-#: ../data/Locations.xml.in.h:5149
+#: ../data/Locations.xml.in.h:5187
 msgid "Ilam"
 msgstr "Ilam"
 
 #. A city in Iran
-#: ../data/Locations.xml.in.h:5151
+#: ../data/Locations.xml.in.h:5189
 msgid "Iranshahr"
 msgstr "Iranshahr"
 
 #. A city in Iran.
 #. The name is also written "كرج".
 #. 
-#: ../data/Locations.xml.in.h:5155
+#: ../data/Locations.xml.in.h:5193
 msgid "Karaj"
 msgstr "Karaj"
 
 #. A city in Iran
-#: ../data/Locations.xml.in.h:5157
+#: ../data/Locations.xml.in.h:5195
 msgid "Kashan"
 msgstr "Kashan"
 
 #. A city in Iran
-#: ../data/Locations.xml.in.h:5159
+#: ../data/Locations.xml.in.h:5197
 msgid "Kerman"
 msgstr "Kerman"
 
 #. A city in Iran
-#: ../data/Locations.xml.in.h:5161
+#: ../data/Locations.xml.in.h:5199
 msgid "Kermanshah"
 msgstr "Kermanshah"
 
 #. A city in Iran.
 #. The name is also written "خرم آباد".
 #. 
-#: ../data/Locations.xml.in.h:5165
+#: ../data/Locations.xml.in.h:5203
 msgid "Khorramabad"
 msgstr "Khorramabad"
 
 #. A city in Iran.
 #. The name is also written "كيش".
 #. 
-#: ../data/Locations.xml.in.h:5169
+#: ../data/Locations.xml.in.h:5207
 msgid "Kish"
 msgstr "Kish"
 
 #. A city in Iran
-#: ../data/Locations.xml.in.h:5171
+#: ../data/Locations.xml.in.h:5209
 msgid "Lar"
 msgstr "Lar"
 
 #. A city in Iran.
 #. The name is also written "مشهد".
 #. 
-#: ../data/Locations.xml.in.h:5175
+#: ../data/Locations.xml.in.h:5213
 msgid "Mashhad"
 msgstr "Mashhad"
 
 #. A city in Iran.
 #. The name is also written "مسجد سلیمان".
 #. 
-#: ../data/Locations.xml.in.h:5179
+#: ../data/Locations.xml.in.h:5217
 msgid "Masjed Soleyman"
 msgstr "Masjed Soleyman"
 
 #. A city in Iran.
 #. The name is also written "نو شهر".
 #. 
-#: ../data/Locations.xml.in.h:5183
+#: ../data/Locations.xml.in.h:5221
 msgid "Now Shahr"
 msgstr "Now Shahr"
 
 #. A city in Iran.
 #. The name is also written "ارومیه".
 #. 
-#: ../data/Locations.xml.in.h:5187
+#: ../data/Locations.xml.in.h:5225
 msgid "Orumiyeh"
 msgstr "Orumiyeh"
 
 #. A city in Iran.
 #. The name is also written "قزوین".
 #. 
-#: ../data/Locations.xml.in.h:5191
+#: ../data/Locations.xml.in.h:5229
 msgid "Qazvin"
 msgstr "Qazvin"
 
 #. A city in Iran
-#: ../data/Locations.xml.in.h:5193
+#: ../data/Locations.xml.in.h:5231
 msgid "Rasht"
 msgstr "Rasht"
 
 #. A city in Iran
-#: ../data/Locations.xml.in.h:5195
+#: ../data/Locations.xml.in.h:5233
 msgid "Sabzevar"
 msgstr "Sabzevar"
 
 #. A city in Iran.
 #. The name is also written "سخت سر".
 #. 
-#: ../data/Locations.xml.in.h:5199
+#: ../data/Locations.xml.in.h:5237
 msgid "Sakht Sar"
 msgstr "Sakht Sar"
 
 #. A city in Iran
-#: ../data/Locations.xml.in.h:5201
+#: ../data/Locations.xml.in.h:5239
 msgid "Sanandaj"
 msgstr "Sanandaj"
 
 #. A city in Iran
-#: ../data/Locations.xml.in.h:5203
+#: ../data/Locations.xml.in.h:5241
 msgid "Sarakhs"
 msgstr "Sarakhs"
 
 #. A city in Iran.
 #. The name is also written "سمنان".
 #. 
-#: ../data/Locations.xml.in.h:5207
+#: ../data/Locations.xml.in.h:5245
 msgid "Semnan"
 msgstr "Semnan"
 
 #. A city in Iran.
 #. The name is also written "شهر بالا".
 #. 
-#: ../data/Locations.xml.in.h:5211
+#: ../data/Locations.xml.in.h:5249
 msgid "Shahr-e Bala"
 msgstr "Shahr-e Bala"
 
 #. A city in Iran.
 #. The name is also written "شهر كرد".
 #. 
-#: ../data/Locations.xml.in.h:5215
+#: ../data/Locations.xml.in.h:5253
 msgid "Shahr-e Kord"
 msgstr "Shahr-e Kord"
 
 #. A city in Iran.
 #. The name is also written "شیراز".
 #. 
-#: ../data/Locations.xml.in.h:5219
+#: ../data/Locations.xml.in.h:5257
 msgid "Shiraz"
 msgstr "Shiraz"
 
 #. A city in Iran
-#: ../data/Locations.xml.in.h:5221
+#: ../data/Locations.xml.in.h:5259
 msgid "Tabas"
 msgstr "Tabas"
 
 #. A city in Iran.
 #. The name is also written "تبريز".
 #. 
-#: ../data/Locations.xml.in.h:5225
+#: ../data/Locations.xml.in.h:5263
 msgid "Tabriz"
 msgstr "Tabriz"
 
 #. The capital of Iran.
 #. The name is also written "تهران".
 #. 
-#: ../data/Locations.xml.in.h:5229
+#: ../data/Locations.xml.in.h:5267
 msgid "Tehran"
 msgstr "Teheran"
 
 #. A city in Iran.
 #. The name is also written "يزد".
 #. 
-#: ../data/Locations.xml.in.h:5233
+#: ../data/Locations.xml.in.h:5271
 msgid "Yazd"
 msgstr "Yazd"
 
 #. A city in Iran.
 #. The name is also written "زابل".
 #. 
-#: ../data/Locations.xml.in.h:5237
+#: ../data/Locations.xml.in.h:5275
 msgid "Zabol"
 msgstr "Zabol"
 
 #. A city in Iran.
 #. The name is also written "زاهدان (کي)".
 #. 
-#: ../data/Locations.xml.in.h:5241
+#: ../data/Locations.xml.in.h:5279
 msgid "Zahedan-e (Yek)"
 msgstr "Zahedan-e (Yek)"
 
 #. IQ - Iraq
-#: ../data/Locations.xml.in.h:5243
+#: ../data/Locations.xml.in.h:5281
 msgid "Iraq"
 msgstr "Irak"
 
 #. IL - Israel
-#: ../data/Locations.xml.in.h:5245
+#: ../data/Locations.xml.in.h:5283
 msgid "Israel"
 msgstr "Israel"
 
 #. A city in Israel
-#: ../data/Locations.xml.in.h:5247
+#: ../data/Locations.xml.in.h:5285
 msgid "Elat"
 msgstr "Elat"
 
 #. A city in Israel
-#: ../data/Locations.xml.in.h:5249
+#: ../data/Locations.xml.in.h:5287
 msgid "Mahanayim"
 msgstr "Mahanayim"
 
 #. A city in Israel
-#: ../data/Locations.xml.in.h:5251
+#: ../data/Locations.xml.in.h:5289
 msgid "Mahane Yisra'el"
 msgstr "Mahane Yisra'el"
 
 #. A city in Israel
-#: ../data/Locations.xml.in.h:5253
+#: ../data/Locations.xml.in.h:5291
 msgid "Ramot Remez"
 msgstr "Ramot Remez"
 
 #. A city in Israel
-#: ../data/Locations.xml.in.h:5255
+#: ../data/Locations.xml.in.h:5293
 msgid "Shizzafon"
 msgstr "Shizzafon"
 
 #. A city in Israel
-#: ../data/Locations.xml.in.h:5257
+#: ../data/Locations.xml.in.h:5295
 msgid "Tel Aviv"
 msgstr "Tel Aviv"
 
 #. JO - Jordan
-#: ../data/Locations.xml.in.h:5259
+#: ../data/Locations.xml.in.h:5297
 msgctxt "Country"
 msgid "Jordan"
 msgstr "Jordan"
 
 #. A city in Jordan
-#: ../data/Locations.xml.in.h:5261
+#: ../data/Locations.xml.in.h:5299
 msgid "Al 'Aqabah"
 msgstr "Al 'Aqabah"
 
 #. A city in Jordan
-#: ../data/Locations.xml.in.h:5263
+#: ../data/Locations.xml.in.h:5301
 msgid "Al Jizah"
 msgstr "Al Jizah"
 
@@ -11816,12 +11816,12 @@
 #. "Amman" is the traditional English name.
 #. The local name in Arabic is "'Amman".
 #. 
-#: ../data/Locations.xml.in.h:5268
+#: ../data/Locations.xml.in.h:5306
 msgid "Amman"
 msgstr "Amman"
 
 #. KW - Kuwait
-#: ../data/Locations.xml.in.h:5270
+#: ../data/Locations.xml.in.h:5308
 msgctxt "Country"
 msgid "Kuwait"
 msgstr "Kuwait"
@@ -11830,13 +11830,13 @@
 #. "Kuwait" is the traditional English name.
 #. The local name in Arabic is "Al Kuwayt / الكويت".
 #. 
-#: ../data/Locations.xml.in.h:5275
+#: ../data/Locations.xml.in.h:5313
 msgctxt "City in Kuwait"
 msgid "Kuwait"
 msgstr "Kuwait"
 
 #. LB - Lebanon
-#: ../data/Locations.xml.in.h:5277
+#: ../data/Locations.xml.in.h:5315
 msgctxt "Country"
 msgid "Lebanon"
 msgstr "Libanon"
@@ -11845,17 +11845,17 @@
 #. "Beirut" is the traditional English name.
 #. The local name is "Beyrouth".
 #. 
-#: ../data/Locations.xml.in.h:5282
+#: ../data/Locations.xml.in.h:5320
 msgid "Beirut"
 msgstr "Beirut"
 
 #. OM - Oman
-#: ../data/Locations.xml.in.h:5284
+#: ../data/Locations.xml.in.h:5322
 msgid "Oman"
 msgstr "Oman"
 
 #. A city in Oman
-#: ../data/Locations.xml.in.h:5286
+#: ../data/Locations.xml.in.h:5324
 msgid "Mu'askar al Murtafi'ah"
 msgstr "Mu'askar al Murtafi'ah"
 
@@ -11863,22 +11863,22 @@
 #. "Muscat" is the traditional English name.
 #. The local name in Arabic is "Masqat".
 #. 
-#: ../data/Locations.xml.in.h:5291
+#: ../data/Locations.xml.in.h:5329
 msgid "Muscat"
 msgstr "Muscat"
 
 #. A city in Oman
-#: ../data/Locations.xml.in.h:5293
+#: ../data/Locations.xml.in.h:5331
 msgid "Salalah"
 msgstr "Salalah"
 
 #. PS - Occupied Palestinian Territory
-#: ../data/Locations.xml.in.h:5295
+#: ../data/Locations.xml.in.h:5333
 msgid "Palestinian Territory"
 msgstr "Palestinske territorier"
 
 #. QA - Qatar
-#: ../data/Locations.xml.in.h:5297
+#: ../data/Locations.xml.in.h:5335
 msgid "Qatar"
 msgstr "Qatar"
 
@@ -11886,67 +11886,67 @@
 #. "Doha" is the traditional English name.
 #. The local name in Arabic is "Ad Dawhah / الدوحة".
 #. 
-#: ../data/Locations.xml.in.h:5302
+#: ../data/Locations.xml.in.h:5340
 msgid "Doha"
 msgstr "Qatar"
 
 #. SA - Saudi Arabia
-#: ../data/Locations.xml.in.h:5304
+#: ../data/Locations.xml.in.h:5342
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5306
+#: ../data/Locations.xml.in.h:5344
 msgid "'Ar'ar"
 msgstr "'Ar'ar"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5308
+#: ../data/Locations.xml.in.h:5346
 msgid "Abha"
 msgstr "Abha"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5310
+#: ../data/Locations.xml.in.h:5348
 msgid "Ad Dalfa'ah"
 msgstr "Ad Dalfa'ah"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5312
+#: ../data/Locations.xml.in.h:5350
 msgid "Ad Dammam"
 msgstr "Ad Dammam"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5314
+#: ../data/Locations.xml.in.h:5352
 msgid "Al 'Aqiq"
 msgstr "Al 'Aqiq"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5316
+#: ../data/Locations.xml.in.h:5354
 msgid "Al Qaysumah"
 msgstr "Al Qaysumah"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5318
+#: ../data/Locations.xml.in.h:5356
 msgid "Al Qurayyat"
 msgstr "Al Qurayyat"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5320
+#: ../data/Locations.xml.in.h:5358
 msgid "Al Wajh"
 msgstr "Al Wajh"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5322
+#: ../data/Locations.xml.in.h:5360
 msgid "Al Wuday'ah"
 msgstr "Al Wuday'ah"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5324
+#: ../data/Locations.xml.in.h:5362
 msgid "Ar Ruqayyiqah"
 msgstr "Ar Ruqayyiqah"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5326
+#: ../data/Locations.xml.in.h:5364
 msgid "At Ta'if"
 msgstr "At Ta'if"
 
@@ -11954,32 +11954,32 @@
 #. "Dhahran" is the traditional English name.
 #. The local name in Arabic is "Az Zahran".
 #. 
-#: ../data/Locations.xml.in.h:5331
+#: ../data/Locations.xml.in.h:5369
 msgid "Dhahran"
 msgstr "Dhahran"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5333
+#: ../data/Locations.xml.in.h:5371
 msgid "Ha'il"
 msgstr "Ha'il"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5335
+#: ../data/Locations.xml.in.h:5373
 msgid "Jiddah"
 msgstr "Jiddah"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5337
+#: ../data/Locations.xml.in.h:5375
 msgid "Jizan"
 msgstr "Jizan"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5339
+#: ../data/Locations.xml.in.h:5377
 msgid "Khamis Mushayt"
 msgstr "Khamis Mushayt"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5341
+#: ../data/Locations.xml.in.h:5379
 msgid "Masjid Ibn Rashid"
 msgstr "Masjid Ibn Rashid"
 
@@ -11987,7 +11987,7 @@
 #. "Mecca" is the traditional English name.
 #. The local name in Arabic is "Makkah".
 #. 
-#: ../data/Locations.xml.in.h:5346
+#: ../data/Locations.xml.in.h:5384
 msgid "Mecca"
 msgstr "Mekka"
 
@@ -11995,27 +11995,27 @@
 #. "Medina" is the traditional English name.
 #. The local name in Arabic is "Al Madinah al Munawwarah".
 #. 
-#: ../data/Locations.xml.in.h:5351
+#: ../data/Locations.xml.in.h:5389
 msgid "Medina"
 msgstr "Medina"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5353
+#: ../data/Locations.xml.in.h:5391
 msgid "Najran"
 msgstr "Najran"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5355
+#: ../data/Locations.xml.in.h:5393
 msgid "Qal'at Bishah"
 msgstr "Qal'at Bishah"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5357
+#: ../data/Locations.xml.in.h:5395
 msgid "Qara"
 msgstr "Qara"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5359
+#: ../data/Locations.xml.in.h:5397
 msgid "Rafha"
 msgstr "Rafha"
 
@@ -12023,37 +12023,37 @@
 #. "Riyadh" is the traditional English name.
 #. The local name in Arabic is "Ar Riyad".
 #. 
-#: ../data/Locations.xml.in.h:5364
+#: ../data/Locations.xml.in.h:5402
 msgid "Riyadh"
 msgstr "Riyadh"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5366
+#: ../data/Locations.xml.in.h:5404
 msgid "Tabuk"
 msgstr "Tabuk"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5368
+#: ../data/Locations.xml.in.h:5406
 msgid "Tamrah"
 msgstr "Tamrah"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5370
+#: ../data/Locations.xml.in.h:5408
 msgid "Turayf"
 msgstr "Turayf"
 
 #. A city in Saudi Arabia
-#: ../data/Locations.xml.in.h:5372
+#: ../data/Locations.xml.in.h:5410
 msgid "Yanbu' al Bahr"
 msgstr "Yanbu' al Bahr"
 
 #. SY - Syrian Arab Republic
-#: ../data/Locations.xml.in.h:5374
+#: ../data/Locations.xml.in.h:5412
 msgid "Syria"
 msgstr "Syria"
 
 #. A city in Syria
-#: ../data/Locations.xml.in.h:5376
+#: ../data/Locations.xml.in.h:5414
 msgid "Al Qamishli"
 msgstr "Al Qamishli"
 
@@ -12061,7 +12061,7 @@
 #. "Aleppo" is the traditional English name.
 #. The local name in Arabic is "Halab".
 #. 
-#: ../data/Locations.xml.in.h:5381
+#: ../data/Locations.xml.in.h:5419
 msgid "Aleppo"
 msgstr "Aleppo"
 
@@ -12069,12 +12069,12 @@
 #. "Damascus" is the traditional English name.
 #. The local name in Arabic is "Dimashq".
 #. 
-#: ../data/Locations.xml.in.h:5386
+#: ../data/Locations.xml.in.h:5424
 msgid "Damascus"
 msgstr "Damaskus"
 
 #. A city in Syria
-#: ../data/Locations.xml.in.h:5388
+#: ../data/Locations.xml.in.h:5426
 msgid "Dayr az Zawr"
 msgstr "Dayr az Zawr"
 
@@ -12082,12 +12082,12 @@
 #. "Latakia" is the traditional English name.
 #. The local name in Arabic is "Al Ladhiqiyah".
 #. 
-#: ../data/Locations.xml.in.h:5393
+#: ../data/Locations.xml.in.h:5431
 msgid "Latakia"
 msgstr "Latakia"
 
 #. AE - United Arab Emirates
-#: ../data/Locations.xml.in.h:5395
+#: ../data/Locations.xml.in.h:5433
 msgid "United Arab Emirates"
 msgstr "Förenade Arabemiraten"
 
@@ -12095,17 +12095,17 @@
 #. "Abu Dhabi" is the traditional English name.
 #. The local name in Arabic is "Abu Zaby".
 #. 
-#: ../data/Locations.xml.in.h:5400
+#: ../data/Locations.xml.in.h:5438
 msgid "Abu Dhabi"
 msgstr "Abu Dhabi"
 
 #. A city in the United Arab Emirates
-#: ../data/Locations.xml.in.h:5402
+#: ../data/Locations.xml.in.h:5440
 msgid "Al 'Ayn"
 msgstr "Al 'Ayn"
 
 #. A city in the United Arab Emirates
-#: ../data/Locations.xml.in.h:5404
+#: ../data/Locations.xml.in.h:5442
 msgid "Al Fujayrah"
 msgstr "Al Fujayrah"
 
@@ -12113,12 +12113,12 @@
 #. "Dubai" is the traditional English name.
 #. The local name in Arabic is "Dubayy".
 #. 
-#: ../data/Locations.xml.in.h:5409
+#: ../data/Locations.xml.in.h:5447
 msgid "Dubai"
 msgstr "Forente arabiske emirater"
 
 #. A city in the United Arab Emirates
-#: ../data/Locations.xml.in.h:5411
+#: ../data/Locations.xml.in.h:5449
 msgid "Ra's al Khaymah"
 msgstr "Ra's al Khaymah"
 
@@ -12126,42 +12126,42 @@
 #. "Sharjah" is the traditional English name.
 #. The local name in Arabic is "Ash Shariqah".
 #. 
-#: ../data/Locations.xml.in.h:5416
+#: ../data/Locations.xml.in.h:5454
 msgid "Sharjah"
 msgstr "Sharjah"
 
 #. YE - Yemen
-#: ../data/Locations.xml.in.h:5418
+#: ../data/Locations.xml.in.h:5456
 msgid "Yemen"
 msgstr "Jemen"
 
 #. A city in Yemen
-#: ../data/Locations.xml.in.h:5420
+#: ../data/Locations.xml.in.h:5458
 msgid "'Adan"
 msgstr "'Adan"
 
 #. A city in Yemen
-#: ../data/Locations.xml.in.h:5422
+#: ../data/Locations.xml.in.h:5460
 msgid "'Ataq"
 msgstr "'Ataq"
 
 #. A city in Yemen
-#: ../data/Locations.xml.in.h:5424
+#: ../data/Locations.xml.in.h:5462
 msgid "Al Hudaydah"
 msgstr "Al Hudaydah"
 
 #. A city in Yemen
-#: ../data/Locations.xml.in.h:5426
+#: ../data/Locations.xml.in.h:5464
 msgid "Ma'rib"
 msgstr "Ma'rib"
 
 #. A city in Yemen
-#: ../data/Locations.xml.in.h:5428
+#: ../data/Locations.xml.in.h:5466
 msgid "Mori"
 msgstr "Mori"
 
 #. A city in Yemen
-#: ../data/Locations.xml.in.h:5430
+#: ../data/Locations.xml.in.h:5468
 msgid "Sa'dah"
 msgstr "Sa'dah"
 
@@ -12169,26 +12169,26 @@
 #. "Sanaa" is the traditional English name.
 #. The local name in Arabic is "San'a'".
 #. 
-#: ../data/Locations.xml.in.h:5435
+#: ../data/Locations.xml.in.h:5473
 msgid "Sanaa"
 msgstr "Sanaa"
 
 #. A city in Yemen
-#: ../data/Locations.xml.in.h:5437
+#: ../data/Locations.xml.in.h:5475
 msgid "Say'un"
 msgstr "Say'un"
 
 #. A city in Yemen
-#: ../data/Locations.xml.in.h:5439
+#: ../data/Locations.xml.in.h:5477
 msgid "Ta'izz"
 msgstr "Ta'izz"
 
-#: ../data/Locations.xml.in.h:5440
+#: ../data/Locations.xml.in.h:5478
 msgid "North America"
 msgstr "Nord-Amerika"
 
 #. CA - Canada
-#: ../data/Locations.xml.in.h:5442
+#: ../data/Locations.xml.in.h:5480
 msgid "Canada"
 msgstr "Canada"
 
@@ -12199,7 +12199,7 @@
 #. where "US", "Canada" or "Mexico" is already clear from
 #. the context.
 #. 
-#: ../data/Locations.xml.in.h:5450
+#: ../data/Locations.xml.in.h:5488
 msgid "Pacific Time"
 msgstr "Stillehavstid"
 
@@ -12210,7 +12210,7 @@
 #. string is only used in places where "US", "Canada" or
 #. "Mexico" is already clear from the context.
 #. 
-#: ../data/Locations.xml.in.h:5458
+#: ../data/Locations.xml.in.h:5496
 msgid "Mountain Time"
 msgstr "Mountain tid"
 
@@ -12219,7 +12219,7 @@
 #. is part of the "Mountain Time" zone, but does not
 #. observe Daylight Saving Time with the rest of the zone.
 #. 
-#: ../data/Locations.xml.in.h:5464
+#: ../data/Locations.xml.in.h:5502
 msgid "Mountain Time, no DST (Northeast BC)"
 msgstr "Mountain Time, uten DST (Northeast BC)"
 
@@ -12230,7 +12230,7 @@
 #. "US", "Canada" or "Mexico" is already clear from the
 #. context.
 #. 
-#: ../data/Locations.xml.in.h:5472
+#: ../data/Locations.xml.in.h:5510
 msgid "Central Time"
 msgstr "Sentral tid"
 
@@ -12239,7 +12239,7 @@
 #. zone, but does not observe Daylight Saving Time with the
 #. rest of the zone.
 #. 
-#: ../data/Locations.xml.in.h:5478
+#: ../data/Locations.xml.in.h:5516
 msgid "Central Time, no DST (Saskatchewan)"
 msgstr "Sentral tid uten DST (Saskatchewan)"
 
@@ -12249,7 +12249,7 @@
 #. "Heure de l'Est". The string is only used in places
 #. where "US" or "Canada" is already clear from the context.
 #. 
-#: ../data/Locations.xml.in.h:5485
+#: ../data/Locations.xml.in.h:5523
 msgid "Eastern Time"
 msgstr "Østlig tid"
 
@@ -12259,7 +12259,7 @@
 #. which do not observe Daylight Saving Time with the rest
 #. of the zone.
 #. 
-#: ../data/Locations.xml.in.h:5492
+#: ../data/Locations.xml.in.h:5530
 msgid "Eastern Time, no DST (Southampton Island, etc)"
 msgstr "Østlig tid uten DST (Southampton Island, etc)"
 
@@ -12268,7 +12268,7 @@
 #. "Atlantic Time" zone, but does not observe Daylight
 #. Saving Time with the rest of the zone.
 #. 
-#: ../data/Locations.xml.in.h:5498
+#: ../data/Locations.xml.in.h:5536
 msgid "Atlantic Time, no DST (Eastern Quebec)"
 msgstr "Atlanterhavs tid, uten DST (Østlige Quebec)"
 
@@ -12276,2177 +12276,2177 @@
 #. Newfoundland. In French-speaking parts of Canada it is
 #. called "Heure de Terre-Neuve".
 #. 
-#: ../data/Locations.xml.in.h:5503
+#: ../data/Locations.xml.in.h:5541
 msgid "Newfoundland Time"
 msgstr "Newfoundland tid"
 
 #. A state/province/territory in Canada
-#: ../data/Locations.xml.in.h:5505
+#: ../data/Locations.xml.in.h:5543
 msgid "Alberta"
 msgstr "Alberta"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5507
+#: ../data/Locations.xml.in.h:5545
 msgid "Banff"
 msgstr "Banff"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5509
+#: ../data/Locations.xml.in.h:5547
 msgid "Bergen"
 msgstr "Bergen"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5511
+#: ../data/Locations.xml.in.h:5549
 msgid "Bow Island"
 msgstr "Bow Island"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5513
+#: ../data/Locations.xml.in.h:5551
 msgid "Brooks"
 msgstr "Brooks"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5515
+#: ../data/Locations.xml.in.h:5553
 msgid "Calgary"
 msgstr "Calgary"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5517
+#: ../data/Locations.xml.in.h:5555
 msgid "Cardston"
 msgstr "Cardston"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5519
+#: ../data/Locations.xml.in.h:5557
 msgid "Claresholm"
 msgstr "Claresholm"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5521
+#: ../data/Locations.xml.in.h:5559
 msgid "Cold Lake"
 msgstr "Cold Lake"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5523
+#: ../data/Locations.xml.in.h:5561
 msgid "Coleman"
 msgstr "Coleman"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5525
+#: ../data/Locations.xml.in.h:5563
 msgid "Coronation"
 msgstr "Coronation"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5527
+#: ../data/Locations.xml.in.h:5565
 msgid "Drumheller"
 msgstr "Drumheller"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5529
+#: ../data/Locations.xml.in.h:5567
 msgid "Edmonton"
 msgstr "Edmonton"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5531
+#: ../data/Locations.xml.in.h:5569
 msgid "Edson"
 msgstr "Edson"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5533
+#: ../data/Locations.xml.in.h:5571
 msgid "Embarras Portage"
 msgstr "Embarras Portage"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5535
+#: ../data/Locations.xml.in.h:5573
 msgid "Esther"
 msgstr "Esther"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5537
+#: ../data/Locations.xml.in.h:5575
 msgid "Fort Chipewyan"
 msgstr "Fort Chipewyan"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5539
+#: ../data/Locations.xml.in.h:5577
 msgid "Fort McMurray"
 msgstr "Fort McMurray"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5541
+#: ../data/Locations.xml.in.h:5579
 msgid "Grande Prairie"
 msgstr "Grand Prairie"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5543
+#: ../data/Locations.xml.in.h:5581
 msgid "High Level"
 msgstr "Høyt nivå"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5545
+#: ../data/Locations.xml.in.h:5583
 msgctxt "City in Alberta, Canada"
 msgid "Jasper"
 msgstr "Jasper"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5547
+#: ../data/Locations.xml.in.h:5585
 msgid "Lac La Biche"
 msgstr "Lac La Biche"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5549
+#: ../data/Locations.xml.in.h:5587
 msgid "Lethbridge"
 msgstr "Lethbridge"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5551
+#: ../data/Locations.xml.in.h:5589
 msgid "Medicine Hat"
 msgstr "Medicine Hat"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5553
+#: ../data/Locations.xml.in.h:5591
 msgid "Milk River"
 msgstr "Milk River"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5555
+#: ../data/Locations.xml.in.h:5593
 msgid "Onefour"
 msgstr "Onefour"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5557
+#: ../data/Locations.xml.in.h:5595
 msgid "Peace River"
 msgstr "Peace River"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5559
+#: ../data/Locations.xml.in.h:5597
 msgid "Pincher Creek"
 msgstr "Pincher Creek"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5561
+#: ../data/Locations.xml.in.h:5599
 msgid "Red Deer"
 msgstr "Red Deer"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5563
+#: ../data/Locations.xml.in.h:5601
 msgid "Rocky Mountain House"
 msgstr "Rocky Mountain House"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5565
+#: ../data/Locations.xml.in.h:5603
 msgid "Seebe"
 msgstr "Seebe"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5567
+#: ../data/Locations.xml.in.h:5605
 msgid "Slave Lake"
 msgstr "Slave Lake"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5569
+#: ../data/Locations.xml.in.h:5607
 msgid "Spirit River"
 msgstr "Spirit River"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5571
+#: ../data/Locations.xml.in.h:5609
 msgid "Three Hills"
 msgstr "Three Hills"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5573
+#: ../data/Locations.xml.in.h:5611
 msgid "Vegreville"
 msgstr "Vegreville"
 
 #. A city in Alberta in Canada
-#: ../data/Locations.xml.in.h:5575
+#: ../data/Locations.xml.in.h:5613
 msgid "Whitecourt"
 msgstr "Whitecourt"
 
 #. A state/province/territory in Canada
-#: ../data/Locations.xml.in.h:5577
+#: ../data/Locations.xml.in.h:5615
 msgid "British Columbia"
 msgstr "British Columbia"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5579
+#: ../data/Locations.xml.in.h:5617
 msgid "Abbotsford"
 msgstr "Abbotsford"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5581
+#: ../data/Locations.xml.in.h:5619
 msgid "Agassiz"
 msgstr "Agassiz"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5583
+#: ../data/Locations.xml.in.h:5621
 msgid "Allison Harbour"
 msgstr "Allison Harbor"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5585
+#: ../data/Locations.xml.in.h:5623
 msgid "Alta Lake"
 msgstr "Alta Lake"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5587
+#: ../data/Locations.xml.in.h:5625
 msgid "Baldonnel"
 msgstr "Baldonnel"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5589
+#: ../data/Locations.xml.in.h:5627
 msgid "Bella Coola"
 msgstr "Bella Coola"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5591
+#: ../data/Locations.xml.in.h:5629
 msgid "Blue River"
 msgstr "Blue River"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5593
+#: ../data/Locations.xml.in.h:5631
 msgid "Boat Basin"
 msgstr "Boat Basin"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5595
+#: ../data/Locations.xml.in.h:5633
 msgid "Burns Lake"
 msgstr "Burns Lake"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5597
+#: ../data/Locations.xml.in.h:5635
 msgid "Campbell River"
 msgstr "Campbell River"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5599
+#: ../data/Locations.xml.in.h:5637
 msgid "Castlegar"
 msgstr "Castlegar"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5601
+#: ../data/Locations.xml.in.h:5639
 msgctxt "City in British Columbia, Canada"
 msgid "Clinton"
 msgstr "Clinton"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5603
+#: ../data/Locations.xml.in.h:5641
 msgid "Comox"
 msgstr "Comox"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5605
+#: ../data/Locations.xml.in.h:5643
 msgid "Cranbrook"
 msgstr "Cranbrook"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5607
+#: ../data/Locations.xml.in.h:5645
 msgctxt "City in British Columbia, Canada"
 msgid "Creston"
 msgstr "Creston"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5609
+#: ../data/Locations.xml.in.h:5647
 msgid "Dease Lake"
 msgstr "Dease Lake"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5611
+#: ../data/Locations.xml.in.h:5649
 msgid "Esquimalt"
 msgstr "Esquimalt"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5613
+#: ../data/Locations.xml.in.h:5651
 msgid "Fort Grahame"
 msgstr "Fort Grahame"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5615
+#: ../data/Locations.xml.in.h:5653
 msgid "Fort Nelson"
 msgstr "Fort Nelson"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5617
+#: ../data/Locations.xml.in.h:5655
 msgid "Gabriola"
 msgstr "Gabriola"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5619
+#: ../data/Locations.xml.in.h:5657
 msgid "Golden"
 msgstr "Golden"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5621
+#: ../data/Locations.xml.in.h:5659
 msgid "Hollyburn"
 msgstr "Hollyburn"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5623
+#: ../data/Locations.xml.in.h:5661
 msgid "Hope"
 msgstr "Hope"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5625
+#: ../data/Locations.xml.in.h:5663
 msgid "Kamloops"
 msgstr "Kamloops"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5627
+#: ../data/Locations.xml.in.h:5665
 msgid "Kelowna"
 msgstr "Kelowna"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5629
+#: ../data/Locations.xml.in.h:5667
 msgid "Lasqueti"
 msgstr "Lesqueti"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5631
+#: ../data/Locations.xml.in.h:5669
 msgid "Little Prairie"
 msgstr "Little Prairie"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5633
+#: ../data/Locations.xml.in.h:5671
 msgid "Lytton"
 msgstr "Lytton"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5635
+#: ../data/Locations.xml.in.h:5673
 msgid "McLeod Lake"
 msgstr "McLeod Lake"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5637
+#: ../data/Locations.xml.in.h:5675
 msgid "Nakusp"
 msgstr "Nakusp"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5639
+#: ../data/Locations.xml.in.h:5677
 msgid "Nanaimo"
 msgstr "Nanaimo"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5641
+#: ../data/Locations.xml.in.h:5679
 msgid "Nanoose Bay"
 msgstr "Nanoose Bay"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5643
+#: ../data/Locations.xml.in.h:5681
 msgctxt "City in British Columbia, Canada"
 msgid "Natal"
 msgstr "Natal"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5645
+#: ../data/Locations.xml.in.h:5683
 msgid "Nelson"
 msgstr "Nelson"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5647
+#: ../data/Locations.xml.in.h:5685
 msgid "North Kamloops"
 msgstr "North Kamloops"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5649
+#: ../data/Locations.xml.in.h:5687
 msgid "Ocean Falls"
 msgstr "Ocean Falls"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5651
+#: ../data/Locations.xml.in.h:5689
 msgid "Osoyoos"
 msgstr "Osoyoos"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5653
+#: ../data/Locations.xml.in.h:5691
 msgid "Penticton"
 msgstr "Penticton"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5655
+#: ../data/Locations.xml.in.h:5693
 msgid "Pitt Meadows"
 msgstr "Pitt Meadows"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5657
+#: ../data/Locations.xml.in.h:5695
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5659
+#: ../data/Locations.xml.in.h:5697
 msgid "Port Simpson"
 msgstr "Port Simpson"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5661
+#: ../data/Locations.xml.in.h:5699
 msgid "Powell River"
 msgstr "Powell River"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5663
+#: ../data/Locations.xml.in.h:5701
 msgid "Prince George"
 msgstr "Prince George"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5665
+#: ../data/Locations.xml.in.h:5703
 msgid "Prince Rupert"
 msgstr "Prince Rupert"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5667
+#: ../data/Locations.xml.in.h:5705
 msgctxt "City in British Columbia, Canada"
 msgid "Princeton"
 msgstr "Princeton"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5669
+#: ../data/Locations.xml.in.h:5707
 msgid "Queen Charlotte"
 msgstr "Queen Charlotte"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5671
+#: ../data/Locations.xml.in.h:5709
 msgid "Quesnel"
 msgstr "Quesnel"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5673
+#: ../data/Locations.xml.in.h:5711
 msgid "Revelstoke"
 msgstr "Revelstoke"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5675
+#: ../data/Locations.xml.in.h:5713
 msgid "Rocky Point"
 msgstr "Rocky Point"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5677
+#: ../data/Locations.xml.in.h:5715
 msgid "Salmon Arm"
 msgstr "Salmon Arm"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5679
+#: ../data/Locations.xml.in.h:5717
 msgid "Sandspit"
 msgstr "Sandspit"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5681
+#: ../data/Locations.xml.in.h:5719
 msgid "Smithers"
 msgstr "Smithers"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5683
+#: ../data/Locations.xml.in.h:5721
 msgid "Squamish"
 msgstr "Squamish"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5685
+#: ../data/Locations.xml.in.h:5723
 msgid "Stephen"
 msgstr "Stephen"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5687
+#: ../data/Locations.xml.in.h:5725
 msgid "Steveston"
 msgstr "Steveston"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5689
+#: ../data/Locations.xml.in.h:5727
 msgid "Stewart"
 msgstr "Sewart"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5691
+#: ../data/Locations.xml.in.h:5729
 msgid "Summerland"
 msgstr "Summerland"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5693
+#: ../data/Locations.xml.in.h:5731
 msgid "Terrace"
 msgstr "Terrace"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5695
+#: ../data/Locations.xml.in.h:5733
 msgid "Tofino"
 msgstr "Tofino"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5697
+#: ../data/Locations.xml.in.h:5735
 msgid "Tow Hill"
 msgstr "Tow Hill"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5699
+#: ../data/Locations.xml.in.h:5737
 msgid "Trout Lake"
 msgstr "Trout Lake"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5701
+#: ../data/Locations.xml.in.h:5739
 msgctxt "City in British Columbia, Canada"
 msgid "Vancouver"
 msgstr "Vancover"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5703
+#: ../data/Locations.xml.in.h:5741
 msgctxt "City in British Columbia, Canada"
 msgid "Vernon"
 msgstr "Vernon"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5705
+#: ../data/Locations.xml.in.h:5743
 msgctxt "City in British Columbia, Canada"
 msgid "Victoria"
 msgstr "Victoria"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5707
+#: ../data/Locations.xml.in.h:5745
 msgid "White Rock"
 msgstr "White Rock"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5709
+#: ../data/Locations.xml.in.h:5747
 msgid "Williams Lake"
 msgstr "Williams Lake"
 
 #. A city in British Columbia in Canada
-#: ../data/Locations.xml.in.h:5711
+#: ../data/Locations.xml.in.h:5749
 msgid "Winter Harbour"
 msgstr "Winter Harbor"
 
 #. A state/province/territory in Canada
-#: ../data/Locations.xml.in.h:5713
+#: ../data/Locations.xml.in.h:5751
 msgid "Manitoba"
 msgstr "Manitoba"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5715
+#: ../data/Locations.xml.in.h:5753
 msgid "Berens River"
 msgstr "Berens River"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5717
+#: ../data/Locations.xml.in.h:5755
 msgid "Brandon"
 msgstr "Brandon"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5719
+#: ../data/Locations.xml.in.h:5757
 msgid "Carman"
 msgstr "Carman"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5721
+#: ../data/Locations.xml.in.h:5759
 msgid "Churchill"
 msgstr "Churchill"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5723
+#: ../data/Locations.xml.in.h:5761
 msgid "Dauphin"
 msgstr "Daupin"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5725
+#: ../data/Locations.xml.in.h:5763
 msgid "Flin Flon"
 msgstr "Flin Flon"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5727
+#: ../data/Locations.xml.in.h:5765
 msgid "Gillam"
 msgstr "Gillam"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5729
+#: ../data/Locations.xml.in.h:5767
 msgid "Gimli"
 msgstr "Gimli"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5731
+#: ../data/Locations.xml.in.h:5769
 msgctxt "City in Manitoba, Canada"
 msgid "Grand Rapids"
 msgstr "Grand Rapids"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5733
+#: ../data/Locations.xml.in.h:5771
 msgid "Island Lake"
 msgstr "Island Lake"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5735
+#: ../data/Locations.xml.in.h:5773
 msgid "Lynn Lake"
 msgstr "Lynn Lake"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5737
+#: ../data/Locations.xml.in.h:5775
 msgctxt "City in Manitoba, Canada"
 msgid "Miami"
 msgstr "Miami"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5739
+#: ../data/Locations.xml.in.h:5777
 msgid "Morden"
 msgstr "Morden"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5741
+#: ../data/Locations.xml.in.h:5779
 msgid "Norway House"
 msgstr "Norway House"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5743
+#: ../data/Locations.xml.in.h:5781
 msgid "Pilot Mound"
 msgstr "Pilot Mound"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5745
+#: ../data/Locations.xml.in.h:5783
 msgid "Swan River"
 msgstr "Swan River"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5747
+#: ../data/Locations.xml.in.h:5785
 msgid "The Pas"
 msgstr "The Pas"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5749
+#: ../data/Locations.xml.in.h:5787
 msgid "Thompson"
 msgstr "Thompson"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5751
+#: ../data/Locations.xml.in.h:5789
 msgid "Victoria Beach"
 msgstr "Victoria Beach"
 
 #. A city in Manitoba in Canada
-#: ../data/Locations.xml.in.h:5753
+#: ../data/Locations.xml.in.h:5791
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
 #. A state/province/territory in Canada
-#: ../data/Locations.xml.in.h:5755
+#: ../data/Locations.xml.in.h:5793
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
 #. A city in New Brunswick in Canada
-#: ../data/Locations.xml.in.h:5757
+#: ../data/Locations.xml.in.h:5795
 msgid "Bathurst"
 msgstr "Bathurst"
 
 #. A city in New Brunswick in Canada
-#: ../data/Locations.xml.in.h:5759
+#: ../data/Locations.xml.in.h:5797
 msgid "Dipper Harbour"
 msgstr "Dipper Harbor"
 
 #. A city in New Brunswick in Canada
-#: ../data/Locations.xml.in.h:5761
+#: ../data/Locations.xml.in.h:5799
 msgid "Fredericton"
 msgstr "Fredericton"
 
 #. A city in New Brunswick in Canada
-#: ../data/Locations.xml.in.h:5763
+#: ../data/Locations.xml.in.h:5801
 msgid "Gagetown"
 msgstr "Gagetown"
 
 #. A city in New Brunswick in Canada
-#: ../data/Locations.xml.in.h:5765
+#: ../data/Locations.xml.in.h:5803
 msgid "Moncton"
 msgstr "Moncton"
 
 #. A city in New Brunswick in Canada
-#: ../data/Locations.xml.in.h:5767
+#: ../data/Locations.xml.in.h:5805
 msgid "Saint John"
 msgstr "Saint John"
 
 #. A city in New Brunswick in Canada
-#: ../data/Locations.xml.in.h:5769
+#: ../data/Locations.xml.in.h:5807
 msgid "Saint Leonard"
 msgstr "Saint Leonard"
 
 #. A city in New Brunswick in Canada
-#: ../data/Locations.xml.in.h:5771
+#: ../data/Locations.xml.in.h:5809
 msgid "Saint Stephen"
 msgstr "Saint Stephen"
 
 #. A state/province/territory in Canada
-#: ../data/Locations.xml.in.h:5773
+#: ../data/Locations.xml.in.h:5811
 msgid "Newfoundland and Labrador"
 msgstr "Newfoundland og Labrador"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5775
+#: ../data/Locations.xml.in.h:5813
 msgid "Argentia"
 msgstr "Argentia"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5777
+#: ../data/Locations.xml.in.h:5815
 msgid "Cape Race"
 msgstr "Cape Race"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5779
+#: ../data/Locations.xml.in.h:5817
 msgid "Cartwright"
 msgstr "Cartwright"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5781
+#: ../data/Locations.xml.in.h:5819
 msgid "Deer Lake"
 msgstr "Deer Lake"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5783
+#: ../data/Locations.xml.in.h:5821
 msgid "Englee"
 msgstr "Englee"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5785
+#: ../data/Locations.xml.in.h:5823
 msgid "Ferolle Point"
 msgstr "Ferolle Point"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5787
+#: ../data/Locations.xml.in.h:5825
 msgid "Gander"
 msgstr "Gander"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5789
+#: ../data/Locations.xml.in.h:5827
 msgid "Goose Bay"
 msgstr "Goose Bay"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5791
+#: ../data/Locations.xml.in.h:5829
 msgid "Harbour Breton"
 msgstr "Harbor Breton"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5793
+#: ../data/Locations.xml.in.h:5831
 msgctxt "City in Newfoundland and Labrador, Canada"
 msgid "Hebron"
 msgstr "Hebron"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5795
+#: ../data/Locations.xml.in.h:5833
 msgid "Hopedale"
 msgstr "Hopedale"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5797
+#: ../data/Locations.xml.in.h:5835
 msgid "Makkovik"
 msgstr "Makkovik"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5799
+#: ../data/Locations.xml.in.h:5837
 msgid "Mary's Harbour"
 msgstr "Mary's Harbor"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5801
+#: ../data/Locations.xml.in.h:5839
 msgid "Mount Pearl Park"
 msgstr "Mount Pearl Park"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5803
+#: ../data/Locations.xml.in.h:5841
 msgid "Nain"
 msgstr "Nain"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5805
+#: ../data/Locations.xml.in.h:5843
 msgid "Neddy Harbour"
 msgstr "Neddy Harbor"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5807
+#: ../data/Locations.xml.in.h:5845
 msgid "Nutak"
 msgstr "Nutak"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5809
+#: ../data/Locations.xml.in.h:5847
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5811
+#: ../data/Locations.xml.in.h:5849
 msgctxt "City in Newfoundland and Labrador, Canada"
 msgid "Saint John's"
 msgstr "Saint John's"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5813
+#: ../data/Locations.xml.in.h:5851
 msgctxt "City in Newfoundland and Labrador, Canada"
 msgid "Stephenville"
 msgstr "Stephenville"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5815
+#: ../data/Locations.xml.in.h:5853
 msgid "Terra Nova"
 msgstr "Terra Nova"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5817
+#: ../data/Locations.xml.in.h:5855
 msgid "Twillingate"
 msgstr "Twillingate"
 
 #. A city in Newfoundland and Labrador in Canada
-#: ../data/Locations.xml.in.h:5819
+#: ../data/Locations.xml.in.h:5857
 msgid "Wabush"
 msgstr "Wabush"
 
 #. A state/province/territory in Canada
-#: ../data/Locations.xml.in.h:5821
+#: ../data/Locations.xml.in.h:5859
 msgid "Northwest Territories"
 msgstr "Nordvest Territoriene"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5823
+#: ../data/Locations.xml.in.h:5861
 msgid "Aklavik"
 msgstr "Aklavik"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5825
+#: ../data/Locations.xml.in.h:5863
 msgid "Cape Parry"
 msgstr "Cape Parry"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5827
+#: ../data/Locations.xml.in.h:5865
 msgid "Délįne"
 msgstr "Délįne"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5829
+#: ../data/Locations.xml.in.h:5867
 msgid "Fort Good Hope"
 msgstr "Fort Good Hope"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5831
+#: ../data/Locations.xml.in.h:5869
 msgid "Fort Providence"
 msgstr "Fort Providence"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5833
+#: ../data/Locations.xml.in.h:5871
 msgid "Fort Simpson"
 msgstr "Fort Simpson"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5835
+#: ../data/Locations.xml.in.h:5873
 msgctxt "City in Northwest Territories, Canada"
 msgid "Fort Smith"
 msgstr "Fort Smith"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5837
+#: ../data/Locations.xml.in.h:5875
 msgid "Hay River"
 msgstr "Hay River"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5839
+#: ../data/Locations.xml.in.h:5877
 msgid "Holman"
 msgstr "Holman"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5841
+#: ../data/Locations.xml.in.h:5879
 msgid "Inuvik"
 msgstr "Inuvik"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5843
+#: ../data/Locations.xml.in.h:5881
 msgid "Nahanni Butte"
 msgstr "Nahanni Butte"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5845
+#: ../data/Locations.xml.in.h:5883
 msgid "Norman Wells"
 msgstr "Norman Wells"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5847
+#: ../data/Locations.xml.in.h:5885
 msgid "Paulatuk"
 msgstr "Paulatuk"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5849
+#: ../data/Locations.xml.in.h:5887
 msgid "Sachs Harbour"
 msgstr "Sachs Harbour"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5851
+#: ../data/Locations.xml.in.h:5889
 msgid "Tuktoyaktuk"
 msgstr "Tuktoyaktuk"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5853
+#: ../data/Locations.xml.in.h:5891
 msgid "Tununuk"
 msgstr "Tununuk"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5855
+#: ../data/Locations.xml.in.h:5893
 msgid "Wha Ti"
 msgstr "Wha Ti"
 
 #. A city in Northwest Territories in Canada
-#: ../data/Locations.xml.in.h:5857
+#: ../data/Locations.xml.in.h:5895
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
 #. A state/province/territory in Canada
-#: ../data/Locations.xml.in.h:5859
+#: ../data/Locations.xml.in.h:5897
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5861
+#: ../data/Locations.xml.in.h:5899
 msgid "Bay Saint Lawrence"
 msgstr "Bay Saint Lawrence"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5863
+#: ../data/Locations.xml.in.h:5901
 msgid "Beaver Harbour"
 msgstr "Beaver Harbour"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5865
+#: ../data/Locations.xml.in.h:5903
 msgid "Caledonia"
 msgstr "Caledonia"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5867
+#: ../data/Locations.xml.in.h:5905
 msgid "Canso"
 msgstr "Canso"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5869
+#: ../data/Locations.xml.in.h:5907
 msgid "Caribou Island"
 msgstr "Caribou Island"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5871
+#: ../data/Locations.xml.in.h:5909
 msgid "Chéticamp"
 msgstr "Chéticamp"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5873
+#: ../data/Locations.xml.in.h:5911
 msgid "Dingwall"
 msgstr "Dingwall"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5875
+#: ../data/Locations.xml.in.h:5913
 msgid "Grand-Etang"
 msgstr "Grand-Etang"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5877
+#: ../data/Locations.xml.in.h:5915
 msgctxt "City in Nova Scotia, Canada"
 msgid "Greenwood"
 msgstr "Greenwood"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5879
+#: ../data/Locations.xml.in.h:5917
 msgid "Halifax"
 msgstr "Halifax"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5881
+#: ../data/Locations.xml.in.h:5919
 msgid "Kentville"
 msgstr "Kentville"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5883
+#: ../data/Locations.xml.in.h:5921
 msgctxt "City in Nova Scotia, Canada"
 msgid "Liverpool"
 msgstr "Liverpool"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5885
+#: ../data/Locations.xml.in.h:5923
 msgid "Sheet Harbour"
 msgstr "Sheet Harbour"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5887
+#: ../data/Locations.xml.in.h:5925
 msgctxt "City in Nova Scotia, Canada"
 msgid "Sydney"
 msgstr "Sydney"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5889
+#: ../data/Locations.xml.in.h:5927
 msgid "Westport"
 msgstr "Westport"
 
 #. A city in Nova Scotia in Canada
-#: ../data/Locations.xml.in.h:5891
+#: ../data/Locations.xml.in.h:5929
 msgid "Yarmouth"
 msgstr "Yarmouth"
 
 #. A state/province/territory in Canada
-#: ../data/Locations.xml.in.h:5893
+#: ../data/Locations.xml.in.h:5931
 msgid "Nunavut"
 msgstr "Nunavut"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5895
+#: ../data/Locations.xml.in.h:5933
 msgid "Arviat"
 msgstr "Arviat"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5897
+#: ../data/Locations.xml.in.h:5935
 msgid "Baker Lake"
 msgstr "Baker Lake"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5899
+#: ../data/Locations.xml.in.h:5937
 msgid "Cambridge Bay"
 msgstr "Cambridge Bay"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5901
+#: ../data/Locations.xml.in.h:5939
 msgid "Cape Dorset"
 msgstr "Cape Dorset"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5903
+#: ../data/Locations.xml.in.h:5941
 msgid "Cape Dyer"
 msgstr "Cape Dyer"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5905
+#: ../data/Locations.xml.in.h:5943
 msgid "Chesterfield Inlet"
 msgstr "Chesterfield Inlet"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5907
+#: ../data/Locations.xml.in.h:5945
 msgid "Clyde River"
 msgstr "Clyde River"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5909
+#: ../data/Locations.xml.in.h:5947
 msgid "Coral Harbour"
 msgstr "Coral Harbor"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5911
+#: ../data/Locations.xml.in.h:5949
 msgid "Ennadai"
 msgstr "Ennadai"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5913
+#: ../data/Locations.xml.in.h:5951
 msgctxt "City in Nunavut, Canada"
 msgid "Eureka"
 msgstr "Eureka"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5915
+#: ../data/Locations.xml.in.h:5953
 msgid "Gjoa Haven"
 msgstr "Gjoa Haven"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5917
+#: ../data/Locations.xml.in.h:5955
 msgid "Hall Beach"
 msgstr "Hall Beach"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5919
+#: ../data/Locations.xml.in.h:5957
 msgid "Igloolik"
 msgstr "Igloolik"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5921
+#: ../data/Locations.xml.in.h:5959
 msgid "Iqaluit"
 msgstr "Iqaluit"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5923
+#: ../data/Locations.xml.in.h:5961
 msgid "Kugaaruk"
 msgstr "Kugaaruk"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5925
+#: ../data/Locations.xml.in.h:5963
 msgid "Kugluktuk"
 msgstr "Kugluktuk"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5927
+#: ../data/Locations.xml.in.h:5965
 msgid "Pangnirtung"
 msgstr "Pangnirtung"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5929
+#: ../data/Locations.xml.in.h:5967
 msgid "Pond Inlet"
 msgstr "Pond Inlet"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5931
+#: ../data/Locations.xml.in.h:5969
 msgid "Qikiqtarjuaq"
 msgstr "Qikiqtarjuaq"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5933
+#: ../data/Locations.xml.in.h:5971
 msgid "Rankin Inlet"
 msgstr "Rankin Inlet"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5935
+#: ../data/Locations.xml.in.h:5973
 msgid "Repulse Bay"
 msgstr "Repulse Bay"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5937
+#: ../data/Locations.xml.in.h:5975
 msgid "Resolute"
 msgstr "Resolute"
 
 #. A city in Nunavut in Canada
-#: ../data/Locations.xml.in.h:5939
+#: ../data/Locations.xml.in.h:5977
 msgid "Taloyoak"
 msgstr "Taloyoak"
 
 #. A state/province/territory in Canada
-#: ../data/Locations.xml.in.h:5941
+#: ../data/Locations.xml.in.h:5979
 msgctxt "State in Canada"
 msgid "Ontario"
 msgstr "Ontario"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5943
+#: ../data/Locations.xml.in.h:5981
 msgid "Bancroft"
 msgstr "Bancroft"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5945
+#: ../data/Locations.xml.in.h:5983
 msgid "Beardmore"
 msgstr "Beardmore"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5947
+#: ../data/Locations.xml.in.h:5985
 msgid "Borden"
 msgstr "Borden"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5949
+#: ../data/Locations.xml.in.h:5987
 msgctxt "City in Ontario, Canada"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5951
+#: ../data/Locations.xml.in.h:5989
 msgid "Central Patricia"
 msgstr "Central Patricia"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5953
+#: ../data/Locations.xml.in.h:5991
 msgid "Chapleau"
 msgstr "Chapleau"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5955
+#: ../data/Locations.xml.in.h:5993
 msgid "Cobourg"
 msgstr "Cobourg"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5957
+#: ../data/Locations.xml.in.h:5995
 msgid "Collingwood"
 msgstr "Collingwood"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5959
+#: ../data/Locations.xml.in.h:5997
 msgid "Coppell"
 msgstr "Coppell"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5961
+#: ../data/Locations.xml.in.h:5999
 msgid "Delhi"
 msgstr "Delhi"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5963
+#: ../data/Locations.xml.in.h:6001
 msgctxt "City in Ontario, Canada"
 msgid "Dryden"
 msgstr "Dryden"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5965
+#: ../data/Locations.xml.in.h:6003
 msgid "Earlton"
 msgstr "Earlton"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5967
+#: ../data/Locations.xml.in.h:6005
 msgid "Elliot Lake"
 msgstr "Elliot Lake"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5969
+#: ../data/Locations.xml.in.h:6007
 msgid "Erieau"
 msgstr "Erieau"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5971
+#: ../data/Locations.xml.in.h:6009
 msgid "Front of Escott"
 msgstr "Front of Escott"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5973
+#: ../data/Locations.xml.in.h:6011
 msgid "Geraldton"
 msgstr "Geraldton"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5975
+#: ../data/Locations.xml.in.h:6013
 msgid "Goderich"
 msgstr "Goderich"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5977
+#: ../data/Locations.xml.in.h:6015
 msgid "Gore Bay"
 msgstr "Gore Bay"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5979
+#: ../data/Locations.xml.in.h:6017
 msgid "Hallowell"
 msgstr "Hallowell"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5981
+#: ../data/Locations.xml.in.h:6019
 msgctxt "City in Ontario, Canada"
 msgid "Hamilton"
 msgstr "Hamilton"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5983
+#: ../data/Locations.xml.in.h:6021
 msgid "Heron Bay"
 msgstr "Heron Bay"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5985
+#: ../data/Locations.xml.in.h:6023
 msgid "Kapuskasing"
 msgstr "Kapuskasing"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5987
+#: ../data/Locations.xml.in.h:6025
 msgid "Kenora"
 msgstr "Kenora"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5989
+#: ../data/Locations.xml.in.h:6027
 msgctxt "City in Ontario, Canada"
 msgid "Kingston"
 msgstr "Kingston"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5991
+#: ../data/Locations.xml.in.h:6029
 msgctxt "City in Ontario, Canada"
 msgid "London"
 msgstr "London"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5993
+#: ../data/Locations.xml.in.h:6031
 msgid "Moosonee"
 msgstr "Moosonee"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5995
+#: ../data/Locations.xml.in.h:6033
 msgid "Mount Forest"
 msgstr "Mount Forest"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5997
+#: ../data/Locations.xml.in.h:6035
 msgid "Muskoka Falls"
 msgstr "Muskoka Falls"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:5999
+#: ../data/Locations.xml.in.h:6037
 msgid "Nanticoke"
 msgstr "Nanticoke"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6001
+#: ../data/Locations.xml.in.h:6039
 msgid "North Bay"
 msgstr "North Bay"
 
 #. The capital of Canada
-#: ../data/Locations.xml.in.h:6003
+#: ../data/Locations.xml.in.h:6041
 msgid "Ottawa"
 msgstr "Ottawa"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6005
+#: ../data/Locations.xml.in.h:6043
 msgid "Petawawa"
 msgstr "Petawawa"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6007
+#: ../data/Locations.xml.in.h:6045
 msgid "Peterborough"
 msgstr "Peterborough"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6009
+#: ../data/Locations.xml.in.h:6047
 msgid "Port Weller"
 msgstr "Port Weller"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6011
+#: ../data/Locations.xml.in.h:6049
 msgid "Red Lake"
 msgstr "Red Lake"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6013
+#: ../data/Locations.xml.in.h:6051
 msgid "Saint Catharines"
 msgstr "Saint Catharines"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6015
+#: ../data/Locations.xml.in.h:6053
 msgid "Sarnia"
 msgstr "Sarnia"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6017
+#: ../data/Locations.xml.in.h:6055
 msgid "Sault Sainte Marie"
 msgstr "Sault Sainte Marie"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6019
+#: ../data/Locations.xml.in.h:6057
 msgid "Sioux Lookout"
 msgstr "Sioux Lookout"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6021
+#: ../data/Locations.xml.in.h:6059
 msgid "Sudbury"
 msgstr "Sudbury"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6023
+#: ../data/Locations.xml.in.h:6061
 msgid "Thunder Bay"
 msgstr "Amerika/Thunder_Bay"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6025
+#: ../data/Locations.xml.in.h:6063
 msgid "Timmins"
 msgstr "Timmins"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6027
+#: ../data/Locations.xml.in.h:6065
 msgid "Tobermory"
 msgstr "Tobermory"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6029
+#: ../data/Locations.xml.in.h:6067
 msgid "Toronto"
 msgstr "Toronto"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6031
+#: ../data/Locations.xml.in.h:6069
 msgctxt "City in Ontario, Canada"
 msgid "Trenton"
 msgstr "Trenton"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6033
+#: ../data/Locations.xml.in.h:6071
 msgid "Upsala"
 msgstr "Upsala"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6035
+#: ../data/Locations.xml.in.h:6073
 msgctxt "City in Ontario, Canada"
 msgid "Waterloo"
 msgstr "Waterloo"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6037
+#: ../data/Locations.xml.in.h:6075
 msgid "Wawa"
 msgstr "Wawa"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6039
+#: ../data/Locations.xml.in.h:6077
 msgid "Whitefish Falls"
 msgstr "Whitefish Falls"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6041
+#: ../data/Locations.xml.in.h:6079
 msgid "Wiarton"
 msgstr "Wiarton"
 
 #. A city in Ontario in Canada
-#: ../data/Locations.xml.in.h:6043
+#: ../data/Locations.xml.in.h:6081
 msgid "Windsor"
 msgstr "Windsor"
 
 #. A state/province/territory in Canada
-#: ../data/Locations.xml.in.h:6045
+#: ../data/Locations.xml.in.h:6083
 msgid "Prince Edward Island"
 msgstr "Prince Edward Island"
 
 #. A city in Prince Edward Island in Canada
-#: ../data/Locations.xml.in.h:6047
+#: ../data/Locations.xml.in.h:6085
 msgid "Charlottetown"
 msgstr "Charlottetown"
 
 #. A city in Prince Edward Island in Canada
-#: ../data/Locations.xml.in.h:6049
+#: ../data/Locations.xml.in.h:6087
 msgctxt "City in Prince Edward Island, Canada"
 msgid "Elmira"
 msgstr "Elmira"
 
 #. A city in Prince Edward Island in Canada
-#: ../data/Locations.xml.in.h:6051
+#: ../data/Locations.xml.in.h:6089
 msgid "Summerside"
 msgstr "Summerside"
 
 #. A city in Prince Edward Island in Canada
-#: ../data/Locations.xml.in.h:6053
+#: ../data/Locations.xml.in.h:6091
 msgid "Tignish"
 msgstr "Tignish"
 
 #. A state/province/territory in Canada
-#: ../data/Locations.xml.in.h:6055
+#: ../data/Locations.xml.in.h:6093
 msgctxt "State in Canada"
 msgid "Quebec"
 msgstr "Québec"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6057
+#: ../data/Locations.xml.in.h:6095
 msgid "Amqui"
 msgstr "Amqui"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6059
+#: ../data/Locations.xml.in.h:6097
 msgid "Bagotville"
 msgstr "Bagotville"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6061
+#: ../data/Locations.xml.in.h:6099
 msgid "Baie-Comeau"
 msgstr "Baie-Comeau"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6063
+#: ../data/Locations.xml.in.h:6101
 msgid "Baie-Sainte-Catherine"
 msgstr "Baie-Sainte-Catherine"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6065
+#: ../data/Locations.xml.in.h:6103
 msgid "Baie-de-la-Trinité"
 msgstr "Baie-de-la-Trinité"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6067
+#: ../data/Locations.xml.in.h:6105
 msgid "Beauceville"
 msgstr "Beauceville"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6069
+#: ../data/Locations.xml.in.h:6107
 msgid "Beauport"
 msgstr "Beauport"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6071
+#: ../data/Locations.xml.in.h:6109
 msgctxt "City in Quebec, Canada"
 msgid "Bedford"
 msgstr "Bedford"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6073
+#: ../data/Locations.xml.in.h:6111
 msgid "Bellin"
 msgstr "Bellin"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6075
+#: ../data/Locations.xml.in.h:6113
 msgid "Blanc-Sablon"
 msgstr "Blanc-Sablon"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6077
+#: ../data/Locations.xml.in.h:6115
 msgid "Canton-Bégin"
 msgstr "Canton-Bégin"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6079
+#: ../data/Locations.xml.in.h:6117
 msgid "Cap-Chat"
 msgstr "Cap-Chat"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6081
+#: ../data/Locations.xml.in.h:6119
 msgid "Cap-aux-Meules"
 msgstr "Cap-aux-Meules"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6083
+#: ../data/Locations.xml.in.h:6121
 msgid "Cape Cove"
 msgstr "Cape Cove"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6085
+#: ../data/Locations.xml.in.h:6123
 msgid "Chibougamau"
 msgstr "Chibougamau"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6087
+#: ../data/Locations.xml.in.h:6125
 msgid "Fort-Rupert"
 msgstr "Fort-Rupert"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6089
+#: ../data/Locations.xml.in.h:6127
 msgid "Gaspé"
 msgstr "Gaspé"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6091
+#: ../data/Locations.xml.in.h:6129
 msgid "Gatineau"
 msgstr "Gatineau"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6093
+#: ../data/Locations.xml.in.h:6131
 msgid "Harrington Harbour"
 msgstr "Harrington Harbour"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6095
+#: ../data/Locations.xml.in.h:6133
 msgid "Havre-Saint-Pierre"
 msgstr "Havre-Saint Pierre"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6097
+#: ../data/Locations.xml.in.h:6135
 msgid "Inoucdjouac"
 msgstr "Inoucdjouac"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6099
+#: ../data/Locations.xml.in.h:6137
 msgid "Ivugivik"
 msgstr "Ivugivik"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6101
+#: ../data/Locations.xml.in.h:6139
 msgid "Jacques-Cartier"
 msgstr "Jacques-Cartier"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6103
+#: ../data/Locations.xml.in.h:6141
 msgid "Jonquière"
 msgstr "Jonquière"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6105
+#: ../data/Locations.xml.in.h:6143
 msgid "Koartac"
 msgstr "Koartac"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6107
+#: ../data/Locations.xml.in.h:6145
 msgid "Kuujjuaq"
 msgstr "Kuujjuaq"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6109
+#: ../data/Locations.xml.in.h:6147
 msgid "L'Anse-Saint-Jean"
 msgstr "L'Anse-Saint-Jean"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6111
+#: ../data/Locations.xml.in.h:6149
 msgid "L'Ascension"
 msgstr "L'Ascension"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6113
+#: ../data/Locations.xml.in.h:6151
 msgid "L'Assomption"
 msgstr "L'Assomption"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6115
+#: ../data/Locations.xml.in.h:6153
 msgid "La Baie"
 msgstr "La Baie"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6117
+#: ../data/Locations.xml.in.h:6155
 msgid "La Tuque"
 msgstr "La Tuque"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6119
+#: ../data/Locations.xml.in.h:6157
 msgid "Leaf River"
 msgstr "Leaf River"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6121
+#: ../data/Locations.xml.in.h:6159
 msgid "Lennoxville"
 msgstr "Lennoxville"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6123
+#: ../data/Locations.xml.in.h:6161
 msgid "Longue-Pointe-de-Mingan"
 msgstr "Longue-Pointe-de-Mingan"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6125
+#: ../data/Locations.xml.in.h:6163
 msgid "Maniwaki"
 msgstr "Maniwaki"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6127
+#: ../data/Locations.xml.in.h:6165
 msgid "Maricourt"
 msgstr "Maricourt"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6129
+#: ../data/Locations.xml.in.h:6167
 msgid "Matagami"
 msgstr "Matagami"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6131
+#: ../data/Locations.xml.in.h:6169
 msgid "Mont-Apica"
 msgstr "Mont-Apica"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6133
+#: ../data/Locations.xml.in.h:6171
 msgid "Mont-Joli"
 msgstr "Mont-Joli"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6135
+#: ../data/Locations.xml.in.h:6173
 msgid "Montmagny"
 msgstr "Montmagny"
 
 #. A city in Quebec in Canada.
 #. The local name in French is "Montréal".
 #. 
-#: ../data/Locations.xml.in.h:6139
+#: ../data/Locations.xml.in.h:6177
 msgid "Montreal"
 msgstr "Montreal"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6141
+#: ../data/Locations.xml.in.h:6179
 msgid "Natashquan"
 msgstr "Natashquan"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6143
+#: ../data/Locations.xml.in.h:6181
 msgid "New Carlisle"
 msgstr "New Carlisle"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6145
+#: ../data/Locations.xml.in.h:6183
 msgid "Nicolet"
 msgstr "Nicolet"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6147
+#: ../data/Locations.xml.in.h:6185
 msgid "Normandin"
 msgstr "Normandin"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6149
+#: ../data/Locations.xml.in.h:6187
 msgid "Notre-Dame-de-la-Salette"
 msgstr "Notre-Dame-de-la-Salette"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6151
+#: ../data/Locations.xml.in.h:6189
 msgid "Nouveau-Comptoir"
 msgstr "Nouveau-Comptoir"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6153
+#: ../data/Locations.xml.in.h:6191
 msgid "Parent"
 msgstr "Parent"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6155
+#: ../data/Locations.xml.in.h:6193
 msgid "Petite-Rivière"
 msgstr "Petite-Rivière"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6157
+#: ../data/Locations.xml.in.h:6195
 msgid "Port-Menier"
 msgstr "Port-Menier"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6159
+#: ../data/Locations.xml.in.h:6197
 msgid "Portneuf"
 msgstr "Portneuf"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6161
+#: ../data/Locations.xml.in.h:6199
 msgid "Poste-de-la-Baleine"
 msgstr "Poste-de-la-Baleine"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6163
+#: ../data/Locations.xml.in.h:6201
 msgid "Puvirnituq"
 msgstr "Puvirnituq"
 
 #. A city in Quebec in Canada.
 #. The local name in French is "Québec".
 #. 
-#: ../data/Locations.xml.in.h:6167
+#: ../data/Locations.xml.in.h:6205
 msgctxt "City in Quebec, Canada"
 msgid "Quebec"
 msgstr "Quebec"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6169
+#: ../data/Locations.xml.in.h:6207
 msgid "Radisson"
 msgstr "Radisson"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6171
+#: ../data/Locations.xml.in.h:6209
 msgid "Rivière-du-Loup"
 msgstr "Rivière-du-Loup"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6173
+#: ../data/Locations.xml.in.h:6211
 msgid "Rivière-la-Madeleine"
 msgstr "Rivière-la-Madeleine"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6175
+#: ../data/Locations.xml.in.h:6213
 msgid "Roberval"
 msgstr "Roberval"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6177
+#: ../data/Locations.xml.in.h:6215
 msgid "Rouyn"
 msgstr "Rouyn"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6179
+#: ../data/Locations.xml.in.h:6217
 msgid "Saint-Anicet"
 msgstr "Saint-Anicet"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6181
+#: ../data/Locations.xml.in.h:6219
 msgid "Saint-Chrysostome"
 msgstr "Saint-Chrysostome"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6183
+#: ../data/Locations.xml.in.h:6221
 msgid "Saint-Fabien"
 msgstr "Saint-Fabien"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6185
+#: ../data/Locations.xml.in.h:6223
 msgid "Saint-François"
 msgstr "Saint-François"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6187
+#: ../data/Locations.xml.in.h:6225
 msgid "Saint-Henri-de-Taillon"
 msgstr "Saint-Henri-de-Taillon"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6189
+#: ../data/Locations.xml.in.h:6227
 msgid "Saint-Jean"
 msgstr "Saint-Jean"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6191
+#: ../data/Locations.xml.in.h:6229
 msgid "Saint-Joachim"
 msgstr "Saint-Joachim"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6193
+#: ../data/Locations.xml.in.h:6231
 msgid "Saint-Jovite"
 msgstr "Saint-Jovite"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6195
+#: ../data/Locations.xml.in.h:6233
 msgid "Sainte-Anne-de-la-Pocatière"
 msgstr "Sainte-Anne-de-la-Pocatière"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6197
+#: ../data/Locations.xml.in.h:6235
 msgid "Schefferville"
 msgstr "Schefferville"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6199
+#: ../data/Locations.xml.in.h:6237
 msgid "Senneville"
 msgstr "Senneville"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6201
+#: ../data/Locations.xml.in.h:6239
 msgid "Sept-Îles"
 msgstr "Sept-Îles"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6203
+#: ../data/Locations.xml.in.h:6241
 msgid "Shawinigan"
 msgstr "Shawinigan"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6205
+#: ../data/Locations.xml.in.h:6243
 msgid "Sherbrooke"
 msgstr "Sherbrooke"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6207
+#: ../data/Locations.xml.in.h:6245
 msgid "Stoneham"
 msgstr "Stoneham"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6209
+#: ../data/Locations.xml.in.h:6247
 msgid "Trois-Rivières"
 msgstr "Trois-Rivières"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6211
+#: ../data/Locations.xml.in.h:6249
 msgid "Val-d'Or"
 msgstr "Val-d'Or"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6213
+#: ../data/Locations.xml.in.h:6251
 msgid "Valcartier Station"
 msgstr "Valcartier Station"
 
 #. A city in Quebec in Canada
-#: ../data/Locations.xml.in.h:6215
+#: ../data/Locations.xml.in.h:6253
 msgid "Varennes"
 msgstr "Varennes"
 
 #. A state/province/territory in Canada
-#: ../data/Locations.xml.in.h:6217
+#: ../data/Locations.xml.in.h:6255
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6219
+#: ../data/Locations.xml.in.h:6257
 msgid "Assiniboia"
 msgstr "Assiniboia"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6221
+#: ../data/Locations.xml.in.h:6259
 msgid "Broadview"
 msgstr "Broadview"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6223
+#: ../data/Locations.xml.in.h:6261
 msgid "Buffalo Narrows"
 msgstr "Buffalo Narrows"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6225
+#: ../data/Locations.xml.in.h:6263
 msgid "East Poplar"
 msgstr "East Poplar"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6227
+#: ../data/Locations.xml.in.h:6265
 msgid "Eastend"
 msgstr "Eastend"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6229
+#: ../data/Locations.xml.in.h:6267
 msgid "Estevan"
 msgstr "Estevan"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6231
+#: ../data/Locations.xml.in.h:6269
 msgid "Kindersley"
 msgstr "Kindersley"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6233
+#: ../data/Locations.xml.in.h:6271
 msgid "La Ronge"
 msgstr "La Ronge"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6235
+#: ../data/Locations.xml.in.h:6273
 msgid "Leader"
 msgstr "Leader"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6237
+#: ../data/Locations.xml.in.h:6275
 msgid "Lloydminster"
 msgstr "Lloydminster"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6239
+#: ../data/Locations.xml.in.h:6277
 msgid "Lucky Lake"
 msgstr "Lucky Lake"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6241
+#: ../data/Locations.xml.in.h:6279
 msgid "Maple Creek"
 msgstr "Maple Creek"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6243
+#: ../data/Locations.xml.in.h:6281
 msgid "Meadow Lake"
 msgstr "Meadow Lake"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6245
+#: ../data/Locations.xml.in.h:6283
 msgid "Melfort"
 msgstr "Melfort"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6247
+#: ../data/Locations.xml.in.h:6285
 msgid "Nipawin"
 msgstr "Nipawin"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6249
+#: ../data/Locations.xml.in.h:6287
 msgid "North Battleford"
 msgstr "North Battleford"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6251
+#: ../data/Locations.xml.in.h:6289
 msgid "Prince Albert"
 msgstr "Prince Albert"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6253
+#: ../data/Locations.xml.in.h:6291
 msgid "Regina"
 msgstr "Regina"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6255
+#: ../data/Locations.xml.in.h:6293
 msgid "Rockglen"
 msgstr "Rockglen"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6257
+#: ../data/Locations.xml.in.h:6295
 msgid "Rosetown"
 msgstr "Rosetown"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6259
+#: ../data/Locations.xml.in.h:6297
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6261
+#: ../data/Locations.xml.in.h:6299
 msgctxt "City in Saskatchewan, Canada"
 msgid "Southend"
 msgstr "Southend"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6263
+#: ../data/Locations.xml.in.h:6301
 msgid "Spiritwood"
 msgstr "Spiritwood"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6265
+#: ../data/Locations.xml.in.h:6303
 msgid "Stony Rapids"
 msgstr "Stony Rapids"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6267
+#: ../data/Locations.xml.in.h:6305
 msgid "Swift Current"
 msgstr "Swift Current"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6269
+#: ../data/Locations.xml.in.h:6307
 msgid "Uranium City"
 msgstr "Uranium City"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6271
+#: ../data/Locations.xml.in.h:6309
 msgid "Val Marie"
 msgstr "Val Marie"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6273
+#: ../data/Locations.xml.in.h:6311
 msgid "Watrous"
 msgstr "Watrous"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6275
+#: ../data/Locations.xml.in.h:6313
 msgid "Weyburn"
 msgstr "Weyburn"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6277
+#: ../data/Locations.xml.in.h:6315
 msgid "Wynyard"
 msgstr "Wynyard"
 
 #. A city in Saskatchewan in Canada
-#: ../data/Locations.xml.in.h:6279
+#: ../data/Locations.xml.in.h:6317
 msgid "Yorkton"
 msgstr "Yorkton"
 
 #. FIXME: rename this to Yukon
-#: ../data/Locations.xml.in.h:6281
+#: ../data/Locations.xml.in.h:6319
 msgid "Yukon Territory"
 msgstr "Yukon-territoriet"
 
 #. A city in Yukon Territory in Canada
-#: ../data/Locations.xml.in.h:6283
+#: ../data/Locations.xml.in.h:6321
 msgid "Burwash Landing"
 msgstr "Burwash Landing"
 
 #. A city in Yukon Territory in Canada
-#: ../data/Locations.xml.in.h:6285
+#: ../data/Locations.xml.in.h:6323
 msgid "Carmacks"
 msgstr "Carmacks"
 
 #. A city in Yukon Territory in Canada
-#: ../data/Locations.xml.in.h:6287
+#: ../data/Locations.xml.in.h:6325
 msgid "Dawson"
 msgstr "Dawson"
 
 #. A city in Yukon Territory in Canada
-#: ../data/Locations.xml.in.h:6289
+#: ../data/Locations.xml.in.h:6327
 msgid "Haines Junction"
 msgstr "Haines Junction"
 
 #. A city in Yukon Territory in Canada
-#: ../data/Locations.xml.in.h:6291
+#: ../data/Locations.xml.in.h:6329
 msgid "Mayo"
 msgstr "Mayo"
 
 #. A city in Yukon Territory in Canada
-#: ../data/Locations.xml.in.h:6293
+#: ../data/Locations.xml.in.h:6331
 msgid "Old Crow"
 msgstr "Old Crow"
 
 #. A city in Yukon Territory in Canada
-#: ../data/Locations.xml.in.h:6295
+#: ../data/Locations.xml.in.h:6333
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
 #. A city in Yukon Territory in Canada
-#: ../data/Locations.xml.in.h:6297
+#: ../data/Locations.xml.in.h:6335
 msgid "Snag"
 msgstr "Snag"
 
 #. A city in Yukon Territory in Canada
-#: ../data/Locations.xml.in.h:6299
+#: ../data/Locations.xml.in.h:6337
 msgid "Teslin"
 msgstr "Teslin"
 
 #. A city in Yukon Territory in Canada
-#: ../data/Locations.xml.in.h:6301
+#: ../data/Locations.xml.in.h:6339
 msgid "Watson Lake"
 msgstr "Watson Lake"
 
 #. A city in Yukon Territory in Canada
-#: ../data/Locations.xml.in.h:6303
+#: ../data/Locations.xml.in.h:6341
 msgid "Whitehorse"
 msgstr "Whitehorse"
 
 #. MX - Mexico
-#: ../data/Locations.xml.in.h:6305
+#: ../data/Locations.xml.in.h:6343
 msgid "Mexico"
 msgstr "Mexico"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6307
+#: ../data/Locations.xml.in.h:6345
 msgctxt "State in Mexico"
 msgid "Aguascalientes"
 msgstr "Aguascalientes"
 
 #. A city in Aguascalientes in Mexico
-#: ../data/Locations.xml.in.h:6309
+#: ../data/Locations.xml.in.h:6347
 msgctxt "City in Aguascalientes, Mexico"
 msgid "Aguascalientes"
 msgstr "Aguascalientes"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6311
+#: ../data/Locations.xml.in.h:6349
 msgid "Baja California"
 msgstr "Baja California"
 
 #. A city in Baja California in Mexico
-#: ../data/Locations.xml.in.h:6313
+#: ../data/Locations.xml.in.h:6351
 msgid "Mexicali"
 msgstr "Mexicali"
 
 #. A city in Baja California in Mexico
-#: ../data/Locations.xml.in.h:6315
+#: ../data/Locations.xml.in.h:6353
 msgid "Tijuana"
 msgstr "Tijuana"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6317
+#: ../data/Locations.xml.in.h:6355
 msgid "Baja California Sur"
 msgstr "Baja California Sur"
 
 #. A city in Baja California Sur in Mexico
-#: ../data/Locations.xml.in.h:6319
+#: ../data/Locations.xml.in.h:6357
 msgctxt "City in Baja California Sur, Mexico"
 msgid "La Paz"
 msgstr "La Paz"
 
 #. A city in Baja California Sur in Mexico
-#: ../data/Locations.xml.in.h:6321
+#: ../data/Locations.xml.in.h:6359
 msgid "Loreto"
 msgstr "Loreto"
 
 #. A city in Baja California Sur in Mexico
-#: ../data/Locations.xml.in.h:6323
+#: ../data/Locations.xml.in.h:6361
 msgid "San José del Cabo"
 msgstr "San José del Cabo"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6325
+#: ../data/Locations.xml.in.h:6363
 msgctxt "State in Mexico"
 msgid "Campeche"
 msgstr "Campeche"
 
 #. A city in Campeche in Mexico
-#: ../data/Locations.xml.in.h:6327
+#: ../data/Locations.xml.in.h:6365
 msgctxt "City in Campeche, Mexico"
 msgid "Campeche"
 msgstr "Campeche"
 
 #. A city in Campeche in Mexico
-#: ../data/Locations.xml.in.h:6329
+#: ../data/Locations.xml.in.h:6367
 msgid "Carmen"
 msgstr "Carmen"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6331
+#: ../data/Locations.xml.in.h:6369
 msgid "Chiapas"
 msgstr "Chiapas"
 
 #. A city in Chiapas in Mexico
-#: ../data/Locations.xml.in.h:6333
+#: ../data/Locations.xml.in.h:6371
 msgid "Tapachula"
 msgstr "Tapachula"
 
 #. A city in Chiapas in Mexico
-#: ../data/Locations.xml.in.h:6335
+#: ../data/Locations.xml.in.h:6373
 msgid "Tuxtla"
 msgstr "Tuxtla"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6337
+#: ../data/Locations.xml.in.h:6375
 msgctxt "State in Mexico"
 msgid "Chihuahua"
 msgstr "Chihuahua"
 
 #. A city in Chihuahua in Mexico
-#: ../data/Locations.xml.in.h:6339
+#: ../data/Locations.xml.in.h:6377
 msgctxt "City in Chihuahua, Mexico"
 msgid "Chihuahua"
 msgstr "Chihuahua"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6341
+#: ../data/Locations.xml.in.h:6379
 msgid "Coahuila"
 msgstr "Coahuila"
 
 #. A city in Coahuila in Mexico
-#: ../data/Locations.xml.in.h:6343
+#: ../data/Locations.xml.in.h:6381
 msgid "Monclova"
 msgstr "Monclova"
 
 #. A city in Coahuila in Mexico
-#: ../data/Locations.xml.in.h:6345
+#: ../data/Locations.xml.in.h:6383
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
 #. A city in Coahuila in Mexico
-#: ../data/Locations.xml.in.h:6347
+#: ../data/Locations.xml.in.h:6385
 msgid "Saltillo"
 msgstr "Saltillo"
 
 #. A city in Coahuila in Mexico
-#: ../data/Locations.xml.in.h:6349
+#: ../data/Locations.xml.in.h:6387
 msgid "Torreón"
 msgstr "Torreón"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6351
+#: ../data/Locations.xml.in.h:6389
 msgctxt "State in Mexico"
 msgid "Colima"
 msgstr "Colima"
 
 #. A city in Colima in Mexico
-#: ../data/Locations.xml.in.h:6353
+#: ../data/Locations.xml.in.h:6391
 msgctxt "City in Colima, Mexico"
 msgid "Colima"
 msgstr "Colima"
 
 #. A city in Colima in Mexico
-#: ../data/Locations.xml.in.h:6355
+#: ../data/Locations.xml.in.h:6393
 msgctxt "City in Colima, Mexico"
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6357
+#: ../data/Locations.xml.in.h:6395
 msgctxt "State in Mexico"
 msgid "Distrito Federal"
 msgstr "Distrito Federal"
@@ -14455,347 +14455,347 @@
 #. "Mexico City" is the traditional English name.
 #. The local name in Spanish is "México".
 #. 
-#: ../data/Locations.xml.in.h:6362
+#: ../data/Locations.xml.in.h:6400
 msgid "Mexico City"
 msgstr "Mexico City"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6364
+#: ../data/Locations.xml.in.h:6402
 msgctxt "State in Mexico"
 msgid "Durango"
 msgstr "Durango"
 
 #. A city in Durango in Mexico
-#: ../data/Locations.xml.in.h:6366
+#: ../data/Locations.xml.in.h:6404
 msgctxt "City in Durango, Mexico"
 msgid "Durango"
 msgstr "Durango"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6368
+#: ../data/Locations.xml.in.h:6406
 msgid "Guanajuato"
 msgstr "Guanajuato"
 
 #. A city in Guanajuato in Mexico
-#: ../data/Locations.xml.in.h:6370
+#: ../data/Locations.xml.in.h:6408
 msgctxt "City in Guanajuato, Mexico"
 msgid "León"
 msgstr "León"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6372
+#: ../data/Locations.xml.in.h:6410
 msgid "Guerrero"
 msgstr "Guerrero"
 
 #. A city in Guerrero in Mexico
-#: ../data/Locations.xml.in.h:6374
+#: ../data/Locations.xml.in.h:6412
 msgid "Acapulco"
 msgstr "Acapulco"
 
 #. A city in Guerrero in Mexico
-#: ../data/Locations.xml.in.h:6376
+#: ../data/Locations.xml.in.h:6414
 msgid "Ixtapa"
 msgstr "Ixtapa"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6378
+#: ../data/Locations.xml.in.h:6416
 msgid "Hidalgo"
 msgstr "Hidalgo"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6380
+#: ../data/Locations.xml.in.h:6418
 msgid "Jalisco"
 msgstr "Jalisco"
 
 #. A city in Jalisco in Mexico
-#: ../data/Locations.xml.in.h:6382
+#: ../data/Locations.xml.in.h:6420
 msgid "Guadalajara"
 msgstr "Guadalajara"
 
 #. A city in Jalisco in Mexico
-#: ../data/Locations.xml.in.h:6384
+#: ../data/Locations.xml.in.h:6422
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6386
+#: ../data/Locations.xml.in.h:6424
 msgid "Michoacán"
 msgstr "Michoacán"
 
 #. A city in Michoacán in Mexico
-#: ../data/Locations.xml.in.h:6388
+#: ../data/Locations.xml.in.h:6426
 msgid "Morelia"
 msgstr "Morelia"
 
 #. A city in Michoacán in Mexico
-#: ../data/Locations.xml.in.h:6390
+#: ../data/Locations.xml.in.h:6428
 msgid "Uruapan"
 msgstr "Uruapan"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6392
+#: ../data/Locations.xml.in.h:6430
 msgid "Morelos"
 msgstr "Morelos"
 
 #. A city in Morelos in Mexico
-#: ../data/Locations.xml.in.h:6394
+#: ../data/Locations.xml.in.h:6432
 msgid "Cuernavaca"
 msgstr "Cuernavaca"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6396
+#: ../data/Locations.xml.in.h:6434
 msgid "México"
 msgstr "México"
 
 #. A city in México in Mexico.
 #. One of several cities in Mexico called "Juárez".
 #. 
-#: ../data/Locations.xml.in.h:6400
+#: ../data/Locations.xml.in.h:6438
 msgid "Ciudad Juárez"
 msgstr "Ciudad Juárez"
 
 #. A city in México in Mexico
-#: ../data/Locations.xml.in.h:6402
+#: ../data/Locations.xml.in.h:6440
 msgid "Toluca"
 msgstr "Toluca"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6404
+#: ../data/Locations.xml.in.h:6442
 msgid "Nayarit"
 msgstr "Nayarit"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6406
+#: ../data/Locations.xml.in.h:6444
 msgid "Nuevo León"
 msgstr "Nuevo León"
 
 #. A city in Nuevo León in Mexico
-#: ../data/Locations.xml.in.h:6408
+#: ../data/Locations.xml.in.h:6446
 msgid "Monterrey"
 msgstr "Monterrey"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6410
+#: ../data/Locations.xml.in.h:6448
 msgctxt "State in Mexico"
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
 #. A city in Oaxaca in Mexico
-#: ../data/Locations.xml.in.h:6412
+#: ../data/Locations.xml.in.h:6450
 msgid "El Zapote"
 msgstr "El Zapote"
 
 #. A city in Oaxaca in Mexico
-#: ../data/Locations.xml.in.h:6414
+#: ../data/Locations.xml.in.h:6452
 msgid "Ixtepec"
 msgstr "Ixtepec"
 
 #. A city in Oaxaca in Mexico
-#: ../data/Locations.xml.in.h:6416
+#: ../data/Locations.xml.in.h:6454
 msgid "Laguna Tepic"
 msgstr "Laguna Tepic"
 
 #. A city in Oaxaca in Mexico
-#: ../data/Locations.xml.in.h:6418
+#: ../data/Locations.xml.in.h:6456
 msgctxt "City in Oaxaca, Mexico"
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
 #. A city in Oaxaca in Mexico
-#: ../data/Locations.xml.in.h:6420
+#: ../data/Locations.xml.in.h:6458
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6422
+#: ../data/Locations.xml.in.h:6460
 msgctxt "State in Mexico"
 msgid "Puebla"
 msgstr "Puebla"
 
 #. A city in Puebla in Mexico
-#: ../data/Locations.xml.in.h:6424
+#: ../data/Locations.xml.in.h:6462
 msgctxt "City in Puebla, Mexico"
 msgid "Puebla"
 msgstr "Puebla"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6426
+#: ../data/Locations.xml.in.h:6464
 msgctxt "State in Mexico"
 msgid "Querétaro"
 msgstr "Querétaro"
 
 #. A city in Querétaro in Mexico
-#: ../data/Locations.xml.in.h:6428
+#: ../data/Locations.xml.in.h:6466
 msgctxt "City in Querétaro, Mexico"
 msgid "Querétaro"
 msgstr "Querétaro"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6430
+#: ../data/Locations.xml.in.h:6468
 msgid "Quintana Roo"
 msgstr "Quintana Roo"
 
 #. A city in Quintana Roo in Mexico
-#: ../data/Locations.xml.in.h:6432
+#: ../data/Locations.xml.in.h:6470
 msgid "Cancún"
 msgstr "Cancún"
 
 #. A city in Quintana Roo in Mexico
-#: ../data/Locations.xml.in.h:6434
+#: ../data/Locations.xml.in.h:6472
 msgid "Chetumal"
 msgstr "Chetumal"
 
 #. A city in Quintana Roo in Mexico
-#: ../data/Locations.xml.in.h:6436
+#: ../data/Locations.xml.in.h:6474
 msgid "Cozumel"
 msgstr "Cozumel"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6438
+#: ../data/Locations.xml.in.h:6476
 msgctxt "State in Mexico"
 msgid "San Luis Potosí"
 msgstr "San Luis Potosí"
 
 #. A city in San Luis Potosí in Mexico
-#: ../data/Locations.xml.in.h:6440
+#: ../data/Locations.xml.in.h:6478
 msgctxt "City in San Luis Potosí, Mexico"
 msgid "San Luis Potosí"
 msgstr "San Luis Potosí"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6442
+#: ../data/Locations.xml.in.h:6480
 msgid "Sinaloa"
 msgstr "Sinaloa"
 
 #. A city in Sinaloa in Mexico
-#: ../data/Locations.xml.in.h:6444
+#: ../data/Locations.xml.in.h:6482
 msgid "Culiacán"
 msgstr "Culiacán"
 
 #. A city in Sinaloa in Mexico
-#: ../data/Locations.xml.in.h:6446
+#: ../data/Locations.xml.in.h:6484
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
 #. A city in Sinaloa in Mexico
-#: ../data/Locations.xml.in.h:6448
+#: ../data/Locations.xml.in.h:6486
 msgid "Mazatlán"
 msgstr "Mazatlán"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6450
+#: ../data/Locations.xml.in.h:6488
 msgctxt "State in Mexico"
 msgid "Sonora"
 msgstr "Sonora"
 
 #. A city in Sonora in Mexico
-#: ../data/Locations.xml.in.h:6452
+#: ../data/Locations.xml.in.h:6490
 msgid "Ciudad Obregón"
 msgstr "Ciudad Obregón"
 
 #. A city in Sonora in Mexico
-#: ../data/Locations.xml.in.h:6454
+#: ../data/Locations.xml.in.h:6492
 msgid "Guaymas"
 msgstr "Guaymas"
 
 #. A city in Sonora in Mexico
-#: ../data/Locations.xml.in.h:6456
+#: ../data/Locations.xml.in.h:6494
 msgid "Hermosillo"
 msgstr "Hermosillo"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6458
+#: ../data/Locations.xml.in.h:6496
 msgid "Tabasco"
 msgstr "Tabasco"
 
 #. A city in Tabasco in Mexico
-#: ../data/Locations.xml.in.h:6460
+#: ../data/Locations.xml.in.h:6498
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6462
+#: ../data/Locations.xml.in.h:6500
 msgid "Tamaulipas"
 msgstr "Tamaulipas"
 
 #. A city in Tamaulipas in Mexico
-#: ../data/Locations.xml.in.h:6464
+#: ../data/Locations.xml.in.h:6502
 msgid "Ciudad Victoria"
 msgstr "Ciudad Victoria"
 
 #. A city in Tamaulipas in Mexico
-#: ../data/Locations.xml.in.h:6466
+#: ../data/Locations.xml.in.h:6504
 msgid "Matamoros"
 msgstr "Matamoros"
 
 #. A city in Tamaulipas in Mexico
-#: ../data/Locations.xml.in.h:6468
+#: ../data/Locations.xml.in.h:6506
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
 #. A city in Tamaulipas in Mexico
-#: ../data/Locations.xml.in.h:6470
+#: ../data/Locations.xml.in.h:6508
 msgid "Reynosa"
 msgstr "Reynosa"
 
 #. A city in Tamaulipas in Mexico
-#: ../data/Locations.xml.in.h:6472
+#: ../data/Locations.xml.in.h:6510
 msgid "Tampico"
 msgstr "Tampico"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6474
+#: ../data/Locations.xml.in.h:6512
 msgid "Tlaxcala"
 msgstr "Tlaxcala"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6476
+#: ../data/Locations.xml.in.h:6514
 msgctxt "State in Mexico"
 msgid "Veracruz"
 msgstr "Veracruz"
 
 #. A city in Veracruz in Mexico
-#: ../data/Locations.xml.in.h:6478
+#: ../data/Locations.xml.in.h:6516
 msgid "Minatitlán"
 msgstr "Minatitlán"
 
 #. A city in Veracruz in Mexico.
 #. One of several cities in Mexico called "Poza Rica".
 #. 
-#: ../data/Locations.xml.in.h:6482
+#: ../data/Locations.xml.in.h:6520
 msgid "Poza Rica de Hidalgo"
 msgstr "Poza Rica de Hidalgo"
 
 #. A city in Veracruz in Mexico
-#: ../data/Locations.xml.in.h:6484
+#: ../data/Locations.xml.in.h:6522
 msgctxt "City in Veracruz, Mexico"
 msgid "Veracruz"
 msgstr "Veracruz"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6486
+#: ../data/Locations.xml.in.h:6524
 msgid "Yucatán"
 msgstr "Yucután"
 
 #. A city in Yucatán in Mexico
-#: ../data/Locations.xml.in.h:6488
+#: ../data/Locations.xml.in.h:6526
 msgid "Chichén-Itzá"
 msgstr "Chichén-Itzá"
 
 #. A city in Yucatán in Mexico
-#: ../data/Locations.xml.in.h:6490
+#: ../data/Locations.xml.in.h:6528
 msgctxt "City in Yucatán, Mexico"
 msgid "Mérida"
 msgstr "Mérida"
 
 #. A state/province/territory in Mexico
-#: ../data/Locations.xml.in.h:6492
+#: ../data/Locations.xml.in.h:6530
 msgctxt "State in Mexico"
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
 #. A city in Zacatecas in Mexico
-#: ../data/Locations.xml.in.h:6494
+#: ../data/Locations.xml.in.h:6532
 msgctxt "City in Zacatecas, Mexico"
 msgid "Zacatecas"
 msgstr "Zacatecas"
@@ -14804,18 +14804,18 @@
 #. America (off the coast of Newfoundland). The French name is
 #. "Saint-Pierre-et-Miquelon".
 #. 
-#: ../data/Locations.xml.in.h:6499
+#: ../data/Locations.xml.in.h:6537
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre and Miquelon"
 
 #. The capital of Saint Pierre and Miquelon
-#: ../data/Locations.xml.in.h:6501
+#: ../data/Locations.xml.in.h:6539
 msgctxt "City in Saint Pierre and Miquelon"
 msgid "Saint-Pierre"
 msgstr "Saint-Pierre"
 
 #. US - United States, aka United States of America
-#: ../data/Locations.xml.in.h:6503
+#: ../data/Locations.xml.in.h:6541
 msgid "United States"
 msgstr "USA"
 
@@ -14826,7 +14826,7 @@
 #. Daylight Saving Time). It is only used in places where
 #. "United States" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:6511
+#: ../data/Locations.xml.in.h:6549
 msgid "Hawaiian-Aleutian Time (Aleutian Islands)"
 msgstr "Hawaii-Aleutisk tid (aleutiske øyer)"
 
@@ -14837,7 +14837,7 @@
 #. Daylight Saving Time. It is only used in places where
 #. "United States" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:6519
+#: ../data/Locations.xml.in.h:6557
 msgid "Hawaiian-Aleutian Time, no DST (Hawaii)"
 msgstr "Hawaii-Aleutisk tid, uten DST (Hawaii)"
 
@@ -14845,7 +14845,7 @@
 #. United States. The string is only used in places where
 #. "United States" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:6524
+#: ../data/Locations.xml.in.h:6562
 msgid "Alaska Time"
 msgstr "Alaska tid"
 
@@ -14855,8720 +14855,8720 @@
 #. the zone. The string is only used in places where
 #. "United States" is already clear from context.
 #. 
-#: ../data/Locations.xml.in.h:6531
+#: ../data/Locations.xml.in.h:6569
 msgid "Mountain Time, no DST (Arizona)"
 msgstr "Mountain Time, uten DST (Arizona)"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:6533
+#: ../data/Locations.xml.in.h:6571
 msgid "Alabama"
 msgstr "Alabama"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6535
+#: ../data/Locations.xml.in.h:6573
 msgid "Alabaster"
 msgstr "Alabaster"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6537
+#: ../data/Locations.xml.in.h:6575
 msgid "Albertville"
 msgstr "Albertville"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6539
+#: ../data/Locations.xml.in.h:6577
 msgid "Alexander City"
 msgstr "Alexander City"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6541
+#: ../data/Locations.xml.in.h:6579
 msgid "Andalusia"
 msgstr "Andalusia"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6543
+#: ../data/Locations.xml.in.h:6581
 msgid "Anniston"
 msgstr "Anniston"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6545
+#: ../data/Locations.xml.in.h:6583
 msgctxt "City in Alabama, United States"
 msgid "Auburn"
 msgstr "Auburn"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6547
+#: ../data/Locations.xml.in.h:6585
 msgctxt "City in Alabama, United States"
 msgid "Birmingham"
 msgstr "Birmingham"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6549
+#: ../data/Locations.xml.in.h:6587
 msgid "Cullman"
 msgstr "Cullman"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6551
+#: ../data/Locations.xml.in.h:6589
 msgid "Daleville"
 msgstr "Daleville"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6553
+#: ../data/Locations.xml.in.h:6591
 msgctxt "City in Alabama, United States"
 msgid "Decatur"
 msgstr "Decatur"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6555
+#: ../data/Locations.xml.in.h:6593
 msgid "Dothan"
 msgstr "Dothan"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6557
+#: ../data/Locations.xml.in.h:6595
 msgid "Evergreen"
 msgstr "Evergreen"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6559
+#: ../data/Locations.xml.in.h:6597
 msgid "Fort Payne"
 msgstr "Fort Payne"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6561
+#: ../data/Locations.xml.in.h:6599
 msgid "Gadsden"
 msgstr "Gadsden"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6563
+#: ../data/Locations.xml.in.h:6601
 msgid "Haleyville"
 msgstr "Haleyville"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6565
+#: ../data/Locations.xml.in.h:6603
 msgctxt "City in Alabama, United States"
 msgid "Huntsville"
 msgstr "Huntsville"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6567
+#: ../data/Locations.xml.in.h:6605
 msgid "Mobile"
 msgstr "Mobile"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6569
+#: ../data/Locations.xml.in.h:6607
 msgctxt "City in Alabama, United States"
 msgid "Montgomery"
 msgstr "Montgomery"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6571
+#: ../data/Locations.xml.in.h:6609
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6573
+#: ../data/Locations.xml.in.h:6611
 msgid "Ozark"
 msgstr "Ozark"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6575
+#: ../data/Locations.xml.in.h:6613
 msgctxt "City in Alabama, United States"
 msgid "Troy"
 msgstr "Troy"
 
 #. A city in Alabama in the United States
-#: ../data/Locations.xml.in.h:6577
+#: ../data/Locations.xml.in.h:6615
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:6579
+#: ../data/Locations.xml.in.h:6617
 msgid "Alaska"
 msgstr "Alaska"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6581
+#: ../data/Locations.xml.in.h:6619
 msgid "Adak"
 msgstr "Adak"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6583
+#: ../data/Locations.xml.in.h:6621
 msgctxt "City in Alaska, United States"
 msgid "Alpine"
 msgstr "Alpine"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6585
+#: ../data/Locations.xml.in.h:6623
 msgid "Ambler"
 msgstr "Ambler"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6587
+#: ../data/Locations.xml.in.h:6625
 msgid "Anaktuvuk Pass"
 msgstr "Anaktuvuk-passet"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6589
+#: ../data/Locations.xml.in.h:6627
 msgid "Anchorage"
 msgstr "Anchorage"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6591
+#: ../data/Locations.xml.in.h:6629
 msgid "Angoon"
 msgstr "Angoon"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6593
+#: ../data/Locations.xml.in.h:6631
 msgid "Aniak"
 msgstr "Aniak"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6595
+#: ../data/Locations.xml.in.h:6633
 msgid "Annette"
 msgstr "Annette"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6597
+#: ../data/Locations.xml.in.h:6635
 msgid "Anvik"
 msgstr "Anvik"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6599
+#: ../data/Locations.xml.in.h:6637
 msgid "Arctic Village"
 msgstr "Arctic Village"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6601
+#: ../data/Locations.xml.in.h:6639
 msgid "Barrow"
 msgstr "Barrow"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6603
+#: ../data/Locations.xml.in.h:6641
 msgid "Bethel"
 msgstr "Bethel"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6605
+#: ../data/Locations.xml.in.h:6643
 msgid "Bettles"
 msgstr "Bettles"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6607
+#: ../data/Locations.xml.in.h:6645
 msgid "Birchwood"
 msgstr "Birchwood"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6609
+#: ../data/Locations.xml.in.h:6647
 msgid "Buckland"
 msgstr "Buckland"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6611
+#: ../data/Locations.xml.in.h:6649
 msgid "Chandalar"
 msgstr "Chandalar"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6613
+#: ../data/Locations.xml.in.h:6651
 msgid "Chignik"
 msgstr "Chignik"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6615
+#: ../data/Locations.xml.in.h:6653
 msgid "Chisana"
 msgstr "Chisana"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6617
+#: ../data/Locations.xml.in.h:6655
 msgid "Chistochina"
 msgstr "Chistochina"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6619
+#: ../data/Locations.xml.in.h:6657
 msgid "Chulitna"
 msgstr "Chulitna"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6621
+#: ../data/Locations.xml.in.h:6659
 msgid "Cold Bay"
 msgstr "Cold Bay"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6623
+#: ../data/Locations.xml.in.h:6661
 msgid "Cordova"
 msgstr "Cordova"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6625
+#: ../data/Locations.xml.in.h:6663
 msgid "Deadhorse"
 msgstr "Deadhorse"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6627
+#: ../data/Locations.xml.in.h:6665
 msgid "Delta Junction"
 msgstr "Delta Junction"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6629
+#: ../data/Locations.xml.in.h:6667
 msgid "Dillingham"
 msgstr "Dillingham"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6631
+#: ../data/Locations.xml.in.h:6669
 msgctxt "City in Alaska, United States"
 msgid "Eagle"
 msgstr "Eagle"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6633
+#: ../data/Locations.xml.in.h:6671
 msgid "Egegik"
 msgstr "Egegik"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6635
+#: ../data/Locations.xml.in.h:6673
 msgid "Elfin Cove"
 msgstr "Elfin Cove"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6637
+#: ../data/Locations.xml.in.h:6675
 msgid "Emmonak"
 msgstr "Emmonak"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6639
+#: ../data/Locations.xml.in.h:6677
 msgid "Eureka Roadhouse"
 msgstr "Eureka Roadhouse"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6641
+#: ../data/Locations.xml.in.h:6679
 msgid "Fairbanks"
 msgstr "Fairbanks"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6643
+#: ../data/Locations.xml.in.h:6681
 msgid "Fort Yukon"
 msgstr "Fort Yukon"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6645
+#: ../data/Locations.xml.in.h:6683
 msgid "Galena"
 msgstr "Galena"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6647
+#: ../data/Locations.xml.in.h:6685
 msgid "Gambell"
 msgstr "Gambell"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6649
+#: ../data/Locations.xml.in.h:6687
 msgid "Gulkana"
 msgstr "Gulkana"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6651
+#: ../data/Locations.xml.in.h:6689
 msgid "Gustavus"
 msgstr "Gustavus"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6653
+#: ../data/Locations.xml.in.h:6691
 msgid "Haines"
 msgstr "Haines"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6655
+#: ../data/Locations.xml.in.h:6693
 msgid "Healy"
 msgstr "Healy"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6657
+#: ../data/Locations.xml.in.h:6695
 msgid "Homer"
 msgstr "Homer"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6659
+#: ../data/Locations.xml.in.h:6697
 msgid "Hoonah"
 msgstr "Hoonah"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6661
+#: ../data/Locations.xml.in.h:6699
 msgid "Hooper Bay"
 msgstr "Hooper Bay"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6663
+#: ../data/Locations.xml.in.h:6701
 msgid "Huslia"
 msgstr "Huslia"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6665
+#: ../data/Locations.xml.in.h:6703
 msgid "Hydaburg"
 msgstr "Hydaburg"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6667
+#: ../data/Locations.xml.in.h:6705
 msgctxt "City in Alaska, United States"
 msgid "Juneau"
 msgstr "Juneau"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6669
+#: ../data/Locations.xml.in.h:6707
 msgid "Kake"
 msgstr "Kake"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6671
+#: ../data/Locations.xml.in.h:6709
 msgid "Kaktovik"
 msgstr "Kaktovik"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6673
+#: ../data/Locations.xml.in.h:6711
 msgid "Kaltag"
 msgstr "Kaltag"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6675
+#: ../data/Locations.xml.in.h:6713
 msgid "Kenai"
 msgstr "Kenai"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6677
+#: ../data/Locations.xml.in.h:6715
 msgid "Ketchikan"
 msgstr "Ketchikan"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6679
+#: ../data/Locations.xml.in.h:6717
 msgid "King Salmon"
 msgstr "King Salmon"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6681
+#: ../data/Locations.xml.in.h:6719
 msgid "Kipnuk"
 msgstr "Kipnuk"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6683
+#: ../data/Locations.xml.in.h:6721
 msgid "Kivalina"
 msgstr "Kivalina"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6685
+#: ../data/Locations.xml.in.h:6723
 msgid "Klawock"
 msgstr "Klawock"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6687
+#: ../data/Locations.xml.in.h:6725
 msgid "Kodiak"
 msgstr "Kodiak"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6689
+#: ../data/Locations.xml.in.h:6727
 msgid "Kotzebue"
 msgstr "Kotzebue"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6691
+#: ../data/Locations.xml.in.h:6729
 msgid "Koyuk"
 msgstr "Koyuk"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6693
+#: ../data/Locations.xml.in.h:6731
 msgid "Kustatan"
 msgstr "Kustatan"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6695
+#: ../data/Locations.xml.in.h:6733
 msgid "Lake Minchumina"
 msgstr "Lake Minchumina"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6697
+#: ../data/Locations.xml.in.h:6735
 msgid "Lime Village"
 msgstr "Lime Village"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6699
+#: ../data/Locations.xml.in.h:6737
 msgid "Manley Hot Springs"
 msgstr "Manley Hot Springs"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6701
+#: ../data/Locations.xml.in.h:6739
 msgid "McCarthy"
 msgstr "McCarthy"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6703
+#: ../data/Locations.xml.in.h:6741
 msgid "McGrath"
 msgstr "McGrath"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6705
+#: ../data/Locations.xml.in.h:6743
 msgid "McKinley Park"
 msgstr "McKinley Park"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6707
+#: ../data/Locations.xml.in.h:6745
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6709
+#: ../data/Locations.xml.in.h:6747
 msgid "Metlakatla"
 msgstr "Metlakatla"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6711
+#: ../data/Locations.xml.in.h:6749
 msgid "Nabesna"
 msgstr "Nabesna"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6713
+#: ../data/Locations.xml.in.h:6751
 msgid "Nenana"
 msgstr "Nenana"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6715
+#: ../data/Locations.xml.in.h:6753
 msgid "Newhalen"
 msgstr "Newhalen"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6717
+#: ../data/Locations.xml.in.h:6755
 msgid "Noatak"
 msgstr "Noatak"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6719
+#: ../data/Locations.xml.in.h:6757
 msgid "Nome"
 msgstr "Nome"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6721
+#: ../data/Locations.xml.in.h:6759
 msgid "Northway"
 msgstr "Northway"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6723
+#: ../data/Locations.xml.in.h:6761
 msgid "Nuiqsut"
 msgstr "Nuiqsut"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6725
+#: ../data/Locations.xml.in.h:6763
 msgid "Palmer"
 msgstr "Palmer"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6727
+#: ../data/Locations.xml.in.h:6765
 msgid "Paxson"
 msgstr "Paxson"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6729
+#: ../data/Locations.xml.in.h:6767
 msgctxt "City in Alaska, United States"
 msgid "Petersburg"
 msgstr "Petersburg"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6731
+#: ../data/Locations.xml.in.h:6769
 msgid "Platinum"
 msgstr "Platinum"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6733
+#: ../data/Locations.xml.in.h:6771
 msgid "Point Hope"
 msgstr "Point Hope"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6735
+#: ../data/Locations.xml.in.h:6773
 msgid "Point Lay"
 msgstr "Point Lay"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6737
+#: ../data/Locations.xml.in.h:6775
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6739
+#: ../data/Locations.xml.in.h:6777
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6741
+#: ../data/Locations.xml.in.h:6779
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6743
+#: ../data/Locations.xml.in.h:6781
 msgctxt "City in Alaska, United States"
 msgid "Saint George"
 msgstr "Saint George"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6745
+#: ../data/Locations.xml.in.h:6783
 msgid "Saint Marys"
 msgstr "Saint Marys"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6747
+#: ../data/Locations.xml.in.h:6785
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6749
+#: ../data/Locations.xml.in.h:6787
 msgid "Sand Point"
 msgstr "Sand Point"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6751
+#: ../data/Locations.xml.in.h:6789
 msgid "Savoonga"
 msgstr "Sanoonga"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6753
+#: ../data/Locations.xml.in.h:6791
 msgid "Scammon Bay"
 msgstr "Scammon Bay"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6755
+#: ../data/Locations.xml.in.h:6793
 msgid "Selawik"
 msgstr "Selawik"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6757
+#: ../data/Locations.xml.in.h:6795
 msgid "Seldovia"
 msgstr "Seldovia"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6759
+#: ../data/Locations.xml.in.h:6797
 msgid "Seward"
 msgstr "Seward"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6761
+#: ../data/Locations.xml.in.h:6799
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6763
+#: ../data/Locations.xml.in.h:6801
 msgid "Sitka"
 msgstr "Sitka"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6765
+#: ../data/Locations.xml.in.h:6803
 msgid "Skagway"
 msgstr "Skagway"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6767
+#: ../data/Locations.xml.in.h:6805
 msgid "Sleetmute"
 msgstr "Sleetmute"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6769
+#: ../data/Locations.xml.in.h:6807
 msgid "Soldotna"
 msgstr "Soldotna"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6771
+#: ../data/Locations.xml.in.h:6809
 msgctxt "City in Alaska, United States"
 msgid "Sutton"
 msgstr "Sutton"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6773
+#: ../data/Locations.xml.in.h:6811
 msgid "Takotna"
 msgstr "Takotna"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6775
+#: ../data/Locations.xml.in.h:6813
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6777
+#: ../data/Locations.xml.in.h:6815
 msgid "Tanana"
 msgstr "Tanana"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6779
+#: ../data/Locations.xml.in.h:6817
 msgid "Tin City"
 msgstr "Tin City"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6781
+#: ../data/Locations.xml.in.h:6819
 msgid "Togiak"
 msgstr "Togiak"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6783
+#: ../data/Locations.xml.in.h:6821
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6785
+#: ../data/Locations.xml.in.h:6823
 msgid "Unalaska"
 msgstr "Unalaska"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6787
+#: ../data/Locations.xml.in.h:6825
 msgid "Valdez"
 msgstr "Valdez"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6789
+#: ../data/Locations.xml.in.h:6827
 msgid "Wainwright"
 msgstr "Wainwright"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6791
+#: ../data/Locations.xml.in.h:6829
 msgid "Wasilla"
 msgstr "Wasilla"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6793
+#: ../data/Locations.xml.in.h:6831
 msgid "Whittier"
 msgstr "Whittier"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6795
+#: ../data/Locations.xml.in.h:6833
 msgid "Willow"
 msgstr "Willow"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6797
+#: ../data/Locations.xml.in.h:6835
 msgid "Wrangell"
 msgstr "Wrangell"
 
 #. A city in Alaska in the United States
-#: ../data/Locations.xml.in.h:6799
+#: ../data/Locations.xml.in.h:6837
 msgid "Yakutat"
 msgstr "Yakutat"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:6801
+#: ../data/Locations.xml.in.h:6839
 msgid "Arizona"
 msgstr "Arizona"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6803
+#: ../data/Locations.xml.in.h:6841
 msgid "Bullhead City"
 msgstr "Bullhead City"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6805
+#: ../data/Locations.xml.in.h:6843
 msgid "Casa Grande"
 msgstr "Casa Grande"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6807
+#: ../data/Locations.xml.in.h:6845
 msgctxt "City in Arizona, United States"
 msgid "Chandler"
 msgstr "Chandler"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6809
+#: ../data/Locations.xml.in.h:6847
 msgid "Childs"
 msgstr "Childs"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6811
+#: ../data/Locations.xml.in.h:6849
 msgctxt "City in Arizona, United States"
 msgid "Douglas"
 msgstr "Douglas"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6813
+#: ../data/Locations.xml.in.h:6851
 msgid "Flagstaff"
 msgstr "Flagstaff"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6815
+#: ../data/Locations.xml.in.h:6853
 msgid "Gilbert"
 msgstr "Gilbert"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6817
+#: ../data/Locations.xml.in.h:6855
 msgctxt "City in Arizona, United States"
 msgid "Glendale"
 msgstr "Glendale"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6819
+#: ../data/Locations.xml.in.h:6857
 msgid "Goodyear"
 msgstr "Goodyear"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6821
+#: ../data/Locations.xml.in.h:6859
 msgid "Grand Canyon"
 msgstr "Grand Canyon"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6823
+#: ../data/Locations.xml.in.h:6861
 msgid "Kingman"
 msgstr "Kingman"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6825
+#: ../data/Locations.xml.in.h:6863
 msgid "Mesa"
 msgstr "Mesa"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6827
+#: ../data/Locations.xml.in.h:6865
 msgid "Nogales"
 msgstr "Nogales"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6829
+#: ../data/Locations.xml.in.h:6867
 msgid "Page"
 msgstr "Page"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6831
+#: ../data/Locations.xml.in.h:6869
 msgctxt "City in Arizona, United States"
 msgid "Peoria"
 msgstr "Peoria"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6833
+#: ../data/Locations.xml.in.h:6871
 msgid "Phoenix"
 msgstr "Phoenix"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6835
+#: ../data/Locations.xml.in.h:6873
 msgid "Prescott"
 msgstr "Prescott"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6837
+#: ../data/Locations.xml.in.h:6875
 msgid "Safford"
 msgstr "Safford"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6839
+#: ../data/Locations.xml.in.h:6877
 msgid "Saint Johns"
 msgstr "Saint Johns"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6841
+#: ../data/Locations.xml.in.h:6879
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6843
+#: ../data/Locations.xml.in.h:6881
 msgid "Show Low"
 msgstr "Show Low"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6845
+#: ../data/Locations.xml.in.h:6883
 msgid "Sierra Vista"
 msgstr "Sierra Vista"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6847
+#: ../data/Locations.xml.in.h:6885
 msgid "Tempe"
 msgstr "Tempe"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6849
+#: ../data/Locations.xml.in.h:6887
 msgid "Tucson"
 msgstr "Tucson"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6851
+#: ../data/Locations.xml.in.h:6889
 msgid "Window Rock"
 msgstr "Window Rock"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6853
+#: ../data/Locations.xml.in.h:6891
 msgid "Winslow"
 msgstr "Winslow"
 
 #. A city in Arizona in the United States
-#: ../data/Locations.xml.in.h:6855
+#: ../data/Locations.xml.in.h:6893
 msgid "Yuma"
 msgstr "Yuma"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:6857
+#: ../data/Locations.xml.in.h:6895
 msgid "Arkansas"
 msgstr "Arkansas"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6859
+#: ../data/Locations.xml.in.h:6897
 msgid "Arkadelphia"
 msgstr "Arkadelphia"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6861
+#: ../data/Locations.xml.in.h:6899
 msgid "Batesville"
 msgstr "Batesville"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6863
+#: ../data/Locations.xml.in.h:6901
 msgid "Bentonville"
 msgstr "Bentonville"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6865
+#: ../data/Locations.xml.in.h:6903
 msgid "Blytheville"
 msgstr "Blytheville"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6867
+#: ../data/Locations.xml.in.h:6905
 msgid "Camden"
 msgstr "Camden"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6869
+#: ../data/Locations.xml.in.h:6907
 msgid "De Queen"
 msgstr "De Queen"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6871
+#: ../data/Locations.xml.in.h:6909
 msgid "El Dorado"
 msgstr "El Dorado"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6873
+#: ../data/Locations.xml.in.h:6911
 msgctxt "City in Arkansas, United States"
 msgid "Fayetteville"
 msgstr "Fayetteville"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6875
+#: ../data/Locations.xml.in.h:6913
 msgid "Flippin"
 msgstr "Flippin"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6877
+#: ../data/Locations.xml.in.h:6915
 msgctxt "City in Arkansas, United States"
 msgid "Fort Smith"
 msgstr "Fort Smith"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6879
+#: ../data/Locations.xml.in.h:6917
 msgid "Harrison"
 msgstr "Harrison"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6881
+#: ../data/Locations.xml.in.h:6919
 msgctxt "City in Arkansas, United States"
 msgid "Hot Springs"
 msgstr "Hot Springs"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6883
+#: ../data/Locations.xml.in.h:6921
 msgid "Jonesboro"
 msgstr "Jonesboro"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6885
+#: ../data/Locations.xml.in.h:6923
 msgid "Little Rock"
 msgstr "Little Rock"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6887
+#: ../data/Locations.xml.in.h:6925
 msgid "Mena"
 msgstr "Mena"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6889
+#: ../data/Locations.xml.in.h:6927
 msgctxt "City in Arkansas, United States"
 msgid "Monticello"
 msgstr "Monticello"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6891
+#: ../data/Locations.xml.in.h:6929
 msgid "Mount Ida"
 msgstr "Mount Ida"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6893
+#: ../data/Locations.xml.in.h:6931
 msgctxt "City in Arkansas, United States"
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6895
+#: ../data/Locations.xml.in.h:6933
 msgctxt "City in Arkansas, United States"
 msgid "Newport"
 msgstr "Newport"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6897
+#: ../data/Locations.xml.in.h:6935
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6899
+#: ../data/Locations.xml.in.h:6937
 msgid "Rogers"
 msgstr "Rogers"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6901
+#: ../data/Locations.xml.in.h:6939
 msgid "Russellville"
 msgstr "Russellville"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6903
+#: ../data/Locations.xml.in.h:6941
 msgid "Searcy"
 msgstr "Searcy"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6905
+#: ../data/Locations.xml.in.h:6943
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6907
+#: ../data/Locations.xml.in.h:6945
 msgid "Springdale"
 msgstr "Springdale"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6909
+#: ../data/Locations.xml.in.h:6947
 msgctxt "City in Arkansas, United States"
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6911
+#: ../data/Locations.xml.in.h:6949
 msgid "Texarkana"
 msgstr "Texarkana"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6913
+#: ../data/Locations.xml.in.h:6951
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
 #. A city in Arkansas in the United States
-#: ../data/Locations.xml.in.h:6915
+#: ../data/Locations.xml.in.h:6953
 msgid "West Memphis"
 msgstr "West Memphis"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:6917
+#: ../data/Locations.xml.in.h:6955
 msgid "California"
 msgstr "California"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6919
+#: ../data/Locations.xml.in.h:6957
 msgid "Alturas"
 msgstr "Alturas"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6921
+#: ../data/Locations.xml.in.h:6959
 msgid "Anaheim"
 msgstr "Anaheim"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6923
+#: ../data/Locations.xml.in.h:6961
 msgid "Arcata"
 msgstr "Arcata"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6925
+#: ../data/Locations.xml.in.h:6963
 msgctxt "City in California, United States"
 msgid "Auburn"
 msgstr "Auburn"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6927
+#: ../data/Locations.xml.in.h:6965
 msgid "Avalon"
 msgstr "Avalon"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6929
+#: ../data/Locations.xml.in.h:6967
 msgid "Bakersfield"
 msgstr "Bakersfield"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6931
+#: ../data/Locations.xml.in.h:6969
 msgid "Berkeley"
 msgstr "Berkeley"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6933
+#: ../data/Locations.xml.in.h:6971
 msgid "Bishop"
 msgstr "Bishop"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6935
+#: ../data/Locations.xml.in.h:6973
 msgid "Blythe"
 msgstr "Blythe"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6937
+#: ../data/Locations.xml.in.h:6975
 msgid "Burbank"
 msgstr "Burbank"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6939
+#: ../data/Locations.xml.in.h:6977
 msgid "Camarillo"
 msgstr "Camarillo"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6941
+#: ../data/Locations.xml.in.h:6979
 msgid "Campo"
 msgstr "Campo"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6943
+#: ../data/Locations.xml.in.h:6981
 msgctxt "City in California, United States"
 msgid "Carlsbad"
 msgstr "Carlsbad"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6945
+#: ../data/Locations.xml.in.h:6983
 msgid "Chico"
 msgstr "Chico"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6947
+#: ../data/Locations.xml.in.h:6985
 msgid "China Lake"
 msgstr "China Lake"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6949
+#: ../data/Locations.xml.in.h:6987
 msgid "Chino"
 msgstr "Chino"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6951
+#: ../data/Locations.xml.in.h:6989
 msgid "Chula Vista"
 msgstr "Chula Vista"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6953
+#: ../data/Locations.xml.in.h:6991
 msgctxt "City in California, United States"
 msgid "Concord"
 msgstr "Concord"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6955
+#: ../data/Locations.xml.in.h:6993
 msgctxt "City in California, United States"
 msgid "Corona"
 msgstr "Corona"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6957
+#: ../data/Locations.xml.in.h:6995
 msgid "Costa Mesa"
 msgstr "Costa Mesa"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6959
+#: ../data/Locations.xml.in.h:6997
 msgid "Crescent City"
 msgstr "Crescent City"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6961
+#: ../data/Locations.xml.in.h:6999
 msgid "Daggett"
 msgstr "Daggett"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6963
+#: ../data/Locations.xml.in.h:7001
 msgid "Daly City"
 msgstr "Daly City"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6965
+#: ../data/Locations.xml.in.h:7003
 msgid "Edwards"
 msgstr "Edwards"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6967
+#: ../data/Locations.xml.in.h:7005
 msgid "El Centro"
 msgstr "El Centro"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6969
+#: ../data/Locations.xml.in.h:7007
 msgid "El Monte"
 msgstr "El Monte"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6971
+#: ../data/Locations.xml.in.h:7009
 msgid "Emigrant Gap"
 msgstr "Emigrant Gap"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6973
+#: ../data/Locations.xml.in.h:7011
 msgid "Escondido"
 msgstr "Escondido"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6975
+#: ../data/Locations.xml.in.h:7013
 msgctxt "City in California, United States"
 msgid "Fairfield"
 msgstr "Fairfield"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6977
+#: ../data/Locations.xml.in.h:7015
 msgid "Fontana"
 msgstr "Fontana"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6979
+#: ../data/Locations.xml.in.h:7017
 msgctxt "City in California, United States"
 msgid "Fremont"
 msgstr "Fremont"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6981
+#: ../data/Locations.xml.in.h:7019
 msgid "Fresno"
 msgstr "Fresno"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6983
+#: ../data/Locations.xml.in.h:7021
 msgid "Fullerton"
 msgstr "Fullerton"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6985
+#: ../data/Locations.xml.in.h:7023
 msgid "Garden Grove"
 msgstr "Garden Grove"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6987
+#: ../data/Locations.xml.in.h:7025
 msgctxt "City in California, United States"
 msgid "Glendale"
 msgstr "Glendale"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6989
+#: ../data/Locations.xml.in.h:7027
 msgctxt "City in California, United States"
 msgid "Hanford"
 msgstr "Hanford"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6991
+#: ../data/Locations.xml.in.h:7029
 msgid "Hawthorne"
 msgstr "Hawthorne"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6993
+#: ../data/Locations.xml.in.h:7031
 msgctxt "City in California, United States"
 msgid "Hayward"
 msgstr "Hayward"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6995
+#: ../data/Locations.xml.in.h:7033
 msgid "Huntington Beach"
 msgstr "Huntington Beach"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6997
+#: ../data/Locations.xml.in.h:7035
 msgctxt "City in California, United States"
 msgid "Imperial"
 msgstr "Imperial"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:6999
+#: ../data/Locations.xml.in.h:7037
 msgid "Imperial Beach"
 msgstr "Imperial Beach"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7001
+#: ../data/Locations.xml.in.h:7039
 msgid "Inglewood"
 msgstr "Inglewood"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7003
+#: ../data/Locations.xml.in.h:7041
 msgid "Inyokern"
 msgstr "Inyokern"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7005
+#: ../data/Locations.xml.in.h:7043
 msgid "Irvine"
 msgstr "Irvine"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7007
+#: ../data/Locations.xml.in.h:7045
 msgid "La Verne"
 msgstr "La Verne"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7009
+#: ../data/Locations.xml.in.h:7047
 msgctxt "City in California, United States"
 msgid "Lancaster"
 msgstr "Lancaster"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7011
+#: ../data/Locations.xml.in.h:7049
 msgid "Lemoore"
 msgstr "Lemoore"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7013
+#: ../data/Locations.xml.in.h:7051
 msgid "Livermore"
 msgstr "Livermore"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7015
+#: ../data/Locations.xml.in.h:7053
 msgid "Lompoc"
 msgstr "Lompoc"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7017
+#: ../data/Locations.xml.in.h:7055
 msgid "Long Beach"
 msgstr "Long Beach"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7019
+#: ../data/Locations.xml.in.h:7057
 msgid "Los Alamitos"
 msgstr "Los Alamitos"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7021
+#: ../data/Locations.xml.in.h:7059
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7023
+#: ../data/Locations.xml.in.h:7061
 msgid "Madera"
 msgstr "Madera"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7025
+#: ../data/Locations.xml.in.h:7063
 msgctxt "City in California, United States"
 msgid "Marysville"
 msgstr "Marysville"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7027
+#: ../data/Locations.xml.in.h:7065
 msgid "Merced"
 msgstr "Merced"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7029
+#: ../data/Locations.xml.in.h:7067
 msgid "Modesto"
 msgstr "Modesto"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7031
+#: ../data/Locations.xml.in.h:7069
 msgid "Montague"
 msgstr "Montague"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7033
+#: ../data/Locations.xml.in.h:7071
 msgid "Monterey"
 msgstr "Monterey"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7035
+#: ../data/Locations.xml.in.h:7073
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7037
+#: ../data/Locations.xml.in.h:7075
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7039
+#: ../data/Locations.xml.in.h:7077
 msgid "Mountain View"
 msgstr "Mountain View"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7041
+#: ../data/Locations.xml.in.h:7079
 msgid "Napa"
 msgstr "Napa"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7043
+#: ../data/Locations.xml.in.h:7081
 msgid "Needles"
 msgstr "Needles"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7045
+#: ../data/Locations.xml.in.h:7083
 msgid "Newhall"
 msgstr "Newhall"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7047
+#: ../data/Locations.xml.in.h:7085
 msgid "Norwalk"
 msgstr "Norwalk"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7049
+#: ../data/Locations.xml.in.h:7087
 msgid "Oakland"
 msgstr "Oakland"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7051
+#: ../data/Locations.xml.in.h:7089
 msgid "Oceanside"
 msgstr "Oceanside"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7053
+#: ../data/Locations.xml.in.h:7091
 msgctxt "City in California, United States"
 msgid "Ontario"
 msgstr "Ontario"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7055
+#: ../data/Locations.xml.in.h:7093
 msgctxt "City in California, United States"
 msgid "Orange"
 msgstr "Orange"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7057
+#: ../data/Locations.xml.in.h:7095
 msgid "Oroville"
 msgstr "Oroville"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7059
+#: ../data/Locations.xml.in.h:7097
 msgid "Oxnard"
 msgstr "Oxnard"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7061
+#: ../data/Locations.xml.in.h:7099
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7063
+#: ../data/Locations.xml.in.h:7101
 msgid "Palmdale"
 msgstr "Palmdale"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7065
+#: ../data/Locations.xml.in.h:7103
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7067
+#: ../data/Locations.xml.in.h:7105
 msgctxt "City in California, United States"
 msgid "Pasadena"
 msgstr "Pasadena"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7069
+#: ../data/Locations.xml.in.h:7107
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7071
+#: ../data/Locations.xml.in.h:7109
 msgid "Pomona"
 msgstr "Pomona"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7073
+#: ../data/Locations.xml.in.h:7111
 msgid "Porterville"
 msgstr "Porterville"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7075
+#: ../data/Locations.xml.in.h:7113
 msgid "Ramona"
 msgstr "Ramona"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7077
+#: ../data/Locations.xml.in.h:7115
 msgid "Rancho Cucamonga"
 msgstr "Rancho Cucamonga"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7079
+#: ../data/Locations.xml.in.h:7117
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7081
+#: ../data/Locations.xml.in.h:7119
 msgid "Redding"
 msgstr "Redding"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7083
+#: ../data/Locations.xml.in.h:7121
 msgid "Riverside"
 msgstr "Riverside"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7085
+#: ../data/Locations.xml.in.h:7123
 msgid "Sacramento"
 msgstr "Sacramento"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7087
+#: ../data/Locations.xml.in.h:7125
 msgid "Salinas"
 msgstr "Salinas"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7089
+#: ../data/Locations.xml.in.h:7127
 msgid "San Bernardino"
 msgstr "San Bernandino"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7091
+#: ../data/Locations.xml.in.h:7129
 msgid "San Carlos"
 msgstr "San Carlos"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7093
+#: ../data/Locations.xml.in.h:7131
 msgid "San Diego"
 msgstr "San Diego"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7095
+#: ../data/Locations.xml.in.h:7133
 msgid "San Francisco"
 msgstr "San Francisco"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7097
+#: ../data/Locations.xml.in.h:7135
 msgid "San Jose"
 msgstr "San José"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7099
+#: ../data/Locations.xml.in.h:7137
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7101
+#: ../data/Locations.xml.in.h:7139
 msgid "Sandberg"
 msgstr "Sandberg"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7103
+#: ../data/Locations.xml.in.h:7141
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7105
+#: ../data/Locations.xml.in.h:7143
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7107
+#: ../data/Locations.xml.in.h:7145
 msgctxt "City in California, United States"
 msgid "Santa Clara"
 msgstr "Santa Clara"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7109
+#: ../data/Locations.xml.in.h:7147
 msgctxt "City in California, United States"
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7111
+#: ../data/Locations.xml.in.h:7149
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7113
+#: ../data/Locations.xml.in.h:7151
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7115
+#: ../data/Locations.xml.in.h:7153
 msgid "Simi Valley"
 msgstr "Simi Valley"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7117
+#: ../data/Locations.xml.in.h:7155
 msgid "South Lake Tahoe"
 msgstr "South Lake Tahoe"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7119
+#: ../data/Locations.xml.in.h:7157
 msgctxt "City in California, United States"
 msgid "Stockton"
 msgstr "Stockton"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7121
+#: ../data/Locations.xml.in.h:7159
 msgid "Sunnyvale"
 msgstr "Sunnyvale"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7123
+#: ../data/Locations.xml.in.h:7161
 msgid "Thousand Oaks"
 msgstr "Thousand Oaks"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7125
+#: ../data/Locations.xml.in.h:7163
 msgid "Torrance"
 msgstr "Torrance"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7127
+#: ../data/Locations.xml.in.h:7165
 msgid "Truckee"
 msgstr "Truckee"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7129
+#: ../data/Locations.xml.in.h:7167
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7131
+#: ../data/Locations.xml.in.h:7169
 msgid "Ukiah"
 msgstr "Ukiah"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7133
+#: ../data/Locations.xml.in.h:7171
 msgid "Vacaville"
 msgstr "Vacaville"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7135
+#: ../data/Locations.xml.in.h:7173
 msgid "Vallejo"
 msgstr "Vallejo"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7137
+#: ../data/Locations.xml.in.h:7175
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7139
+#: ../data/Locations.xml.in.h:7177
 msgid "Ventura"
 msgstr "Ventura"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7141
+#: ../data/Locations.xml.in.h:7179
 msgid "Victorville"
 msgstr "Victorville"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7143
+#: ../data/Locations.xml.in.h:7181
 msgid "Visalia"
 msgstr "Visalia"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7145
+#: ../data/Locations.xml.in.h:7183
 msgid "Watsonville"
 msgstr "Watsonville"
 
 #. A city in California in the United States
-#: ../data/Locations.xml.in.h:7147
+#: ../data/Locations.xml.in.h:7185
 msgid "West Covina"
 msgstr "West Covina"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7149
+#: ../data/Locations.xml.in.h:7187
 msgid "Colorado"
 msgstr "Colorado"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7151
+#: ../data/Locations.xml.in.h:7189
 msgctxt "City in Colorado, United States"
 msgid "Akron"
 msgstr "Akron"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7153
+#: ../data/Locations.xml.in.h:7191
 msgid "Alamosa"
 msgstr "Alamosa"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7155
+#: ../data/Locations.xml.in.h:7193
 msgid "Arvada"
 msgstr "Arvada"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7157
+#: ../data/Locations.xml.in.h:7195
 msgid "Aspen"
 msgstr "Aspen"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7159
+#: ../data/Locations.xml.in.h:7197
 msgctxt "City in Colorado, United States"
 msgid "Aurora"
 msgstr "Aurora"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7161
+#: ../data/Locations.xml.in.h:7199
 msgid "Broomfield"
 msgstr "Broomfield"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7163
+#: ../data/Locations.xml.in.h:7201
 msgctxt "City in Colorado, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7165
+#: ../data/Locations.xml.in.h:7203
 msgctxt "City in Colorado, United States"
 msgid "Cardiff"
 msgstr "Cardiff"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7167
+#: ../data/Locations.xml.in.h:7205
 msgid "Colorado Springs"
 msgstr "Colorado Springs"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7169
+#: ../data/Locations.xml.in.h:7207
 msgid "Cortez"
 msgstr "Cortez"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7171
+#: ../data/Locations.xml.in.h:7209
 msgid "Craig"
 msgstr "Craig"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7173
+#: ../data/Locations.xml.in.h:7211
 msgid "Denver"
 msgstr "Denver"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7175
+#: ../data/Locations.xml.in.h:7213
 msgctxt "City in Colorado, United States"
 msgid "Durango"
 msgstr "Durango"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7177
+#: ../data/Locations.xml.in.h:7215
 msgctxt "City in Colorado, United States"
 msgid "Eagle"
 msgstr "Eagle"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7179
+#: ../data/Locations.xml.in.h:7217
 msgid "Elbert"
 msgstr "Elbert"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7181
+#: ../data/Locations.xml.in.h:7219
 msgid "Fort Carson"
 msgstr "Fort Carson"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7183
+#: ../data/Locations.xml.in.h:7221
 msgid "Fort Collins"
 msgstr "Fort Collins"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7185
+#: ../data/Locations.xml.in.h:7223
 msgid "Grand Junction"
 msgstr "Grand Junction"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7187
+#: ../data/Locations.xml.in.h:7225
 msgid "Gunnison"
 msgstr "Gunnison"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7189
+#: ../data/Locations.xml.in.h:7227
 msgid "Hayden"
 msgstr "Hayden"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7191
+#: ../data/Locations.xml.in.h:7229
 msgid "La Junta"
 msgstr "La Junta"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7193
+#: ../data/Locations.xml.in.h:7231
 msgid "La Veta"
 msgstr "La Veta"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7195
+#: ../data/Locations.xml.in.h:7233
 msgid "Lakewood"
 msgstr "Lakewood"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7197
+#: ../data/Locations.xml.in.h:7235
 msgid "Lamar"
 msgstr "Lamar"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7199
+#: ../data/Locations.xml.in.h:7237
 msgid "Leadville"
 msgstr "Leadville"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7201
+#: ../data/Locations.xml.in.h:7239
 msgid "Limon"
 msgstr "Limon"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7203
+#: ../data/Locations.xml.in.h:7241
 msgid "Meeker"
 msgstr "Meeker"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7205
+#: ../data/Locations.xml.in.h:7243
 msgid "Montrose"
 msgstr "Montrose"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7207
+#: ../data/Locations.xml.in.h:7245
 msgid "Pagosa Springs"
 msgstr "Pagosa Springs"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7209
+#: ../data/Locations.xml.in.h:7247
 msgid "Pueblo"
 msgstr "Pueblo"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7211
+#: ../data/Locations.xml.in.h:7249
 msgid "Rifle"
 msgstr "Rifle"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7213
+#: ../data/Locations.xml.in.h:7251
 msgid "Saguache"
 msgstr "Saguache"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7215
+#: ../data/Locations.xml.in.h:7253
 msgid "Salida"
 msgstr "Salida"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7217
+#: ../data/Locations.xml.in.h:7255
 msgctxt "City in Colorado, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7219
+#: ../data/Locations.xml.in.h:7257
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7221
+#: ../data/Locations.xml.in.h:7259
 msgid "Tarryall"
 msgstr "Tarryall"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7223
+#: ../data/Locations.xml.in.h:7261
 msgid "Telluride"
 msgstr "Telluride"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7225
+#: ../data/Locations.xml.in.h:7263
 msgctxt "City in Colorado, United States"
 msgid "Trinidad"
 msgstr "Trinidad"
 
 #. A city in Colorado in the United States
-#: ../data/Locations.xml.in.h:7227
+#: ../data/Locations.xml.in.h:7265
 msgid "Westminster"
 msgstr "Westminster"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7229
+#: ../data/Locations.xml.in.h:7267
 msgid "Connecticut"
 msgstr "Connecticut"
 
 #. A city in Connecticut in the United States
-#: ../data/Locations.xml.in.h:7231
+#: ../data/Locations.xml.in.h:7269
 msgid "Bridgeport"
 msgstr "Bridgeport"
 
 #. A city in Connecticut in the United States
-#: ../data/Locations.xml.in.h:7233
+#: ../data/Locations.xml.in.h:7271
 msgid "Danbury"
 msgstr "Danbury"
 
 #. A city in Connecticut in the United States
-#: ../data/Locations.xml.in.h:7235
+#: ../data/Locations.xml.in.h:7273
 msgid "Groton"
 msgstr "Groton"
 
 #. A city in Connecticut in the United States
-#: ../data/Locations.xml.in.h:7237
+#: ../data/Locations.xml.in.h:7275
 msgid "Hartford"
 msgstr "Hartford"
 
 #. A city in Connecticut in the United States
-#: ../data/Locations.xml.in.h:7239
+#: ../data/Locations.xml.in.h:7277
 msgid "Meriden"
 msgstr "Meriden"
 
 #. A city in Connecticut in the United States
-#: ../data/Locations.xml.in.h:7241
+#: ../data/Locations.xml.in.h:7279
 msgid "New Haven"
 msgstr "New Haven"
 
 #. A city in Connecticut in the United States
-#: ../data/Locations.xml.in.h:7243
+#: ../data/Locations.xml.in.h:7281
 msgctxt "City in Connecticut, United States"
 msgid "Oxford"
 msgstr "Oxford"
 
 #. A city in Connecticut in the United States
-#: ../data/Locations.xml.in.h:7245
+#: ../data/Locations.xml.in.h:7283
 msgid "Stamford"
 msgstr "Stamford"
 
 #. A city in Connecticut in the United States
-#: ../data/Locations.xml.in.h:7247
+#: ../data/Locations.xml.in.h:7285
 msgid "Waterbury"
 msgstr "Waterbury"
 
 #. A city in Connecticut in the United States
-#: ../data/Locations.xml.in.h:7249
+#: ../data/Locations.xml.in.h:7287
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7251
+#: ../data/Locations.xml.in.h:7289
 msgid "Delaware"
 msgstr "Delaware"
 
 #. A city in Delaware in the United States
-#: ../data/Locations.xml.in.h:7253
+#: ../data/Locations.xml.in.h:7291
 msgid "Dover"
 msgstr "Dover"
 
 #. A city in Delaware in the United States
-#: ../data/Locations.xml.in.h:7255
+#: ../data/Locations.xml.in.h:7293
 msgctxt "City in Delaware, United States"
 msgid "Georgetown"
 msgstr "Georgetown"
 
 #. A city in Delaware in the United States
-#: ../data/Locations.xml.in.h:7257
+#: ../data/Locations.xml.in.h:7295
 msgctxt "City in Delaware, United States"
 msgid "Wilmington"
 msgstr "Wilmington"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7259
+#: ../data/Locations.xml.in.h:7297
 msgid "District of Columbia"
 msgstr "District of Columbia"
 
 #. The capital of the United States
-#: ../data/Locations.xml.in.h:7261
+#: ../data/Locations.xml.in.h:7299
 msgctxt "City in District of Columbia, United States"
 msgid "Washington"
 msgstr "Washington"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7263
+#: ../data/Locations.xml.in.h:7301
 msgid "Florida"
 msgstr "Florida"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7265
+#: ../data/Locations.xml.in.h:7303
 msgid "Apalachicola"
 msgstr "Apalachiola"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7267
+#: ../data/Locations.xml.in.h:7305
 msgid "Bartow"
 msgstr "Bartow"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7269
+#: ../data/Locations.xml.in.h:7307
 msgid "Boca Raton"
 msgstr "Boca Raton"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7271
+#: ../data/Locations.xml.in.h:7309
 msgid "Brooksville"
 msgstr "Brooksville"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7273
+#: ../data/Locations.xml.in.h:7311
 msgid "Cape Canaveral"
 msgstr "Cape Canaveral"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7275
+#: ../data/Locations.xml.in.h:7313
 msgid "Cape Coral"
 msgstr "Cape Coral"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7277
+#: ../data/Locations.xml.in.h:7315
 msgid "Clearwater"
 msgstr "Clearwater"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7279
+#: ../data/Locations.xml.in.h:7317
 msgid "Cocoa"
 msgstr "Cocoa"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7281
+#: ../data/Locations.xml.in.h:7319
 msgid "Crestview"
 msgstr "Crestview"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7283
+#: ../data/Locations.xml.in.h:7321
 msgid "Cross City"
 msgstr "Cross City"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7285
+#: ../data/Locations.xml.in.h:7323
 msgid "Daytona Beach"
 msgstr "Daytona Beach"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7287
+#: ../data/Locations.xml.in.h:7325
 msgid "Destin"
 msgstr "Destin"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7289
+#: ../data/Locations.xml.in.h:7327
 msgid "Fort Lauderdale"
 msgstr "Fort Lauderdale"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7291
+#: ../data/Locations.xml.in.h:7329
 msgid "Fort Myers"
 msgstr "Fort Myers"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7293
+#: ../data/Locations.xml.in.h:7331
 msgid "Fort Pierce"
 msgstr "Fort Pierce"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7295
+#: ../data/Locations.xml.in.h:7333
 msgid "Fort Walton Beach"
 msgstr "Fort Walton Beach"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7297
+#: ../data/Locations.xml.in.h:7335
 msgctxt "City in Florida, United States"
 msgid "Gainesville"
 msgstr "Gainesville"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7299
+#: ../data/Locations.xml.in.h:7337
 msgid "Hialeah"
 msgstr "Hialeah"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7301
+#: ../data/Locations.xml.in.h:7339
 msgid "Hollywood"
 msgstr "Hollywood"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7303
+#: ../data/Locations.xml.in.h:7341
 msgid "Homestead"
 msgstr "Homestead"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7305
+#: ../data/Locations.xml.in.h:7343
 msgctxt "City in Florida, United States"
 msgid "Jacksonville"
 msgstr "Jacksonville"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7307
+#: ../data/Locations.xml.in.h:7345
 msgid "Key West"
 msgstr "Key West"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7309
+#: ../data/Locations.xml.in.h:7347
 msgid "Lakeland"
 msgstr "Lakeland"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7311
+#: ../data/Locations.xml.in.h:7349
 msgctxt "City in Florida, United States"
 msgid "Leesburg"
 msgstr "Leesburg"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7313
+#: ../data/Locations.xml.in.h:7351
 msgid "Marathon"
 msgstr "Marathon"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7315
+#: ../data/Locations.xml.in.h:7353
 msgid "Marianna"
 msgstr "Marianna"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7317
+#: ../data/Locations.xml.in.h:7355
 msgid "Mayport"
 msgstr "Mayport"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7319
+#: ../data/Locations.xml.in.h:7357
 msgctxt "City in Florida, United States"
 msgid "Melbourne"
 msgstr "Melbourne"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7321
+#: ../data/Locations.xml.in.h:7359
 msgctxt "City in Florida, United States"
 msgid "Miami"
 msgstr "Miami"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7323
+#: ../data/Locations.xml.in.h:7361
 msgid "Milton"
 msgstr "Milton"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7325
+#: ../data/Locations.xml.in.h:7363
 msgctxt "City in Florida, United States"
 msgid "Naples"
 msgstr "Naples"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7327
+#: ../data/Locations.xml.in.h:7365
 msgid "New Smyrna Beach"
 msgstr "New Smyrna Beach"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7329
+#: ../data/Locations.xml.in.h:7367
 msgid "Ocala"
 msgstr "Ocala"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7331
+#: ../data/Locations.xml.in.h:7369
 msgid "Okeechobee"
 msgstr "Okeechobee"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7333
+#: ../data/Locations.xml.in.h:7371
 msgid "Orlando"
 msgstr "Orlando"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7335
+#: ../data/Locations.xml.in.h:7373
 msgid "Ormond Beach"
 msgstr "Ormond Beach"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7337
+#: ../data/Locations.xml.in.h:7375
 msgid "Panama City"
 msgstr "Panama City"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7339
+#: ../data/Locations.xml.in.h:7377
 msgid "Pembroke Pines"
 msgstr "Pembroke Pines"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7341
+#: ../data/Locations.xml.in.h:7379
 msgid "Pensacola"
 msgstr "Pensacola"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7343
+#: ../data/Locations.xml.in.h:7381
 msgid "Perry"
 msgstr "Perry"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7345
+#: ../data/Locations.xml.in.h:7383
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7347
+#: ../data/Locations.xml.in.h:7385
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7349
+#: ../data/Locations.xml.in.h:7387
 msgid "Sarasota"
 msgstr "Sarasota"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7351
+#: ../data/Locations.xml.in.h:7389
 msgctxt "City in Florida, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7353
+#: ../data/Locations.xml.in.h:7391
 msgid "Stuart"
 msgstr "Stuart"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7355
+#: ../data/Locations.xml.in.h:7393
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7357
+#: ../data/Locations.xml.in.h:7395
 msgid "Tampa"
 msgstr "Tampa"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7359
+#: ../data/Locations.xml.in.h:7397
 msgid "The Villages"
 msgstr "The Villages"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7361
+#: ../data/Locations.xml.in.h:7399
 msgid "Titusville"
 msgstr "Titusville"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7363
+#: ../data/Locations.xml.in.h:7401
 msgctxt "City in Florida, United States"
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7365
+#: ../data/Locations.xml.in.h:7403
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7367
+#: ../data/Locations.xml.in.h:7405
 msgid "Vilano Beach"
 msgstr "Vilano Beach"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7369
+#: ../data/Locations.xml.in.h:7407
 msgid "West Palm Beach"
 msgstr "West Pam Bech"
 
 #. A city in Florida in the United States
-#: ../data/Locations.xml.in.h:7371
+#: ../data/Locations.xml.in.h:7409
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7373
+#: ../data/Locations.xml.in.h:7411
 msgctxt "State in United States"
 msgid "Georgia"
 msgstr "Georgia"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7375
+#: ../data/Locations.xml.in.h:7413
 msgctxt "City in Georgia, United States"
 msgid "Albany"
 msgstr "Albany"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7377
+#: ../data/Locations.xml.in.h:7415
 msgctxt "City in Georgia, United States"
 msgid "Alma"
 msgstr "Alma"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7379
+#: ../data/Locations.xml.in.h:7417
 msgctxt "City in Georgia, United States"
 msgid "Athens"
 msgstr "Athen"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7381
+#: ../data/Locations.xml.in.h:7419
 msgid "Atlanta"
 msgstr "Atlanta"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7383
+#: ../data/Locations.xml.in.h:7421
 msgctxt "City in Georgia, United States"
 msgid "Augusta"
 msgstr "Augusta"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7385
+#: ../data/Locations.xml.in.h:7423
 msgid "Bainbridge"
 msgstr "Bainbridge"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7387
+#: ../data/Locations.xml.in.h:7425
 msgid "Barretts"
 msgstr "Barretts"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7389
+#: ../data/Locations.xml.in.h:7427
 msgctxt "City in Georgia, United States"
 msgid "Brunswick"
 msgstr "Brunswick"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7391
+#: ../data/Locations.xml.in.h:7429
 msgid "Canton"
 msgstr "Canton"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7393
+#: ../data/Locations.xml.in.h:7431
 msgid "Cartersville"
 msgstr "Cartersville"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7395
+#: ../data/Locations.xml.in.h:7433
 msgctxt "City in Georgia, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7397
+#: ../data/Locations.xml.in.h:7435
 msgid "Dalton"
 msgstr "Dalton"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7399
+#: ../data/Locations.xml.in.h:7437
 msgctxt "City in Georgia, United States"
 msgid "Douglas"
 msgstr "Douglas"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7401
+#: ../data/Locations.xml.in.h:7439
 msgctxt "City in Georgia, United States"
 msgid "Dublin"
 msgstr "Dublin"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7403
+#: ../data/Locations.xml.in.h:7441
 msgid "Fort Benning"
 msgstr "Fort Benning"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7405
+#: ../data/Locations.xml.in.h:7443
 msgctxt "City in Georgia, United States"
 msgid "Gainesville"
 msgstr "Gainesville"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7407
+#: ../data/Locations.xml.in.h:7445
 msgctxt "City in Georgia, United States"
 msgid "Greensboro"
 msgstr "Greensboro"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7409
+#: ../data/Locations.xml.in.h:7447
 msgid "Hinesville"
 msgstr "Hinesville"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7411
+#: ../data/Locations.xml.in.h:7449
 msgctxt "City in Georgia, United States"
 msgid "La Grange"
 msgstr "La Grange"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7413
+#: ../data/Locations.xml.in.h:7451
 msgctxt "City in Georgia, United States"
 msgid "Lawrenceville"
 msgstr "Lawrenceville"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7415
+#: ../data/Locations.xml.in.h:7453
 msgid "Macon"
 msgstr "Macon"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7417
+#: ../data/Locations.xml.in.h:7455
 msgid "Marietta"
 msgstr "Marietta"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7419
+#: ../data/Locations.xml.in.h:7457
 msgid "Milledgeville"
 msgstr "Milledgeville"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7421
+#: ../data/Locations.xml.in.h:7459
 msgid "Moultrie"
 msgstr "Moultrie"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7423
+#: ../data/Locations.xml.in.h:7461
 msgid "Newnan"
 msgstr "Newnan"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7425
+#: ../data/Locations.xml.in.h:7463
 msgctxt "City in Georgia, United States"
 msgid "Rome"
 msgstr "Rome"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7427
+#: ../data/Locations.xml.in.h:7465
 msgid "Savannah"
 msgstr "Savannah"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7429
+#: ../data/Locations.xml.in.h:7467
 msgid "Statesboro"
 msgstr "Statesboro"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7431
+#: ../data/Locations.xml.in.h:7469
 msgid "Sylvania"
 msgstr "Sylvania"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7433
+#: ../data/Locations.xml.in.h:7471
 msgid "Thomaston"
 msgstr "Thomaston"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7435
+#: ../data/Locations.xml.in.h:7473
 msgid "Thomson"
 msgstr "Thomson"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7437
+#: ../data/Locations.xml.in.h:7475
 msgid "Valdosta"
 msgstr "Valdosta"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7439
+#: ../data/Locations.xml.in.h:7477
 msgid "Vidalia"
 msgstr "Vidalia"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7441
+#: ../data/Locations.xml.in.h:7479
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7443
+#: ../data/Locations.xml.in.h:7481
 msgid "Waycross"
 msgstr "Waycross"
 
 #. A city in Georgia in the United States
-#: ../data/Locations.xml.in.h:7445
+#: ../data/Locations.xml.in.h:7483
 msgid "Winder"
 msgstr "Winder"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7447
+#: ../data/Locations.xml.in.h:7485
 msgid "Hawaii"
 msgstr "Hawaii"
 
 #. A city in Hawaii in the United States
-#: ../data/Locations.xml.in.h:7449
+#: ../data/Locations.xml.in.h:7487
 msgid "Hilo"
 msgstr "Hilo"
 
 #. A city in Hawaii in the United States
-#: ../data/Locations.xml.in.h:7451
+#: ../data/Locations.xml.in.h:7489
 msgid "Honolulu"
 msgstr "Honolulu"
 
 #. A city in Hawaii in the United States
-#: ../data/Locations.xml.in.h:7453
+#: ../data/Locations.xml.in.h:7491
 msgid "Kahului"
 msgstr "Kahului"
 
 #. A city in Hawaii in the United States
-#: ../data/Locations.xml.in.h:7455
+#: ../data/Locations.xml.in.h:7493
 msgid "Kailua"
 msgstr "Kailua"
 
 #. A city in Hawaii in the United States
-#: ../data/Locations.xml.in.h:7457
+#: ../data/Locations.xml.in.h:7495
 msgid "Kaumalapau"
 msgstr "Kaumalapau"
 
 #. A city in Hawaii in the United States
-#: ../data/Locations.xml.in.h:7459
+#: ../data/Locations.xml.in.h:7497
 msgid "Kaunakakai"
 msgstr "Kaunakakai"
 
 #. A city in Hawaii in the United States
-#: ../data/Locations.xml.in.h:7461
+#: ../data/Locations.xml.in.h:7499
 msgid "Kekaha"
 msgstr "Kekaha"
 
 #. A city in Hawaii in the United States
-#: ../data/Locations.xml.in.h:7463
+#: ../data/Locations.xml.in.h:7501
 msgid "Lahaina"
 msgstr "Lahaina"
 
 #. A city in Hawaii in the United States
-#: ../data/Locations.xml.in.h:7465
+#: ../data/Locations.xml.in.h:7503
 msgid "Lihue"
 msgstr "Lihue"
 
 #. A city in Hawaii in the United States
-#: ../data/Locations.xml.in.h:7467
+#: ../data/Locations.xml.in.h:7505
 msgid "Wahiawā"
 msgstr "Wahiawā"
 
 #. A city in Hawaii in the United States
-#: ../data/Locations.xml.in.h:7469
+#: ../data/Locations.xml.in.h:7507
 msgid "Waiki‘i"
 msgstr "Waiki‘i"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7471
+#: ../data/Locations.xml.in.h:7509
 msgid "Idaho"
 msgstr "Idaho"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7473
+#: ../data/Locations.xml.in.h:7511
 msgid "Boise"
 msgstr "Boise"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7475
+#: ../data/Locations.xml.in.h:7513
 msgid "Burley"
 msgstr "Burley"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7477
+#: ../data/Locations.xml.in.h:7515
 msgctxt "City in Idaho, United States"
 msgid "Caldwell"
 msgstr "Caldwell"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7479
+#: ../data/Locations.xml.in.h:7517
 msgid "Challis"
 msgstr "Challis"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7481
+#: ../data/Locations.xml.in.h:7519
 msgid "Coeur d'Alene"
 msgstr "Coeur d'Alene"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7483
+#: ../data/Locations.xml.in.h:7521
 msgid "Hailey"
 msgstr "Hailey"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7485
+#: ../data/Locations.xml.in.h:7523
 msgid "Idaho Falls"
 msgstr "Idaho Falls"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7487
+#: ../data/Locations.xml.in.h:7525
 msgid "Jerome"
 msgstr "Jerome"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7489
+#: ../data/Locations.xml.in.h:7527
 msgid "Lewiston"
 msgstr "Lewiston"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7491
+#: ../data/Locations.xml.in.h:7529
 msgctxt "City in Idaho, United States"
 msgid "Lowell"
 msgstr "Lowell"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7493
+#: ../data/Locations.xml.in.h:7531
 msgctxt "City in Idaho, United States"
 msgid "Malta"
 msgstr "Malta"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7495
+#: ../data/Locations.xml.in.h:7533
 msgid "McCall"
 msgstr "McCall"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7497
+#: ../data/Locations.xml.in.h:7535
 msgctxt "City in Idaho, United States"
 msgid "Moscow"
 msgstr "Moskva"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7499
+#: ../data/Locations.xml.in.h:7537
 msgctxt "City in Idaho, United States"
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7501
+#: ../data/Locations.xml.in.h:7539
 msgid "Mullan"
 msgstr "Mullan"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7503
+#: ../data/Locations.xml.in.h:7541
 msgid "Pocatello"
 msgstr "Pocatello"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7505
+#: ../data/Locations.xml.in.h:7543
 msgid "Rexburg"
 msgstr "Rexburg"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7507
+#: ../data/Locations.xml.in.h:7545
 msgid "Salmon"
 msgstr "Salmon"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7509
+#: ../data/Locations.xml.in.h:7547
 msgid "Sandpoint"
 msgstr "Sandpoint"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7511
+#: ../data/Locations.xml.in.h:7549
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7513
+#: ../data/Locations.xml.in.h:7551
 msgctxt "City in Idaho, United States"
 msgid "Stanley"
 msgstr "Stanley"
 
 #. A city in Idaho in the United States
-#: ../data/Locations.xml.in.h:7515
+#: ../data/Locations.xml.in.h:7553
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7517
+#: ../data/Locations.xml.in.h:7555
 msgid "Illinois"
 msgstr "Illinois"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7519
+#: ../data/Locations.xml.in.h:7557
 msgid "Alton"
 msgstr "Alton"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7521
+#: ../data/Locations.xml.in.h:7559
 msgctxt "City in Illinois, United States"
 msgid "Aurora"
 msgstr "Aurora"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7523
+#: ../data/Locations.xml.in.h:7561
 msgid "Belleville"
 msgstr "Belleville"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7525
+#: ../data/Locations.xml.in.h:7563
 msgctxt "City in Illinois, United States"
 msgid "Bloomington"
 msgstr "Bloomington"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7527
+#: ../data/Locations.xml.in.h:7565
 msgid "Cahokia"
 msgstr "Cahokia"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7529
+#: ../data/Locations.xml.in.h:7567
 msgctxt "City in Illinois, United States"
 msgid "Cairo"
 msgstr "Kairo"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7531
+#: ../data/Locations.xml.in.h:7569
 msgid "Carbondale"
 msgstr "Carbondale"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7533
+#: ../data/Locations.xml.in.h:7571
 msgid "Carmi"
 msgstr "Carmi"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7535
+#: ../data/Locations.xml.in.h:7573
 msgid "Centralia"
 msgstr "Centralia"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7537
+#: ../data/Locations.xml.in.h:7575
 msgid "Champaign"
 msgstr "Champaign"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7539
+#: ../data/Locations.xml.in.h:7577
 msgid "Chicago"
 msgstr "Chicago"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7541
+#: ../data/Locations.xml.in.h:7579
 msgctxt "City in Illinois, United States"
 msgid "Danville"
 msgstr "Danville"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7543
+#: ../data/Locations.xml.in.h:7581
 msgid "DeKalb"
 msgstr "DeKalb"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7545
+#: ../data/Locations.xml.in.h:7583
 msgctxt "City in Illinois, United States"
 msgid "Decatur"
 msgstr "Decatur"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7547
+#: ../data/Locations.xml.in.h:7585
 msgid "Effingham"
 msgstr "Effingham"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7549
+#: ../data/Locations.xml.in.h:7587
 msgctxt "City in Illinois, United States"
 msgid "Fairfield"
 msgstr "Fairfield"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7551
+#: ../data/Locations.xml.in.h:7589
 msgid "Flora"
 msgstr "Flora"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7553
+#: ../data/Locations.xml.in.h:7591
 msgctxt "City in Illinois, United States"
 msgid "Freeport"
 msgstr "Freeport"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7555
+#: ../data/Locations.xml.in.h:7593
 msgid "Galesburg"
 msgstr "Galesburg"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7557
+#: ../data/Locations.xml.in.h:7595
 msgid "Grafton"
 msgstr "Grafton"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7559
+#: ../data/Locations.xml.in.h:7597
 msgctxt "City in Illinois, United States"
 msgid "Harrisburg"
 msgstr "Harrisburg"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7561
+#: ../data/Locations.xml.in.h:7599
 msgctxt "City in Illinois, United States"
 msgid "Jacksonville"
 msgstr "Jacksonville"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7563
+#: ../data/Locations.xml.in.h:7601
 msgid "Joliet"
 msgstr "Joliet"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7565
+#: ../data/Locations.xml.in.h:7603
 msgid "Kankakee"
 msgstr "Kankakee"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7567
+#: ../data/Locations.xml.in.h:7605
 msgid "Lacon"
 msgstr "Lacon"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7569
+#: ../data/Locations.xml.in.h:7607
 msgctxt "City in Illinois, United States"
 msgid "Lawrenceville"
 msgstr "Lawrenceville"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7571
+#: ../data/Locations.xml.in.h:7609
 msgctxt "City in Illinois, United States"
 msgid "Lincoln"
 msgstr "Lincoln"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7573
+#: ../data/Locations.xml.in.h:7611
 msgctxt "City in Illinois, United States"
 msgid "Litchfield"
 msgstr "Litchfield"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7575
+#: ../data/Locations.xml.in.h:7613
 msgid "Macomb"
 msgstr "Macomb"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7577
+#: ../data/Locations.xml.in.h:7615
 msgctxt "City in Illinois, United States"
 msgid "Marion"
 msgstr "Marion"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7579
+#: ../data/Locations.xml.in.h:7617
 msgid "Mattoon"
 msgstr "Mattoon"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7581
+#: ../data/Locations.xml.in.h:7619
 msgid "Metropolis"
 msgstr "Metropolis"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7583
+#: ../data/Locations.xml.in.h:7621
 msgid "Moline"
 msgstr "Moline"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7585
+#: ../data/Locations.xml.in.h:7623
 msgctxt "City in Illinois, United States"
 msgid "Morris"
 msgstr "Morris"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7587
+#: ../data/Locations.xml.in.h:7625
 msgid "Mount Carmel"
 msgstr "Mount Carmel"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7589
+#: ../data/Locations.xml.in.h:7627
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7591
+#: ../data/Locations.xml.in.h:7629
 msgid "Naperville"
 msgstr "Naperville"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7593
+#: ../data/Locations.xml.in.h:7631
 msgid "Olney"
 msgstr "Olney"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7595
+#: ../data/Locations.xml.in.h:7633
 msgctxt "City in Illinois, United States"
 msgid "Paris"
 msgstr "Paris"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7597
+#: ../data/Locations.xml.in.h:7635
 msgctxt "City in Illinois, United States"
 msgid "Peoria"
 msgstr "Peoria"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7599
+#: ../data/Locations.xml.in.h:7637
 msgctxt "City in Illinois, United States"
 msgid "Peru"
 msgstr "Peru"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7601
+#: ../data/Locations.xml.in.h:7639
 msgctxt "City in Illinois, United States"
 msgid "Pittsfield"
 msgstr "Pittsfield"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7603
+#: ../data/Locations.xml.in.h:7641
 msgctxt "City in Illinois, United States"
 msgid "Pontiac"
 msgstr "Pontiac"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7605
+#: ../data/Locations.xml.in.h:7643
 msgid "Quincy"
 msgstr "Quincy"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7607
+#: ../data/Locations.xml.in.h:7645
 msgid "Rantoul"
 msgstr "Rantoul"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7609
+#: ../data/Locations.xml.in.h:7647
 msgid "Robinson"
 msgstr "Robinson"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7611
+#: ../data/Locations.xml.in.h:7649
 msgid "Rochelle"
 msgstr "Rochelle"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7613
+#: ../data/Locations.xml.in.h:7651
 msgid "Rockford"
 msgstr "Rockford"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7615
+#: ../data/Locations.xml.in.h:7653
 msgctxt "City in Illinois, United States"
 msgid "Salem"
 msgstr "Salem"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7617
+#: ../data/Locations.xml.in.h:7655
 msgid "Savanna"
 msgstr "Savanna"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7619
+#: ../data/Locations.xml.in.h:7657
 msgctxt "City in Illinois, United States"
 msgid "Sparta"
 msgstr "Sparta"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7621
+#: ../data/Locations.xml.in.h:7659
 msgctxt "City in Illinois, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7623
+#: ../data/Locations.xml.in.h:7661
 msgid "Sterling"
 msgstr "Sterling"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7625
+#: ../data/Locations.xml.in.h:7663
 msgid "Taylorville"
 msgstr "Taylorville"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7627
+#: ../data/Locations.xml.in.h:7665
 msgid "Waukegan"
 msgstr "Waukegan"
 
 #. A city in Illinois in the United States
-#: ../data/Locations.xml.in.h:7629
+#: ../data/Locations.xml.in.h:7667
 msgid "West Chicago"
 msgstr "Vest Chicago"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7631
+#: ../data/Locations.xml.in.h:7669
 msgctxt "State in United States"
 msgid "Indiana"
 msgstr "Indiana"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7633
+#: ../data/Locations.xml.in.h:7671
 msgctxt "City in Indiana, United States"
 msgid "Anderson"
 msgstr "Anderson"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7635
+#: ../data/Locations.xml.in.h:7673
 msgctxt "City in Indiana, United States"
 msgid "Bloomington"
 msgstr "Bloomington"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7637
+#: ../data/Locations.xml.in.h:7675
 msgctxt "City in Indiana, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7639
+#: ../data/Locations.xml.in.h:7677
 msgctxt "City in Indiana, United States"
 msgid "Elkhart"
 msgstr "Elkhart"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7641
+#: ../data/Locations.xml.in.h:7679
 msgid "Evansville"
 msgstr "Evansville"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7643
+#: ../data/Locations.xml.in.h:7681
 msgid "Fort Wayne"
 msgstr "Fort Wayne"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7645
+#: ../data/Locations.xml.in.h:7683
 msgid "Gary"
 msgstr "Gary"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7647
+#: ../data/Locations.xml.in.h:7685
 msgid "Goshen"
 msgstr "Goshen"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7649
+#: ../data/Locations.xml.in.h:7687
 msgid "Indianapolis"
 msgstr "Indianapolis"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7651
+#: ../data/Locations.xml.in.h:7689
 msgid "Kokomo"
 msgstr "Kokomo"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7653
+#: ../data/Locations.xml.in.h:7691
 msgctxt "City in Indiana, United States"
 msgid "Lafayette"
 msgstr "Lafayette"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7655
+#: ../data/Locations.xml.in.h:7693
 msgid "Muncie"
 msgstr "Muncie"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7657
+#: ../data/Locations.xml.in.h:7695
 msgctxt "City in Indiana, United States"
 msgid "Peru"
 msgstr "Peru"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7659
+#: ../data/Locations.xml.in.h:7697
 msgid "Shelbyville"
 msgstr "Shelbyville"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7661
+#: ../data/Locations.xml.in.h:7699
 msgid "South Bend"
 msgstr "South Bend"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7663
+#: ../data/Locations.xml.in.h:7701
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7665
+#: ../data/Locations.xml.in.h:7703
 msgctxt "City in Indiana, United States"
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
 #. A city in Indiana in the United States
-#: ../data/Locations.xml.in.h:7667
+#: ../data/Locations.xml.in.h:7705
 msgctxt "City in Indiana, United States"
 msgid "Warsaw"
 msgstr "Warszawa"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7669
+#: ../data/Locations.xml.in.h:7707
 msgid "Iowa"
 msgstr "Iowa"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7671
+#: ../data/Locations.xml.in.h:7709
 msgid "Ames"
 msgstr "Ames"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7673
+#: ../data/Locations.xml.in.h:7711
 msgid "Ankeny"
 msgstr "Ankeny"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7675
+#: ../data/Locations.xml.in.h:7713
 msgctxt "City in Iowa, United States"
 msgid "Atlantic"
 msgstr "Atlantic"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7677
+#: ../data/Locations.xml.in.h:7715
 msgid "Audubon"
 msgstr "Audubon"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7679
+#: ../data/Locations.xml.in.h:7717
 msgctxt "City in Iowa, United States"
 msgid "Boone"
 msgstr "Boone"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7681
+#: ../data/Locations.xml.in.h:7719
 msgctxt "City in Iowa, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7683
+#: ../data/Locations.xml.in.h:7721
 msgid "Carroll"
 msgstr "Carroll"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7685
+#: ../data/Locations.xml.in.h:7723
 msgid "Cedar Rapids"
 msgstr "Cedar Rapids"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7687
+#: ../data/Locations.xml.in.h:7725
 msgid "Chariton"
 msgstr "Chariton"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7689
+#: ../data/Locations.xml.in.h:7727
 msgid "Charles City"
 msgstr "Charles City"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7691
+#: ../data/Locations.xml.in.h:7729
 msgid "Cherokee"
 msgstr "Cherokee"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7693
+#: ../data/Locations.xml.in.h:7731
 msgid "Clarinda"
 msgstr "Clarinda"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7695
+#: ../data/Locations.xml.in.h:7733
 msgid "Clarion"
 msgstr "Clarion"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7697
+#: ../data/Locations.xml.in.h:7735
 msgctxt "City in Iowa, United States"
 msgid "Clinton"
 msgstr "Clinton"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7699
+#: ../data/Locations.xml.in.h:7737
 msgid "Council Bluffs"
 msgstr "Council Bluffs"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7701
+#: ../data/Locations.xml.in.h:7739
 msgctxt "City in Iowa, United States"
 msgid "Creston"
 msgstr "Creston"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7703
+#: ../data/Locations.xml.in.h:7741
 msgid "Davenport"
 msgstr "Davenport"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7705
+#: ../data/Locations.xml.in.h:7743
 msgid "Decorah"
 msgstr "Decorah"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7707
+#: ../data/Locations.xml.in.h:7745
 msgid "Denison"
 msgstr "Denison"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7709
+#: ../data/Locations.xml.in.h:7747
 msgid "Des Moines"
 msgstr "Des Moines"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7711
+#: ../data/Locations.xml.in.h:7749
 msgid "Dubuque"
 msgstr "Dubuque"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7713
+#: ../data/Locations.xml.in.h:7751
 msgid "Estherville"
 msgstr "Estherville"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7715
+#: ../data/Locations.xml.in.h:7753
 msgctxt "City in Iowa, United States"
 msgid "Fairfield"
 msgstr "Fairfield"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7717
+#: ../data/Locations.xml.in.h:7755
 msgid "Fort Dodge"
 msgstr "Fort Dodge"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7719
+#: ../data/Locations.xml.in.h:7757
 msgid "Fort Madison"
 msgstr "Fort Madison"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7721
+#: ../data/Locations.xml.in.h:7759
 msgid "Harlan"
 msgstr "Harlan"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7723
+#: ../data/Locations.xml.in.h:7761
 msgid "Iowa City"
 msgstr "Iowa City"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7725
+#: ../data/Locations.xml.in.h:7763
 msgid "Keokuk"
 msgstr "Keokuk"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7727
+#: ../data/Locations.xml.in.h:7765
 msgctxt "City in Iowa, United States"
 msgid "Knoxville"
 msgstr "Knoxville"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7729
+#: ../data/Locations.xml.in.h:7767
 msgid "Lamoni"
 msgstr "Lamoni"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7731
+#: ../data/Locations.xml.in.h:7769
 msgid "Le Mars"
 msgstr "Le Mars"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7733
+#: ../data/Locations.xml.in.h:7771
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7735
+#: ../data/Locations.xml.in.h:7773
 msgid "Mason City"
 msgstr "Mason City"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7737
+#: ../data/Locations.xml.in.h:7775
 msgctxt "City in Iowa, United States"
 msgid "Monticello"
 msgstr "Monticello"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7739
+#: ../data/Locations.xml.in.h:7777
 msgctxt "City in Iowa, United States"
 msgid "Mount Pleasant"
 msgstr "Mount Pleasant"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7741
+#: ../data/Locations.xml.in.h:7779
 msgid "Muscatine"
 msgstr "Muscatine"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7743
+#: ../data/Locations.xml.in.h:7781
 msgid "Oelwein"
 msgstr "Oelwein"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7745
+#: ../data/Locations.xml.in.h:7783
 msgid "Orange City"
 msgstr "Orange City"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7747
+#: ../data/Locations.xml.in.h:7785
 msgid "Oskaloosa"
 msgstr "Oskaloosa"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7749
+#: ../data/Locations.xml.in.h:7787
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7751
+#: ../data/Locations.xml.in.h:7789
 msgid "Pella"
 msgstr "Pella"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7753
+#: ../data/Locations.xml.in.h:7791
 msgid "Red Oak"
 msgstr "Red Oak"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7755
+#: ../data/Locations.xml.in.h:7793
 msgid "Sheldon"
 msgstr "Sheldon"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7757
+#: ../data/Locations.xml.in.h:7795
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7759
+#: ../data/Locations.xml.in.h:7797
 msgid "Sioux City"
 msgstr "Sioux City"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7761
+#: ../data/Locations.xml.in.h:7799
 msgid "Spencer"
 msgstr "Spencer"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7763
+#: ../data/Locations.xml.in.h:7801
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7765
+#: ../data/Locations.xml.in.h:7803
 msgid "Vinton"
 msgstr "Vinton"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7767
+#: ../data/Locations.xml.in.h:7805
 msgctxt "City in Iowa, United States"
 msgid "Washington"
 msgstr "Washington"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7769
+#: ../data/Locations.xml.in.h:7807
 msgctxt "City in Iowa, United States"
 msgid "Waterloo"
 msgstr "Waterloo"
 
 #. A city in Iowa in the United States
-#: ../data/Locations.xml.in.h:7771
+#: ../data/Locations.xml.in.h:7809
 msgid "Webster City"
 msgstr "Webster City"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7773
+#: ../data/Locations.xml.in.h:7811
 msgid "Kansas"
 msgstr "Kansas"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7775
+#: ../data/Locations.xml.in.h:7813
 msgid "Chanute"
 msgstr "Chanute"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7777
+#: ../data/Locations.xml.in.h:7815
 msgid "Coffeyville"
 msgstr "Coffeyville"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7779
+#: ../data/Locations.xml.in.h:7817
 msgid "Concordia"
 msgstr "Concordia"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7781
+#: ../data/Locations.xml.in.h:7819
 msgid "Dodge City"
 msgstr "Dodge City"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7783
+#: ../data/Locations.xml.in.h:7821
 msgctxt "City in Kansas, United States"
 msgid "Elkhart"
 msgstr "Elkhart"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7785
+#: ../data/Locations.xml.in.h:7823
 msgid "Elwood"
 msgstr "Elwood"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7787
+#: ../data/Locations.xml.in.h:7825
 msgctxt "City in Kansas, United States"
 msgid "Emporia"
 msgstr "Emporia"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7789
+#: ../data/Locations.xml.in.h:7827
 msgctxt "City in Kansas, United States"
 msgid "Garden City"
 msgstr "Garden City"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7791
+#: ../data/Locations.xml.in.h:7829
 msgid "Goodland"
 msgstr "Goodland"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7793
+#: ../data/Locations.xml.in.h:7831
 msgid "Great Bend"
 msgstr "Great Bend"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7795
+#: ../data/Locations.xml.in.h:7833
 msgid "Hays"
 msgstr "Hays"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7797
+#: ../data/Locations.xml.in.h:7835
 msgid "Hill City"
 msgstr "Hill City"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7799
+#: ../data/Locations.xml.in.h:7837
 msgctxt "City in Kansas, United States"
 msgid "Hutchinson"
 msgstr "Hutchinson"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7801
+#: ../data/Locations.xml.in.h:7839
 msgid "Junction City"
 msgstr "Junction City"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7803
+#: ../data/Locations.xml.in.h:7841
 msgctxt "City in Kansas, United States"
 msgid "Kansas City"
 msgstr "Kansas City"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7805
+#: ../data/Locations.xml.in.h:7843
 msgctxt "City in Kansas, United States"
 msgid "Lawrence"
 msgstr "Lawrence"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7807
+#: ../data/Locations.xml.in.h:7845
 msgid "Liberal"
 msgstr "Liberal"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7809
+#: ../data/Locations.xml.in.h:7847
 msgid "Manhattan"
 msgstr "Manhattan"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7811
+#: ../data/Locations.xml.in.h:7849
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7813
+#: ../data/Locations.xml.in.h:7851
 msgid "Newton"
 msgstr "Newton"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7815
+#: ../data/Locations.xml.in.h:7853
 msgid "Olathe"
 msgstr "Olathe"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7817
+#: ../data/Locations.xml.in.h:7855
 msgid "Overland Park"
 msgstr "Overland Park"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7819
+#: ../data/Locations.xml.in.h:7857
 msgid "Parsons"
 msgstr "Parsons"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7821
+#: ../data/Locations.xml.in.h:7859
 msgid "Pratt"
 msgstr "Pratt"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7823
+#: ../data/Locations.xml.in.h:7861
 msgid "Russell"
 msgstr "Russell"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7825
+#: ../data/Locations.xml.in.h:7863
 msgid "Salina"
 msgstr "Salina"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7827
+#: ../data/Locations.xml.in.h:7865
 msgid "Topeka"
 msgstr "Topeka"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7829
+#: ../data/Locations.xml.in.h:7867
 msgid "Wichita"
 msgstr "Wichita"
 
 #. A city in Kansas in the United States
-#: ../data/Locations.xml.in.h:7831
+#: ../data/Locations.xml.in.h:7869
 msgid "Winfield"
 msgstr "Winfield"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7833
+#: ../data/Locations.xml.in.h:7871
 msgid "Kentucky"
 msgstr "Kentucky"
 
 #. A city in Kentucky in the United States
-#: ../data/Locations.xml.in.h:7835
+#: ../data/Locations.xml.in.h:7873
 msgid "Bowling Green"
 msgstr "Bowling Green"
 
 #. A city in Kentucky in the United States
-#: ../data/Locations.xml.in.h:7837
+#: ../data/Locations.xml.in.h:7875
 msgctxt "City in Kentucky, United States"
 msgid "Frankfort"
 msgstr "Frankfort"
 
 #. A city in Kentucky in the United States
-#: ../data/Locations.xml.in.h:7839
+#: ../data/Locations.xml.in.h:7877
 msgctxt "City in Kentucky, United States"
 msgid "Glasgow"
 msgstr "Glasgow"
 
 #. A city in Kentucky in the United States
-#: ../data/Locations.xml.in.h:7841
+#: ../data/Locations.xml.in.h:7879
 msgctxt "City in Kentucky, United States"
 msgid "Henderson"
 msgstr "Henderson"
 
 #. A city in Kentucky in the United States
-#: ../data/Locations.xml.in.h:7843
+#: ../data/Locations.xml.in.h:7881
 msgctxt "City in Kentucky, United States"
 msgid "Jackson"
 msgstr "Jackson"
 
 #. A city in Kentucky in the United States
-#: ../data/Locations.xml.in.h:7845
+#: ../data/Locations.xml.in.h:7883
 msgctxt "City in Kentucky, United States"
 msgid "Lexington"
 msgstr "Lexington"
 
 #. A city in Kentucky in the United States
-#: ../data/Locations.xml.in.h:7847
+#: ../data/Locations.xml.in.h:7885
 msgctxt "City in Kentucky, United States"
 msgid "London"
 msgstr "London"
 
 #. A city in Kentucky in the United States
-#: ../data/Locations.xml.in.h:7849
+#: ../data/Locations.xml.in.h:7887
 msgid "Louisville"
 msgstr "Louisville"
 
 #. A city in Kentucky in the United States
-#: ../data/Locations.xml.in.h:7851
+#: ../data/Locations.xml.in.h:7889
 msgid "Middlesboro"
 msgstr "Middlesboro"
 
 #. A city in Kentucky in the United States
-#: ../data/Locations.xml.in.h:7853
+#: ../data/Locations.xml.in.h:7891
 msgid "Muldraugh"
 msgstr "Muldraugh"
 
 #. A city in Kentucky in the United States
-#: ../data/Locations.xml.in.h:7855
+#: ../data/Locations.xml.in.h:7893
 msgid "Owensboro"
 msgstr "Owensboro"
 
 #. A city in Kentucky in the United States
-#: ../data/Locations.xml.in.h:7857
+#: ../data/Locations.xml.in.h:7895
 msgid "Paducah"
 msgstr "Paducah"
 
 #. A city in Kentucky in the United States
-#: ../data/Locations.xml.in.h:7859
+#: ../data/Locations.xml.in.h:7897
 msgid "Somerset"
 msgstr "Somerset"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7861
+#: ../data/Locations.xml.in.h:7899
 msgid "Louisiana"
 msgstr "Louisiana"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7863
+#: ../data/Locations.xml.in.h:7901
 msgctxt "City in Louisiana, United States"
 msgid "Alexandria"
 msgstr "Alexandria"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7865
+#: ../data/Locations.xml.in.h:7903
 msgid "Amelia"
 msgstr "Amelia"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7867
+#: ../data/Locations.xml.in.h:7905
 msgid "Baton Rouge"
 msgstr "Baton Rouge"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7869
+#: ../data/Locations.xml.in.h:7907
 msgid "Boothville"
 msgstr "Boothville"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7871
+#: ../data/Locations.xml.in.h:7909
 msgid "DeRidder"
 msgstr "DeRidder"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7873
+#: ../data/Locations.xml.in.h:7911
 msgid "Fort Polk"
 msgstr "Fort Polk"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7875
+#: ../data/Locations.xml.in.h:7913
 msgid "Galliano"
 msgstr "Galliano"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7877
+#: ../data/Locations.xml.in.h:7915
 msgctxt "City in Louisiana, United States"
 msgid "Garden City"
 msgstr "Garden City"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7879
+#: ../data/Locations.xml.in.h:7917
 msgid "Goosport"
 msgstr "Goosport"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7881
+#: ../data/Locations.xml.in.h:7919
 msgid "Grand Isle"
 msgstr "Grand Isle"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7883
+#: ../data/Locations.xml.in.h:7921
 msgid "Hammond"
 msgstr "Hammond"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7885
+#: ../data/Locations.xml.in.h:7923
 msgid "Hicks"
 msgstr "Hicks"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7887
+#: ../data/Locations.xml.in.h:7925
 msgid "Houma"
 msgstr "Houma"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7889
+#: ../data/Locations.xml.in.h:7927
 msgctxt "City in Louisiana, United States"
 msgid "Lafayette"
 msgstr "Lafayette"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7891
+#: ../data/Locations.xml.in.h:7929
 msgid "Lake Charles"
 msgstr "Lake Charles"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7893
+#: ../data/Locations.xml.in.h:7931
 msgid "Leeville"
 msgstr "Leeville"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7895
+#: ../data/Locations.xml.in.h:7933
 msgctxt "City in Louisiana, United States"
 msgid "Monroe"
 msgstr "Monroe"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7897
+#: ../data/Locations.xml.in.h:7935
 msgid "Natchitoches"
 msgstr "Natchitoches"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7899
+#: ../data/Locations.xml.in.h:7937
 msgid "New Iberia"
 msgstr "New Iberia"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7901
+#: ../data/Locations.xml.in.h:7939
 msgid "New Orleans"
 msgstr "New Orleans"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7903
+#: ../data/Locations.xml.in.h:7941
 msgid "Oakdale"
 msgstr "Oaksdale"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7905
+#: ../data/Locations.xml.in.h:7943
 msgid "Patterson"
 msgstr "Patterson"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7907
+#: ../data/Locations.xml.in.h:7945
 msgid "Peason"
 msgstr "Peason"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7909
+#: ../data/Locations.xml.in.h:7947
 msgid "Ruston"
 msgstr "Ruston"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7911
+#: ../data/Locations.xml.in.h:7949
 msgid "Shreveport"
 msgstr "Shreveport"
 
 #. A city in Louisiana in the United States
-#: ../data/Locations.xml.in.h:7913
+#: ../data/Locations.xml.in.h:7951
 msgid "Slidell"
 msgstr "Slidell"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7915
+#: ../data/Locations.xml.in.h:7953
 msgid "Maine"
 msgstr "Maine"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7917
+#: ../data/Locations.xml.in.h:7955
 msgctxt "City in Maine, United States"
 msgid "Auburn"
 msgstr "Auburn"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7919
+#: ../data/Locations.xml.in.h:7957
 msgctxt "City in Maine, United States"
 msgid "Augusta"
 msgstr "Augusta"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7921
+#: ../data/Locations.xml.in.h:7959
 msgid "Bangor"
 msgstr "Bangor"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7923
+#: ../data/Locations.xml.in.h:7961
 msgid "Bar Harbor"
 msgstr "Bar Harbor"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7925
+#: ../data/Locations.xml.in.h:7963
 msgctxt "City in Maine, United States"
 msgid "Brunswick"
 msgstr "Brunswick"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7927
+#: ../data/Locations.xml.in.h:7965
 msgid "Caribou"
 msgstr "Caribou"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7929
+#: ../data/Locations.xml.in.h:7967
 msgid "Frenchville"
 msgstr "Frenchville"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7931
+#: ../data/Locations.xml.in.h:7969
 msgid "Fryeburg"
 msgstr "Fryeburg"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7933
+#: ../data/Locations.xml.in.h:7971
 msgctxt "City in Maine, United States"
 msgid "Greenville"
 msgstr "Greenville"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7935
+#: ../data/Locations.xml.in.h:7973
 msgid "Houlton"
 msgstr "Houlton"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7937
+#: ../data/Locations.xml.in.h:7975
 msgid "Millinocket"
 msgstr "Millinocket"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7939
+#: ../data/Locations.xml.in.h:7977
 msgctxt "City in Maine, United States"
 msgid "Portland"
 msgstr "Portland"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7941
+#: ../data/Locations.xml.in.h:7979
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7943
+#: ../data/Locations.xml.in.h:7981
 msgid "Rockland"
 msgstr "Rockland"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7945
+#: ../data/Locations.xml.in.h:7983
 msgctxt "City in Maine, United States"
 msgid "Sanford"
 msgstr "Sanford"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7947
+#: ../data/Locations.xml.in.h:7985
 msgid "Waterville"
 msgstr "Waterville"
 
 #. A city in Maine in the United States
-#: ../data/Locations.xml.in.h:7949
+#: ../data/Locations.xml.in.h:7987
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7951
+#: ../data/Locations.xml.in.h:7989
 msgid "Maryland"
 msgstr "Maryland"
 
 #. A city in Maryland in the United States
-#: ../data/Locations.xml.in.h:7953
+#: ../data/Locations.xml.in.h:7991
 msgid "Annapolis"
 msgstr "Annapolis"
 
 #. A city in Maryland in the United States
-#: ../data/Locations.xml.in.h:7955
+#: ../data/Locations.xml.in.h:7993
 msgid "Baltimore"
 msgstr "Baltimore"
 
 #. A city in Maryland in the United States
-#: ../data/Locations.xml.in.h:7957
+#: ../data/Locations.xml.in.h:7995
 msgid "Camp Springs"
 msgstr "Camp Springs"
 
 #. A city in Maryland in the United States
-#: ../data/Locations.xml.in.h:7959
+#: ../data/Locations.xml.in.h:7997
 msgid "Cumberland"
 msgstr "Cumberland"
 
 #. A city in Maryland in the United States
-#: ../data/Locations.xml.in.h:7961
+#: ../data/Locations.xml.in.h:7999
 msgid "Easton"
 msgstr "Easton"
 
 #. A city in Maryland in the United States
-#: ../data/Locations.xml.in.h:7963
+#: ../data/Locations.xml.in.h:8001
 msgctxt "City in Maryland, United States"
 msgid "Frederick"
 msgstr "Frederick"
 
 #. A city in Maryland in the United States
-#: ../data/Locations.xml.in.h:7965
+#: ../data/Locations.xml.in.h:8003
 msgid "Hagerstown"
 msgstr "Hagerstown"
 
 #. A city in Maryland in the United States
-#: ../data/Locations.xml.in.h:7967
+#: ../data/Locations.xml.in.h:8005
 msgid "Ocean City"
 msgstr "Ocean City"
 
 #. A city in Maryland in the United States
-#: ../data/Locations.xml.in.h:7969
+#: ../data/Locations.xml.in.h:8007
 msgid "Patuxent"
 msgstr "Patuxent"
 
 #. A city in Maryland in the United States
-#: ../data/Locations.xml.in.h:7971
+#: ../data/Locations.xml.in.h:8009
 msgid "Saint Marys City"
 msgstr "Saint Marys City"
 
 #. A city in Maryland in the United States
-#: ../data/Locations.xml.in.h:7973
+#: ../data/Locations.xml.in.h:8011
 msgctxt "City in Maryland, United States"
 msgid "Salisbury"
 msgstr "Salisbury"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:7975
+#: ../data/Locations.xml.in.h:8013
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:7977
+#: ../data/Locations.xml.in.h:8015
 msgctxt "City in Massachusetts, United States"
 msgid "Bedford"
 msgstr "Bedford"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:7979
+#: ../data/Locations.xml.in.h:8017
 msgid "Beverly"
 msgstr "Beverly"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:7981
+#: ../data/Locations.xml.in.h:8019
 msgid "Boston"
 msgstr "Boston"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:7983
+#: ../data/Locations.xml.in.h:8021
 msgctxt "City in Massachusetts, United States"
 msgid "Cambridge"
 msgstr "Cambridge"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:7985
+#: ../data/Locations.xml.in.h:8023
 msgid "Chatham"
 msgstr "Chatham"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:7987
+#: ../data/Locations.xml.in.h:8025
 msgid "Chicopee Falls"
 msgstr "Chicopee Falls"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:7989
+#: ../data/Locations.xml.in.h:8027
 msgid "East Milton"
 msgstr "East Milton"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:7991
+#: ../data/Locations.xml.in.h:8029
 msgid "Fitchburg"
 msgstr "Fitchburg"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:7993
+#: ../data/Locations.xml.in.h:8031
 msgid "Hyannis"
 msgstr "Hyannis"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:7995
+#: ../data/Locations.xml.in.h:8033
 msgctxt "City in Massachusetts, United States"
 msgid "Lawrence"
 msgstr "Lawrence"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:7997
+#: ../data/Locations.xml.in.h:8035
 msgctxt "City in Massachusetts, United States"
 msgid "Lowell"
 msgstr "Lowell"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:7999
+#: ../data/Locations.xml.in.h:8037
 msgid "Nantucket"
 msgstr "Nantucket"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:8001
+#: ../data/Locations.xml.in.h:8039
 msgid "New Bedford"
 msgstr "New Bedford"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:8003
+#: ../data/Locations.xml.in.h:8041
 msgid "North Adams"
 msgstr "North Adams"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:8005
+#: ../data/Locations.xml.in.h:8043
 msgid "Norwood"
 msgstr "Norwood"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:8007
+#: ../data/Locations.xml.in.h:8045
 msgctxt "City in Massachusetts, United States"
 msgid "Orange"
 msgstr "Orange"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:8009
+#: ../data/Locations.xml.in.h:8047
 msgctxt "City in Massachusetts, United States"
 msgid "Pittsfield"
 msgstr "Pittsfield"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:8011
+#: ../data/Locations.xml.in.h:8049
 msgctxt "City in Massachusetts, United States"
 msgid "Plymouth"
 msgstr "Plymouth"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:8013
+#: ../data/Locations.xml.in.h:8051
 msgid "Provincetown"
 msgstr "Provincetown"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:8015
+#: ../data/Locations.xml.in.h:8053
 msgid "Sandwich"
 msgstr "Sandwich"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:8017
+#: ../data/Locations.xml.in.h:8055
 msgctxt "City in Massachusetts, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:8019
+#: ../data/Locations.xml.in.h:8057
 msgid "Vineyard Haven"
 msgstr "Vineyard Haven"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:8021
+#: ../data/Locations.xml.in.h:8059
 msgid "Westfield"
 msgstr "Westfield"
 
 #. A city in Massachusetts in the United States
-#: ../data/Locations.xml.in.h:8023
+#: ../data/Locations.xml.in.h:8061
 msgid "Worcester"
 msgstr "Worcester"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8025
+#: ../data/Locations.xml.in.h:8063
 msgid "Michigan"
 msgstr "Michigan"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8027
+#: ../data/Locations.xml.in.h:8065
 msgid "Adrian"
 msgstr "Adrian"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8029
+#: ../data/Locations.xml.in.h:8067
 msgctxt "City in Michigan, United States"
 msgid "Alma"
 msgstr "Alma"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8031
+#: ../data/Locations.xml.in.h:8069
 msgid "Alpena"
 msgstr "Alpena"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8033
+#: ../data/Locations.xml.in.h:8071
 msgid "Ann Arbor"
 msgstr "Ann Arbor"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8035
+#: ../data/Locations.xml.in.h:8073
 msgid "Bad Axe"
 msgstr "Bad Axe"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8037
+#: ../data/Locations.xml.in.h:8075
 msgid "Battle Creek"
 msgstr "Battle Creek"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8039
+#: ../data/Locations.xml.in.h:8077
 msgid "Bellaire"
 msgstr "Bellaire"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8041
+#: ../data/Locations.xml.in.h:8079
 msgid "Benton Harbor"
 msgstr "Benton Harbor"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8043
+#: ../data/Locations.xml.in.h:8081
 msgid "Big Rapids"
 msgstr "Big Rapids"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8045
+#: ../data/Locations.xml.in.h:8083
 msgid "Cadillac"
 msgstr "Cadillac"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8047
+#: ../data/Locations.xml.in.h:8085
 msgid "Caro"
 msgstr "Caro"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8049
+#: ../data/Locations.xml.in.h:8087
 msgid "Charlevoix"
 msgstr "Charlevoix"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8051
+#: ../data/Locations.xml.in.h:8089
 msgctxt "City in Michigan, United States"
 msgid "Charlotte"
 msgstr "Charlotte"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8053
+#: ../data/Locations.xml.in.h:8091
 msgid "Cheboygan"
 msgstr "Cheboygan"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8055
+#: ../data/Locations.xml.in.h:8093
 msgid "Coldwater"
 msgstr "Coldwater"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8057
+#: ../data/Locations.xml.in.h:8095
 msgid "Copper Harbor"
 msgstr "Copper Harbor"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8059
+#: ../data/Locations.xml.in.h:8097
 msgid "Detroit"
 msgstr "Detroit"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8061
+#: ../data/Locations.xml.in.h:8099
 msgid "Escanaba"
 msgstr "Escanaba"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8063
+#: ../data/Locations.xml.in.h:8101
 msgid "Flint"
 msgstr "Flint"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8065
+#: ../data/Locations.xml.in.h:8103
 msgctxt "City in Michigan, United States"
 msgid "Frankfort"
 msgstr "Frankfort"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8067
+#: ../data/Locations.xml.in.h:8105
 msgid "Gaylord"
 msgstr "Gaylord"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8069
+#: ../data/Locations.xml.in.h:8107
 msgctxt "City in Michigan, United States"
 msgid "Grand Rapids"
 msgstr "Grand Rapids"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8071
+#: ../data/Locations.xml.in.h:8109
 msgid "Grayling"
 msgstr "Grayling"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8073
+#: ../data/Locations.xml.in.h:8111
 msgid "Hancock"
 msgstr "Hancock"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8075
+#: ../data/Locations.xml.in.h:8113
 msgid "Harbor Springs"
 msgstr "Harbor Springs"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8077
+#: ../data/Locations.xml.in.h:8115
 msgid "Hillsdale"
 msgstr "Hillsdale"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8079
+#: ../data/Locations.xml.in.h:8117
 msgid "Holland"
 msgstr "Nederland"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8081
+#: ../data/Locations.xml.in.h:8119
 msgid "Houghton Lake"
 msgstr "Houghton Lake"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8083
+#: ../data/Locations.xml.in.h:8121
 msgid "Howell"
 msgstr "Howell"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8085
+#: ../data/Locations.xml.in.h:8123
 msgid "Iron Mountain"
 msgstr "Iron Mountain"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8087
+#: ../data/Locations.xml.in.h:8125
 msgid "Ironwood"
 msgstr "Ironwood"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8089
+#: ../data/Locations.xml.in.h:8127
 msgctxt "City in Michigan, United States"
 msgid "Jackson"
 msgstr "Jackson"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8091
+#: ../data/Locations.xml.in.h:8129
 msgid "Kalamazoo"
 msgstr "Kalamazoo"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8093
+#: ../data/Locations.xml.in.h:8131
 msgid "Kinross"
 msgstr "Kinross"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8095
+#: ../data/Locations.xml.in.h:8133
 msgid "Lambertville"
 msgstr "Lambertville"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8097
+#: ../data/Locations.xml.in.h:8135
 msgid "Lansing"
 msgstr "Lansing"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8099
+#: ../data/Locations.xml.in.h:8137
 msgid "Livonia"
 msgstr "Livonia"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8101
+#: ../data/Locations.xml.in.h:8139
 msgid "Ludington"
 msgstr "Ludington"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8103
+#: ../data/Locations.xml.in.h:8141
 msgid "Mackinac Island"
 msgstr "Mackinac Island"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8105
+#: ../data/Locations.xml.in.h:8143
 msgid "Manistee"
 msgstr "Manistee"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8107
+#: ../data/Locations.xml.in.h:8145
 msgid "Manistique"
 msgstr "Manistique"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8109
+#: ../data/Locations.xml.in.h:8147
 msgid "Marquette"
 msgstr "Marquette"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8111
+#: ../data/Locations.xml.in.h:8149
 msgctxt "City in Michigan, United States"
 msgid "Marshall"
 msgstr "Marshall"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8113
+#: ../data/Locations.xml.in.h:8151
 msgctxt "City in Michigan, United States"
 msgid "Marysville"
 msgstr "Marysville"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8115
+#: ../data/Locations.xml.in.h:8153
 msgid "Mason"
 msgstr "Mason"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8117
+#: ../data/Locations.xml.in.h:8155
 msgid "Menominee"
 msgstr "Menominee"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8119
+#: ../data/Locations.xml.in.h:8157
 msgctxt "City in Michigan, United States"
 msgid "Monroe"
 msgstr "Monroe"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8121
+#: ../data/Locations.xml.in.h:8159
 msgctxt "City in Michigan, United States"
 msgid "Mount Pleasant"
 msgstr "Mount Pleasant"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8123
+#: ../data/Locations.xml.in.h:8161
 msgid "Munising"
 msgstr "Munising"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8125
+#: ../data/Locations.xml.in.h:8163
 msgid "Muskegon"
 msgstr "Muskegon"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8127
+#: ../data/Locations.xml.in.h:8165
 msgid "Newberry"
 msgstr "Newberry"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8129
+#: ../data/Locations.xml.in.h:8167
 msgid "Oscoda"
 msgstr "Oscoda"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8131
+#: ../data/Locations.xml.in.h:8169
 msgid "Owosso"
 msgstr "Owosso"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8133
+#: ../data/Locations.xml.in.h:8171
 msgid "Pellston"
 msgstr "Pellston"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8135
+#: ../data/Locations.xml.in.h:8173
 msgctxt "City in Michigan, United States"
 msgid "Pontiac"
 msgstr "Pontiac"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8137
+#: ../data/Locations.xml.in.h:8175
 msgid "Port Hope"
 msgstr "Port Hope"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8139
+#: ../data/Locations.xml.in.h:8177
 msgid "Rogers City"
 msgstr "Rogers City"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8141
+#: ../data/Locations.xml.in.h:8179
 msgid "Saginaw"
 msgstr "Saginaw"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8143
+#: ../data/Locations.xml.in.h:8181
 msgctxt "City in Michigan, United States"
 msgid "Saint James"
 msgstr "Saint James"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8145
+#: ../data/Locations.xml.in.h:8183
 msgid "Sault Ste. Marie"
 msgstr "Sault Ste. Marie"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8147
+#: ../data/Locations.xml.in.h:8185
 msgid "South Haven"
 msgstr "South Haven"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8149
+#: ../data/Locations.xml.in.h:8187
 msgid "Sterling Heights"
 msgstr "Sterling Heights"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8151
+#: ../data/Locations.xml.in.h:8189
 msgid "Sturgis"
 msgstr "Sturgis"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8153
+#: ../data/Locations.xml.in.h:8191
 msgid "Traverse City"
 msgstr "Traverse City"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8155
+#: ../data/Locations.xml.in.h:8193
 msgctxt "City in Michigan, United States"
 msgid "Troy"
 msgstr "Troy"
 
 #. A city in Michigan in the United States
-#: ../data/Locations.xml.in.h:8157
+#: ../data/Locations.xml.in.h:8195
 msgid "Warren"
 msgstr "Warren"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8159
+#: ../data/Locations.xml.in.h:8197
 msgid "Minnesota"
 msgstr "Minnesota"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8161
+#: ../data/Locations.xml.in.h:8199
 msgid "Aitkin"
 msgstr "Aitkin"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8163
+#: ../data/Locations.xml.in.h:8201
 msgid "Albert Lea"
 msgstr "Albert Lea"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8165
+#: ../data/Locations.xml.in.h:8203
 msgctxt "City in Minnesota, United States"
 msgid "Alexandria"
 msgstr "Alexandria"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8167
+#: ../data/Locations.xml.in.h:8205
 msgid "Angle Inlet"
 msgstr "Angle Inlet"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8169
+#: ../data/Locations.xml.in.h:8207
 msgctxt "City in Minnesota, United States"
 msgid "Appleton"
 msgstr "Appleton"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8171
+#: ../data/Locations.xml.in.h:8209
 msgctxt "City in Minnesota, United States"
 msgid "Austin"
 msgstr "Austin"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8173
+#: ../data/Locations.xml.in.h:8211
 msgid "Baudette"
 msgstr "Baudette"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8175
+#: ../data/Locations.xml.in.h:8213
 msgid "Bemidji"
 msgstr "Bemidji"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8177
+#: ../data/Locations.xml.in.h:8215
 msgctxt "City in Minnesota, United States"
 msgid "Benson"
 msgstr "Benson"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8179
+#: ../data/Locations.xml.in.h:8217
 msgid "Bigfork"
 msgstr "Bigfork"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8181
+#: ../data/Locations.xml.in.h:8219
 msgid "Brainerd"
 msgstr "Brainerd"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8183
+#: ../data/Locations.xml.in.h:8221
 msgctxt "City in Minnesota, United States"
 msgid "Buffalo"
 msgstr "Buffalo"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8185
+#: ../data/Locations.xml.in.h:8223
 msgctxt "City in Minnesota, United States"
 msgid "Cambridge"
 msgstr "Cambridge"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8187
+#: ../data/Locations.xml.in.h:8225
 msgid "Cloquet"
 msgstr "Cloquet"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8189
+#: ../data/Locations.xml.in.h:8227
 msgid "Cook"
 msgstr "Cook"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8191
+#: ../data/Locations.xml.in.h:8229
 msgid "Crane Lake"
 msgstr "Crane Lake"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8193
+#: ../data/Locations.xml.in.h:8231
 msgid "Crookston"
 msgstr "Crookston"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8195
+#: ../data/Locations.xml.in.h:8233
 msgid "Detroit Lakes"
 msgstr "Detroit Lakes"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8197
+#: ../data/Locations.xml.in.h:8235
 msgid "Dodge Center"
 msgstr "Dodge Center"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8199
+#: ../data/Locations.xml.in.h:8237
 msgid "Duluth"
 msgstr "Duluth"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8201
+#: ../data/Locations.xml.in.h:8239
 msgctxt "City in Minnesota, United States"
 msgid "Ely"
 msgstr "Ely"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8203
+#: ../data/Locations.xml.in.h:8241
 msgid "Eveleth"
 msgstr "Eveleth"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8205
+#: ../data/Locations.xml.in.h:8243
 msgid "Fairmont"
 msgstr "Fairmont"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8207
+#: ../data/Locations.xml.in.h:8245
 msgid "Faribault"
 msgstr "Faribault"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8209
+#: ../data/Locations.xml.in.h:8247
 msgid "Fergus Falls"
 msgstr "Fergus Falls"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8211
+#: ../data/Locations.xml.in.h:8249
 msgid "Fosston"
 msgstr "Fosston"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8213
+#: ../data/Locations.xml.in.h:8251
 msgid "Glencoe"
 msgstr "Glencoe"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8215
+#: ../data/Locations.xml.in.h:8253
 msgid "Glenwood"
 msgstr "Glenwood"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8217
+#: ../data/Locations.xml.in.h:8255
 msgid "Grand Marais"
 msgstr "Grand Marais"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8219
+#: ../data/Locations.xml.in.h:8257
 msgctxt "City in Minnesota, United States"
 msgid "Grand Rapids"
 msgstr "Grand Rapids"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8221
+#: ../data/Locations.xml.in.h:8259
 msgid "Granite Falls"
 msgstr "Granite Falls"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8223
+#: ../data/Locations.xml.in.h:8261
 msgid "Hallock"
 msgstr "Hallock"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8225
+#: ../data/Locations.xml.in.h:8263
 msgid "Hibbing"
 msgstr "Hibbing"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8227
+#: ../data/Locations.xml.in.h:8265
 msgctxt "City in Minnesota, United States"
 msgid "Hutchinson"
 msgstr "Hutchinson"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8229
+#: ../data/Locations.xml.in.h:8267
 msgid "International Falls"
 msgstr "International Falls"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8231
+#: ../data/Locations.xml.in.h:8269
 msgid "Inver Grove Heights"
 msgstr "Inver Grove Heights"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8233
+#: ../data/Locations.xml.in.h:8271
 msgctxt "City in Minnesota, United States"
 msgid "Jackson"
 msgstr "Jackson"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8235
+#: ../data/Locations.xml.in.h:8273
 msgctxt "City in Minnesota, United States"
 msgid "Litchfield"
 msgstr "Litchfield"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8237
+#: ../data/Locations.xml.in.h:8275
 msgid "Little Falls"
 msgstr "Little Falls"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8239
+#: ../data/Locations.xml.in.h:8277
 msgid "Longville"
 msgstr "Longville"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8241
+#: ../data/Locations.xml.in.h:8279
 msgid "Luverne"
 msgstr "Luverne"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8243
+#: ../data/Locations.xml.in.h:8281
 msgctxt "City in Minnesota, United States"
 msgid "Madison"
 msgstr "Madison"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8245
+#: ../data/Locations.xml.in.h:8283
 msgid "Mankato"
 msgstr "Mankato"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8247
+#: ../data/Locations.xml.in.h:8285
 msgid "Maple Lake"
 msgstr "Maple Lake"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8249
+#: ../data/Locations.xml.in.h:8287
 msgctxt "City in Minnesota, United States"
 msgid "Marshall"
 msgstr "Marshall"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8251
+#: ../data/Locations.xml.in.h:8289
 msgid "McGregor"
 msgstr "McGregor"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8253
+#: ../data/Locations.xml.in.h:8291
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8255
+#: ../data/Locations.xml.in.h:8293
 msgctxt "City in Minnesota, United States"
 msgid "Montevideo"
 msgstr "Montevideo"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8257
+#: ../data/Locations.xml.in.h:8295
 msgid "Moorhead"
 msgstr "Moorhead"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8259
+#: ../data/Locations.xml.in.h:8297
 msgid "Moose Lake"
 msgstr "Moose Lake"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8261
+#: ../data/Locations.xml.in.h:8299
 msgid "Mora"
 msgstr "Mora"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8263
+#: ../data/Locations.xml.in.h:8301
 msgctxt "City in Minnesota, United States"
 msgid "Morris"
 msgstr "Morris"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8265
+#: ../data/Locations.xml.in.h:8303
 msgid "New Ulm"
 msgstr "New Ulm"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8267
+#: ../data/Locations.xml.in.h:8305
 msgid "Olivia"
 msgstr "Olivia"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8269
+#: ../data/Locations.xml.in.h:8307
 msgid "Orr"
 msgstr "Orr"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8271
+#: ../data/Locations.xml.in.h:8309
 msgid "Ortonville"
 msgstr "Ortonville"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8273
+#: ../data/Locations.xml.in.h:8311
 msgid "Owatonna"
 msgstr "Owatonna"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8275
+#: ../data/Locations.xml.in.h:8313
 msgid "Park Rapids"
 msgstr "Park Rapids"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8277
+#: ../data/Locations.xml.in.h:8315
 msgid "Paynesville"
 msgstr "Paynesville"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8279
+#: ../data/Locations.xml.in.h:8317
 msgid "Pine River"
 msgstr "Pine River"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8281
+#: ../data/Locations.xml.in.h:8319
 msgid "Pipestone"
 msgstr "Pipestone"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8283
+#: ../data/Locations.xml.in.h:8321
 msgid "Preston"
 msgstr "Preston"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8285
+#: ../data/Locations.xml.in.h:8323
 msgctxt "City in Minnesota, United States"
 msgid "Princeton"
 msgstr "Princeton"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8287
+#: ../data/Locations.xml.in.h:8325
 msgid "Red Wing"
 msgstr "Red Wing"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8289
+#: ../data/Locations.xml.in.h:8327
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8291
+#: ../data/Locations.xml.in.h:8329
 msgctxt "City in Minnesota, United States"
 msgid "Rochester"
 msgstr "Rochester"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8293
+#: ../data/Locations.xml.in.h:8331
 msgctxt "City in Minnesota, United States"
 msgid "Roseau"
 msgstr "Roseau"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8295
+#: ../data/Locations.xml.in.h:8333
 msgid "Rush City"
 msgstr "Rush City"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8297
+#: ../data/Locations.xml.in.h:8335
 msgid "Saint Cloud"
 msgstr "Saint Cloud"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8299
+#: ../data/Locations.xml.in.h:8337
 msgctxt "City in Minnesota, United States"
 msgid "Saint James"
 msgstr "Saint James"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8301
+#: ../data/Locations.xml.in.h:8339
 msgid "Silver Bay"
 msgstr "Silver Bay"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8303
+#: ../data/Locations.xml.in.h:8341
 msgid "Slayton"
 msgstr "Slayton"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8305
+#: ../data/Locations.xml.in.h:8343
 msgid "Stanton"
 msgstr "Stanton"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8307
+#: ../data/Locations.xml.in.h:8345
 msgid "Staples"
 msgstr "Staples"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8309
+#: ../data/Locations.xml.in.h:8347
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8311
+#: ../data/Locations.xml.in.h:8349
 msgid "Tracy"
 msgstr "Tracy"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8313
+#: ../data/Locations.xml.in.h:8351
 msgid "Two Harbors"
 msgstr "Two Harbors"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8315
+#: ../data/Locations.xml.in.h:8353
 msgid "Wadena"
 msgstr "Wadena"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8317
+#: ../data/Locations.xml.in.h:8355
 msgid "Warroad"
 msgstr "Warroad"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8319
+#: ../data/Locations.xml.in.h:8357
 msgid "Waseca"
 msgstr "Waseca"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8321
+#: ../data/Locations.xml.in.h:8359
 msgid "Waskish"
 msgstr "Waskish"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8323
+#: ../data/Locations.xml.in.h:8361
 msgid "Wheaton"
 msgstr "Wheaton"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8325
+#: ../data/Locations.xml.in.h:8363
 msgid "Windom"
 msgstr "Windom"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8327
+#: ../data/Locations.xml.in.h:8365
 msgid "Winona"
 msgstr "Winona"
 
 #. A city in Minnesota in the United States
-#: ../data/Locations.xml.in.h:8329
+#: ../data/Locations.xml.in.h:8367
 msgid "Worthington"
 msgstr "Worthington"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8331
+#: ../data/Locations.xml.in.h:8369
 msgid "Mississippi"
 msgstr "Mississippi"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8333
+#: ../data/Locations.xml.in.h:8371
 msgid "Biloxi"
 msgstr "Biloxi"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8335
+#: ../data/Locations.xml.in.h:8373
 msgctxt "City in Mississippi, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8337
+#: ../data/Locations.xml.in.h:8375
 msgctxt "City in Mississippi, United States"
 msgid "Greenville"
 msgstr "Greenville"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8339
+#: ../data/Locations.xml.in.h:8377
 msgctxt "City in Mississippi, United States"
 msgid "Greenwood"
 msgstr "Greenwood"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8341
+#: ../data/Locations.xml.in.h:8379
 msgid "Gulfport"
 msgstr "Gulfport"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8343
+#: ../data/Locations.xml.in.h:8381
 msgid "Hattiesburg"
 msgstr "Hattiesburg"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8345
+#: ../data/Locations.xml.in.h:8383
 msgctxt "City in Mississippi, United States"
 msgid "Jackson"
 msgstr "Jackson"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8347
+#: ../data/Locations.xml.in.h:8385
 msgid "McComb"
 msgstr "McComb"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8349
+#: ../data/Locations.xml.in.h:8387
 msgid "Meridian"
 msgstr "Meridian"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8351
+#: ../data/Locations.xml.in.h:8389
 msgid "Natchez"
 msgstr "Natchez"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8353
+#: ../data/Locations.xml.in.h:8391
 msgid "Olive Branch"
 msgstr "Olive Branch"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8355
+#: ../data/Locations.xml.in.h:8393
 msgctxt "City in Mississippi, United States"
 msgid "Oxford"
 msgstr "Oxford"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8357
+#: ../data/Locations.xml.in.h:8395
 msgid "Pascagoula"
 msgstr "Pascagoula"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8359
+#: ../data/Locations.xml.in.h:8397
 msgid "Tunica"
 msgstr "Tunica"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8361
+#: ../data/Locations.xml.in.h:8399
 msgid "Tupelo"
 msgstr "Tupelo"
 
 #. A city in Mississippi in the United States
-#: ../data/Locations.xml.in.h:8363
+#: ../data/Locations.xml.in.h:8401
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8365
+#: ../data/Locations.xml.in.h:8403
 msgid "Missouri"
 msgstr "Missouri"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8367
+#: ../data/Locations.xml.in.h:8405
 msgid "Cape Girardeau"
 msgstr "Cape Girardeau"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8369
+#: ../data/Locations.xml.in.h:8407
 msgid "Chesterfield"
 msgstr "Chesterfield"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8371
+#: ../data/Locations.xml.in.h:8409
 msgid "Chillicothe"
 msgstr "Chillicothe"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8373
+#: ../data/Locations.xml.in.h:8411
 msgctxt "City in Missouri, United States"
 msgid "Columbia"
 msgstr "Columbia"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8375
+#: ../data/Locations.xml.in.h:8413
 msgctxt "City in Missouri, United States"
 msgid "Farmington"
 msgstr "Farmington"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8377
+#: ../data/Locations.xml.in.h:8415
 msgid "Independence"
 msgstr "Indipendence"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8379
+#: ../data/Locations.xml.in.h:8417
 msgid "Jefferson City"
 msgstr "Jefferson City"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8381
+#: ../data/Locations.xml.in.h:8419
 msgid "Joplin"
 msgstr "Joplin"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8383
+#: ../data/Locations.xml.in.h:8421
 msgid "Kaiser"
 msgstr "Kaiser"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8385
+#: ../data/Locations.xml.in.h:8423
 msgctxt "City in Missouri, United States"
 msgid "Kansas City"
 msgstr "Kansas City"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8387
+#: ../data/Locations.xml.in.h:8425
 msgid "Kirksville"
 msgstr "Kirksville"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8389
+#: ../data/Locations.xml.in.h:8427
 msgid "Knob Noster"
 msgstr "Knob Noster"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8391
+#: ../data/Locations.xml.in.h:8429
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8393
+#: ../data/Locations.xml.in.h:8431
 msgid "Sedalia"
 msgstr "Sedalia"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8395
+#: ../data/Locations.xml.in.h:8433
 msgctxt "City in Missouri, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8397
+#: ../data/Locations.xml.in.h:8435
 msgid "St. Louis"
 msgstr "St. Louis"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8399
+#: ../data/Locations.xml.in.h:8437
 msgid "Unity Village"
 msgstr "Unity Village"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8401
+#: ../data/Locations.xml.in.h:8439
 msgctxt "City in Missouri, United States"
 msgid "Vichy"
 msgstr "Vichy"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8403
+#: ../data/Locations.xml.in.h:8441
 msgid "Waynesville"
 msgstr "Waynesville"
 
 #. A city in Missouri in the United States
-#: ../data/Locations.xml.in.h:8405
+#: ../data/Locations.xml.in.h:8443
 msgid "West Plains"
 msgstr "West Plains"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8407
+#: ../data/Locations.xml.in.h:8445
 msgid "Montana"
 msgstr "Montana"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8409
+#: ../data/Locations.xml.in.h:8447
 msgid "Baker"
 msgstr "Baker"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8411
+#: ../data/Locations.xml.in.h:8449
 msgid "Billings"
 msgstr "Billings"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8413
+#: ../data/Locations.xml.in.h:8451
 msgid "Black Eagle"
 msgstr "Black Eagle"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8415
+#: ../data/Locations.xml.in.h:8453
 msgid "Bozeman"
 msgstr "Bozeman"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8417
+#: ../data/Locations.xml.in.h:8455
 msgid "Browning"
 msgstr "Browning"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8419
+#: ../data/Locations.xml.in.h:8457
 msgid "Butte"
 msgstr "Butte"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8421
+#: ../data/Locations.xml.in.h:8459
 msgid "Cut Bank"
 msgstr "Cut Bank"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8423
+#: ../data/Locations.xml.in.h:8461
 msgid "Dillon"
 msgstr "Dillon"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8425
+#: ../data/Locations.xml.in.h:8463
 msgid "Drummond"
 msgstr "Drummond"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8427
+#: ../data/Locations.xml.in.h:8465
 msgctxt "City in Montana, United States"
 msgid "Glasgow"
 msgstr "Glasgow"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8429
+#: ../data/Locations.xml.in.h:8467
 msgid "Glendive"
 msgstr "Glendive"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8431
+#: ../data/Locations.xml.in.h:8469
 msgid "Great Falls"
 msgstr "Great Falls"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8433
+#: ../data/Locations.xml.in.h:8471
 msgid "Havre"
 msgstr "Havre"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8435
+#: ../data/Locations.xml.in.h:8473
 msgid "Helena"
 msgstr "Helena"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8437
+#: ../data/Locations.xml.in.h:8475
 msgctxt "City in Montana, United States"
 msgid "Jordan"
 msgstr "Jordan"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8439
+#: ../data/Locations.xml.in.h:8477
 msgid "Kalispell"
 msgstr "Kalispell"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8441
+#: ../data/Locations.xml.in.h:8479
 msgid "Lewistown"
 msgstr "Lewistown"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8443
+#: ../data/Locations.xml.in.h:8481
 msgid "Livingston"
 msgstr "Livingston"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8445
+#: ../data/Locations.xml.in.h:8483
 msgid "Miles City"
 msgstr "Miles City"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8447
+#: ../data/Locations.xml.in.h:8485
 msgid "Missoula"
 msgstr "Missoula"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8449
+#: ../data/Locations.xml.in.h:8487
 msgctxt "City in Montana, United States"
 msgid "Sidney"
 msgstr "Sidney"
 
 #. A city in Montana in the United States
-#: ../data/Locations.xml.in.h:8451
+#: ../data/Locations.xml.in.h:8489
 msgid "Wolf Point"
 msgstr "Wolf point"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8453
+#: ../data/Locations.xml.in.h:8491
 msgid "Nebraska"
 msgstr "Nebraska"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8455
+#: ../data/Locations.xml.in.h:8493
 msgid "Ainsworth"
 msgstr "Ainsworth"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8457
+#: ../data/Locations.xml.in.h:8495
 msgid "Albion"
 msgstr "Albion"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8459
+#: ../data/Locations.xml.in.h:8497
 msgid "Alliance"
 msgstr "Alliance"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8461
+#: ../data/Locations.xml.in.h:8499
 msgctxt "City in Nebraska, United States"
 msgid "Aurora"
 msgstr "Aurora"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8463
+#: ../data/Locations.xml.in.h:8501
 msgid "Beatrice"
 msgstr "Beatrice"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8465
+#: ../data/Locations.xml.in.h:8503
 msgid "Broken Bow"
 msgstr "Broken Bow"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8467
+#: ../data/Locations.xml.in.h:8505
 msgid "Chadron"
 msgstr "Chadron"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8469
+#: ../data/Locations.xml.in.h:8507
 msgctxt "City in Nebraska, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8471
+#: ../data/Locations.xml.in.h:8509
 msgid "Falls City"
 msgstr "Falls City"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8473
+#: ../data/Locations.xml.in.h:8511
 msgctxt "City in Nebraska, United States"
 msgid "Fremont"
 msgstr "Fremont"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8475
+#: ../data/Locations.xml.in.h:8513
 msgid "Grand Island"
 msgstr "Grand Island"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8477
+#: ../data/Locations.xml.in.h:8515
 msgid "Hastings"
 msgstr "Hastings"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8479
+#: ../data/Locations.xml.in.h:8517
 msgctxt "City in Nebraska, United States"
 msgid "Hebron"
 msgstr "Hebron"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8481
+#: ../data/Locations.xml.in.h:8519
 msgid "Holdrege"
 msgstr "Holdrege"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8483
+#: ../data/Locations.xml.in.h:8521
 msgctxt "City in Nebraska, United States"
 msgid "Imperial"
 msgstr "Imperial"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8485
+#: ../data/Locations.xml.in.h:8523
 msgid "Kearney"
 msgstr "Kearney"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8487
+#: ../data/Locations.xml.in.h:8525
 msgid "Kimball"
 msgstr "Kimball"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8489
+#: ../data/Locations.xml.in.h:8527
 msgctxt "City in Nebraska, United States"
 msgid "Lexington"
 msgstr "Lexington"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8491
+#: ../data/Locations.xml.in.h:8529
 msgctxt "City in Nebraska, United States"
 msgid "Lincoln"
 msgstr "Lincoln"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8493
+#: ../data/Locations.xml.in.h:8531
 msgid "McCook"
 msgstr "McCook"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8495
+#: ../data/Locations.xml.in.h:8533
 msgid "Nebraska City"
 msgstr "Nebraska by"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8497
+#: ../data/Locations.xml.in.h:8535
 msgctxt "City in Nebraska, United States"
 msgid "Norfolk"
 msgstr "Norfolk"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8499
+#: ../data/Locations.xml.in.h:8537
 msgid "North Platte"
 msgstr "North Platte"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8501
+#: ../data/Locations.xml.in.h:8539
 msgid "O'Neill"
 msgstr "O'Neill"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8503
+#: ../data/Locations.xml.in.h:8541
 msgid "Ogallala"
 msgstr "Ogallala"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8505
+#: ../data/Locations.xml.in.h:8543
 msgid "Omaha"
 msgstr "Omaha"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8507
+#: ../data/Locations.xml.in.h:8545
 msgid "Ord"
 msgstr "Ord"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8509
+#: ../data/Locations.xml.in.h:8547
 msgid "Plattsmouth"
 msgstr "Plattsmouth"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8511
+#: ../data/Locations.xml.in.h:8549
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8513
+#: ../data/Locations.xml.in.h:8551
 msgctxt "City in Nebraska, United States"
 msgid "Sidney"
 msgstr "Sidney"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8515
+#: ../data/Locations.xml.in.h:8553
 msgid "Tekamah"
 msgstr "Tekamah"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8517
+#: ../data/Locations.xml.in.h:8555
 msgid "Thedford"
 msgstr "Thedford"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8519
+#: ../data/Locations.xml.in.h:8557
 msgid "Valentine"
 msgstr "Valentine"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8521
+#: ../data/Locations.xml.in.h:8559
 msgid "Wayne"
 msgstr "Wayne"
 
 #. A city in Nebraska in the United States
-#: ../data/Locations.xml.in.h:8523
+#: ../data/Locations.xml.in.h:8561
 msgctxt "City in Nebraska, United States"
 msgid "York"
 msgstr "York"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8525
+#: ../data/Locations.xml.in.h:8563
 msgid "Nevada"
 msgstr "Nevada"
 
 #. A city in Nevada in the United States
-#: ../data/Locations.xml.in.h:8527
+#: ../data/Locations.xml.in.h:8565
 msgid "Elko"
 msgstr "Elko"
 
 #. A city in Nevada in the United States
-#: ../data/Locations.xml.in.h:8529
+#: ../data/Locations.xml.in.h:8567
 msgctxt "City in Nevada, United States"
 msgid "Ely"
 msgstr "Ely"
 
 #. A city in Nevada in the United States
-#: ../data/Locations.xml.in.h:8531
+#: ../data/Locations.xml.in.h:8569
 msgctxt "City in Nevada, United States"
 msgid "Eureka"
 msgstr "Eureka"
 
 #. A city in Nevada in the United States
-#: ../data/Locations.xml.in.h:8533
+#: ../data/Locations.xml.in.h:8571
 msgid "Fallon"
 msgstr "Fallon"
 
 #. A city in Nevada in the United States
-#: ../data/Locations.xml.in.h:8535
+#: ../data/Locations.xml.in.h:8573
 msgctxt "City in Nevada, United States"
 msgid "Henderson"
 msgstr "Henderson"
 
 #. A city in Nevada in the United States
-#: ../data/Locations.xml.in.h:8537
+#: ../data/Locations.xml.in.h:8575
 msgctxt "City in Nevada, United States"
 msgid "Las Vegas"
 msgstr "Las Vegas"
 
 #. A city in Nevada in the United States
-#: ../data/Locations.xml.in.h:8539
+#: ../data/Locations.xml.in.h:8577
 msgid "Lovelock"
 msgstr "Lovelock"
 
 #. A city in Nevada in the United States
-#: ../data/Locations.xml.in.h:8541
+#: ../data/Locations.xml.in.h:8579
 msgid "Mercury"
 msgstr "Mercury"
 
 #. A city in Nevada in the United States
-#: ../data/Locations.xml.in.h:8543
+#: ../data/Locations.xml.in.h:8581
 msgid "North Las Vegas"
 msgstr "North Las Vegas"
 
 #. A city in Nevada in the United States
-#: ../data/Locations.xml.in.h:8545
+#: ../data/Locations.xml.in.h:8583
 msgid "Reno"
 msgstr "Reno"
 
 #. A city in Nevada in the United States
-#: ../data/Locations.xml.in.h:8547
+#: ../data/Locations.xml.in.h:8585
 msgid "Tonopah"
 msgstr "Tonopah"
 
 #. A city in Nevada in the United States
-#: ../data/Locations.xml.in.h:8549
+#: ../data/Locations.xml.in.h:8587
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8551
+#: ../data/Locations.xml.in.h:8589
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
 #. A city in New Hampshire in the United States
-#: ../data/Locations.xml.in.h:8553
+#: ../data/Locations.xml.in.h:8591
 msgctxt "City in New Hampshire, United States"
 msgid "Berlin"
 msgstr "Berlin"
 
 #. A city in New Hampshire in the United States
-#: ../data/Locations.xml.in.h:8555
+#: ../data/Locations.xml.in.h:8593
 msgctxt "City in New Hampshire, United States"
 msgid "Concord"
 msgstr "Concord"
 
 #. A city in New Hampshire in the United States
-#: ../data/Locations.xml.in.h:8557
+#: ../data/Locations.xml.in.h:8595
 msgid "Gorham"
 msgstr "Gorham"
 
 #. A city in New Hampshire in the United States
-#: ../data/Locations.xml.in.h:8559
+#: ../data/Locations.xml.in.h:8597
 msgid "Jaffrey"
 msgstr "Jaffrey"
 
 #. A city in New Hampshire in the United States
-#: ../data/Locations.xml.in.h:8561
+#: ../data/Locations.xml.in.h:8599
 msgid "Keene"
 msgstr "Keene"
 
 #. A city in New Hampshire in the United States
-#: ../data/Locations.xml.in.h:8563
+#: ../data/Locations.xml.in.h:8601
 msgid "Laconia"
 msgstr "Laconia"
 
 #. A city in New Hampshire in the United States
-#: ../data/Locations.xml.in.h:8565
+#: ../data/Locations.xml.in.h:8603
 msgctxt "City in New Hampshire, United States"
 msgid "Lebanon"
 msgstr "Libanon"
 
 #. A city in New Hampshire in the United States
-#: ../data/Locations.xml.in.h:8567
+#: ../data/Locations.xml.in.h:8605
 msgctxt "City in New Hampshire, United States"
 msgid "Manchester"
 msgstr "Manchester"
 
 #. A city in New Hampshire in the United States
-#: ../data/Locations.xml.in.h:8569
+#: ../data/Locations.xml.in.h:8607
 msgid "Nashua"
 msgstr "Nashua"
 
 #. A city in New Hampshire in the United States
-#: ../data/Locations.xml.in.h:8571
+#: ../data/Locations.xml.in.h:8609
 msgctxt "City in New Hampshire, United States"
 msgid "Plymouth"
 msgstr "Plymouth"
 
 #. A city in New Hampshire in the United States
-#: ../data/Locations.xml.in.h:8573
+#: ../data/Locations.xml.in.h:8611
 msgctxt "City in New Hampshire, United States"
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
 #. A city in New Hampshire in the United States
-#: ../data/Locations.xml.in.h:8575
+#: ../data/Locations.xml.in.h:8613
 msgctxt "City in New Hampshire, United States"
 msgid "Rochester"
 msgstr "Rochester"
 
 #. A city in New Hampshire in the United States
-#: ../data/Locations.xml.in.h:8577
+#: ../data/Locations.xml.in.h:8615
 msgid "Whitefield"
 msgstr "Whitefield"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8579
+#: ../data/Locations.xml.in.h:8617
 msgid "New Jersey"
 msgstr "New Jersey"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8581
+#: ../data/Locations.xml.in.h:8619
 msgid "Andover"
 msgstr "Andover"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8583
+#: ../data/Locations.xml.in.h:8621
 msgid "Atlantic City"
 msgstr "Atlantic City"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8585
+#: ../data/Locations.xml.in.h:8623
 msgid "Belmar"
 msgstr "Belmar"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8587
+#: ../data/Locations.xml.in.h:8625
 msgctxt "City in New Jersey, United States"
 msgid "Caldwell"
 msgstr "Caldwell"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8589
+#: ../data/Locations.xml.in.h:8627
 msgid "Elizabeth"
 msgstr "Elizabeth"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8591
+#: ../data/Locations.xml.in.h:8629
 msgid "Jersey City"
 msgstr "Jersey City"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8593
+#: ../data/Locations.xml.in.h:8631
 msgid "Juliustown"
 msgstr "Juliustown"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8595
+#: ../data/Locations.xml.in.h:8633
 msgid "Millville"
 msgstr "Millville"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8597
+#: ../data/Locations.xml.in.h:8635
 msgid "Morristown"
 msgstr "Morristown"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8599
+#: ../data/Locations.xml.in.h:8637
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8601
+#: ../data/Locations.xml.in.h:8639
 msgctxt "City in New Jersey, United States"
 msgid "Newark"
 msgstr "Newark"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8603
+#: ../data/Locations.xml.in.h:8641
 msgid "Paterson"
 msgstr "Paterson"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8605
+#: ../data/Locations.xml.in.h:8643
 msgid "Somerville"
 msgstr "Somerville"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8607
+#: ../data/Locations.xml.in.h:8645
 msgid "Sussex"
 msgstr "Sussex"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8609
+#: ../data/Locations.xml.in.h:8647
 msgid "Teterboro"
 msgstr "Teterboro"
 
 #. A city in New Jersey in the United States
-#: ../data/Locations.xml.in.h:8611
+#: ../data/Locations.xml.in.h:8649
 msgctxt "City in New Jersey, United States"
 msgid "Trenton"
 msgstr "Trenton"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8613
+#: ../data/Locations.xml.in.h:8651
 msgid "New Mexico"
 msgstr "New Mexico"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8615
+#: ../data/Locations.xml.in.h:8653
 msgid "Alamogordo"
 msgstr "Alamogordo"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8617
+#: ../data/Locations.xml.in.h:8655
 msgid "Albuquerque"
 msgstr "Albuquerque"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8619
+#: ../data/Locations.xml.in.h:8657
 msgid "Artesia"
 msgstr "Artesia"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8621
+#: ../data/Locations.xml.in.h:8659
 msgctxt "City in New Mexico, United States"
 msgid "Carlsbad"
 msgstr "Carlsbad"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8623
+#: ../data/Locations.xml.in.h:8661
 msgid "Chama"
 msgstr "Chama"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8625
+#: ../data/Locations.xml.in.h:8663
 msgid "Clayton"
 msgstr "Clayton"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8627
+#: ../data/Locations.xml.in.h:8665
 msgid "Clines Corners"
 msgstr "Clines Corners"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8629
+#: ../data/Locations.xml.in.h:8667
 msgid "Clovis"
 msgstr "Clovis"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8631
+#: ../data/Locations.xml.in.h:8669
 msgctxt "City in New Mexico, United States"
 msgid "Corona"
 msgstr "Corona"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8633
+#: ../data/Locations.xml.in.h:8671
 msgid "Deming"
 msgstr "Deming"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8635
+#: ../data/Locations.xml.in.h:8673
 msgctxt "City in New Mexico, United States"
 msgid "Farmington"
 msgstr "Farmington"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8637
+#: ../data/Locations.xml.in.h:8675
 msgid "Gallup"
 msgstr "Gallup"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8639
+#: ../data/Locations.xml.in.h:8677
 msgid "Grants"
 msgstr "Grants"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8641
+#: ../data/Locations.xml.in.h:8679
 msgid "Hobbs"
 msgstr "Hobbs"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8643
+#: ../data/Locations.xml.in.h:8681
 msgid "Las Cruces"
 msgstr "Las Cruces"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8645
+#: ../data/Locations.xml.in.h:8683
 msgctxt "City in New Mexico, United States"
 msgid "Las Vegas"
 msgstr "Las Vegas"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8647
+#: ../data/Locations.xml.in.h:8685
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8649
+#: ../data/Locations.xml.in.h:8687
 msgid "Moriarty"
 msgstr "Moriarty"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8651
+#: ../data/Locations.xml.in.h:8689
 msgid "Raton"
 msgstr "Raton"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8653
+#: ../data/Locations.xml.in.h:8691
 msgid "Roswell"
 msgstr "Roswell"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8655
+#: ../data/Locations.xml.in.h:8693
 msgid "Ruidoso"
 msgstr "Ruidoso"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8657
+#: ../data/Locations.xml.in.h:8695
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8659
+#: ../data/Locations.xml.in.h:8697
 msgid "Silver City"
 msgstr "Silver City"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8661
+#: ../data/Locations.xml.in.h:8699
 msgid "Taos"
 msgstr "Taos"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8663
+#: ../data/Locations.xml.in.h:8701
 msgid "Torreon"
 msgstr "Torreon"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8665
+#: ../data/Locations.xml.in.h:8703
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
 #. A city in New Mexico in the United States
-#: ../data/Locations.xml.in.h:8667
+#: ../data/Locations.xml.in.h:8705
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8669
+#: ../data/Locations.xml.in.h:8707
 msgctxt "State in United States"
 msgid "New York"
 msgstr "New York"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8671
+#: ../data/Locations.xml.in.h:8709
 msgctxt "City in New York, United States"
 msgid "Albany"
 msgstr "Albany"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8673
+#: ../data/Locations.xml.in.h:8711
 msgid "Binghamton"
 msgstr "Binghamton"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8675
+#: ../data/Locations.xml.in.h:8713
 msgid "Black River"
 msgstr "Black River"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8677
+#: ../data/Locations.xml.in.h:8715
 msgctxt "City in New York, United States"
 msgid "Buffalo"
 msgstr "Buffalo"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8679
+#: ../data/Locations.xml.in.h:8717
 msgid "Dansville"
 msgstr "Dansville"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8681
+#: ../data/Locations.xml.in.h:8719
 msgid "Dunkirk"
 msgstr "Dunkirk"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8683
+#: ../data/Locations.xml.in.h:8721
 msgid "East Hampton"
 msgstr "East Hampton"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8685
+#: ../data/Locations.xml.in.h:8723
 msgctxt "City in New York, United States"
 msgid "Elmira"
 msgstr "Elmira"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8687
+#: ../data/Locations.xml.in.h:8725
 msgid "Farmingdale"
 msgstr "Farmingdale"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8689
+#: ../data/Locations.xml.in.h:8727
 msgid "Fulton"
 msgstr "Fulton"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8691
+#: ../data/Locations.xml.in.h:8729
 msgid "Glens Falls"
 msgstr "Glens Falls"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8693
+#: ../data/Locations.xml.in.h:8731
 msgid "Islip"
 msgstr "Islip"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8695
+#: ../data/Locations.xml.in.h:8733
 msgid "Ithaca"
 msgstr "Ithaca"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8697
+#: ../data/Locations.xml.in.h:8735
 msgctxt "City in New York, United States"
 msgid "Jamestown"
 msgstr "Jamestown"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8699
+#: ../data/Locations.xml.in.h:8737
 msgid "Massena"
 msgstr "Massena"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8701
+#: ../data/Locations.xml.in.h:8739
 msgid "Montauk"
 msgstr "Montauk"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8703
+#: ../data/Locations.xml.in.h:8741
 msgctxt "City in New York, United States"
 msgid "Montgomery"
 msgstr "Montgomery"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8705
+#: ../data/Locations.xml.in.h:8743
 msgctxt "City in New York, United States"
 msgid "Monticello"
 msgstr "Monticello"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8707
+#: ../data/Locations.xml.in.h:8745
 msgctxt "City in New York, United States"
 msgid "New York"
 msgstr "New York"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8709
+#: ../data/Locations.xml.in.h:8747
 msgid "Newburgh"
 msgstr "Newburgh"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8711
+#: ../data/Locations.xml.in.h:8749
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8713
+#: ../data/Locations.xml.in.h:8751
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8715
+#: ../data/Locations.xml.in.h:8753
 msgid "Plattsburgh"
 msgstr "Plattsburgh"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8717
+#: ../data/Locations.xml.in.h:8755
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8719
+#: ../data/Locations.xml.in.h:8757
 msgctxt "City in New York, United States"
 msgid "Rochester"
 msgstr "Rochester"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8721
+#: ../data/Locations.xml.in.h:8759
 msgctxt "City in New York, United States"
 msgid "Rome"
 msgstr "Rome"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8723
+#: ../data/Locations.xml.in.h:8761
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8725
+#: ../data/Locations.xml.in.h:8763
 msgid "Shirley"
 msgstr "Shirley"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8727
+#: ../data/Locations.xml.in.h:8765
 msgid "Syracuse"
 msgstr "Syracuse"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8729
+#: ../data/Locations.xml.in.h:8767
 msgctxt "City in New York, United States"
 msgid "Watertown"
 msgstr "Watertown"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8731
+#: ../data/Locations.xml.in.h:8769
 msgid "Wellsville"
 msgstr "Wellsville"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8733
+#: ../data/Locations.xml.in.h:8771
 msgid "Westhampton Beach"
 msgstr "Westhampton Beach"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8735
+#: ../data/Locations.xml.in.h:8773
 msgid "White Plains"
 msgstr "White Plains"
 
 #. A city in New York in the United States
-#: ../data/Locations.xml.in.h:8737
+#: ../data/Locations.xml.in.h:8775
 msgid "Yonkers"
 msgstr "Yonkers"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8739
+#: ../data/Locations.xml.in.h:8777
 msgid "North Carolina"
 msgstr "North Carolina"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8741
+#: ../data/Locations.xml.in.h:8779
 msgid "Adamsville"
 msgstr "Adamsville"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8743
+#: ../data/Locations.xml.in.h:8781
 msgid "Ahoskie"
 msgstr "Ahoskie"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8745
+#: ../data/Locations.xml.in.h:8783
 msgid "Albemarle"
 msgstr "Albemarle"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8747
+#: ../data/Locations.xml.in.h:8785
 msgid "Andrews"
 msgstr "Andrews"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8749
+#: ../data/Locations.xml.in.h:8787
 msgid "Asheboro"
 msgstr "Asheboro"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8751
+#: ../data/Locations.xml.in.h:8789
 msgid "Asheville"
 msgstr "Asheville"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8753
+#: ../data/Locations.xml.in.h:8791
 msgctxt "City in North Carolina, United States"
 msgid "Beaufort"
 msgstr "Beaufort"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8755
+#: ../data/Locations.xml.in.h:8793
 msgid "Bogue"
 msgstr "Bogue"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8757
+#: ../data/Locations.xml.in.h:8795
 msgctxt "City in North Carolina, United States"
 msgid "Boone"
 msgstr "Boone"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8759
+#: ../data/Locations.xml.in.h:8797
 msgctxt "City in North Carolina, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8761
+#: ../data/Locations.xml.in.h:8799
 msgid "Chapel Hill"
 msgstr "Chapel Hill"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8763
+#: ../data/Locations.xml.in.h:8801
 msgctxt "City in North Carolina, United States"
 msgid "Charlotte"
 msgstr "Charlotte"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8765
+#: ../data/Locations.xml.in.h:8803
 msgctxt "City in North Carolina, United States"
 msgid "Clinton"
 msgstr "Clinton"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8767
+#: ../data/Locations.xml.in.h:8805
 msgctxt "City in North Carolina, United States"
 msgid "Concord"
 msgstr "Concord"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8769
+#: ../data/Locations.xml.in.h:8807
 msgid "Currituck"
 msgstr "Currituck"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8771
+#: ../data/Locations.xml.in.h:8809
 msgid "Durham"
 msgstr "Durham"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8773
+#: ../data/Locations.xml.in.h:8811
 msgid "Edenton"
 msgstr "Edenton"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8775
+#: ../data/Locations.xml.in.h:8813
 msgid "Elizabeth City"
 msgstr "Elizabeth City"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8777
+#: ../data/Locations.xml.in.h:8815
 msgid "Elizabethtown"
 msgstr "Elizabethtown"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8779
+#: ../data/Locations.xml.in.h:8817
 msgid "Erwin"
 msgstr "Erwin"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8781
+#: ../data/Locations.xml.in.h:8819
 msgctxt "City in North Carolina, United States"
 msgid "Fayetteville"
 msgstr "Fayetteville"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8783
+#: ../data/Locations.xml.in.h:8821
 msgctxt "City in North Carolina, United States"
 msgid "Franklin"
 msgstr "Franklin"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8785
+#: ../data/Locations.xml.in.h:8823
 msgid "Gastonia"
 msgstr "Gastonia"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8787
+#: ../data/Locations.xml.in.h:8825
 msgid "Goldsboro"
 msgstr "Goldsboro"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8789
+#: ../data/Locations.xml.in.h:8827
 msgctxt "City in North Carolina, United States"
 msgid "Greensboro"
 msgstr "Greensboro"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8791
+#: ../data/Locations.xml.in.h:8829
 msgid "Hatteras"
 msgstr "Hatteras"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8793
+#: ../data/Locations.xml.in.h:8831
 msgid "Havelock"
 msgstr "Havelock"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8795
+#: ../data/Locations.xml.in.h:8833
 msgid "Hickory"
 msgstr "Hickory"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8797
+#: ../data/Locations.xml.in.h:8835
 msgid "Hoffman"
 msgstr "Hoffman"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8799
+#: ../data/Locations.xml.in.h:8837
 msgctxt "City in North Carolina, United States"
 msgid "Jacksonville"
 msgstr "Jacksonville"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8801
+#: ../data/Locations.xml.in.h:8839
 msgid "Jefferson"
 msgstr "Jefferson"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8803
+#: ../data/Locations.xml.in.h:8841
 msgid "Kenansville"
 msgstr "Kenansville"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8805
+#: ../data/Locations.xml.in.h:8843
 msgid "Kill Devil Hills"
 msgstr "Kill Devil Hills"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8807
+#: ../data/Locations.xml.in.h:8845
 msgid "Kinston"
 msgstr "Kinston"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8809
+#: ../data/Locations.xml.in.h:8847
 msgctxt "City in North Carolina, United States"
 msgid "Lexington"
 msgstr "Lexington"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8811
+#: ../data/Locations.xml.in.h:8849
 msgid "Louisburg"
 msgstr "Louisburg"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8813
+#: ../data/Locations.xml.in.h:8851
 msgid "Lumberton"
 msgstr "Lumberton"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8815
+#: ../data/Locations.xml.in.h:8853
 msgid "Manteo"
 msgstr "Manteo"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8817
+#: ../data/Locations.xml.in.h:8855
 msgid "Maxton"
 msgstr "Maxton"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8819
+#: ../data/Locations.xml.in.h:8857
 msgctxt "City in North Carolina, United States"
 msgid "Monroe"
 msgstr "Monroe"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8821
+#: ../data/Locations.xml.in.h:8859
 msgid "Mount Airy"
 msgstr "Mount Airy"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8823
+#: ../data/Locations.xml.in.h:8861
 msgid "New Bern"
 msgstr "New Bern"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8825
+#: ../data/Locations.xml.in.h:8863
 msgid "North Wilkesboro"
 msgstr "North Wilkesboro"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8827
+#: ../data/Locations.xml.in.h:8865
 msgid "Oak Island"
 msgstr "Oak Island"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8829
+#: ../data/Locations.xml.in.h:8867
 msgctxt "City in North Carolina, United States"
 msgid "Oxford"
 msgstr "Oxford"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8831
+#: ../data/Locations.xml.in.h:8869
 msgid "Pinehurst"
 msgstr "Pinehurst"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8833
+#: ../data/Locations.xml.in.h:8871
 msgid "Raleigh"
 msgstr "Raleigh"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8835
+#: ../data/Locations.xml.in.h:8873
 msgid "Roanoke Rapids"
 msgstr "Roanoke Rapids"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8837
+#: ../data/Locations.xml.in.h:8875
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8839
+#: ../data/Locations.xml.in.h:8877
 msgid "Roe"
 msgstr "Roe"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8841
+#: ../data/Locations.xml.in.h:8879
 msgid "Roxboro"
 msgstr "Roxboro"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8843
+#: ../data/Locations.xml.in.h:8881
 msgctxt "City in North Carolina, United States"
 msgid "Salisbury"
 msgstr "Salisbury"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8845
+#: ../data/Locations.xml.in.h:8883
 msgctxt "City in North Carolina, United States"
 msgid "Sanford"
 msgstr "Sanford"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8847
+#: ../data/Locations.xml.in.h:8885
 msgid "Shelby"
 msgstr "Shelby"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8849
+#: ../data/Locations.xml.in.h:8887
 msgid "Smithfield"
 msgstr "Smithfield"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8851
+#: ../data/Locations.xml.in.h:8889
 msgid "Statesville"
 msgstr "Statesville"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8853
+#: ../data/Locations.xml.in.h:8891
 msgid "Wadesboro"
 msgstr "Wadesboro"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8855
+#: ../data/Locations.xml.in.h:8893
 msgctxt "City in North Carolina, United States"
 msgid "Washington"
 msgstr "Washington"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8857
+#: ../data/Locations.xml.in.h:8895
 msgctxt "City in North Carolina, United States"
 msgid "Wilmington"
 msgstr "Wilmington"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8859
+#: ../data/Locations.xml.in.h:8897
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
 #. A city in North Carolina in the United States
-#: ../data/Locations.xml.in.h:8861
+#: ../data/Locations.xml.in.h:8899
 msgid "Winterville"
 msgstr "Winterville"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8863
+#: ../data/Locations.xml.in.h:8901
 msgid "North Dakota"
 msgstr "North Dakota"
 
 #. A city in North Dakota in the United States
-#: ../data/Locations.xml.in.h:8865
+#: ../data/Locations.xml.in.h:8903
 msgid "Bismarck"
 msgstr "Bismarck"
 
 #. A city in North Dakota in the United States
-#: ../data/Locations.xml.in.h:8867
+#: ../data/Locations.xml.in.h:8905
 msgid "Bowman"
 msgstr "Bowman"
 
 #. A city in North Dakota in the United States
-#: ../data/Locations.xml.in.h:8869
+#: ../data/Locations.xml.in.h:8907
 msgid "Devils Lake"
 msgstr "Devils Lake"
 
 #. A city in North Dakota in the United States
-#: ../data/Locations.xml.in.h:8871
+#: ../data/Locations.xml.in.h:8909
 msgid "Dickinson"
 msgstr "Dickinson"
 
 #. A city in North Dakota in the United States
-#: ../data/Locations.xml.in.h:8873
+#: ../data/Locations.xml.in.h:8911
 msgid "Fargo"
 msgstr "Fargo"
 
 #. A city in North Dakota in the United States
-#: ../data/Locations.xml.in.h:8875
+#: ../data/Locations.xml.in.h:8913
 msgid "Garrison"
 msgstr "Garrison"
 
 #. A city in North Dakota in the United States
-#: ../data/Locations.xml.in.h:8877
+#: ../data/Locations.xml.in.h:8915
 msgid "Grand Forks"
 msgstr "Grand Forks"
 
 #. A city in North Dakota in the United States
-#: ../data/Locations.xml.in.h:8879
+#: ../data/Locations.xml.in.h:8917
 msgid "Hettinger"
 msgstr "Hettinger"
 
 #. A city in North Dakota in the United States
-#: ../data/Locations.xml.in.h:8881
+#: ../data/Locations.xml.in.h:8919
 msgctxt "City in North Dakota, United States"
 msgid "Jamestown"
 msgstr "Jamestown"
 
 #. A city in North Dakota in the United States
-#: ../data/Locations.xml.in.h:8883
+#: ../data/Locations.xml.in.h:8921
 msgid "Minot"
 msgstr "Minot"
 
 #. A city in North Dakota in the United States
-#: ../data/Locations.xml.in.h:8885
+#: ../data/Locations.xml.in.h:8923
 msgid "Wahpeton"
 msgstr "Wahpeton"
 
 #. A city in North Dakota in the United States
-#: ../data/Locations.xml.in.h:8887
+#: ../data/Locations.xml.in.h:8925
 msgid "Williston"
 msgstr "Williston"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8889
+#: ../data/Locations.xml.in.h:8927
 msgid "Ohio"
 msgstr "Ohio"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8891
+#: ../data/Locations.xml.in.h:8929
 msgctxt "City in Ohio, United States"
 msgid "Akron"
 msgstr "Akron"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8893
+#: ../data/Locations.xml.in.h:8931
 msgid "Ashtabula"
 msgstr "Ashtabula"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8895
+#: ../data/Locations.xml.in.h:8933
 msgid "Cincinnati"
 msgstr "Cincinnati"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8897
+#: ../data/Locations.xml.in.h:8935
 msgid "Cleveland"
 msgstr "Cleveland"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8899
+#: ../data/Locations.xml.in.h:8937
 msgctxt "City in Ohio, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8901
+#: ../data/Locations.xml.in.h:8939
 msgid "Dayton"
 msgstr "Dayton"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8903
+#: ../data/Locations.xml.in.h:8941
 msgid "Defiance"
 msgstr "Defiance"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8905
+#: ../data/Locations.xml.in.h:8943
 msgid "Elyria"
 msgstr "Elyria"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8907
+#: ../data/Locations.xml.in.h:8945
 msgid "Findlay"
 msgstr "Findlay"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8909
+#: ../data/Locations.xml.in.h:8947
 msgctxt "City in Ohio, United States"
 msgid "Hamilton"
 msgstr "Hamilton"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8911
+#: ../data/Locations.xml.in.h:8949
 msgctxt "City in Ohio, United States"
 msgid "Lancaster"
 msgstr "Lancaster"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8913
+#: ../data/Locations.xml.in.h:8951
 msgctxt "City in Ohio, United States"
 msgid "Lima"
 msgstr "Lima"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8915
+#: ../data/Locations.xml.in.h:8953
 msgid "Mansfield"
 msgstr "Mansfield"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8917
+#: ../data/Locations.xml.in.h:8955
 msgctxt "City in Ohio, United States"
 msgid "Marion"
 msgstr "Marion"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8919
+#: ../data/Locations.xml.in.h:8957
 msgid "New Philadelphia"
 msgstr "New Philadelphia"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8921
+#: ../data/Locations.xml.in.h:8959
 msgctxt "City in Ohio, United States"
 msgid "Newark"
 msgstr "Newark"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8923
+#: ../data/Locations.xml.in.h:8961
 msgctxt "City in Ohio, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8925
+#: ../data/Locations.xml.in.h:8963
 msgid "Toledo"
 msgstr "Toledo"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8927
+#: ../data/Locations.xml.in.h:8965
 msgctxt "City in Ohio, United States"
 msgid "Wilmington"
 msgstr "Wilmington"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8929
+#: ../data/Locations.xml.in.h:8967
 msgid "Wooster"
 msgstr "Wooster"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8931
+#: ../data/Locations.xml.in.h:8969
 msgid "Youngstown"
 msgstr "Youngstown"
 
 #. A city in Ohio in the United States
-#: ../data/Locations.xml.in.h:8933
+#: ../data/Locations.xml.in.h:8971
 msgid "Zanesville"
 msgstr "Zanesville"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:8935
+#: ../data/Locations.xml.in.h:8973
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8937
+#: ../data/Locations.xml.in.h:8975
 msgid "Ada"
 msgstr "Ada"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8939
+#: ../data/Locations.xml.in.h:8977
 msgid "Altus"
 msgstr "Altus"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8941
+#: ../data/Locations.xml.in.h:8979
 msgid "Alva"
 msgstr "Alva"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8943
+#: ../data/Locations.xml.in.h:8981
 msgid "Ardmore"
 msgstr "Ardmore"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8945
+#: ../data/Locations.xml.in.h:8983
 msgid "Atoka"
 msgstr "Atoka"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8947
+#: ../data/Locations.xml.in.h:8985
 msgid "Bartlesville"
 msgstr "Bartlesville"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8949
+#: ../data/Locations.xml.in.h:8987
 msgctxt "City in Oklahoma, United States"
 msgid "Chandler"
 msgstr "Chandler"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8951
+#: ../data/Locations.xml.in.h:8989
 msgid "Chickasha"
 msgstr "Chickasha"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8953
+#: ../data/Locations.xml.in.h:8991
 msgid "Claremore"
 msgstr "Claremore"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8955
+#: ../data/Locations.xml.in.h:8993
 msgctxt "City in Oklahoma, United States"
 msgid "Clinton"
 msgstr "Clinton"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8957
+#: ../data/Locations.xml.in.h:8995
 msgid "Cushing"
 msgstr "Cushing"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8959
+#: ../data/Locations.xml.in.h:8997
 msgid "Duncan"
 msgstr "Duncan"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8961
+#: ../data/Locations.xml.in.h:8999
 msgid "Durant"
 msgstr "Durant"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8963
+#: ../data/Locations.xml.in.h:9001
 msgid "El Reno"
 msgstr "El Reno"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8965
+#: ../data/Locations.xml.in.h:9003
 msgid "Enid"
 msgstr "Enid"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8967
+#: ../data/Locations.xml.in.h:9005
 msgctxt "City in Oklahoma, United States"
 msgid "Frederick"
 msgstr "Frederick"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8969
+#: ../data/Locations.xml.in.h:9007
 msgid "Gage"
 msgstr "Gage"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8971
+#: ../data/Locations.xml.in.h:9009
 msgid "Grove"
 msgstr "Grove"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8973
+#: ../data/Locations.xml.in.h:9011
 msgid "Guthrie"
 msgstr "Guthrie"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8975
+#: ../data/Locations.xml.in.h:9013
 msgid "Guymon"
 msgstr "Guymon"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8977
+#: ../data/Locations.xml.in.h:9015
 msgctxt "City in Oklahoma, United States"
 msgid "Hobart"
 msgstr "Hobart"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8979
+#: ../data/Locations.xml.in.h:9017
 msgid "Idabel"
 msgstr "Idabel"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8981
+#: ../data/Locations.xml.in.h:9019
 msgid "Lawton"
 msgstr "Lawton"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8983
+#: ../data/Locations.xml.in.h:9021
 msgid "McAlester"
 msgstr "McAlester"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8985
+#: ../data/Locations.xml.in.h:9023
 msgid "Muskogee"
 msgstr "Muskogee"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8987
+#: ../data/Locations.xml.in.h:9025
 msgid "Norman"
 msgstr "Norman"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8989
+#: ../data/Locations.xml.in.h:9027
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8991
+#: ../data/Locations.xml.in.h:9029
 msgid "Okmulgee"
 msgstr "Okmulgee"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8993
+#: ../data/Locations.xml.in.h:9031
 msgid "Pauls Valley"
 msgstr "Pauls Valley"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8995
+#: ../data/Locations.xml.in.h:9033
 msgid "Ponca City"
 msgstr "Ponca City"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8997
+#: ../data/Locations.xml.in.h:9035
 msgid "Poteau"
 msgstr "Poteau"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:8999
+#: ../data/Locations.xml.in.h:9037
 msgid "Sallisaw"
 msgstr "Sallisaw"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:9001
+#: ../data/Locations.xml.in.h:9039
 msgctxt "City in Oklahoma, United States"
 msgid "Seminole"
 msgstr "Seminole"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:9003
+#: ../data/Locations.xml.in.h:9041
 msgid "Shawnee"
 msgstr "Shawnee"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:9005
+#: ../data/Locations.xml.in.h:9043
 msgid "Stillwater"
 msgstr "Stillwater"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:9007
+#: ../data/Locations.xml.in.h:9045
 msgid "Tahlequah"
 msgstr "Tahlequah"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:9009
+#: ../data/Locations.xml.in.h:9047
 msgid "Tulsa"
 msgstr "Tulsa"
 
 #. A city in Oklahoma in the United States
-#: ../data/Locations.xml.in.h:9011
+#: ../data/Locations.xml.in.h:9049
 msgid "Weatherford"
 msgstr "Weatherford"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:9013
+#: ../data/Locations.xml.in.h:9051
 msgid "Oregon"
 msgstr "Oregon"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9015
+#: ../data/Locations.xml.in.h:9053
 msgid "Astoria"
 msgstr "Astoria"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9017
+#: ../data/Locations.xml.in.h:9055
 msgctxt "City in Oregon, United States"
 msgid "Aurora"
 msgstr "Aurora"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9019
+#: ../data/Locations.xml.in.h:9057
 msgid "Baker City"
 msgstr "Baker City"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9021
+#: ../data/Locations.xml.in.h:9059
 msgctxt "City in Oregon, United States"
 msgid "Brookings"
 msgstr "Brookings"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9023
+#: ../data/Locations.xml.in.h:9061
 msgid "Burns"
 msgstr "Burns"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9025
+#: ../data/Locations.xml.in.h:9063
 msgid "Corvallis"
 msgstr "Corvallis"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9027
+#: ../data/Locations.xml.in.h:9065
 msgid "Eugene"
 msgstr "Eugene"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9029
+#: ../data/Locations.xml.in.h:9067
 msgid "Hermiston"
 msgstr "Hermiston"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9031
+#: ../data/Locations.xml.in.h:9069
 msgid "Klamath Falls"
 msgstr "Klamath Falls"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9033
+#: ../data/Locations.xml.in.h:9071
 msgid "La Grande"
 msgstr "La Grande"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9035
+#: ../data/Locations.xml.in.h:9073
 msgid "Lakeview"
 msgstr "Lakeview"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9037
+#: ../data/Locations.xml.in.h:9075
 msgid "McMinnville"
 msgstr "McMinnville"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9039
+#: ../data/Locations.xml.in.h:9077
 msgid "Meacham"
 msgstr "Meacham"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9041
+#: ../data/Locations.xml.in.h:9079
 msgctxt "City in Oregon, United States"
 msgid "Medford"
 msgstr "Medford"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9043
+#: ../data/Locations.xml.in.h:9081
 msgctxt "City in Oregon, United States"
 msgid "Newport"
 msgstr "Newport"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9045
+#: ../data/Locations.xml.in.h:9083
 msgid "North Bend"
 msgstr "North Bend"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9047
+#: ../data/Locations.xml.in.h:9085
 msgctxt "City in Oregon, United States"
 msgid "Ontario"
 msgstr "Ontario"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9049
+#: ../data/Locations.xml.in.h:9087
 msgid "Pendleton"
 msgstr "Pendleton"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9051
+#: ../data/Locations.xml.in.h:9089
 msgid "Placer"
 msgstr "Placer"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9053
+#: ../data/Locations.xml.in.h:9091
 msgctxt "City in Oregon, United States"
 msgid "Portland"
 msgstr "Portland"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9055
+#: ../data/Locations.xml.in.h:9093
 msgid "Redmond"
 msgstr "Redmond"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9057
+#: ../data/Locations.xml.in.h:9095
 msgctxt "City in Oregon, United States"
 msgid "Rome"
 msgstr "Rome"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9059
+#: ../data/Locations.xml.in.h:9097
 msgid "Roseburg"
 msgstr "Roseburg"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9061
+#: ../data/Locations.xml.in.h:9099
 msgctxt "City in Oregon, United States"
 msgid "Salem"
 msgstr "Salem"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9063
+#: ../data/Locations.xml.in.h:9101
 msgid "Scappoose"
 msgstr "Scappoose"
 
 #. A city in Oregon in the United States
-#: ../data/Locations.xml.in.h:9065
+#: ../data/Locations.xml.in.h:9103
 msgid "The Dalles"
 msgstr "The Dalles"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:9067
+#: ../data/Locations.xml.in.h:9105
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9069
+#: ../data/Locations.xml.in.h:9107
 msgid "Allentown"
 msgstr "Allentown"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9071
+#: ../data/Locations.xml.in.h:9109
 msgid "Altoona"
 msgstr "Altoona"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9073
+#: ../data/Locations.xml.in.h:9111
 msgid "Beaver Falls"
 msgstr "Beaver Falls"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9075
+#: ../data/Locations.xml.in.h:9113
 msgid "Bradford"
 msgstr "Bradford"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9077
+#: ../data/Locations.xml.in.h:9115
 msgid "Butler"
 msgstr "Butler"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9079
+#: ../data/Locations.xml.in.h:9117
 msgid "Clearfield"
 msgstr "Clearfield"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9081
+#: ../data/Locations.xml.in.h:9119
 msgid "Doylestown"
 msgstr "Doylestown"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9083
+#: ../data/Locations.xml.in.h:9121
 msgid "Du Bois"
 msgstr "Du Bois"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9085
+#: ../data/Locations.xml.in.h:9123
 msgid "Erie"
 msgstr "Erie"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9087
+#: ../data/Locations.xml.in.h:9125
 msgctxt "City in Pennsylvania, United States"
 msgid "Franklin"
 msgstr "Franklin"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9089
+#: ../data/Locations.xml.in.h:9127
 msgctxt "City in Pennsylvania, United States"
 msgid "Harrisburg"
 msgstr "Harrisburg"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9091
+#: ../data/Locations.xml.in.h:9129
 msgctxt "City in Pennsylvania, United States"
 msgid "Indiana"
 msgstr "Indiana"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9093
+#: ../data/Locations.xml.in.h:9131
 msgid "Indiantown"
 msgstr "Indiantown"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9095
+#: ../data/Locations.xml.in.h:9133
 msgid "Johnstown"
 msgstr "Johnstown"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9097
+#: ../data/Locations.xml.in.h:9135
 msgctxt "City in Pennsylvania, United States"
 msgid "Lancaster"
 msgstr "Lancaster"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9099
+#: ../data/Locations.xml.in.h:9137
 msgid "Latrobe"
 msgstr "Latrobe"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9101
+#: ../data/Locations.xml.in.h:9139
 msgid "Meadville"
 msgstr "Meadville"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9103
+#: ../data/Locations.xml.in.h:9141
 msgid "Mount Pocono"
 msgstr "Mount Pocono"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9105
+#: ../data/Locations.xml.in.h:9143
 msgid "New Castle"
 msgstr "New Castle"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9107
+#: ../data/Locations.xml.in.h:9145
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9109
+#: ../data/Locations.xml.in.h:9147
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9111
+#: ../data/Locations.xml.in.h:9149
 msgid "Pottstown"
 msgstr "Pottstown"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9113
+#: ../data/Locations.xml.in.h:9151
 msgid "Quakertown"
 msgstr "Quakertown"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9115
+#: ../data/Locations.xml.in.h:9153
 msgid "Reading"
 msgstr "Reading"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9117
+#: ../data/Locations.xml.in.h:9155
 msgid "Selinsgrove"
 msgstr "Selinsgrove"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9119
+#: ../data/Locations.xml.in.h:9157
 msgid "State College"
 msgstr "State College"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9121
+#: ../data/Locations.xml.in.h:9159
 msgctxt "City in Pennsylvania, United States"
 msgid "Washington"
 msgstr "Washington"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9123
+#: ../data/Locations.xml.in.h:9161
 msgid "Wilkes-Barre"
 msgstr "Wilkes-Barre"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9125
+#: ../data/Locations.xml.in.h:9163
 msgid "Williamsport"
 msgstr "Williamsport"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9127
+#: ../data/Locations.xml.in.h:9165
 msgid "Willow Grove"
 msgstr "Willow Grove"
 
 #. A city in Pennsylvania in the United States
-#: ../data/Locations.xml.in.h:9129
+#: ../data/Locations.xml.in.h:9167
 msgctxt "City in Pennsylvania, United States"
 msgid "York"
 msgstr "York"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:9131
+#: ../data/Locations.xml.in.h:9169
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
 #. A city in Rhode Island in the United States
-#: ../data/Locations.xml.in.h:9133
+#: ../data/Locations.xml.in.h:9171
 msgctxt "City in Rhode Island, United States"
 msgid "Newport"
 msgstr "Newport"
 
 #. A city in Rhode Island in the United States
-#: ../data/Locations.xml.in.h:9135
+#: ../data/Locations.xml.in.h:9173
 msgid "Pawtucket"
 msgstr "Pawtucket"
 
 #. A city in Rhode Island in the United States
-#: ../data/Locations.xml.in.h:9137
+#: ../data/Locations.xml.in.h:9175
 msgid "Providence"
 msgstr "Providence"
 
 #. A city in Rhode Island in the United States
-#: ../data/Locations.xml.in.h:9139
+#: ../data/Locations.xml.in.h:9177
 msgid "Westerly"
 msgstr "Westerly"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:9141
+#: ../data/Locations.xml.in.h:9179
 msgid "South Carolina"
 msgstr "South Carolina"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9143
+#: ../data/Locations.xml.in.h:9181
 msgctxt "City in South Carolina, United States"
 msgid "Anderson"
 msgstr "Anderson"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9145
+#: ../data/Locations.xml.in.h:9183
 msgctxt "City in South Carolina, United States"
 msgid "Beaufort"
 msgstr "Beaufort"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9147
+#: ../data/Locations.xml.in.h:9185
 msgctxt "City in South Carolina, United States"
 msgid "Charleston"
 msgstr "Charleston"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9149
+#: ../data/Locations.xml.in.h:9187
 msgid "Clemson"
 msgstr "Clemson"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9151
+#: ../data/Locations.xml.in.h:9189
 msgctxt "City in South Carolina, United States"
 msgid "Columbia"
 msgstr "Columbia"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9153
+#: ../data/Locations.xml.in.h:9191
 msgid "Dalzell"
 msgstr "Dalzell"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9155
+#: ../data/Locations.xml.in.h:9193
 msgid "Darlington"
 msgstr "Darlington"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9157
+#: ../data/Locations.xml.in.h:9195
 msgctxt "City in South Carolina, United States"
 msgid "Florence"
 msgstr "Florence"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9159
+#: ../data/Locations.xml.in.h:9197
 msgctxt "City in South Carolina, United States"
 msgid "Greenville"
 msgstr "Greenville"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9161
+#: ../data/Locations.xml.in.h:9199
 msgctxt "City in South Carolina, United States"
 msgid "Greenwood"
 msgstr "Greenwood"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9163
+#: ../data/Locations.xml.in.h:9201
 msgid "Greer"
 msgstr "Greer"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9165
+#: ../data/Locations.xml.in.h:9203
 msgid "Hilton Head Island"
 msgstr "Hilton Head Island"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9167
+#: ../data/Locations.xml.in.h:9205
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9169
+#: ../data/Locations.xml.in.h:9207
 msgid "North Myrtle Beach"
 msgstr "North Myrtle Beach"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9171
+#: ../data/Locations.xml.in.h:9209
 msgid "Orangeburg"
 msgstr "Orangeburg"
 
 #. A city in South Carolina in the United States
-#: ../data/Locations.xml.in.h:9173
+#: ../data/Locations.xml.in.h:9211
 msgid "Rock Hill"
 msgstr "Rock Hill"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:9175
+#: ../data/Locations.xml.in.h:9213
 msgid "South Dakota"
 msgstr "South Dakota"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9177
+#: ../data/Locations.xml.in.h:9215
 msgctxt "City in South Dakota, United States"
 msgid "Aberdeen"
 msgstr "Aberdeen"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9179
+#: ../data/Locations.xml.in.h:9217
 msgid "Box Elder"
 msgstr "Box Elder"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9181
+#: ../data/Locations.xml.in.h:9219
 msgctxt "City in South Dakota, United States"
 msgid "Brookings"
 msgstr "Brookings"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9183
+#: ../data/Locations.xml.in.h:9221
 msgctxt "City in South Dakota, United States"
 msgid "Buffalo"
 msgstr "Buffalo"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9185
+#: ../data/Locations.xml.in.h:9223
 msgid "Chamberlain"
 msgstr "Chamberlain"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9187
+#: ../data/Locations.xml.in.h:9225
 msgid "Custer"
 msgstr "Custer"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9189
+#: ../data/Locations.xml.in.h:9227
 msgid "Faith"
 msgstr "Faith"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9191
+#: ../data/Locations.xml.in.h:9229
 msgid "Huron"
 msgstr "Huron"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9193
+#: ../data/Locations.xml.in.h:9231
 msgid "Mitchell"
 msgstr "Mitchell"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9195
+#: ../data/Locations.xml.in.h:9233
 msgid "Mobridge"
 msgstr "Mobridge"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9197
+#: ../data/Locations.xml.in.h:9235
 msgid "Philip"
 msgstr "Philip"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9199
+#: ../data/Locations.xml.in.h:9237
 msgid "Pierre"
 msgstr "Pierre"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9201
+#: ../data/Locations.xml.in.h:9239
 msgid "Pine Ridge"
 msgstr "Pine Ridge"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9203
+#: ../data/Locations.xml.in.h:9241
 msgid "Rapid City"
 msgstr "Rapid City"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9205
+#: ../data/Locations.xml.in.h:9243
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9207
+#: ../data/Locations.xml.in.h:9245
 msgid "Sisseton"
 msgstr "Sisseton"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9209
+#: ../data/Locations.xml.in.h:9247
 msgctxt "City in South Dakota, United States"
 msgid "Watertown"
 msgstr "Watertown"
 
 #. A city in South Dakota in the United States
-#: ../data/Locations.xml.in.h:9211
+#: ../data/Locations.xml.in.h:9249
 msgid "Yankton"
 msgstr "Yankton"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:9213
+#: ../data/Locations.xml.in.h:9251
 msgid "Tennessee"
 msgstr "Tennessee"
 
 #. A city in Tennessee in the United States
-#: ../data/Locations.xml.in.h:9215
+#: ../data/Locations.xml.in.h:9253
 msgid "Chattanooga"
 msgstr "Chattanooga"
 
 #. A city in Tennessee in the United States
-#: ../data/Locations.xml.in.h:9217
+#: ../data/Locations.xml.in.h:9255
 msgctxt "City in Tennessee, United States"
 msgid "Clarksville"
 msgstr "Clarksville"
 
 #. A city in Tennessee in the United States
-#: ../data/Locations.xml.in.h:9219
+#: ../data/Locations.xml.in.h:9257
 msgid "Crossville"
 msgstr "Crossville"
 
 #. A city in Tennessee in the United States
-#: ../data/Locations.xml.in.h:9221
+#: ../data/Locations.xml.in.h:9259
 msgid "Dyersburg"
 msgstr "Dyersburg"
 
 #. A city in Tennessee in the United States
-#: ../data/Locations.xml.in.h:9223
+#: ../data/Locations.xml.in.h:9261
 msgctxt "City in Tennessee, United States"
 msgid "Jackson"
 msgstr "Jackson"
 
 #. A city in Tennessee in the United States
-#: ../data/Locations.xml.in.h:9225
+#: ../data/Locations.xml.in.h:9263
 msgid "Kingsport"
 msgstr "Kingsport"
 
 #. A city in Tennessee in the United States
-#: ../data/Locations.xml.in.h:9227
+#: ../data/Locations.xml.in.h:9265
 msgctxt "City in Tennessee, United States"
 msgid "Knoxville"
 msgstr "Knoxville"
 
 #. A city in Tennessee in the United States
-#: ../data/Locations.xml.in.h:9229
+#: ../data/Locations.xml.in.h:9267
 msgid "Memphis"
 msgstr "Memphis"
 
 #. A city in Tennessee in the United States
-#: ../data/Locations.xml.in.h:9231
+#: ../data/Locations.xml.in.h:9269
 msgid "Millington"
 msgstr "Millington"
 
 #. A city in Tennessee in the United States
-#: ../data/Locations.xml.in.h:9233
+#: ../data/Locations.xml.in.h:9271
 msgid "Nashville"
 msgstr "Nashville"
 
 #. A city in Tennessee in the United States
-#: ../data/Locations.xml.in.h:9235
+#: ../data/Locations.xml.in.h:9273
 msgid "Oak Ridge"
 msgstr "Oak Ridge"
 
 #. A city in Tennessee in the United States
-#: ../data/Locations.xml.in.h:9237
+#: ../data/Locations.xml.in.h:9275
 msgid "Smyrna"
 msgstr "Smyrna"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:9239
+#: ../data/Locations.xml.in.h:9277
 msgid "Texas"
 msgstr "Texas"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9241
+#: ../data/Locations.xml.in.h:9279
 msgid "Abilene"
 msgstr "Abilene"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9243
+#: ../data/Locations.xml.in.h:9281
 msgid "Alice"
 msgstr "Alice"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9245
+#: ../data/Locations.xml.in.h:9283
 msgctxt "City in Texas, United States"
 msgid "Alpine"
 msgstr "Alpine"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9247
+#: ../data/Locations.xml.in.h:9285
 msgid "Amarillo"
 msgstr "Amarillo"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9249
+#: ../data/Locations.xml.in.h:9287
 msgid "Angleton"
 msgstr "Angleton"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9251
+#: ../data/Locations.xml.in.h:9289
 msgctxt "City in Texas, United States"
 msgid "Arlington"
 msgstr "Arlington"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9253
+#: ../data/Locations.xml.in.h:9291
 msgctxt "City in Texas, United States"
 msgid "Austin"
 msgstr "Austin"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9255
+#: ../data/Locations.xml.in.h:9293
 msgid "Bay City"
 msgstr "Bay City"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9257
+#: ../data/Locations.xml.in.h:9295
 msgid "Beaumont"
 msgstr "Beaumont"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9259
+#: ../data/Locations.xml.in.h:9297
 msgid "Big Spring"
 msgstr "Big Spring"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9261
+#: ../data/Locations.xml.in.h:9299
 msgid "Borger"
 msgstr "Borger"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9263
+#: ../data/Locations.xml.in.h:9301
 msgid "Brady"
 msgstr "Brady"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9265
+#: ../data/Locations.xml.in.h:9303
 msgid "Brenham"
 msgstr "Brenham"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9267
+#: ../data/Locations.xml.in.h:9305
 msgid "Brownsville"
 msgstr "Brownsville"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9269
+#: ../data/Locations.xml.in.h:9307
 msgid "Brownwood"
 msgstr "Brownwood"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9271
+#: ../data/Locations.xml.in.h:9309
 msgid "Burnet"
 msgstr "Burnet"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9273
+#: ../data/Locations.xml.in.h:9311
 msgctxt "City in Texas, United States"
 msgid "Caldwell"
 msgstr "Caldwell"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9275
+#: ../data/Locations.xml.in.h:9313
 msgid "Canadian"
 msgstr "Kanadisk"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9277
+#: ../data/Locations.xml.in.h:9315
 msgid "Carrollton"
 msgstr "Carrollton"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9279
+#: ../data/Locations.xml.in.h:9317
 msgid "Childress"
 msgstr "Childress"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9281
+#: ../data/Locations.xml.in.h:9319
 msgctxt "City in Texas, United States"
 msgid "Clarksville"
 msgstr "Clarksville"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9283
+#: ../data/Locations.xml.in.h:9321
 msgid "College Station"
 msgstr "College Station"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9285
+#: ../data/Locations.xml.in.h:9323
 msgid "Conroe"
 msgstr "Conroe"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9287
+#: ../data/Locations.xml.in.h:9325
 msgid "Corpus Christi"
 msgstr "Corpus Christi"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9289
+#: ../data/Locations.xml.in.h:9327
 msgid "Corsicana"
 msgstr "Corsicana"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9291
+#: ../data/Locations.xml.in.h:9329
 msgid "Cotulla"
 msgstr "Cotulla"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9293
+#: ../data/Locations.xml.in.h:9331
 msgid "Crockett"
 msgstr "Crockett"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9295
+#: ../data/Locations.xml.in.h:9333
 msgid "Dalhart"
 msgstr "Dalhart"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9297
+#: ../data/Locations.xml.in.h:9335
 msgid "Dallas"
 msgstr "Dallas"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9299
+#: ../data/Locations.xml.in.h:9337
 msgctxt "City in Texas, United States"
 msgid "Decatur"
 msgstr "Decatur"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9301
+#: ../data/Locations.xml.in.h:9339
 msgid "Del Rio"
 msgstr "Del Rio"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9303
+#: ../data/Locations.xml.in.h:9341
 msgid "Denton"
 msgstr "Denton"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9305
+#: ../data/Locations.xml.in.h:9343
 msgctxt "City in Texas, United States"
 msgid "Dryden"
 msgstr "Dryden"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9307
+#: ../data/Locations.xml.in.h:9345
 msgid "Dumas"
 msgstr "Dumas"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9309
+#: ../data/Locations.xml.in.h:9347
 msgid "Edinburg"
 msgstr "Edinburg"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9311
+#: ../data/Locations.xml.in.h:9349
 msgid "El Paso"
 msgstr "El Paso"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9313
+#: ../data/Locations.xml.in.h:9351
 msgid "Falfurrias"
 msgstr "Falfurrias"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9315
+#: ../data/Locations.xml.in.h:9353
 msgid "Fort Stockton"
 msgstr "Fort Stockton"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9317
+#: ../data/Locations.xml.in.h:9355
 msgid "Fort Worth"
 msgstr "Fort Worth"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9319
+#: ../data/Locations.xml.in.h:9357
 msgid "Fredericksburg"
 msgstr "Fredericksburg"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9321
+#: ../data/Locations.xml.in.h:9359
 msgctxt "City in Texas, United States"
 msgid "Gainesville"
 msgstr "Gainesville"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9323
+#: ../data/Locations.xml.in.h:9361
 msgid "Galveston"
 msgstr "Galveston"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9325
+#: ../data/Locations.xml.in.h:9363
 msgid "Garland"
 msgstr "Garland"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9327
+#: ../data/Locations.xml.in.h:9365
 msgid "Gatesville"
 msgstr "Gatesville"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9329
+#: ../data/Locations.xml.in.h:9367
 msgctxt "City in Texas, United States"
 msgid "Georgetown"
 msgstr "Georgetown"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9331
+#: ../data/Locations.xml.in.h:9369
 msgid "Giddings"
 msgstr "Giddings"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9333
+#: ../data/Locations.xml.in.h:9371
 msgid "Gilmer"
 msgstr "Gilmer"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9335
+#: ../data/Locations.xml.in.h:9373
 msgid "Graham"
 msgstr "Graham"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9337
+#: ../data/Locations.xml.in.h:9375
 msgid "Granbury"
 msgstr "Granbury"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9339
+#: ../data/Locations.xml.in.h:9377
 msgid "Grand Prairie"
 msgstr "Grand Prairie"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9341
+#: ../data/Locations.xml.in.h:9379
 msgctxt "City in Texas, United States"
 msgid "Greenville"
 msgstr "Greenville"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9343
+#: ../data/Locations.xml.in.h:9381
 msgid "Harlingen"
 msgstr "Harlingen"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9345
+#: ../data/Locations.xml.in.h:9383
 msgid "Hearne"
 msgstr "Hearne"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9347
+#: ../data/Locations.xml.in.h:9385
 msgid "Hebbronville"
 msgstr "Hebbronville"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9349
+#: ../data/Locations.xml.in.h:9387
 msgid "Hillsboro"
 msgstr "Hillsboro"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9351
+#: ../data/Locations.xml.in.h:9389
 msgid "Hondo"
 msgstr "Hondo"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9353
+#: ../data/Locations.xml.in.h:9391
 msgid "Houston"
 msgstr "Houston"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9355
+#: ../data/Locations.xml.in.h:9393
 msgctxt "City in Texas, United States"
 msgid "Huntsville"
 msgstr "Huntsville"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9357
+#: ../data/Locations.xml.in.h:9395
 msgid "Irving"
 msgstr "Irving"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9359
+#: ../data/Locations.xml.in.h:9397
 msgctxt "City in Texas, United States"
 msgid "Jacksonville"
 msgstr "Jacksonville"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9361
+#: ../data/Locations.xml.in.h:9399
 msgctxt "City in Texas, United States"
 msgid "Jasper"
 msgstr "Jasper"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9363
+#: ../data/Locations.xml.in.h:9401
 msgid "Junction"
 msgstr "Junction"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9365
+#: ../data/Locations.xml.in.h:9403
 msgid "Kerrville"
 msgstr "Kerrville"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9367
+#: ../data/Locations.xml.in.h:9405
 msgid "Killeen"
 msgstr "Killeen"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9369
+#: ../data/Locations.xml.in.h:9407
 msgid "Kingsville"
 msgstr "Kingsville"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9371
+#: ../data/Locations.xml.in.h:9409
 msgctxt "City in Texas, United States"
 msgid "La Grange"
 msgstr "La Grange"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9373
+#: ../data/Locations.xml.in.h:9411
 msgctxt "City in Texas, United States"
 msgid "Lancaster"
 msgstr "Lancaster"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9375
+#: ../data/Locations.xml.in.h:9413
 msgid "Laredo"
 msgstr "Laredo"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9377
+#: ../data/Locations.xml.in.h:9415
 msgid "Llano"
 msgstr "Llano"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9379
+#: ../data/Locations.xml.in.h:9417
 msgid "Longview"
 msgstr "Longview"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9381
+#: ../data/Locations.xml.in.h:9419
 msgid "Lubbock"
 msgstr "Lubbock"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9383
+#: ../data/Locations.xml.in.h:9421
 msgid "Lufkin"
 msgstr "Lufkin"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9385
+#: ../data/Locations.xml.in.h:9423
 msgid "Marfa"
 msgstr "Marfa"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9387
+#: ../data/Locations.xml.in.h:9425
 msgid "McAllen"
 msgstr "McAllen"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9389
+#: ../data/Locations.xml.in.h:9427
 msgid "McKinney"
 msgstr "McKinney"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9391
+#: ../data/Locations.xml.in.h:9429
 msgid "Mesquite"
 msgstr "Mesquite"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9393
+#: ../data/Locations.xml.in.h:9431
 msgid "Midland"
 msgstr "Midland"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9395
+#: ../data/Locations.xml.in.h:9433
 msgid "Midlothian"
 msgstr "Midlothian"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9397
+#: ../data/Locations.xml.in.h:9435
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9399
+#: ../data/Locations.xml.in.h:9437
 msgctxt "City in Texas, United States"
 msgid "Mount Pleasant"
 msgstr "Mount Pleasant"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9401
+#: ../data/Locations.xml.in.h:9439
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9403
+#: ../data/Locations.xml.in.h:9441
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9405
+#: ../data/Locations.xml.in.h:9443
 msgid "Odessa"
 msgstr "Odessa"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9407
+#: ../data/Locations.xml.in.h:9445
 msgctxt "City in Texas, United States"
 msgid "Orange"
 msgstr "Orange"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9409
+#: ../data/Locations.xml.in.h:9447
 msgid "Palacios"
 msgstr "Palacios"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9411
+#: ../data/Locations.xml.in.h:9449
 msgid "Palestine"
 msgstr "Palestina"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9413
+#: ../data/Locations.xml.in.h:9451
 msgid "Pampa"
 msgstr "Pampa"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9415
+#: ../data/Locations.xml.in.h:9453
 msgctxt "City in Texas, United States"
 msgid "Paris"
 msgstr "Paris"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9417
+#: ../data/Locations.xml.in.h:9455
 msgctxt "City in Texas, United States"
 msgid "Pasadena"
 msgstr "Pasadena"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9419
+#: ../data/Locations.xml.in.h:9457
 msgid "Pecos"
 msgstr "Pecos"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9421
+#: ../data/Locations.xml.in.h:9459
 msgid "Perryton"
 msgstr "Perryton"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9423
+#: ../data/Locations.xml.in.h:9461
 msgid "Pine Springs"
 msgstr "Pine Springs"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9425
+#: ../data/Locations.xml.in.h:9463
 msgid "Plainview"
 msgstr "Plainview"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9427
+#: ../data/Locations.xml.in.h:9465
 msgid "Plano"
 msgstr "Plano"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9429
+#: ../data/Locations.xml.in.h:9467
 msgid "Port Aransas"
 msgstr "Port Aransas"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9431
+#: ../data/Locations.xml.in.h:9469
 msgid "Port Isabel"
 msgstr "Port Isabel"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9433
+#: ../data/Locations.xml.in.h:9471
 msgid "Port Lavaca"
 msgstr "Port Lavaca"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9435
+#: ../data/Locations.xml.in.h:9473
 msgid "Rockport"
 msgstr "Rockport"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9437
+#: ../data/Locations.xml.in.h:9475
 msgid "Rocksprings"
 msgstr "Rocksprings"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9439
+#: ../data/Locations.xml.in.h:9477
 msgid "San Angelo"
 msgstr "San Angelo"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9441
+#: ../data/Locations.xml.in.h:9479
 msgid "San Antonio"
 msgstr "San Antonio"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9443
+#: ../data/Locations.xml.in.h:9481
 msgid "San Marcos"
 msgstr "San Marcos"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9445
+#: ../data/Locations.xml.in.h:9483
 msgctxt "City in Texas, United States"
 msgid "Seminole"
 msgstr "Seminole"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9447
+#: ../data/Locations.xml.in.h:9485
 msgid "Sherman"
 msgstr "Sherman"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9449
+#: ../data/Locations.xml.in.h:9487
 msgid "Snyder"
 msgstr "Snyder"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9451
+#: ../data/Locations.xml.in.h:9489
 msgctxt "City in Texas, United States"
 msgid "Sonora"
 msgstr "Sonora"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9453
+#: ../data/Locations.xml.in.h:9491
 msgid "Spofford"
 msgstr "Spofford"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9455
+#: ../data/Locations.xml.in.h:9493
 msgctxt "City in Texas, United States"
 msgid "Stephenville"
 msgstr "Stephenville"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9457
+#: ../data/Locations.xml.in.h:9495
 msgid "Sulphur Springs"
 msgstr "Sulphur Springs"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9459
+#: ../data/Locations.xml.in.h:9497
 msgid "Sweetwater"
 msgstr "Sweetwater"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9461
+#: ../data/Locations.xml.in.h:9499
 msgid "Temple"
 msgstr "Temple"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9463
+#: ../data/Locations.xml.in.h:9501
 msgid "Terrell"
 msgstr "Terrell"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9465
+#: ../data/Locations.xml.in.h:9503
 msgid "Tyler"
 msgstr "Tyler"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9467
+#: ../data/Locations.xml.in.h:9505
 msgid "Universal City"
 msgstr "Universal City"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9469
+#: ../data/Locations.xml.in.h:9507
 msgid "Uvalde"
 msgstr "Uvalde"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9471
+#: ../data/Locations.xml.in.h:9509
 msgctxt "City in Texas, United States"
 msgid "Vernon"
 msgstr "Vernon"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9473
+#: ../data/Locations.xml.in.h:9511
 msgctxt "City in Texas, United States"
 msgid "Victoria"
 msgstr "Victoria"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9475
+#: ../data/Locations.xml.in.h:9513
 msgid "Waco"
 msgstr "Waco"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9477
+#: ../data/Locations.xml.in.h:9515
 msgid "Weslaco"
 msgstr "Weslaco"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9479
+#: ../data/Locations.xml.in.h:9517
 msgid "Wharton"
 msgstr "Wharton"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9481
+#: ../data/Locations.xml.in.h:9519
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
 #. A city in Texas in the United States
-#: ../data/Locations.xml.in.h:9483
+#: ../data/Locations.xml.in.h:9521
 msgid "Wink"
 msgstr "Wink"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:9485
+#: ../data/Locations.xml.in.h:9523
 msgid "Utah"
 msgstr "Utah"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9487
+#: ../data/Locations.xml.in.h:9525
 msgid "Bryce Canyon"
 msgstr "Bryce Canyon"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9489
+#: ../data/Locations.xml.in.h:9527
 msgid "Cedar City"
 msgstr "Cedar City"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9491
+#: ../data/Locations.xml.in.h:9529
 msgid "Delta"
 msgstr "Delta"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9493
+#: ../data/Locations.xml.in.h:9531
 msgid "Hanksville"
 msgstr "Hanksville"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9495
+#: ../data/Locations.xml.in.h:9533
 msgid "Lakeside"
 msgstr "Lakeside"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9497
+#: ../data/Locations.xml.in.h:9535
 msgid "Logan"
 msgstr "Logan"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9499
+#: ../data/Locations.xml.in.h:9537
 msgid "Milford"
 msgstr "Milford"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9501
+#: ../data/Locations.xml.in.h:9539
 msgid "Moab"
 msgstr "Moab"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9503
+#: ../data/Locations.xml.in.h:9541
 msgid "Ogden"
 msgstr "Ogden"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9505
+#: ../data/Locations.xml.in.h:9543
 msgid "Price"
 msgstr "Price"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9507
+#: ../data/Locations.xml.in.h:9545
 msgid "Provo"
 msgstr "Provo"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9509
+#: ../data/Locations.xml.in.h:9547
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9511
+#: ../data/Locations.xml.in.h:9549
 msgctxt "City in Utah, United States"
 msgid "Santa Clara"
 msgstr "Santa Clara"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9513
+#: ../data/Locations.xml.in.h:9551
 msgid "Vernal"
 msgstr "Vernal"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9515
+#: ../data/Locations.xml.in.h:9553
 msgid "Wendover"
 msgstr "Wendover"
 
 #. A city in Utah in the United States
-#: ../data/Locations.xml.in.h:9517
+#: ../data/Locations.xml.in.h:9555
 msgid "West Valley City"
 msgstr "West Valley City"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:9519
+#: ../data/Locations.xml.in.h:9557
 msgid "Vermont"
 msgstr "Vermont"
 
 #. A city in Vermont in the United States
-#: ../data/Locations.xml.in.h:9521
+#: ../data/Locations.xml.in.h:9559
 msgid "Barre"
 msgstr "Barre"
 
 #. A city in Vermont in the United States
-#: ../data/Locations.xml.in.h:9523
+#: ../data/Locations.xml.in.h:9561
 msgid "Bennington"
 msgstr "Bennington"
 
 #. A city in Vermont in the United States
-#: ../data/Locations.xml.in.h:9525
+#: ../data/Locations.xml.in.h:9563
 msgctxt "City in Vermont, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in Vermont in the United States
-#: ../data/Locations.xml.in.h:9527
+#: ../data/Locations.xml.in.h:9565
 msgid "Morrisville"
 msgstr "Morrisville"
 
 #. A city in Vermont in the United States
-#: ../data/Locations.xml.in.h:9529
+#: ../data/Locations.xml.in.h:9567
 msgid "Rutland"
 msgstr "Rutland"
 
 #. A city in Vermont in the United States
-#: ../data/Locations.xml.in.h:9531
+#: ../data/Locations.xml.in.h:9569
 msgid "Saint Johnsbury"
 msgstr "Saint Johnsbury"
 
 #. A city in Vermont in the United States
-#: ../data/Locations.xml.in.h:9533
+#: ../data/Locations.xml.in.h:9571
 msgctxt "City in Vermont, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:9535
+#: ../data/Locations.xml.in.h:9573
 msgid "Virginia"
 msgstr "Virginia"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9537
+#: ../data/Locations.xml.in.h:9575
 msgid "Abingdon"
 msgstr "Abingdon"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9539
+#: ../data/Locations.xml.in.h:9577
 msgctxt "City in Virginia, United States"
 msgid "Alexandria"
 msgstr "Alexandria"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9541
+#: ../data/Locations.xml.in.h:9579
 msgctxt "City in Virginia, United States"
 msgid "Ashland"
 msgstr "Ashland"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9543
+#: ../data/Locations.xml.in.h:9581
 msgid "Blacksburg"
 msgstr "Blacksburg"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9545
+#: ../data/Locations.xml.in.h:9583
 msgid "Charlottesville"
 msgstr "Charlottesville"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9547
+#: ../data/Locations.xml.in.h:9585
 msgid "Chesapeake"
 msgstr "Chesapeake"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9549
+#: ../data/Locations.xml.in.h:9587
 msgid "Chincoteague"
 msgstr "Chincoteague"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9551
+#: ../data/Locations.xml.in.h:9589
 msgid "Culpeper"
 msgstr "Culpeper"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9553
+#: ../data/Locations.xml.in.h:9591
 msgctxt "City in Virginia, United States"
 msgid "Danville"
 msgstr "Danville"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9555
+#: ../data/Locations.xml.in.h:9593
 msgctxt "City in Virginia, United States"
 msgid "Dublin"
 msgstr "Dublin"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9557
+#: ../data/Locations.xml.in.h:9595
 msgctxt "City in Virginia, United States"
 msgid "Emporia"
 msgstr "Emporia"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9559
+#: ../data/Locations.xml.in.h:9597
 msgid "Farmville"
 msgstr "Farmville"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9561
+#: ../data/Locations.xml.in.h:9599
 msgctxt "City in Virginia, United States"
 msgid "Franklin"
 msgstr "Franklin"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9563
+#: ../data/Locations.xml.in.h:9601
 msgid "Hampton"
 msgstr "Hampton"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9565
+#: ../data/Locations.xml.in.h:9603
 msgid "Hillsville"
 msgstr "Hillsville"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9567
+#: ../data/Locations.xml.in.h:9605
 msgctxt "City in Virginia, United States"
 msgid "Hot Springs"
 msgstr "Hot Springs"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9569
+#: ../data/Locations.xml.in.h:9607
 msgctxt "City in Virginia, United States"
 msgid "Leesburg"
 msgstr "Leesburg"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9571
+#: ../data/Locations.xml.in.h:9609
 msgid "Louisa"
 msgstr "Louisa"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9573
+#: ../data/Locations.xml.in.h:9611
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9575
+#: ../data/Locations.xml.in.h:9613
 msgid "Manassas"
 msgstr "Manassas"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9577
+#: ../data/Locations.xml.in.h:9615
 msgctxt "City in Virginia, United States"
 msgid "Marion"
 msgstr "Marion"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9579
+#: ../data/Locations.xml.in.h:9617
 msgid "Martinsville"
 msgstr "Martinsville"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9581
+#: ../data/Locations.xml.in.h:9619
 msgid "Melfa"
 msgstr "Melfa"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9583
+#: ../data/Locations.xml.in.h:9621
 msgid "Newport News"
 msgstr "Newport News"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9585
+#: ../data/Locations.xml.in.h:9623
 msgctxt "City in Virginia, United States"
 msgid "Norfolk"
 msgstr "Norfolk"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9587
+#: ../data/Locations.xml.in.h:9625
 msgctxt "City in Virginia, United States"
 msgid "Orange"
 msgstr "Orange"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9589
+#: ../data/Locations.xml.in.h:9627
 msgctxt "City in Virginia, United States"
 msgid "Petersburg"
 msgstr "Petersburg"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9591
+#: ../data/Locations.xml.in.h:9629
 msgid "Pohick"
 msgstr "Pohick"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9593
+#: ../data/Locations.xml.in.h:9631
 msgctxt "City in Virginia, United States"
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9595
+#: ../data/Locations.xml.in.h:9633
 msgid "Quantico"
 msgstr "Quantico"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9597
+#: ../data/Locations.xml.in.h:9635
 msgctxt "City in Virginia, United States"
 msgid "Richmond"
 msgstr "Richmond"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9599
+#: ../data/Locations.xml.in.h:9637
 msgid "Roanoke"
 msgstr "Roanoke"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9601
+#: ../data/Locations.xml.in.h:9639
 msgid "South Hill"
 msgstr "South Hill"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9603
+#: ../data/Locations.xml.in.h:9641
 msgid "Stafford"
 msgstr "Stafford"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9605
+#: ../data/Locations.xml.in.h:9643
 msgid "Staunton"
 msgstr "Staunton"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9607
+#: ../data/Locations.xml.in.h:9645
 msgid "Suffolk"
 msgstr "Suffolk"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9609
+#: ../data/Locations.xml.in.h:9647
 msgid "Virginia Beach"
 msgstr "Virigina Beach"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9611
+#: ../data/Locations.xml.in.h:9649
 msgid "Wakefield"
 msgstr "Wakefield"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9613
+#: ../data/Locations.xml.in.h:9651
 msgid "West Point"
 msgstr "West Point"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9615
+#: ../data/Locations.xml.in.h:9653
 msgid "Williamsburg"
 msgstr "Williamsburg"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9617
+#: ../data/Locations.xml.in.h:9655
 msgid "Winchester"
 msgstr "Winchester"
 
 #. A city in Virginia in the United States
-#: ../data/Locations.xml.in.h:9619
+#: ../data/Locations.xml.in.h:9657
 msgid "Wise"
 msgstr "Wise"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:9621
+#: ../data/Locations.xml.in.h:9659
 msgctxt "State in United States"
 msgid "Washington"
 msgstr "Washington"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9623
+#: ../data/Locations.xml.in.h:9661
 msgctxt "City in Washington, United States"
 msgid "Arlington"
 msgstr "Arlington"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9625
+#: ../data/Locations.xml.in.h:9663
 msgid "Bellevue"
 msgstr "Bellevue"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9627
+#: ../data/Locations.xml.in.h:9665
 msgid "Bellingham"
 msgstr "Bellingham"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9629
+#: ../data/Locations.xml.in.h:9667
 msgid "Bremerton"
 msgstr "Bremerton"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9631
+#: ../data/Locations.xml.in.h:9669
 msgctxt "City in Washington, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9633
+#: ../data/Locations.xml.in.h:9671
 msgid "Deer Park"
 msgstr "Deer Park"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9635
+#: ../data/Locations.xml.in.h:9673
 msgid "Eastsound"
 msgstr "Eastsound"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9637
+#: ../data/Locations.xml.in.h:9675
 msgid "Ellensburg"
 msgstr "Ellensburg"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9639
+#: ../data/Locations.xml.in.h:9677
 msgid "Ephrata"
 msgstr "Ephrata"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9641
+#: ../data/Locations.xml.in.h:9679
 msgid "Everett"
 msgstr "Everett"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9643
+#: ../data/Locations.xml.in.h:9681
 msgid "Fairchild"
 msgstr "Fairchild"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9645
+#: ../data/Locations.xml.in.h:9683
 msgid "Friday Harbor"
 msgstr "Friday Harbor"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9647
+#: ../data/Locations.xml.in.h:9685
 msgctxt "City in Washington, United States"
 msgid "Hanford"
 msgstr "Hanford"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9649
+#: ../data/Locations.xml.in.h:9687
 msgid "Hoquiam"
 msgstr "Hoquiam"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9651
+#: ../data/Locations.xml.in.h:9689
 msgid "Kelso"
 msgstr "Kelso"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9653
+#: ../data/Locations.xml.in.h:9691
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9655
+#: ../data/Locations.xml.in.h:9693
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9657
+#: ../data/Locations.xml.in.h:9695
 msgid "Olympia"
 msgstr "Olympia"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9659
+#: ../data/Locations.xml.in.h:9697
 msgid "Omak"
 msgstr "Omak"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9661
+#: ../data/Locations.xml.in.h:9699
 msgid "Pasco"
 msgstr "Pasco"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9663
+#: ../data/Locations.xml.in.h:9701
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9665
+#: ../data/Locations.xml.in.h:9703
 msgid "Quillayute"
 msgstr "Quillayute"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9667
+#: ../data/Locations.xml.in.h:9705
 msgid "Renton"
 msgstr "Renton"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9669
+#: ../data/Locations.xml.in.h:9707
 msgid "Seattle"
 msgstr "Seattle"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9671
+#: ../data/Locations.xml.in.h:9709
 msgid "Shelton"
 msgstr "Shelton"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9673
+#: ../data/Locations.xml.in.h:9711
 msgid "Spokane"
 msgstr "Spokane"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9675
+#: ../data/Locations.xml.in.h:9713
 msgid "Stampede"
 msgstr "Stampede"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9677
+#: ../data/Locations.xml.in.h:9715
 msgid "Tacoma"
 msgstr "Tacoma"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9679
+#: ../data/Locations.xml.in.h:9717
 msgid "Tillicum"
 msgstr "Tillicum"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9681
+#: ../data/Locations.xml.in.h:9719
 msgctxt "City in Washington, United States"
 msgid "Vancouver"
 msgstr "Vancover"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9683
+#: ../data/Locations.xml.in.h:9721
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9685
+#: ../data/Locations.xml.in.h:9723
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
 #. A city in Washington in the United States
-#: ../data/Locations.xml.in.h:9687
+#: ../data/Locations.xml.in.h:9725
 msgid "Yakima"
 msgstr "Yakima"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:9689
+#: ../data/Locations.xml.in.h:9727
 msgid "West Virginia"
 msgstr "West Wirginia"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9691
+#: ../data/Locations.xml.in.h:9729
 msgid "Beckley"
 msgstr "Beckley"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9693
+#: ../data/Locations.xml.in.h:9731
 msgid "Bluefield"
 msgstr "Bluefield"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9695
+#: ../data/Locations.xml.in.h:9733
 msgid "Buckhannon"
 msgstr "Buckhannon"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9697
+#: ../data/Locations.xml.in.h:9735
 msgctxt "City in West Virginia, United States"
 msgid "Charleston"
 msgstr "Charleston"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9699
+#: ../data/Locations.xml.in.h:9737
 msgid "Clarksburg"
 msgstr "Clarksburg"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9701
+#: ../data/Locations.xml.in.h:9739
 msgid "Elkins"
 msgstr "Elkins"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9703
+#: ../data/Locations.xml.in.h:9741
 msgid "Huntington"
 msgstr "Huntington"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9705
+#: ../data/Locations.xml.in.h:9743
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9707
+#: ../data/Locations.xml.in.h:9745
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9709
+#: ../data/Locations.xml.in.h:9747
 msgid "Morgantown"
 msgstr "Morgantown"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9711
+#: ../data/Locations.xml.in.h:9749
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9713
+#: ../data/Locations.xml.in.h:9751
 msgctxt "City in West Virginia, United States"
 msgid "Petersburg"
 msgstr "Petersburg"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9715
+#: ../data/Locations.xml.in.h:9753
 msgid "Point Pleasant"
 msgstr "Point Pleasant"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9717
+#: ../data/Locations.xml.in.h:9755
 msgctxt "City in West Virginia, United States"
 msgid "Sutton"
 msgstr "Sutton"
 
 #. A city in West Virginia in the United States
-#: ../data/Locations.xml.in.h:9719
+#: ../data/Locations.xml.in.h:9757
 msgid "Wheeling"
 msgstr "Wheeling"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:9721
+#: ../data/Locations.xml.in.h:9759
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9723
+#: ../data/Locations.xml.in.h:9761
 msgid "Antigo"
 msgstr "Antigo"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9725
+#: ../data/Locations.xml.in.h:9763
 msgctxt "City in Wisconsin, United States"
 msgid "Appleton"
 msgstr "Appleton"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9727
+#: ../data/Locations.xml.in.h:9765
 msgctxt "City in Wisconsin, United States"
 msgid "Ashland"
 msgstr "Ashland"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9729
+#: ../data/Locations.xml.in.h:9767
 msgid "Baraboo"
 msgstr "Baraboo"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9731
+#: ../data/Locations.xml.in.h:9769
 msgid "Boscobel"
 msgstr "Boscobel"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9733
+#: ../data/Locations.xml.in.h:9771
 msgctxt "City in Wisconsin, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9735
+#: ../data/Locations.xml.in.h:9773
 msgid "Camp Douglas"
 msgstr "Camp Douglas"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9737
+#: ../data/Locations.xml.in.h:9775
 msgid "Clintonville"
 msgstr "Clintonville"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9739
+#: ../data/Locations.xml.in.h:9777
 msgid "Eagle River"
 msgstr "Eagle River"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9741
+#: ../data/Locations.xml.in.h:9779
 msgid "Eau Claire"
 msgstr "Eau Claire"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9743
+#: ../data/Locations.xml.in.h:9781
 msgid "Fond du Lac"
 msgstr "Fond du Lac"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9745
+#: ../data/Locations.xml.in.h:9783
 msgid "Green Bay"
 msgstr "Green Bay"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9747
+#: ../data/Locations.xml.in.h:9785
 msgctxt "City in Wisconsin, United States"
 msgid "Hayward"
 msgstr "Hayward"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9749
+#: ../data/Locations.xml.in.h:9787
 msgid "Janesville"
 msgstr "Janesville"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9751
+#: ../data/Locations.xml.in.h:9789
 msgctxt "City in Wisconsin, United States"
 msgid "Juneau"
 msgstr "Juneau"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9753
+#: ../data/Locations.xml.in.h:9791
 msgid "Kenosha"
 msgstr "Kenosha"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9755
+#: ../data/Locations.xml.in.h:9793
 msgid "La Crosse"
 msgstr "La Crosse"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9757
+#: ../data/Locations.xml.in.h:9795
 msgid "Ladysmith"
 msgstr "Ladysmith"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9759
+#: ../data/Locations.xml.in.h:9797
 msgid "Land O' Lakes"
 msgstr "Land O' Lakes"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9761
+#: ../data/Locations.xml.in.h:9799
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9763
+#: ../data/Locations.xml.in.h:9801
 msgctxt "City in Wisconsin, United States"
 msgid "Madison"
 msgstr "Madison"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9765
+#: ../data/Locations.xml.in.h:9803
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9767
+#: ../data/Locations.xml.in.h:9805
 msgid "Marshfield"
 msgstr "Marshfield"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9769
+#: ../data/Locations.xml.in.h:9807
 msgctxt "City in Wisconsin, United States"
 msgid "Medford"
 msgstr "Medford"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9771
+#: ../data/Locations.xml.in.h:9809
 msgid "Menomonie"
 msgstr "Menomonie"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9773
+#: ../data/Locations.xml.in.h:9811
 msgid "Merrill"
 msgstr "Merrill"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9775
+#: ../data/Locations.xml.in.h:9813
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9777
+#: ../data/Locations.xml.in.h:9815
 msgctxt "City in Wisconsin, United States"
 msgid "Monroe"
 msgstr "Monroe"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9779
+#: ../data/Locations.xml.in.h:9817
 msgid "Mosinee"
 msgstr "Mosinee"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9781
+#: ../data/Locations.xml.in.h:9819
 msgid "New Richmond"
 msgstr "New Richmond"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9783
+#: ../data/Locations.xml.in.h:9821
 msgid "Osceola"
 msgstr "Osceola"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9785
+#: ../data/Locations.xml.in.h:9823
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9787
+#: ../data/Locations.xml.in.h:9825
 msgid "Phillips"
 msgstr "Phillips"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9789
+#: ../data/Locations.xml.in.h:9827
 msgid "Prairie du Chien"
 msgstr "Prairie du Chien"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9791
+#: ../data/Locations.xml.in.h:9829
 msgid "Racine"
 msgstr "Racine"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9793
+#: ../data/Locations.xml.in.h:9831
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9795
+#: ../data/Locations.xml.in.h:9833
 msgid "Rice Lake"
 msgstr "Rice Lake"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9797
+#: ../data/Locations.xml.in.h:9835
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9799
+#: ../data/Locations.xml.in.h:9837
 msgid "Siren"
 msgstr "Siren"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9801
+#: ../data/Locations.xml.in.h:9839
 msgctxt "City in Wisconsin, United States"
 msgid "Sparta"
 msgstr "Sparta"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9803
+#: ../data/Locations.xml.in.h:9841
 msgid "Stevens Point"
 msgstr "Stevens Point"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9805
+#: ../data/Locations.xml.in.h:9843
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9807
+#: ../data/Locations.xml.in.h:9845
 msgid "Superior"
 msgstr "Superior"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9809
+#: ../data/Locations.xml.in.h:9847
 msgid "Tomahawk"
 msgstr "Tomahawk"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9811
+#: ../data/Locations.xml.in.h:9849
 msgctxt "City in Wisconsin, United States"
 msgid "Watertown"
 msgstr "Watertown"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9813
+#: ../data/Locations.xml.in.h:9851
 msgid "Waukesha"
 msgstr "Waukesha"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9815
+#: ../data/Locations.xml.in.h:9853
 msgid "Waupaca"
 msgstr "Waupaca"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9817
+#: ../data/Locations.xml.in.h:9855
 msgid "Wausau"
 msgstr "Wausau"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9819
+#: ../data/Locations.xml.in.h:9857
 msgid "Wautoma"
 msgstr "Wautoma"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9821
+#: ../data/Locations.xml.in.h:9859
 msgid "West Bend"
 msgstr "West Bend"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9823
+#: ../data/Locations.xml.in.h:9861
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
 #. A city in Wisconsin in the United States
-#: ../data/Locations.xml.in.h:9825
+#: ../data/Locations.xml.in.h:9863
 msgid "Woodruff"
 msgstr "Woodruff"
 
 #. A state/province/territory in United States
-#: ../data/Locations.xml.in.h:9827
+#: ../data/Locations.xml.in.h:9865
 msgctxt "State in United States"
 msgid "Wyoming"
 msgstr "Wyoming"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9829
+#: ../data/Locations.xml.in.h:9867
 msgid "Big Piney"
 msgstr "Big Piney"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9831
+#: ../data/Locations.xml.in.h:9869
 msgctxt "City in Wyoming, United States"
 msgid "Bordeaux"
 msgstr "Bordeaux"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9833
+#: ../data/Locations.xml.in.h:9871
 msgctxt "City in Wyoming, United States"
 msgid "Buffalo"
 msgstr "Buffalo"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9835
+#: ../data/Locations.xml.in.h:9873
 msgid "Casper"
 msgstr "Casper"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9837
+#: ../data/Locations.xml.in.h:9875
 msgid "Cheyenne"
 msgstr "Cheyenne"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9839
+#: ../data/Locations.xml.in.h:9877
 msgid "Cody"
 msgstr "Cody"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9841
+#: ../data/Locations.xml.in.h:9879
 msgctxt "City in Wyoming, United States"
 msgid "Douglas"
 msgstr "Douglas"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9843
+#: ../data/Locations.xml.in.h:9881
 msgid "Evanston"
 msgstr "Evanston"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9845
+#: ../data/Locations.xml.in.h:9883
 msgid "Gillette"
 msgstr "Gillette"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9847
+#: ../data/Locations.xml.in.h:9885
 msgid "Greybull"
 msgstr "Greybull"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9849
+#: ../data/Locations.xml.in.h:9887
 msgctxt "City in Wyoming, United States"
 msgid "Jackson"
 msgstr "Jackson"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9851
+#: ../data/Locations.xml.in.h:9889
 msgid "Lander"
 msgstr "Lander"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9853
+#: ../data/Locations.xml.in.h:9891
 msgid "Laramie"
 msgstr "Laramie"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9855
+#: ../data/Locations.xml.in.h:9893
 msgid "Pinedale"
 msgstr "Pinedale"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9857
+#: ../data/Locations.xml.in.h:9895
 msgid "Rawlins"
 msgstr "Rawlins"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9859
+#: ../data/Locations.xml.in.h:9897
 msgid "Riverton"
 msgstr "Riverton"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9861
+#: ../data/Locations.xml.in.h:9899
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9863
+#: ../data/Locations.xml.in.h:9901
 msgid "Sheridan"
 msgstr "Sheridan"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9865
+#: ../data/Locations.xml.in.h:9903
 msgid "Torrington"
 msgstr "Torrington"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9867
+#: ../data/Locations.xml.in.h:9905
 msgid "West Thumb"
 msgstr "West Thumb"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9869
+#: ../data/Locations.xml.in.h:9907
 msgid "Worland"
 msgstr "Worland"
 
 #. A city in Wyoming in the United States
-#: ../data/Locations.xml.in.h:9871
+#: ../data/Locations.xml.in.h:9909
 msgctxt "City in Wyoming, United States"
 msgid "Wyoming"
 msgstr "Wyoming"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgweather.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgweather.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libgweather.po	2013-01-29 09:33:55.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libgweather.po	2014-01-07 06:37:30.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:22+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:03+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #. TRANSLATOR: Change this to the default location name,
@@ -248,7 +248,7 @@
 msgid "Use metric units instead of english units."
 msgstr "Bruk metriske måleenheter i stedet for engelske enheter."
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:11
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:11
 msgid "Distance unit"
 msgstr "Enhet for avstand"
 
@@ -256,7 +256,7 @@
 msgid "The unit to use for visibility."
 msgstr "Enhet som skal brukes for synlighet."
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:21
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:21
 msgid "Pressure unit"
 msgstr "Enhet for trykk"
 
@@ -264,7 +264,7 @@
 msgid "The unit to use for pressure."
 msgstr "Enhet som skal brukes for trykk."
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:16
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:16
 msgid "Speed unit"
 msgstr "Enhet for hastighet"
 
@@ -272,7 +272,7 @@
 msgid "The unit to use for wind speed."
 msgstr "Enhet som skal brukes for vindhastighet."
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:6
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:6
 msgid "Temperature unit"
 msgstr "Enhet for temperatur"
 
@@ -381,7 +381,7 @@
 msgstr "Ukjent"
 
 #. Translators: %d is an error code, and %s the error string
-#: ../libgweather/weather-metar.c:523
+#: ../libgweather/weather-metar.c:573
 #, c-format
 msgid "Failed to get METAR data: %d %s.\n"
 msgstr "Kunne ikke hente METAR-data: %d %s\n"
@@ -390,71 +390,71 @@
 msgid "WeatherInfo missing location"
 msgstr "VærInfo mangler sted"
 
-#: ../libgweather/weather.c:201
+#: ../libgweather/weather.c:129
 msgid "Variable"
 msgstr "Variabel"
 
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:130
 msgid "North"
 msgstr "Nord"
 
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:130
 msgid "North - NorthEast"
 msgstr "Nord - nordøst"
 
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:130
 msgid "Northeast"
 msgstr "Nordøst"
 
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:130
 msgid "East - NorthEast"
 msgstr "Øst - nordøst"
 
-#: ../libgweather/weather.c:203
+#: ../libgweather/weather.c:131
 msgid "East"
 msgstr "Øst"
 
-#: ../libgweather/weather.c:203
+#: ../libgweather/weather.c:131
 msgid "East - Southeast"
 msgstr "Øst - sørøst"
 
-#: ../libgweather/weather.c:203
+#: ../libgweather/weather.c:131
 msgid "Southeast"
 msgstr "Sørøst"
 
-#: ../libgweather/weather.c:203
+#: ../libgweather/weather.c:131
 msgid "South - Southeast"
 msgstr "Sør - sørøst"
 
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:132
 msgid "South"
 msgstr "Sør"
 
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:132
 msgid "South - Southwest"
 msgstr "Sør - sørvest"
 
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:132
 msgid "Southwest"
 msgstr "Sørvest"
 
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:132
 msgid "West - Southwest"
 msgstr "Vest - sørvest"
 
-#: ../libgweather/weather.c:205
+#: ../libgweather/weather.c:133
 msgid "West"
 msgstr "Vest"
 
-#: ../libgweather/weather.c:205
+#: ../libgweather/weather.c:133
 msgid "West - Northwest"
 msgstr "Vest - nordvest"
 
-#: ../libgweather/weather.c:205
+#: ../libgweather/weather.c:133
 msgid "Northwest"
 msgstr "Nordvest"
 
-#: ../libgweather/weather.c:205
+#: ../libgweather/weather.c:133
 msgid "North - Northwest"
 msgstr "Nord - nordvest"
 
@@ -463,23 +463,23 @@
 msgid "Invalid"
 msgstr "Ugyldig"
 
-#: ../libgweather/weather.c:218
+#: ../libgweather/weather.c:146
 msgid "Clear Sky"
 msgstr "Klar himmel"
 
-#: ../libgweather/weather.c:219
+#: ../libgweather/weather.c:147
 msgid "Broken clouds"
 msgstr "Brutte skyer"
 
-#: ../libgweather/weather.c:220
+#: ../libgweather/weather.c:148
 msgid "Scattered clouds"
 msgstr "Spredte skyer"
 
-#: ../libgweather/weather.c:221
+#: ../libgweather/weather.c:149
 msgid "Few clouds"
 msgstr "Få skyer"
 
-#: ../libgweather/weather.c:222
+#: ../libgweather/weather.c:150
 msgid "Overcast"
 msgstr "Overskyet"
 
@@ -487,290 +487,290 @@
 #. * etc means, you can go to http://www.weather.com/glossary/ and
 #. * http://www.crh.noaa.gov/arx/wx.tbl.php
 #. NONE
-#: ../libgweather/weather.c:261 ../libgweather/weather.c:263
+#: ../libgweather/weather.c:189 ../libgweather/weather.c:191
 msgid "Thunderstorm"
 msgstr "Tordenstorm"
 
 #. DRIZZLE
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:190
 msgid "Drizzle"
 msgstr "Småregn"
 
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:190
 msgid "Light drizzle"
 msgstr "Lett regn"
 
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:190
 msgid "Moderate drizzle"
 msgstr "Moderat småregn"
 
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:190
 msgid "Heavy drizzle"
 msgstr "Tungt småregn"
 
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:190
 msgid "Freezing drizzle"
 msgstr "Frysende småregn"
 
 #. RAIN
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:191
 msgid "Rain"
 msgstr "Regn"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:191
 msgid "Light rain"
 msgstr "Lett regn"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:191
 msgid "Moderate rain"
 msgstr "Moderat regn"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:191
 msgid "Heavy rain"
 msgstr "Tungt regn"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:191
 msgid "Rain showers"
 msgstr "Regnbyger"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:191
 msgid "Freezing rain"
 msgstr "Frysende regn"
 
 #. SNOW
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:192
 msgid "Snow"
 msgstr "Snø"
 
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:192
 msgid "Light snow"
 msgstr "Lett snø"
 
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:192
 msgid "Moderate snow"
 msgstr "Moderat snø"
 
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:192
 msgid "Heavy snow"
 msgstr "Tung snø"
 
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:192
 msgid "Snowstorm"
 msgstr "Snøstorm"
 
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:192
 msgid "Blowing snowfall"
 msgstr "Snø og vind"
 
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:192
 msgid "Snow showers"
 msgstr "Snøbyger"
 
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:192
 msgid "Drifting snow"
 msgstr "Drivende snø"
 
 #. SNOW_GRAINS
-#: ../libgweather/weather.c:265
+#: ../libgweather/weather.c:193
 msgid "Snow grains"
 msgstr "Snøkorn"
 
-#: ../libgweather/weather.c:265
+#: ../libgweather/weather.c:193
 msgid "Light snow grains"
 msgstr "Lette snøkorn"
 
-#: ../libgweather/weather.c:265
+#: ../libgweather/weather.c:193
 msgid "Moderate snow grains"
 msgstr "Moderate snøkorn"
 
-#: ../libgweather/weather.c:265
+#: ../libgweather/weather.c:193
 msgid "Heavy snow grains"
 msgstr "Tunge snøkorn"
 
 #. ICE_CRYSTALS
-#: ../libgweather/weather.c:266
+#: ../libgweather/weather.c:194
 msgid "Ice crystals"
 msgstr "Iskrystaller"
 
 #. ICE_PELLETS
-#: ../libgweather/weather.c:267
+#: ../libgweather/weather.c:195
 msgid "Ice pellets"
 msgstr "Is-pellets"
 
-#: ../libgweather/weather.c:267
+#: ../libgweather/weather.c:195
 msgid "Few ice pellets"
 msgstr "Få is-pellets"
 
-#: ../libgweather/weather.c:267
+#: ../libgweather/weather.c:195
 msgid "Moderate ice pellets"
 msgstr "Moderate is-pellets"
 
-#: ../libgweather/weather.c:267
+#: ../libgweather/weather.c:195
 msgid "Heavy ice pellets"
 msgstr "Kraftige is-pellets"
 
-#: ../libgweather/weather.c:267
+#: ../libgweather/weather.c:195
 msgid "Ice pellet storm"
 msgstr "Is-pellets storm"
 
-#: ../libgweather/weather.c:267
+#: ../libgweather/weather.c:195
 msgid "Showers of ice pellets"
 msgstr "Dusjer med is-pellets"
 
 #. HAIL
-#: ../libgweather/weather.c:268
+#: ../libgweather/weather.c:196
 msgid "Hail"
 msgstr "Hagl"
 
-#: ../libgweather/weather.c:268
+#: ../libgweather/weather.c:196
 msgid "Hailstorm"
 msgstr "Haglstorm"
 
-#: ../libgweather/weather.c:268
+#: ../libgweather/weather.c:196
 msgid "Hail showers"
 msgstr "Haglbyger"
 
 #. SMALL_HAIL
-#: ../libgweather/weather.c:269
+#: ../libgweather/weather.c:197
 msgid "Small hail"
 msgstr "Småhagl"
 
-#: ../libgweather/weather.c:269
+#: ../libgweather/weather.c:197
 msgid "Small hailstorm"
 msgstr "Liten haglstorm"
 
-#: ../libgweather/weather.c:269
+#: ../libgweather/weather.c:197
 msgid "Showers of small hail"
 msgstr "Byger med småhagl"
 
 #. PRECIPITATION
-#: ../libgweather/weather.c:270
+#: ../libgweather/weather.c:198
 msgid "Unknown precipitation"
 msgstr "Ukjent nedbør"
 
 #. MIST
-#: ../libgweather/weather.c:271
+#: ../libgweather/weather.c:199
 msgid "Mist"
 msgstr "Tåke"
 
 #. FOG
-#: ../libgweather/weather.c:272
+#: ../libgweather/weather.c:200
 msgid "Fog"
 msgstr "Dis"
 
-#: ../libgweather/weather.c:272
+#: ../libgweather/weather.c:200
 msgid "Fog in the vicinity"
 msgstr "Dis i området"
 
-#: ../libgweather/weather.c:272
+#: ../libgweather/weather.c:200
 msgid "Shallow fog"
 msgstr "Grunn dis"
 
-#: ../libgweather/weather.c:272
+#: ../libgweather/weather.c:200
 msgid "Patches of fog"
 msgstr "Områder med dis"
 
-#: ../libgweather/weather.c:272
+#: ../libgweather/weather.c:200
 msgid "Partial fog"
 msgstr "Delvis dis"
 
-#: ../libgweather/weather.c:272
+#: ../libgweather/weather.c:200
 msgid "Freezing fog"
 msgstr "Frysende dis"
 
 #. SMOKE
-#: ../libgweather/weather.c:273
+#: ../libgweather/weather.c:201
 msgid "Smoke"
 msgstr "Røyk"
 
 #. VOLCANIC_ASH
-#: ../libgweather/weather.c:274
+#: ../libgweather/weather.c:202
 msgid "Volcanic ash"
 msgstr "Vulkansk aske"
 
 #. SAND
-#: ../libgweather/weather.c:275
+#: ../libgweather/weather.c:203
 msgid "Sand"
 msgstr "Sand"
 
-#: ../libgweather/weather.c:275
+#: ../libgweather/weather.c:203
 msgid "Blowing sand"
 msgstr "Blåsende sand"
 
-#: ../libgweather/weather.c:275
+#: ../libgweather/weather.c:203
 msgid "Drifting sand"
 msgstr "Drivende sand"
 
 #. HAZE
-#: ../libgweather/weather.c:276
+#: ../libgweather/weather.c:204
 msgid "Haze"
 msgstr "Dis"
 
 #. SPRAY
-#: ../libgweather/weather.c:277
+#: ../libgweather/weather.c:205
 msgid "Blowing sprays"
 msgstr "Blåsende yr"
 
 #. DUST
-#: ../libgweather/weather.c:278
+#: ../libgweather/weather.c:206
 msgid "Dust"
 msgstr "Støv"
 
-#: ../libgweather/weather.c:278
+#: ../libgweather/weather.c:206
 msgid "Blowing dust"
 msgstr "Blåsende støv"
 
-#: ../libgweather/weather.c:278
+#: ../libgweather/weather.c:206
 msgid "Drifting dust"
 msgstr "Drivende støv"
 
 #. SQUALL
-#: ../libgweather/weather.c:279
+#: ../libgweather/weather.c:207
 msgid "Squall"
 msgstr "Bygekast"
 
 #. SANDSTORM
-#: ../libgweather/weather.c:280
+#: ../libgweather/weather.c:208
 msgid "Sandstorm"
 msgstr "Sandstorm"
 
-#: ../libgweather/weather.c:280
+#: ../libgweather/weather.c:208
 msgid "Sandstorm in the vicinity"
 msgstr "Sandstorm i omegnen"
 
-#: ../libgweather/weather.c:280
+#: ../libgweather/weather.c:208
 msgid "Heavy sandstorm"
 msgstr "Tung sandstorm"
 
 #. DUSTSTORM
-#: ../libgweather/weather.c:281
+#: ../libgweather/weather.c:209
 msgid "Duststorm"
 msgstr "Støvstorm"
 
-#: ../libgweather/weather.c:281
+#: ../libgweather/weather.c:209
 msgid "Duststorm in the vicinity"
 msgstr "Støvstorm i omegnen"
 
-#: ../libgweather/weather.c:281
+#: ../libgweather/weather.c:209
 msgid "Heavy duststorm"
 msgstr "Tung støvstorm"
 
 #. FUNNEL_CLOUD
-#: ../libgweather/weather.c:282
+#: ../libgweather/weather.c:210
 msgid "Funnel cloud"
 msgstr "Røyksky"
 
 #. TORNADO
-#: ../libgweather/weather.c:283
+#: ../libgweather/weather.c:211
 msgid "Tornado"
 msgstr "Tornado"
 
 #. DUST_WHIRLS
-#: ../libgweather/weather.c:284
+#: ../libgweather/weather.c:212
 msgid "Dust whirls"
 msgstr "Støvvirvler"
 
-#: ../libgweather/weather.c:284
+#: ../libgweather/weather.c:212
 msgid "Dust whirls in the vicinity"
 msgstr "Støvvirvler i omegnen"
 
@@ -778,7 +778,7 @@
 msgid "%a, %b %d / %H:%M"
 msgstr "%a, %b %d / %H:%M"
 
-#: ../libgweather/weather.c:620
+#: ../libgweather/weather.c:558
 msgid "Unknown observation time"
 msgstr "Ukjent observasjonstid"
 
@@ -793,67 +793,67 @@
 msgstr "Ukjent"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libgweather/weather.c:652
+#: ../libgweather/weather.c:590
 #, c-format
 msgid "%.1f °F"
 msgstr "%.1f °F"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libgweather/weather.c:655
+#: ../libgweather/weather.c:593
 #, c-format
 msgid "%d °F"
 msgstr "%d °F"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libgweather/weather.c:661
+#: ../libgweather/weather.c:599
 #, c-format
 msgid "%.1f °C"
 msgstr "%.1f °C"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libgweather/weather.c:664
+#: ../libgweather/weather.c:602
 #, c-format
 msgid "%d °C"
 msgstr "%d °C"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../libgweather/weather.c:670
+#: ../libgweather/weather.c:608
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../libgweather/weather.c:673
+#: ../libgweather/weather.c:611
 #, c-format
 msgid "%d K"
 msgstr "%d K"
 
 #. TRANSLATOR: This is the humidity in percent
-#: ../libgweather/weather.c:764
+#: ../libgweather/weather.c:702
 #, c-format
 msgid "%.f%%"
 msgstr "%.f%%"
 
 #. TRANSLATOR: This is the wind speed in knots
-#: ../libgweather/weather.c:792
+#: ../libgweather/weather.c:730
 #, c-format
 msgid "%0.1f knots"
 msgstr "%0.1f knop"
 
 #. TRANSLATOR: This is the wind speed in miles per hour
-#: ../libgweather/weather.c:795
+#: ../libgweather/weather.c:733
 #, c-format
 msgid "%.1f mph"
 msgstr "%.1f mpg"
 
 #. TRANSLATOR: This is the wind speed in kilometers per hour
-#: ../libgweather/weather.c:798
+#: ../libgweather/weather.c:736
 #, c-format
 msgid "%.1f km/h"
 msgstr "%.1f km/t"
 
 #. TRANSLATOR: This is the wind speed in meters per second
-#: ../libgweather/weather.c:801
+#: ../libgweather/weather.c:739
 #, c-format
 msgid "%.1f m/s"
 msgstr "%.1f m/s"
@@ -861,71 +861,71 @@
 #. TRANSLATOR: This is the wind speed as a Beaufort force factor
 #. * (commonly used in nautical wind estimation).
 #. 
-#: ../libgweather/weather.c:806
+#: ../libgweather/weather.c:744
 #, c-format
 msgid "Beaufort force %.1f"
 msgstr "Beaufort styrke %.1f"
 
-#: ../libgweather/weather.c:831
+#: ../libgweather/weather.c:769
 msgid "Calm"
 msgstr "Rolig"
 
 #. TRANSLATOR: This is 'wind direction' / 'wind speed'
-#: ../libgweather/weather.c:839
+#: ../libgweather/weather.c:777
 #, c-format
 msgid "%s / %s"
 msgstr "%s / %s"
 
 #. TRANSLATOR: This is pressure in inches of mercury
-#: ../libgweather/weather.c:863
+#: ../libgweather/weather.c:801
 #, c-format
 msgid "%.2f inHg"
 msgstr "%.2f inHg"
 
 #. TRANSLATOR: This is pressure in millimeters of mercury
-#: ../libgweather/weather.c:866
+#: ../libgweather/weather.c:804
 #, c-format
 msgid "%.1f mmHg"
 msgstr "%.1f mmHg"
 
 #. TRANSLATOR: This is pressure in kiloPascals
-#: ../libgweather/weather.c:869
+#: ../libgweather/weather.c:807
 #, c-format
 msgid "%.2f kPa"
 msgstr "%.2f kPa"
 
 #. TRANSLATOR: This is pressure in hectoPascals
-#: ../libgweather/weather.c:872
+#: ../libgweather/weather.c:810
 #, c-format
 msgid "%.2f hPa"
 msgstr "%.2f hPa"
 
 #. TRANSLATOR: This is pressure in millibars
-#: ../libgweather/weather.c:875
+#: ../libgweather/weather.c:813
 #, c-format
 msgid "%.2f mb"
 msgstr "%.2f mb"
 
 #. TRANSLATOR: This is pressure in atmospheres
-#: ../libgweather/weather.c:878
+#: ../libgweather/weather.c:816
 #, c-format
 msgid "%.3f atm"
 msgstr "%.3f atm"
 
 #. TRANSLATOR: This is the visibility in miles
-#: ../libgweather/weather.c:906
+#: ../libgweather/weather.c:844
 #, c-format
 msgid "%.1f miles"
 msgstr "%.1f engelske mil"
 
 #. TRANSLATOR: This is the visibility in kilometers
-#: ../libgweather/weather.c:909
+#: ../libgweather/weather.c:847
 #, c-format
 msgid "%.1f km"
 msgstr "%.1f km"
 
 #. TRANSLATOR: This is the visibility in meters
-#: ../libgweather/weather.c:912
+#: ../libgweather/weather.c:850
 #, c-format
 msgid "%.0fm"
 msgstr "%.0fm"
@@ -934,6 +934,6 @@
 msgid "%H:%M"
 msgstr "%H.%M"
 
-#: ../libgweather/weather.c:1054
+#: ../libgweather/weather.c:1006
 msgid "Retrieval failed"
 msgstr "Henting feilet"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libpeas.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libpeas.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libpeas.po	2013-01-29 09:33:51.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libpeas.po	2014-01-07 06:37:37.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:28+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:24+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../data/glade/libpeas-gtk.xml.in.h:1
@@ -105,15 +105,15 @@
 msgid "_Disable All"
 msgstr "Slå a_v alle"
 
-#: ../libpeas-gtk/peas-gtk-plugin-manager-view.c:508
+#: ../libpeas-gtk/peas-gtk-plugin-manager-view.c:510
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: ../libpeas-gtk/peas-gtk-plugin-manager-view.c:529
+#: ../libpeas-gtk/peas-gtk-plugin-manager-view.c:531
 msgid "Plugin"
 msgstr "Tillegg"
 
-#: ../libpeas-gtk/peas-gtk-plugin-manager-view.c:619
+#: ../libpeas-gtk/peas-gtk-plugin-manager-view.c:621
 #, c-format
 msgid ""
 "<b>The plugin '%s' could not be loaded</b>\n"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libubuntuone.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libubuntuone.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libubuntuone.po	2013-01-29 09:34:02.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libubuntuone.po	2014-01-07 06:37:51.000000000 +0000
@@ -14,13 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:33+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 21:01+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../libubuntuoneui/u1-codec-installer.c:255
 #, c-format
 msgid "Downloaded %s of %s at %s/s"
-msgstr ""
+msgstr "Lastet ned %s av %s med en fart på %s/s"
 
 #: ../libubuntuoneui/u1-codec-installer.c:258
 #, c-format
@@ -41,27 +41,35 @@
 "Error while getting credentials:\n"
 "%s"
 msgstr ""
+"Feil med påloggingsinformasjon:\n"
+"%s"
 
 #: ../libubuntuoneui/u1-music-store.c:484
 msgid "Authentication to the music store failed"
-msgstr ""
+msgstr "Klarte ikke å autensiere deg mot musikkbutikken"
 
 #: ../libubuntuoneui/u1-music-store.c:852
 msgid ""
 "MP3 playback support is not available. It must be installed to play Previews "
 "and Purchased Music on this computer."
 msgstr ""
+"Du har ingen støtte tilgjengelig for avspilling av MP3. Det må installeres "
+"for å spille av forhåndslytting og kjøpt musikk på denne maskinen."
 
 #: ../libubuntuoneui/u1-music-store.c:884
 msgid ""
 "Your 'Purchased Music' folder is not subscribed. New purchases will not "
 "download to this computer."
 msgstr ""
+"Du abonnerer ikke på «kjøpt musikk»-mappen din. Nye kjøp vil derfor ikke bli "
+"lastet ned til denne maskinen."
 
 #: ../libubuntuoneui/u1-music-store.c:1097
 msgid ""
 "MP3 codec cannot be installed. Install is only supported on Ubuntu Linux."
 msgstr ""
+"MP3-kodek kan ikke installeres. Det er kun Ubuntu Linux som støtter "
+"installasjon av denne."
 
 #: ../libubuntuoneui/u1-music-store.c:1269
 msgid "Install"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libwnck-3.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libwnck-3.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libwnck-3.0.po	2013-01-29 09:33:49.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libwnck-3.0.po	2014-01-07 06:37:38.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:38+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:37+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #. *
@@ -53,133 +53,133 @@
 msgid "Click this to switch to workspace %s"
 msgstr "Klikk her for å bytte til arbeidsområde %s"
 
-#: ../libwnck/pager.c:2203
+#: ../libwnck/pager.c:2188
 #, c-format
 msgid "Click to start dragging \"%s\""
 msgstr "Klikk for å dra «%s»"
 
-#: ../libwnck/pager.c:2206
+#: ../libwnck/pager.c:2191
 #, c-format
 msgid "Current workspace: \"%s\""
 msgstr "Aktivt arbeidsområde: «%s»"
 
-#: ../libwnck/pager.c:2211
+#: ../libwnck/pager.c:2196
 #, c-format
 msgid "Click to switch to \"%s\""
 msgstr "Klikk for å bytte til «%s»"
 
-#: ../libwnck/selector.c:1183
+#: ../libwnck/selector.c:1184
 msgid "No Windows Open"
 msgstr "Ingen åpne vinduer"
 
-#: ../libwnck/selector.c:1239
+#: ../libwnck/selector.c:1240
 msgid "Window Selector"
 msgstr "Vinduvelger"
 
-#: ../libwnck/selector.c:1240
+#: ../libwnck/selector.c:1241
 msgid "Tool to switch between windows"
 msgstr "Verktøy for å bytte mellom vinduer"
 
-#: ../libwnck/tasklist.c:676
+#: ../libwnck/tasklist.c:594
 msgid "Window List"
 msgstr "Vinduliste"
 
-#: ../libwnck/tasklist.c:677
+#: ../libwnck/tasklist.c:595
 msgid "Tool to switch between visible windows"
 msgstr "Verktøy for å bytte mellom synlige vinduer"
 
-#: ../libwnck/tasklist.c:2983
+#: ../libwnck/tasklist.c:2952
 msgid "Mi_nimize All"
 msgstr "Mi_nimer alle"
 
-#: ../libwnck/tasklist.c:2994
+#: ../libwnck/tasklist.c:2963
 msgid "Un_minimize All"
 msgstr "Gjen_opprett alle"
 
-#: ../libwnck/tasklist.c:3002
+#: ../libwnck/tasklist.c:2971
 msgid "Ma_ximize All"
 msgstr "Ma_ksimer alle"
 
-#: ../libwnck/tasklist.c:3013
+#: ../libwnck/tasklist.c:2982
 msgid "_Unmaximize All"
 msgstr "Gjeno_pprett alle"
 
-#: ../libwnck/tasklist.c:3025
+#: ../libwnck/tasklist.c:2994
 msgid "_Close All"
 msgstr "_Lukk alle"
 
-#: ../libwnck/window-action-menu.c:413
+#: ../libwnck/window-action-menu.c:398
 msgid "Unmi_nimize"
 msgstr "Gje_nopprett"
 
-#: ../libwnck/window-action-menu.c:420
+#: ../libwnck/window-action-menu.c:405
 msgid "Mi_nimize"
 msgstr "Mi_nimer"
 
-#: ../libwnck/window-action-menu.c:428
+#: ../libwnck/window-action-menu.c:413
 msgid "Unma_ximize"
 msgstr "_Gjenopprett"
 
-#: ../libwnck/window-action-menu.c:435
+#: ../libwnck/window-action-menu.c:420
 msgid "Ma_ximize"
 msgstr "Ma_ksimer"
 
-#: ../libwnck/window-action-menu.c:742 ../libwnck/workspace.c:281
+#: ../libwnck/window-action-menu.c:727 ../libwnck/workspace.c:273
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeidsområde %d"
 
-#: ../libwnck/window-action-menu.c:751 ../libwnck/window-action-menu.c:898
+#: ../libwnck/window-action-menu.c:736 ../libwnck/window-action-menu.c:883
 #, c-format
 msgid "Workspace 1_0"
 msgstr "Arbeidsområde 1_0"
 
-#: ../libwnck/window-action-menu.c:753 ../libwnck/window-action-menu.c:900
+#: ../libwnck/window-action-menu.c:738 ../libwnck/window-action-menu.c:885
 #, c-format
 msgid "Workspace %s%d"
 msgstr "Arbeidsområde %s%d"
 
-#: ../libwnck/window-action-menu.c:1043
+#: ../libwnck/window-action-menu.c:1027
 msgid "_Move"
 msgstr "F_lytt"
 
-#: ../libwnck/window-action-menu.c:1050
+#: ../libwnck/window-action-menu.c:1034
 msgid "_Resize"
 msgstr "End_re størrelse"
 
-#: ../libwnck/window-action-menu.c:1059
+#: ../libwnck/window-action-menu.c:1043
 msgid "Always On _Top"
 msgstr "Alltid øvers_t"
 
-#: ../libwnck/window-action-menu.c:1067
+#: ../libwnck/window-action-menu.c:1051
 msgid "_Always on Visible Workspace"
 msgstr "_Alltid på synlig arbeidsområde"
 
-#: ../libwnck/window-action-menu.c:1072
+#: ../libwnck/window-action-menu.c:1056
 msgid "_Only on This Workspace"
 msgstr "K_un på dette arbeidsområdet"
 
-#: ../libwnck/window-action-menu.c:1079
+#: ../libwnck/window-action-menu.c:1063
 msgid "Move to Workspace _Left"
 msgstr "Flytt til arbeidsområdet til _venstre"
 
-#: ../libwnck/window-action-menu.c:1085
+#: ../libwnck/window-action-menu.c:1069
 msgid "Move to Workspace R_ight"
 msgstr "Flytt til arbeidsområdet til hø_yre"
 
-#: ../libwnck/window-action-menu.c:1091
+#: ../libwnck/window-action-menu.c:1075
 msgid "Move to Workspace _Up"
 msgstr "Flytt til et arbeidsområdet _over"
 
-#: ../libwnck/window-action-menu.c:1097
+#: ../libwnck/window-action-menu.c:1081
 msgid "Move to Workspace _Down"
 msgstr "Flytt til arbeidsområdet un_der"
 
-#: ../libwnck/window-action-menu.c:1100
+#: ../libwnck/window-action-menu.c:1084
 msgid "Move to Another _Workspace"
 msgstr "Flytt til et annet _arbeidsområde"
 
-#: ../libwnck/window-action-menu.c:1120
+#: ../libwnck/window-action-menu.c:1104
 msgid "_Close"
 msgstr "_Lukk"
 
@@ -192,16 +192,16 @@
 #. * The #WnckWindow objects are always owned by libwnck and must not be
 #. * referenced or unreferenced.
 #. 
-#: ../libwnck/window.c:50
+#: ../libwnck/window.c:49
 msgid "Untitled window"
 msgstr "Vindu uten tittel"
 
-#: ../libwnck/wnckprop.c:138
+#: ../libwnck/wnckprop.c:139
 msgid "X window ID of the window to examine or modify"
 msgstr "X-vindu ID for vinduet som skal undersøkes eller endres"
 
-#: ../libwnck/wnckprop.c:138 ../libwnck/wnckprop.c:145
-#: ../libwnck/wnckprop.c:155
+#: ../libwnck/wnckprop.c:139 ../libwnck/wnckprop.c:146
+#: ../libwnck/wnckprop.c:156
 msgid "XID"
 msgstr "XID"
 
@@ -209,41 +209,41 @@
 #. * group of windows, ie: if you have multiple windows in one
 #. * application, one window has some information about the application
 #. * (like the application name).
-#: ../libwnck/wnckprop.c:144
+#: ../libwnck/wnckprop.c:145
 msgid "X window ID of the group leader of an application to examine"
 msgstr "X-vindu ID for et programs gruppeleder som skal undersøkes"
 
 #. Translators: A class is like a "family". E.g., all gvim windows
 #. * are of the same class.
-#: ../libwnck/wnckprop.c:149
+#: ../libwnck/wnckprop.c:150
 msgid "Class resource of the class group to examine"
 msgstr "Klasseressurs for klassegruppen som skal undersøkes"
 
-#: ../libwnck/wnckprop.c:149
+#: ../libwnck/wnckprop.c:150
 msgid "CLASS"
 msgstr "KLASSE"
 
-#: ../libwnck/wnckprop.c:151
+#: ../libwnck/wnckprop.c:152
 msgid "NUMBER of the workspace to examine or modify"
 msgstr "NUMMER på arbeidsområdet som skal undersøkes eller endres"
 
-#: ../libwnck/wnckprop.c:151 ../libwnck/wnckprop.c:153
-#: ../libwnck/wnckprop.c:171 ../libwnck/wnckprop.c:173
-#: ../libwnck/wnckprop.c:175 ../libwnck/wnckprop.c:272
+#: ../libwnck/wnckprop.c:152 ../libwnck/wnckprop.c:154
+#: ../libwnck/wnckprop.c:172 ../libwnck/wnckprop.c:174
+#: ../libwnck/wnckprop.c:176 ../libwnck/wnckprop.c:273
 msgid "NUMBER"
 msgstr "ANTALL"
 
-#: ../libwnck/wnckprop.c:153
+#: ../libwnck/wnckprop.c:154
 msgid "NUMBER of the screen to examine or modify"
 msgstr "NUMMER på skjermen som skal undersøkes eller endres"
 
-#: ../libwnck/wnckprop.c:155
+#: ../libwnck/wnckprop.c:156
 msgid "Alias of --window"
 msgstr "Alias for --window"
 
 #. Translators: A class is like a "family". E.g., all gvim windows
 #. * are of the same class.
-#: ../libwnck/wnckprop.c:163
+#: ../libwnck/wnckprop.c:164
 msgid ""
 "List windows of the application/class group/workspace/screen (output format: "
 "\"XID: Window Name\")"
@@ -251,493 +251,523 @@
 "Vis liste med vinduer for program/klasse gruppe/arbeidsområde/skjerm "
 "(utdataformat: «XID: navn på vindu»)"
 
-#: ../libwnck/wnckprop.c:165
+#: ../libwnck/wnckprop.c:166
 msgid ""
 "List workspaces of the screen (output format: \"Number: Workspace Name\")"
 msgstr ""
 "Vis arbeidsområder for skjermen (utdataformat: «Nummer: navn på "
 "arbeidsområde»)"
 
-#: ../libwnck/wnckprop.c:171
+#: ../libwnck/wnckprop.c:172
 msgid "Change the number of workspaces of the screen to NUMBER"
 msgstr "Endre antall arbeidsområder på skjermen til TALL"
 
-#: ../libwnck/wnckprop.c:173
+#: ../libwnck/wnckprop.c:174
 msgid "Change the workspace layout of the screen to use NUMBER rows"
 msgstr ""
 "Endre utforming av arbeidsområde for skjermen til å bruke ANTALL rader"
 
-#: ../libwnck/wnckprop.c:175
+#: ../libwnck/wnckprop.c:176
 msgid "Change the workspace layout of the screen to use NUMBER columns"
 msgstr ""
 "Endre utforming av arbeidsområde for skjermen til å bruke ANTALL kolonner"
 
-#: ../libwnck/wnckprop.c:177
+#: ../libwnck/wnckprop.c:178
 msgid "Show the desktop"
 msgstr "Vis skrivebordet"
 
-#: ../libwnck/wnckprop.c:179
+#: ../libwnck/wnckprop.c:180
 msgid "Stop showing the desktop"
 msgstr "Ikke vis skrivebordet"
 
 #. Translators: 'viewport' is kind of the viewable area. A viewport
 #. * can be used to implement workspaces (e.g. compiz is an example);
 #. * however it is not just the current workspace.
-#: ../libwnck/wnckprop.c:184
+#: ../libwnck/wnckprop.c:185
 msgid "Move the viewport of the current workspace to X coordinate X"
 msgstr "Flytt visningsområde for aktivt arbeidsområde til X-koordinat X"
 
-#: ../libwnck/wnckprop.c:184 ../libwnck/wnckprop.c:274
+#: ../libwnck/wnckprop.c:185 ../libwnck/wnckprop.c:275
 msgid "X"
 msgstr "X"
 
 #. Translators: 'viewport' is kind of the viewable area. A viewport
 #. * can be used to implement workspaces (e.g. compiz is an example);
 #. * however it is not just the current workspace.
-#: ../libwnck/wnckprop.c:189
+#: ../libwnck/wnckprop.c:190
 msgid "Move the viewport of the current workspace to Y coordinate Y"
 msgstr "Flytt visningsområde for aktivt arbeidsområde til Y-koordinat Y"
 
-#: ../libwnck/wnckprop.c:189 ../libwnck/wnckprop.c:276
+#: ../libwnck/wnckprop.c:190 ../libwnck/wnckprop.c:277
 msgid "Y"
 msgstr "Y"
 
-#: ../libwnck/wnckprop.c:195
+#: ../libwnck/wnckprop.c:196
 msgid "Minimize the window"
 msgstr "Minimer vinduet"
 
-#: ../libwnck/wnckprop.c:197
+#: ../libwnck/wnckprop.c:198
 msgid "Unminimize the window"
 msgstr "Gjenopprett vinduet"
 
-#: ../libwnck/wnckprop.c:199
+#: ../libwnck/wnckprop.c:200
 msgid "Maximize the window"
 msgstr "Maksimer vinduet"
 
-#: ../libwnck/wnckprop.c:201
+#: ../libwnck/wnckprop.c:202
 msgid "Unmaximize the window"
 msgstr "Gjenopprett vinduet"
 
-#: ../libwnck/wnckprop.c:203
+#: ../libwnck/wnckprop.c:204
 msgid "Maximize horizontally the window"
 msgstr "Maksimer vinduet horisontalt"
 
-#: ../libwnck/wnckprop.c:205
+#: ../libwnck/wnckprop.c:206
 msgid "Unmaximize horizontally the window"
 msgstr "Gjenopprett vinduet horisontalt"
 
-#: ../libwnck/wnckprop.c:207
+#: ../libwnck/wnckprop.c:208
 msgid "Maximize vertically the window"
 msgstr "Maksimer vinduet vertikalt"
 
-#: ../libwnck/wnckprop.c:209
+#: ../libwnck/wnckprop.c:210
 msgid "Unmaximize vertically the window"
 msgstr "Gjenopprett vinduet vertikalt"
 
-#: ../libwnck/wnckprop.c:211
+#: ../libwnck/wnckprop.c:212
 msgid "Start moving the window via the keyboard"
 msgstr "Flytt vinduet med tastaturet"
 
-#: ../libwnck/wnckprop.c:213
+#: ../libwnck/wnckprop.c:214
 msgid "Start resizing the window via the keyboard"
 msgstr "Endre størrelse på vinduet med tastaturet"
 
-#: ../libwnck/wnckprop.c:215
+#: ../libwnck/wnckprop.c:216
 msgid "Activate the window"
 msgstr "Aktiver vinduet"
 
-#: ../libwnck/wnckprop.c:217
+#: ../libwnck/wnckprop.c:218
 msgid "Close the window"
 msgstr "Lukk vinduet"
 
-#: ../libwnck/wnckprop.c:220
+#: ../libwnck/wnckprop.c:221
 msgid "Make the window fullscreen"
 msgstr "Gjør vinduet fullskjerm"
 
-#: ../libwnck/wnckprop.c:222
+#: ../libwnck/wnckprop.c:223
 msgid "Make the window quit fullscreen mode"
 msgstr "La vinduet avslutte fullskjermmodus"
 
-#: ../libwnck/wnckprop.c:224
+#: ../libwnck/wnckprop.c:225
 msgid "Make the window always on top"
 msgstr "La vinduet alltid være øverst"
 
-#: ../libwnck/wnckprop.c:226
+#: ../libwnck/wnckprop.c:227
 msgid "Make the window not always on top"
 msgstr "La vinduet aldri være øverst"
 
-#: ../libwnck/wnckprop.c:228
+#: ../libwnck/wnckprop.c:229
 msgid "Make the window below other windows"
 msgstr "Plasser vinduet under andre vinduer"
 
-#: ../libwnck/wnckprop.c:230
+#: ../libwnck/wnckprop.c:231
 msgid "Make the window not below other windows"
 msgstr "Ikke plasser vinduet under andre vinduer"
 
-#: ../libwnck/wnckprop.c:232
+#: ../libwnck/wnckprop.c:233
 msgid "Shade the window"
 msgstr "Rull opp vinduet"
 
-#: ../libwnck/wnckprop.c:234
+#: ../libwnck/wnckprop.c:235
 msgid "Unshade the window"
 msgstr "Rull ned vinduet"
 
 #. Translators: 'viewport' is kind of the viewable area. A viewport
 #. * can be used to implement workspaces (e.g. compiz is an example);
 #. * however it is not just the current workspace.
-#: ../libwnck/wnckprop.c:239
+#: ../libwnck/wnckprop.c:240
 msgid "Make the window have a fixed position in the viewport"
 msgstr "Plassert vinduet med en fast plass i visningsområdet"
 
 #. Translators: 'viewport' is kind of the viewable area. A viewport
 #. * can be used to implement workspaces (e.g. compiz is an example);
 #. * however it is not just the current workspace.
-#: ../libwnck/wnckprop.c:244
+#: ../libwnck/wnckprop.c:245
 msgid "Make the window not have a fixed position in the viewport"
-msgstr ""
+msgstr "Ikke lås vinduet til en bestemt plassering på skjermen"
 
 #. Translators: A pager is the technical term for the workspace
 #. * switcher. It's a representation of all workspaces with windows
 #. * inside it. Please make sure that the translation is in sync with
 #. * gnome-panel, where this term is also used in translatable strings
 #. 
-#: ../libwnck/wnckprop.c:251
+#: ../libwnck/wnckprop.c:252
 msgid "Make the window not appear in pagers"
-msgstr ""
+msgstr "Ikke vis vinduet i skrivebordsoversikten"
 
 #. Translators: A pager is the technical term for the workspace
 #. * switcher. It's a representation of all workspaces with windows
 #. * inside it. Please make sure that the translation is in sync with
 #. * gnome-panel, where this term is also used in translatable strings
 #. 
-#: ../libwnck/wnckprop.c:258
+#: ../libwnck/wnckprop.c:259
 msgid "Make the window appear in pagers"
 msgstr "Gjør vinduet synlig i arbeidsområdebyttere"
 
 #. Translators: "tasklist" is the list of running applications (the
 #. * window list)
-#: ../libwnck/wnckprop.c:262
+#: ../libwnck/wnckprop.c:263
 msgid "Make the window not appear in tasklists"
 msgstr "Ikke gjør vinduet synlig i oppgavelisten"
 
 #. Translators: "tasklist" is the list of running applications (the
 #. * window list)
-#: ../libwnck/wnckprop.c:266
+#: ../libwnck/wnckprop.c:267
 msgid "Make the window appear in tasklists"
 msgstr "Gjør vinduet synlig i oppgavelisten"
 
-#: ../libwnck/wnckprop.c:268
+#: ../libwnck/wnckprop.c:269
 msgid "Make the window visible on all workspaces"
 msgstr "Gjør vinduet synlig på alle arbeidsområder"
 
-#: ../libwnck/wnckprop.c:270
+#: ../libwnck/wnckprop.c:271
 msgid "Make the window visible on the current workspace only"
 msgstr "Gjør vinduet synlig kun på aktivt arbeidsområde"
 
-#: ../libwnck/wnckprop.c:272
+#: ../libwnck/wnckprop.c:273
 msgid "Move the window to workspace NUMBER (first workspace is 0)"
 msgstr "Flytt vinduet til arbeidsområde TALL (første arbeidsområde er 0)"
 
-#: ../libwnck/wnckprop.c:274
+#: ../libwnck/wnckprop.c:275
 msgid "Change the X coordinate of the window to X"
 msgstr "Endre X-koordinaten for vinduet til X"
 
-#: ../libwnck/wnckprop.c:276
+#: ../libwnck/wnckprop.c:277
 msgid "Change the Y coordinate of the window to Y"
 msgstr "Endre Y-koordinaten for vinduet til Y"
 
-#: ../libwnck/wnckprop.c:278
+#: ../libwnck/wnckprop.c:279
 msgid "Change the width of the window to WIDTH"
 msgstr "Endre bredden på vinduet til BREDDE"
 
-#: ../libwnck/wnckprop.c:278
+#: ../libwnck/wnckprop.c:279
 msgid "WIDTH"
 msgstr "BREDDE"
 
-#: ../libwnck/wnckprop.c:280
+#: ../libwnck/wnckprop.c:281
 msgid "Change the height of the window to HEIGHT"
 msgstr "Endre høyden på vinduet til HØYDE"
 
-#: ../libwnck/wnckprop.c:280
+#: ../libwnck/wnckprop.c:281
 msgid "HEIGHT"
 msgstr "HØYDE"
 
 #. Translators: do not translate "normal, desktop, dock..."
-#: ../libwnck/wnckprop.c:283
+#: ../libwnck/wnckprop.c:284
 msgid ""
 "Change the type of the window to TYPE (valid values: normal, desktop, dock, "
 "dialog, toolbar, menu, utility, splash)"
 msgstr ""
+"Endre vindutypen til TYPE (gyldige verdier: normal, desktop, dock, dialog, "
+"toolbar, menu, utility, splash)"
 
-#: ../libwnck/wnckprop.c:283
+#: ../libwnck/wnckprop.c:284
 msgid "TYPE"
 msgstr "TYPE"
 
-#: ../libwnck/wnckprop.c:289
+#: ../libwnck/wnckprop.c:290
 msgid "Change the name of the workspace to NAME"
 msgstr "Endre navn på arbeidsområdet til NAVN"
 
-#: ../libwnck/wnckprop.c:289
+#: ../libwnck/wnckprop.c:290
 msgid "NAME"
 msgstr "NAVN"
 
-#: ../libwnck/wnckprop.c:291
+#: ../libwnck/wnckprop.c:292
 msgid "Activate the workspace"
 msgstr "Aktiver arbeidsområdet"
 
-#: ../libwnck/wnckprop.c:385 ../libwnck/wnckprop.c:409
-#: ../libwnck/wnckprop.c:445 ../libwnck/wnckprop.c:468
+#: ../libwnck/wnckprop.c:386 ../libwnck/wnckprop.c:410
+#: ../libwnck/wnckprop.c:446 ../libwnck/wnckprop.c:469
 #, c-format
 msgid "Invalid value \"%s\" for --%s"
 msgstr "Ugyldig verdi «%s» for --%s"
 
-#: ../libwnck/wnckprop.c:502 ../libwnck/wnckprop.c:521
+#: ../libwnck/wnckprop.c:503 ../libwnck/wnckprop.c:522
 #, c-format
 msgid ""
 "Conflicting options are present: screen %d should be interacted with, but --"
 "%s has been used\n"
 msgstr ""
+"Du bruker motstridende parametre. Skulle kommunisere med skjerm %d, men --%s "
+"er i bruk\n"
 
-#: ../libwnck/wnckprop.c:511
+#: ../libwnck/wnckprop.c:512
 #, c-format
 msgid ""
 "Conflicting options are present: windows or workspaces of screen %d should "
 "be listed, but --%s has been used\n"
 msgstr ""
+"Du bruker motstridende parametre. Skulle vise vinduer eller arbeidsområder "
+"på skjerm %d, men --%s er i bruk\n"
 
-#: ../libwnck/wnckprop.c:534 ../libwnck/wnckprop.c:554
+#: ../libwnck/wnckprop.c:535 ../libwnck/wnckprop.c:555
 #, c-format
 msgid ""
 "Conflicting options are present: workspace %d should be interacted with, but "
 "--%s has been used\n"
 msgstr ""
+"Du bruker motstridende parametre. Skulle kommunisere med arbeidsområde %d, "
+"men --%s er i bruk\n"
 
-#: ../libwnck/wnckprop.c:544
+#: ../libwnck/wnckprop.c:545
 #, c-format
 msgid ""
 "Conflicting options are present: windows of workspace %d should be listed, "
 "but --%s has been used\n"
 msgstr ""
+"Du bruker motstridende parametre. Skulle liste opp vinduer på arbeidsområde "
+"%d, men --%s er i bruk\n"
 
-#: ../libwnck/wnckprop.c:566
+#: ../libwnck/wnckprop.c:567
 #, c-format
 msgid ""
 "Conflicting options are present: an application should be interacted with, "
 "but --%s has been used\n"
 msgstr ""
+"Du bruker motstridende parametre. Skulle kommunisere med et program, men --"
+"%s er i bruk\n"
 
-#: ../libwnck/wnckprop.c:576
+#: ../libwnck/wnckprop.c:577
 #, c-format
 msgid ""
 "Conflicting options are present: windows of an application should be listed, "
 "but --%s has been used\n"
 msgstr ""
+"Du bruker motstridende parametre. Skulle liste opp vinduet til et program, "
+"men --%s er i bruk\n"
 
 #. Translators: A class is like a "family". E.g., all gvim windows
 #. * are of the same class.
-#: ../libwnck/wnckprop.c:590
+#: ../libwnck/wnckprop.c:591
 #, c-format
 msgid ""
 "Conflicting options are present: class group \"%s\" should be interacted "
 "with, but --%s has been used\n"
 msgstr ""
+"Du bruker motstridende parametre. Skulle kommunisere med gruppa «%s», men --"
+"%s er i bruk\n"
 
 #. Translators: A class is like a "family". E.g., all gvim windows
 #. * are of the same class.
-#: ../libwnck/wnckprop.c:602
+#: ../libwnck/wnckprop.c:603
 #, c-format
 msgid ""
 "Conflicting options are present: windows of class group \"%s\" should be "
 "listed, but --%s has been used\n"
 msgstr ""
+"Du bruker motstridende parametre. Skulle liste opp vinduer i gruppa «%s», "
+"men --%s er i bruk\n"
 
-#: ../libwnck/wnckprop.c:614 ../libwnck/wnckprop.c:623
+#: ../libwnck/wnckprop.c:615 ../libwnck/wnckprop.c:624
 #, c-format
 msgid ""
 "Conflicting options are present: a window should be interacted with, but --"
 "%s has been used\n"
 msgstr ""
+"Du bruker motstridende parametre. Skulle kommunisere med et vindu, men --%s "
+"er i bruk\n"
 
-#: ../libwnck/wnckprop.c:642 ../libwnck/wnckprop.c:723
-#: ../libwnck/wnckprop.c:770
+#: ../libwnck/wnckprop.c:643 ../libwnck/wnckprop.c:724
+#: ../libwnck/wnckprop.c:771
 #, c-format
 msgid "Conflicting options are present: --%s and --%s\n"
 msgstr ""
+"Du bruker parametrene --%s og --%s, som er i konflikt med hverandre\n"
 
-#: ../libwnck/wnckprop.c:681
+#: ../libwnck/wnckprop.c:682
 #, c-format
 msgid ""
 "Invalid argument \"%d\" for --%s: the argument must be strictly positive\n"
-msgstr ""
+msgstr "Argumentet «%d» er ugyldig for --%s. Argumentet må være positivt\n"
 
-#: ../libwnck/wnckprop.c:694
+#: ../libwnck/wnckprop.c:695
 #, c-format
 msgid "Invalid argument \"%d\" for --%s: the argument must be positive\n"
-msgstr ""
+msgstr "Argumentet «%d» er ugyldig for --%s. Argumentet må være negativt\n"
 
-#: ../libwnck/wnckprop.c:789
+#: ../libwnck/wnckprop.c:790
 #, c-format
 msgid "Conflicting options are present: --%s or --%s, and --%s\n"
 msgstr ""
+"Du bruker parametrene --%s eller --%s, og --%s, som er i konflikt med "
+"hverandre\n"
 
-#: ../libwnck/wnckprop.c:821
+#: ../libwnck/wnckprop.c:822
 #, c-format
 msgid "Invalid argument \"%s\" for --%s, valid values are: %s\n"
-msgstr ""
+msgstr "Argumentet «%s» er ugyldig for --%s. Gyldige verdier er: %s\n"
 
-#: ../libwnck/wnckprop.c:864
+#: ../libwnck/wnckprop.c:865
 #, c-format
 msgid ""
 "Cannot change the workspace layout on the screen: the layout is already "
 "owned\n"
 msgstr ""
+"Kan ikke endre utseende på synlig arbeidsområde. Utseendet er allerede i "
+"bruk\n"
 
 #. Translators: 'viewport' is kind of the viewable area. A viewport
 #. * can be used to implement workspaces (e.g. compiz is an example);
 #. * however it is not just the current workspace.
-#: ../libwnck/wnckprop.c:899
+#: ../libwnck/wnckprop.c:900
 #, c-format
 msgid ""
 "Viewport cannot be moved: the current workspace does not contain a viewport\n"
 msgstr ""
+"Arbeidsområdet kan ikke flyttes. Gjeldende arbeidsområde inneholder ikke et "
+"synsfelt\n"
 
 #. Translators: 'viewport' is kind of the viewable area. A viewport
 #. * can be used to implement workspaces (e.g. compiz is an example);
 #. * however it is not just the current workspace.
-#: ../libwnck/wnckprop.c:906
+#: ../libwnck/wnckprop.c:907
 #, c-format
 msgid "Viewport cannot be moved: there is no current workspace\n"
-msgstr ""
+msgstr "Synsfeltet kan ikke flyttes. Det er ikke et aktivt arbeidsområde\n"
 
 #. FIXME: why do we have dual & boolean API. This is not consistent!
-#: ../libwnck/wnckprop.c:942 ../libwnck/wnckprop.c:951
-#: ../libwnck/wnckprop.c:960 ../libwnck/wnckprop.c:967
-#: ../libwnck/wnckprop.c:977 ../libwnck/wnckprop.c:984
-#: ../libwnck/wnckprop.c:993 ../libwnck/wnckprop.c:1042
+#: ../libwnck/wnckprop.c:943 ../libwnck/wnckprop.c:952
+#: ../libwnck/wnckprop.c:961 ../libwnck/wnckprop.c:968
+#: ../libwnck/wnckprop.c:978 ../libwnck/wnckprop.c:985
+#: ../libwnck/wnckprop.c:994 ../libwnck/wnckprop.c:1043
 #, c-format
 msgid "Action not allowed\n"
 msgstr "Handling ikke tillatt\n"
 
-#: ../libwnck/wnckprop.c:1038
+#: ../libwnck/wnckprop.c:1039
 #, c-format
 msgid ""
 "Window cannot be moved to workspace %d: the workspace does not exist\n"
 msgstr ""
+"Vinduet kan ikke flyttes til arbeidsflate %d. Arbeidsflaten finnes ikke\n"
 
 #. Translators: 'unset' in the sense of "something has not been set".
-#: ../libwnck/wnckprop.c:1102 ../libwnck/wnckprop.c:1234
+#: ../libwnck/wnckprop.c:1103 ../libwnck/wnckprop.c:1235
 msgid "<name unset>"
 msgstr "<navn ikke satt>"
 
 #. Translators: %lu is a window number and %s a window name
-#: ../libwnck/wnckprop.c:1105
+#: ../libwnck/wnckprop.c:1106
 #, c-format
 msgid "%lu: %s\n"
 msgstr "%lu: %s\n"
 
 #. Translators: %d is a workspace number and %s a workspace name
-#: ../libwnck/wnckprop.c:1125
+#: ../libwnck/wnckprop.c:1126
 #, c-format
 msgid "%d: %s\n"
 msgstr "%d: %s\n"
 
-#: ../libwnck/wnckprop.c:1188
+#: ../libwnck/wnckprop.c:1189
 #, c-format
 msgid "Screen Number: %d\n"
 msgstr "Skjermnummer: %d\n"
 
-#: ../libwnck/wnckprop.c:1190 ../libwnck/wnckprop.c:1271
+#: ../libwnck/wnckprop.c:1191 ../libwnck/wnckprop.c:1272
 #, c-format
 msgid "Geometry (width, height): %d, %d\n"
 msgstr "Geometri (bredde, høyd): %d, %d\n"
 
-#: ../libwnck/wnckprop.c:1194
+#: ../libwnck/wnckprop.c:1195
 #, c-format
 msgid "Number of Workspaces: %d\n"
 msgstr "Antall arbeidsområder: %d\n"
 
-#: ../libwnck/wnckprop.c:1200
+#: ../libwnck/wnckprop.c:1201
 #, c-format
 msgid "Workspace Layout (rows, columns, orientation): %d, %d, %s\n"
 msgstr ""
+"Arbeidsflatens utseende (rader, kolonner, syns- og utskriftsretning): %d, "
+"%d, %s\n"
 
-#: ../libwnck/wnckprop.c:1210 ../libwnck/wnckprop.c:1267
-#: ../libwnck/wnckprop.c:1464
+#: ../libwnck/wnckprop.c:1211 ../libwnck/wnckprop.c:1268
+#: ../libwnck/wnckprop.c:1465
 msgid "<no EWMH-compliant window manager>"
-msgstr ""
+msgstr "<ingen vindusbehandler som støtter EWMH>"
 
-#: ../libwnck/wnckprop.c:1211
+#: ../libwnck/wnckprop.c:1212
 #, c-format
 msgid "Window Manager: %s\n"
 msgstr "Vindushåndterer: %s\n"
 
 #. Translators: %d is a workspace number and %s a workspace name
-#: ../libwnck/wnckprop.c:1216 ../libwnck/wnckprop.c:1297
-#: ../libwnck/wnckprop.c:1309 ../libwnck/wnckprop.c:1321
-#: ../libwnck/wnckprop.c:1333 ../libwnck/wnckprop.c:1449
+#: ../libwnck/wnckprop.c:1217 ../libwnck/wnckprop.c:1298
+#: ../libwnck/wnckprop.c:1310 ../libwnck/wnckprop.c:1322
+#: ../libwnck/wnckprop.c:1334 ../libwnck/wnckprop.c:1450
 #, c-format
 msgid "%d (\"%s\")"
 msgstr "%d («%s»)"
 
 #. Translators: "none" here means "no workspace"
-#: ../libwnck/wnckprop.c:1221 ../libwnck/wnckprop.c:1302
-#: ../libwnck/wnckprop.c:1314 ../libwnck/wnckprop.c:1326
-#: ../libwnck/wnckprop.c:1338 ../libwnck/wnckprop.c:1456
+#: ../libwnck/wnckprop.c:1222 ../libwnck/wnckprop.c:1303
+#: ../libwnck/wnckprop.c:1315 ../libwnck/wnckprop.c:1327
+#: ../libwnck/wnckprop.c:1339 ../libwnck/wnckprop.c:1457
 msgctxt "workspace"
 msgid "none"
 msgstr "ingen"
 
-#: ../libwnck/wnckprop.c:1222
+#: ../libwnck/wnckprop.c:1223
 #, c-format
 msgid "Active Workspace: %s\n"
 msgstr "Aktivt arbeidsområde: %s\n"
 
-#: ../libwnck/wnckprop.c:1231
+#: ../libwnck/wnckprop.c:1232
 #, c-format
 msgid "\"%s\""
 msgstr "«%s»"
 
 #. Translators: %lu is a window identifier (number) and %s a window name
-#: ../libwnck/wnckprop.c:1237
+#: ../libwnck/wnckprop.c:1238
 #, c-format
 msgid "%lu (%s)"
 msgstr "%lu (%s)"
 
 #. Translators: "none" here means "no window"
-#: ../libwnck/wnckprop.c:1243
+#: ../libwnck/wnckprop.c:1244
 msgctxt "window"
 msgid "none"
 msgstr "ingen"
 
-#: ../libwnck/wnckprop.c:1244
+#: ../libwnck/wnckprop.c:1245
 #, c-format
 msgid "Active Window: %s\n"
 msgstr "Aktivt vindu: %s\n"
 
-#: ../libwnck/wnckprop.c:1247
+#: ../libwnck/wnckprop.c:1248
 #, c-format
 msgid "Showing the desktop: %s\n"
 msgstr "Viser skrivebordet: %s\n"
 
-#: ../libwnck/wnckprop.c:1249
+#: ../libwnck/wnckprop.c:1250
 msgid "true"
 msgstr "sann"
 
-#: ../libwnck/wnckprop.c:1249
+#: ../libwnck/wnckprop.c:1250
 msgid "false"
 msgstr "usnn"
 
-#: ../libwnck/wnckprop.c:1260
+#: ../libwnck/wnckprop.c:1261
 #, c-format
 msgid "Workspace Name: %s\n"
 msgstr "Navn på arbeidsområde: %s\n"
 
-#: ../libwnck/wnckprop.c:1261
+#: ../libwnck/wnckprop.c:1262
 #, c-format
 msgid "Workspace Number: %d\n"
 msgstr "Arbeidsområde nummer: %d\n"
 
-#: ../libwnck/wnckprop.c:1268 ../libwnck/wnckprop.c:1465
+#: ../libwnck/wnckprop.c:1269 ../libwnck/wnckprop.c:1466
 #, c-format
 msgid "On Screen: %d (Window Manager: %s)\n"
 msgstr "På skjerm: %d (Vindushåndterer: %s)\n"
@@ -745,158 +775,159 @@
 #. Translators: 'viewport' is kind of the viewable area. A viewport can be
 #. * used to implement workspaces (e.g. compiz is an example); however it is
 #. * not just the current workspace.
-#: ../libwnck/wnckprop.c:1283
+#: ../libwnck/wnckprop.c:1284
 msgid "<no viewport>"
 msgstr "<ikke noe visningområde>"
 
 #. Translators: 'viewport' is kind of the viewable area. A viewport can be
 #. * used to implement workspaces (e.g. compiz is an example); however it is
 #. * not just the current workspace.
-#: ../libwnck/wnckprop.c:1287
+#: ../libwnck/wnckprop.c:1288
 #, c-format
 msgid "Viewport position (x, y): %s\n"
-msgstr ""
+msgstr "Synsfeltets posisjon (x, y): %s\n"
 
-#: ../libwnck/wnckprop.c:1290
+#: ../libwnck/wnckprop.c:1291
 #, c-format
 msgid "Position in Layout (row, column): %d, %d\n"
-msgstr ""
+msgstr "Posisjoin i utforming (rad, kolonne): %d %d\n"
 
-#: ../libwnck/wnckprop.c:1303
+#: ../libwnck/wnckprop.c:1304
 #, c-format
 msgid "Left Neighbor: %s\n"
 msgstr "Venstre nabo: %s\n"
 
-#: ../libwnck/wnckprop.c:1315
+#: ../libwnck/wnckprop.c:1316
 #, c-format
 msgid "Right Neighbor: %s\n"
 msgstr "Høyre nabo: %s\n"
 
-#: ../libwnck/wnckprop.c:1327
+#: ../libwnck/wnckprop.c:1328
 #, c-format
 msgid "Top Neighbor: %s\n"
 msgstr "Øverste nabo: %s\n"
 
-#: ../libwnck/wnckprop.c:1339
+#: ../libwnck/wnckprop.c:1340
 #, c-format
 msgid "Bottom Neighbor: %s\n"
 msgstr "Nederste nabo: %s\n"
 
 #. Translators: A class is like a "family". E.g., all gvim windows are of the
 #. * same class.
-#: ../libwnck/wnckprop.c:1352 ../libwnck/wnckprop.c:1511
+#: ../libwnck/wnckprop.c:1353 ../libwnck/wnckprop.c:1512
 #, c-format
 msgid "Class Group ID: %s\n"
 msgstr "Klassegruppe-ID: %s\n"
 
 #. Translators: A class is like a "family". E.g., all gvim windows are of the
 #. * same class.
-#: ../libwnck/wnckprop.c:1356
+#: ../libwnck/wnckprop.c:1357
 #, c-format
 msgid "Class Group Name: %s\n"
 msgstr "Klassegruppenavn: %s\n"
 
 #. Translators: 'set' in the sense of "something has been set".
-#: ../libwnck/wnckprop.c:1362 ../libwnck/wnckprop.c:1386
-#: ../libwnck/wnckprop.c:1440
+#: ../libwnck/wnckprop.c:1363 ../libwnck/wnckprop.c:1387
+#: ../libwnck/wnckprop.c:1441
 msgid "set"
 msgstr "satt"
 
 #. Translators: 'unset' in the sense of "something has not been set".
-#: ../libwnck/wnckprop.c:1365 ../libwnck/wnckprop.c:1389
-#: ../libwnck/wnckprop.c:1396 ../libwnck/wnckprop.c:1426
-#: ../libwnck/wnckprop.c:1433 ../libwnck/wnckprop.c:1443
-#: ../libwnck/wnckprop.c:1508 ../libwnck/wnckprop.c:1517
-#: ../libwnck/wnckprop.c:1529 ../libwnck/wnckprop.c:1537
+#: ../libwnck/wnckprop.c:1366 ../libwnck/wnckprop.c:1390
+#: ../libwnck/wnckprop.c:1397 ../libwnck/wnckprop.c:1427
+#: ../libwnck/wnckprop.c:1434 ../libwnck/wnckprop.c:1444
+#: ../libwnck/wnckprop.c:1509 ../libwnck/wnckprop.c:1518
+#: ../libwnck/wnckprop.c:1530 ../libwnck/wnckprop.c:1538
+#: ../libwnck/wnckprop.c:1545
 msgid "<unset>"
 msgstr "<ikke satt>"
 
-#: ../libwnck/wnckprop.c:1366 ../libwnck/wnckprop.c:1390
-#: ../libwnck/wnckprop.c:1444
+#: ../libwnck/wnckprop.c:1367 ../libwnck/wnckprop.c:1391
+#: ../libwnck/wnckprop.c:1445
 #, c-format
 msgid "Icons: %s\n"
 msgstr "Ikoner: %s\n"
 
-#: ../libwnck/wnckprop.c:1369 ../libwnck/wnckprop.c:1407
+#: ../libwnck/wnckprop.c:1370 ../libwnck/wnckprop.c:1408
 #, c-format
 msgid "Number of Windows: %d\n"
 msgstr "Antall vinduer: %d\n"
 
-#: ../libwnck/wnckprop.c:1381 ../libwnck/wnckprop.c:1427
+#: ../libwnck/wnckprop.c:1382 ../libwnck/wnckprop.c:1428
 #, c-format
 msgid "Name: %s\n"
 msgstr "Navn: %s\n"
 
 #. Translators: note that "Icon" here has a specific window
 #. * management-related meaning. It means minimized.
-#: ../libwnck/wnckprop.c:1382 ../libwnck/wnckprop.c:1436
+#: ../libwnck/wnckprop.c:1383 ../libwnck/wnckprop.c:1437
 #, c-format
 msgid "Icon Name: %s\n"
 msgstr "Ikonnavn: %s\n"
 
-#: ../libwnck/wnckprop.c:1397 ../libwnck/wnckprop.c:1530
+#: ../libwnck/wnckprop.c:1398 ../libwnck/wnckprop.c:1531
 #, c-format
 msgid "PID: %s\n"
 msgstr "PID: %s\n"
 
 #. Translators: "none" here means "no startup ID"
-#: ../libwnck/wnckprop.c:1404
+#: ../libwnck/wnckprop.c:1405
 msgctxt "startupID"
 msgid "none"
 msgstr "ingen"
 
-#: ../libwnck/wnckprop.c:1405
+#: ../libwnck/wnckprop.c:1406
 #, c-format
 msgid "Startup ID: %s\n"
 msgstr "Oppstarts-ID: %s\n"
 
-#: ../libwnck/wnckprop.c:1453
+#: ../libwnck/wnckprop.c:1454
 msgid "all workspaces"
 msgstr "alle arbeidsområder"
 
-#: ../libwnck/wnckprop.c:1457
+#: ../libwnck/wnckprop.c:1458
 #, c-format
 msgid "On Workspace: %s\n"
 msgstr "På arbeidsområde %s\n"
 
-#: ../libwnck/wnckprop.c:1472
+#: ../libwnck/wnckprop.c:1473
 msgid "normal window"
 msgstr "normalt vindu"
 
-#: ../libwnck/wnckprop.c:1475
+#: ../libwnck/wnckprop.c:1476
 msgid "desktop"
 msgstr "skrivebord"
 
-#: ../libwnck/wnckprop.c:1478
+#: ../libwnck/wnckprop.c:1479
 msgid "dock or panel"
 msgstr "dokk eller panel"
 
-#: ../libwnck/wnckprop.c:1481
+#: ../libwnck/wnckprop.c:1482
 msgid "dialog window"
 msgstr "dialogvindu"
 
-#: ../libwnck/wnckprop.c:1484
+#: ../libwnck/wnckprop.c:1485
 msgid "tearoff toolbar"
 msgstr "avtagbar verktøylinje"
 
-#: ../libwnck/wnckprop.c:1487
+#: ../libwnck/wnckprop.c:1488
 msgid "tearoff menu"
 msgstr "avtagbar meny"
 
-#: ../libwnck/wnckprop.c:1490
+#: ../libwnck/wnckprop.c:1491
 msgid "utility window"
 msgstr "verktøyvindu"
 
-#: ../libwnck/wnckprop.c:1493
+#: ../libwnck/wnckprop.c:1494
 msgid "splash screen"
 msgstr "oppstartsskjerm"
 
-#: ../libwnck/wnckprop.c:1498
+#: ../libwnck/wnckprop.c:1499
 #, c-format
 msgid "Window Type: %s\n"
 msgstr "Type vindu: %s\n"
 
-#: ../libwnck/wnckprop.c:1501
+#: ../libwnck/wnckprop.c:1502
 #, c-format
 msgid "Geometry (x, y, width, height): %d, %d, %d, %d\n"
 msgstr "Geometri (x, y, bredde, høyde): %d, %d, %d, %d\n"
@@ -904,17 +935,17 @@
 #. Translators: A class is like a "family". E.g., all gvim windows are of the
 #. * same class. The class instance is a way to differentiate windows belonging
 #. * to the same class group.
-#: ../libwnck/wnckprop.c:1521
+#: ../libwnck/wnckprop.c:1522
 #, c-format
 msgid "Class Instance: %s\n"
 msgstr "Klasseinstans: %s\n"
 
-#: ../libwnck/wnckprop.c:1523
+#: ../libwnck/wnckprop.c:1524
 #, c-format
 msgid "XID: %lu\n"
 msgstr "XID: %lu\n"
 
-#: ../libwnck/wnckprop.c:1538
+#: ../libwnck/wnckprop.c:1539
 #, c-format
 msgid "Session ID: %s\n"
 msgstr "Sesjons-ID: %s\n"
@@ -923,14 +954,14 @@
 #. * of windows, ie: if you have multiple windows in one application, one
 #. * window has some information about the application (like the application
 #. * name).
-#: ../libwnck/wnckprop.c:1545
+#: ../libwnck/wnckprop.c:1553
 #, c-format
 msgid "Group Leader: %lu\n"
 msgstr "Gruppeleder: %lu\n"
 
 #. Translators: A window can be transient for another window: it means it's
 #. * on top of it
-#: ../libwnck/wnckprop.c:1551
+#: ../libwnck/wnckprop.c:1559
 #, c-format
 msgid "Transient for: %lu\n"
 msgstr "Transient for: %lu\n"
@@ -938,57 +969,57 @@
 #. FIXME: else print something?
 #. Translators: we're building a list of items here.             * For example, the result is "a, b".                            * In this case, the first string is "a", the second             * string is ", " and the third string is "b".                   * We can then use this information here to also                 * recursively build longer lists, like "a, b, c, d"
 #. Translators: we're building a list of items here.             * The end result is something like "a, b, c"                    * In this case, the first string is "a, b", the second          * string is ", " and the third string is "c"
-#: ../libwnck/wnckprop.c:1566 ../libwnck/wnckprop.c:1614
+#: ../libwnck/wnckprop.c:1574 ../libwnck/wnckprop.c:1622
 #, c-format
 msgid "%1$s%2$s%3$s"
 msgstr "%1$s%2$s%3$s"
 
 #. Translators: see comment for "%1$s%2$s%3$s" in order          * to properly translate this
-#: ../libwnck/wnckprop.c:1570 ../libwnck/wnckprop.c:1616
+#: ../libwnck/wnckprop.c:1578 ../libwnck/wnckprop.c:1624
 msgid ", "
 msgstr ", "
 
-#: ../libwnck/wnckprop.c:1576
+#: ../libwnck/wnckprop.c:1584
 msgid "minimized"
 msgstr "minimert"
 
-#: ../libwnck/wnckprop.c:1577
+#: ../libwnck/wnckprop.c:1585
 msgid "maximized"
 msgstr "maksimert"
 
-#: ../libwnck/wnckprop.c:1581
+#: ../libwnck/wnckprop.c:1589
 msgid "maximized horizontally"
 msgstr "maksimert horisontalt"
 
-#: ../libwnck/wnckprop.c:1583
+#: ../libwnck/wnckprop.c:1591
 msgid "maximized vertically"
 msgstr "maksimert vertikalt"
 
-#: ../libwnck/wnckprop.c:1585
+#: ../libwnck/wnckprop.c:1593
 msgid "shaded"
 msgstr "rullet opp"
 
-#: ../libwnck/wnckprop.c:1586
+#: ../libwnck/wnckprop.c:1594
 msgid "pinned"
 msgstr "festet"
 
-#: ../libwnck/wnckprop.c:1587
+#: ../libwnck/wnckprop.c:1595
 msgid "sticky"
 msgstr "klebrig"
 
-#: ../libwnck/wnckprop.c:1588
+#: ../libwnck/wnckprop.c:1596
 msgid "above"
 msgstr "over"
 
-#: ../libwnck/wnckprop.c:1589
+#: ../libwnck/wnckprop.c:1597
 msgid "below"
 msgstr "under"
 
-#: ../libwnck/wnckprop.c:1590
+#: ../libwnck/wnckprop.c:1598
 msgid "fullscreen"
 msgstr "fullskjerm"
 
-#: ../libwnck/wnckprop.c:1591
+#: ../libwnck/wnckprop.c:1599
 msgid "needs attention"
 msgstr "trenger oppmerksomhet"
 
@@ -996,177 +1027,181 @@
 #. * It's a representation of all workspaces with windows inside it.
 #. * Please make sure that the translation is in sync with gnome-panel,
 #. * where this term is also used in translatable strings
-#: ../libwnck/wnckprop.c:1596
+#: ../libwnck/wnckprop.c:1604
 msgid "skip pager"
 msgstr "hopp over arbeidsområdebytter"
 
 #. Translators: "tasklist" is the list of running applications (the window
 #. * list)
-#: ../libwnck/wnckprop.c:1599
+#: ../libwnck/wnckprop.c:1607
 msgid "skip tasklist"
 msgstr "hopp over oppgaveliste"
 
-#: ../libwnck/wnckprop.c:1601
+#: ../libwnck/wnckprop.c:1609
 msgid "normal"
 msgstr "normal"
 
-#: ../libwnck/wnckprop.c:1602
+#: ../libwnck/wnckprop.c:1610
 #, c-format
 msgid "State: %s\n"
 msgstr "Tilstand: %s\n"
 
-#: ../libwnck/wnckprop.c:1623
+#: ../libwnck/wnckprop.c:1631
 msgid "move"
 msgstr "flytt"
 
-#: ../libwnck/wnckprop.c:1624
+#: ../libwnck/wnckprop.c:1632
 msgid "resize"
 msgstr "endre størrelse"
 
-#: ../libwnck/wnckprop.c:1625
+#: ../libwnck/wnckprop.c:1633
 msgid "shade"
 msgstr "rull opp"
 
-#: ../libwnck/wnckprop.c:1626
+#: ../libwnck/wnckprop.c:1634
 msgid "unshade"
 msgstr "rull ned"
 
-#: ../libwnck/wnckprop.c:1627
+#: ../libwnck/wnckprop.c:1635
 msgid "stick"
 msgstr "fest"
 
-#: ../libwnck/wnckprop.c:1628
+#: ../libwnck/wnckprop.c:1636
 msgid "unstick"
 msgstr "løsne"
 
-#: ../libwnck/wnckprop.c:1630
+#: ../libwnck/wnckprop.c:1638
 msgid "maximize horizontally"
 msgstr "maksimer horisontalt"
 
-#: ../libwnck/wnckprop.c:1632
+#: ../libwnck/wnckprop.c:1640
 msgid "unmaximize horizontally"
 msgstr "gjenopprett horisontalt"
 
-#: ../libwnck/wnckprop.c:1634
+#: ../libwnck/wnckprop.c:1642
 msgid "maximize vertically"
 msgstr "maksimer vertikalt"
 
-#: ../libwnck/wnckprop.c:1636
+#: ../libwnck/wnckprop.c:1644
 msgid "unmaximize vertically"
 msgstr "gjenopprett vertikalt"
 
-#: ../libwnck/wnckprop.c:1639
+#: ../libwnck/wnckprop.c:1647
 msgid "change workspace"
 msgstr "endre arbeidsområde"
 
-#: ../libwnck/wnckprop.c:1641
+#: ../libwnck/wnckprop.c:1649
 msgid "pin"
 msgstr "fest"
 
-#: ../libwnck/wnckprop.c:1643
+#: ../libwnck/wnckprop.c:1651
 msgid "unpin"
 msgstr "løsne"
 
-#: ../libwnck/wnckprop.c:1644
+#: ../libwnck/wnckprop.c:1652
 msgid "minimize"
 msgstr "minimer"
 
-#: ../libwnck/wnckprop.c:1645
+#: ../libwnck/wnckprop.c:1653
 msgid "unminimize"
 msgstr "gjenopprett"
 
-#: ../libwnck/wnckprop.c:1646
+#: ../libwnck/wnckprop.c:1654
 msgid "maximize"
 msgstr "maksimer"
 
-#: ../libwnck/wnckprop.c:1647
+#: ../libwnck/wnckprop.c:1655
 msgid "unmaximize"
 msgstr "gjenopprett"
 
-#: ../libwnck/wnckprop.c:1649
+#: ../libwnck/wnckprop.c:1657
 msgid "change fullscreen mode"
 msgstr "endre fullskjermmodus"
 
-#: ../libwnck/wnckprop.c:1650
+#: ../libwnck/wnckprop.c:1658
 msgid "close"
 msgstr "lukk"
 
-#: ../libwnck/wnckprop.c:1652
+#: ../libwnck/wnckprop.c:1660
 msgid "make above"
 msgstr "plasser over"
 
-#: ../libwnck/wnckprop.c:1654
+#: ../libwnck/wnckprop.c:1662
 msgid "unmake above"
 msgstr "ikke plasser over"
 
-#: ../libwnck/wnckprop.c:1656
+#: ../libwnck/wnckprop.c:1664
 msgid "make below"
 msgstr "plasser under"
 
-#: ../libwnck/wnckprop.c:1658
+#: ../libwnck/wnckprop.c:1666
 msgid "unmake below"
 msgstr "ikke plasser under"
 
-#: ../libwnck/wnckprop.c:1660
+#: ../libwnck/wnckprop.c:1668
 msgid "no action possible"
 msgstr "ingen handling mulig"
 
-#: ../libwnck/wnckprop.c:1661
+#: ../libwnck/wnckprop.c:1669
 #, c-format
 msgid "Possible Actions: %s\n"
 msgstr "Mulige handlinger: %s\n"
 
-#: ../libwnck/wnckprop.c:1842
+#: ../libwnck/wnckprop.c:1901
 msgid ""
 "Print or modify the properties of a screen/workspace/window, or interact "
 "with it, following the EWMH specification.\n"
 "For information about this specification, see:\n"
 "\thttp://freedesktop.org/wiki/Specifications/wm-spec"
 msgstr ""
+"Skriv ut eller endre egenskapene på en visning, arbeidsflate eller vindu, "
+"eller kommuniser med det i henhold til EWMH-spesifikasjonen.\n"
+"For mer informasjon om spesifikasjonen, besøk denne nettsiden:\n"
+"\thttp://freedesktop.org/wiki/Specifications/wm-spec"
 
-#: ../libwnck/wnckprop.c:1852
+#: ../libwnck/wnckprop.c:1911
 msgid "Options to list windows or workspaces"
 msgstr "Alternativer for visning av vinduer eller arbeidsområder"
 
-#: ../libwnck/wnckprop.c:1853
+#: ../libwnck/wnckprop.c:1912
 msgid "Show options to list windows or workspaces"
 msgstr "Vis alternativ for å vise vinduer eller arbeidsområder"
 
-#: ../libwnck/wnckprop.c:1860
+#: ../libwnck/wnckprop.c:1919
 msgid "Options to modify properties of a window"
 msgstr "Alternativer for å endre egenskaper for et vindu"
 
-#: ../libwnck/wnckprop.c:1861
+#: ../libwnck/wnckprop.c:1920
 msgid "Show options to modify properties of a window"
 msgstr "Vis alternativer for å endre egenskaper for et vindu"
 
-#: ../libwnck/wnckprop.c:1868
+#: ../libwnck/wnckprop.c:1927
 msgid "Options to modify properties of a workspace"
 msgstr "Alternativer for å endre egenskaper for et arbeidsområde"
 
-#: ../libwnck/wnckprop.c:1869
+#: ../libwnck/wnckprop.c:1928
 msgid "Show options to modify properties of a workspace"
 msgstr "Vis alternativer for å endre egenskaper for et arbeidsområde"
 
-#: ../libwnck/wnckprop.c:1876
+#: ../libwnck/wnckprop.c:1935
 msgid "Options to modify properties of a screen"
 msgstr "Alternativer for å endre egenskaper for en skjerm"
 
-#: ../libwnck/wnckprop.c:1877
+#: ../libwnck/wnckprop.c:1936
 msgid "Show options to modify properties of a screen"
 msgstr "Vis alternativer for å endre egenskaper for en skjerm"
 
-#: ../libwnck/wnckprop.c:1888
+#: ../libwnck/wnckprop.c:1947
 #, c-format
 msgid "Error while parsing arguments: %s\n"
 msgstr "Feil under lesing av argumenter: %s\n"
 
-#: ../libwnck/wnckprop.c:1911
+#: ../libwnck/wnckprop.c:1970
 #, c-format
 msgid "Cannot interact with screen %d: the screen does not exist\n"
 msgstr "Kan ikke kommunisere med skjerm %d: skjermen eksisterer ikke\n"
 
-#: ../libwnck/wnckprop.c:1967
+#: ../libwnck/wnckprop.c:2026
 #, c-format
 msgid "Cannot interact with workspace %d: the workspace cannot be found\n"
 msgstr ""
@@ -1174,7 +1209,7 @@
 
 #. Translators: A class is like a "family". E.g., all gvim windows are
 #. * of the same class.
-#: ../libwnck/wnckprop.c:1991
+#: ../libwnck/wnckprop.c:2050
 #, c-format
 msgid ""
 "Cannot interact with class group \"%s\": the class group cannot be found\n"
@@ -1182,14 +1217,14 @@
 "Kan ikke ha interaksjon med klassegruppen «%s»: klassegruppen ble ikke "
 "funnet\n"
 
-#: ../libwnck/wnckprop.c:2014
+#: ../libwnck/wnckprop.c:2073
 #, c-format
 msgid ""
 "Cannot interact with application having its group leader with XID %lu: the "
 "application cannot be found\n"
-msgstr ""
+msgstr "Finner ikke applikasjonen som har gruppeleder med XID %lu\n"
 
-#: ../libwnck/wnckprop.c:2037
+#: ../libwnck/wnckprop.c:2096
 #, c-format
 msgid ""
 "Cannot interact with window with XID %lu: the window cannot be found\n"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libwnck.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libwnck.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/libwnck.po	2013-01-29 09:34:02.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/libwnck.po	2014-01-07 06:37:07.000000000 +0000
@@ -8,13 +8,13 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-09-10 03:56+0000\n"
 "PO-Revision-Date: 2011-09-03 11:39+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
+"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.n>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:02+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:14+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. *
 #. * SECTION:application
@@ -107,78 +107,78 @@
 msgid "_Close All"
 msgstr "_Lukk alle"
 
-#: ../libwnck/window-action-menu.c:419
+#: ../libwnck/window-action-menu.c:404
 msgid "Unmi_nimize"
 msgstr "Gje_nopprett"
 
-#: ../libwnck/window-action-menu.c:426
+#: ../libwnck/window-action-menu.c:411
 msgid "Mi_nimize"
 msgstr "Mi_nimer"
 
-#: ../libwnck/window-action-menu.c:434
+#: ../libwnck/window-action-menu.c:419
 msgid "Unma_ximize"
 msgstr "_Gjenopprett"
 
-#: ../libwnck/window-action-menu.c:441
+#: ../libwnck/window-action-menu.c:426
 msgid "Ma_ximize"
 msgstr "Ma_ksimer"
 
-#: ../libwnck/window-action-menu.c:748 ../libwnck/workspace.c:281
+#: ../libwnck/window-action-menu.c:733 ../libwnck/workspace.c:281
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeidsområde %d"
 
-#: ../libwnck/window-action-menu.c:757 ../libwnck/window-action-menu.c:904
+#: ../libwnck/window-action-menu.c:742 ../libwnck/window-action-menu.c:889
 #, c-format
 msgid "Workspace 1_0"
 msgstr "Arbeidsområde 1_0"
 
-#: ../libwnck/window-action-menu.c:759 ../libwnck/window-action-menu.c:906
+#: ../libwnck/window-action-menu.c:744 ../libwnck/window-action-menu.c:891
 #, c-format
 msgid "Workspace %s%d"
 msgstr "Arbeidsområde %s%d"
 
-#: ../libwnck/window-action-menu.c:1049
+#: ../libwnck/window-action-menu.c:1033
 msgid "_Move"
 msgstr "F_lytt"
 
-#: ../libwnck/window-action-menu.c:1056
+#: ../libwnck/window-action-menu.c:1040
 msgid "_Resize"
 msgstr "End_re størrelse"
 
-#: ../libwnck/window-action-menu.c:1065
+#: ../libwnck/window-action-menu.c:1049
 msgid "Always On _Top"
 msgstr "Alltid øvers_t"
 
-#: ../libwnck/window-action-menu.c:1073
+#: ../libwnck/window-action-menu.c:1057
 msgid "_Always on Visible Workspace"
 msgstr "_Alltid på synlig arbeidsområde"
 
-#: ../libwnck/window-action-menu.c:1078
+#: ../libwnck/window-action-menu.c:1062
 msgid "_Only on This Workspace"
 msgstr "K_un på dette arbeidsområdet"
 
-#: ../libwnck/window-action-menu.c:1085
+#: ../libwnck/window-action-menu.c:1069
 msgid "Move to Workspace _Left"
 msgstr "Flytt til arbeidsområdet til _venstre"
 
-#: ../libwnck/window-action-menu.c:1091
+#: ../libwnck/window-action-menu.c:1075
 msgid "Move to Workspace R_ight"
 msgstr "Flytt til arbeidsområdet til hø_yre"
 
-#: ../libwnck/window-action-menu.c:1097
+#: ../libwnck/window-action-menu.c:1081
 msgid "Move to Workspace _Up"
 msgstr "Flytt til et arbeidsområdet _over"
 
-#: ../libwnck/window-action-menu.c:1103
+#: ../libwnck/window-action-menu.c:1087
 msgid "Move to Workspace _Down"
 msgstr "Flytt til arbeidsområdet un_der"
 
-#: ../libwnck/window-action-menu.c:1106
+#: ../libwnck/window-action-menu.c:1090
 msgid "Move to Another _Workspace"
 msgstr "Flytt til et annet _arbeidsområde"
 
-#: ../libwnck/window-action-menu.c:1126
+#: ../libwnck/window-action-menu.c:1110
 msgid "_Close"
 msgstr "_Lukk"
 
@@ -618,6 +618,8 @@
 msgid ""
 "Viewport cannot be moved: the current workspace does not contain a viewport\n"
 msgstr ""
+"Synsfeltet kan ikke flyttes. Gjeldende arbeidsområde inneholder ikke et "
+"synsfelt\n"
 
 #. Translators: 'viewport' is kind of the viewable area. A viewport
 #. * can be used to implement workspaces (e.g. compiz is an example);
@@ -626,6 +628,7 @@
 #, c-format
 msgid "Viewport cannot be moved: there is no current workspace\n"
 msgstr ""
+"Synsfeltet kan ikke flyttes. Det finnes ikke et aktivt arbeidsområde\n"
 
 #. FIXME: why do we have dual & boolean API. This is not consistent!
 #: ../libwnck/wnckprop.c:943 ../libwnck/wnckprop.c:952
@@ -641,6 +644,7 @@
 msgid ""
 "Window cannot be moved to workspace %d: the workspace does not exist\n"
 msgstr ""
+"Vinduet kan ikke flyttes til arbeidsflate %d. Arbeidsflaten finnes ikke\n"
 
 #. Translators: 'unset' in the sense of "something has not been set".
 #: ../libwnck/wnckprop.c:1103 ../libwnck/wnckprop.c:1235
@@ -678,6 +682,8 @@
 #, c-format
 msgid "Workspace Layout (rows, columns, orientation): %d, %d, %s\n"
 msgstr ""
+"Arbeidsflatens utseende (rader, kolonner, syns- og utskriftsretning): %d, "
+"%d, %s\n"
 
 #: ../libwnck/wnckprop.c:1211 ../libwnck/wnckprop.c:1268
 #: ../libwnck/wnckprop.c:1462
@@ -773,12 +779,12 @@
 #: ../libwnck/wnckprop.c:1288
 #, c-format
 msgid "Viewport position (x, y): %s\n"
-msgstr ""
+msgstr "Synsfeltets posisjon (x, y): %s\n"
 
 #: ../libwnck/wnckprop.c:1291
 #, c-format
 msgid "Position in Layout (row, column): %d, %d\n"
-msgstr ""
+msgstr "Posisjoin i utforming (rad, kolonne): %d %d\n"
 
 #: ../libwnck/wnckprop.c:1304
 #, c-format
@@ -1137,6 +1143,10 @@
 "For information about this specification, see:\n"
 "\thttp://freedesktop.org/wiki/Specifications/wm-spec"
 msgstr ""
+"Skriv ut eller endre egenskapene på en visning, arbeidsflate eller vindu, "
+"eller kommuniser med det i henhold til EWMH-spesifikasjonen.\n"
+"Besøk denne nettsiden for ytterligere informasjon om EWMH:\n"
+"\thttp://freedesktop.org/wiki/Specifications/wm-spec"
 
 #: ../libwnck/wnckprop.c:1840
 msgid "Options to list windows or workspaces"
@@ -1201,7 +1211,7 @@
 msgid ""
 "Cannot interact with application having its group leader with XID %lu: the "
 "application cannot be found\n"
-msgstr ""
+msgstr "Finner ikke programmet som har gruppeleder med XID %lu\n"
 
 #: ../libwnck/wnckprop.c:2025
 #, c-format
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/liferea.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/liferea.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/liferea.po	2013-01-29 09:33:49.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/liferea.po	2014-01-07 06:37:21.000000000 +0000
@@ -9,14 +9,14 @@
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-04-12 04:46+0000\n"
 "PO-Revision-Date: 2009-10-12 15:28+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
+"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 13:44+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:09+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. GTK theme support
 #: ../liferea.desktop.in.h:1 ../src/main.c:278 ../glade/liferea.ui.h:1
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/metacity.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/metacity.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/metacity.po	2013-01-29 09:33:54.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/metacity.po	2014-01-07 06:37:06.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:54+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:04+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../src/50-metacity-launchers.xml.in.h:1
@@ -530,19 +530,19 @@
 "Egenskap %s på vindu 0x%lx inneholdt ugyldig UTF-8 for oppføring %d i "
 "listen\n"
 
-#: ../src/50-metacity-navigation.xml.in.h:17
+#: ../src/50-metacity-navigation.xml.in.h:18
 msgid "Switch to workspace 1"
 msgstr "Bytt til arbeidsområde 1"
 
-#: ../src/50-metacity-navigation.xml.in.h:18
+#: ../src/50-metacity-navigation.xml.in.h:19
 msgid "Switch to workspace 2"
 msgstr "Bytt til arbeidsområde 2"
 
-#: ../src/50-metacity-navigation.xml.in.h:19
+#: ../src/50-metacity-navigation.xml.in.h:20
 msgid "Switch to workspace 3"
 msgstr "Bytt til arbeidsområde 3"
 
-#: ../src/50-metacity-navigation.xml.in.h:20
+#: ../src/50-metacity-navigation.xml.in.h:21
 msgid "Switch to workspace 4"
 msgstr "Bytt til arbeidsområde 4"
 
@@ -578,23 +578,23 @@
 msgid "Switch to workspace 12"
 msgstr "Bytt til arbeidsområde 12"
 
-#: ../src/50-metacity-navigation.xml.in.h:21
+#: ../src/50-metacity-navigation.xml.in.h:22
 msgid "Move to workspace left"
 msgstr "Flytt til arbeidsområdet til venstre"
 
-#: ../src/50-metacity-navigation.xml.in.h:22
+#: ../src/50-metacity-navigation.xml.in.h:23
 msgid "Move to workspace right"
 msgstr "Flytt til arbeidsområdet til høyre"
 
-#: ../src/50-metacity-navigation.xml.in.h:23
+#: ../src/50-metacity-navigation.xml.in.h:24
 msgid "Move to workspace above"
 msgstr "Flytt til arbeidsområdet over"
 
-#: ../src/50-metacity-navigation.xml.in.h:24
+#: ../src/50-metacity-navigation.xml.in.h:25
 msgid "Move to workspace below"
 msgstr "Flytt til arbeidsområdet under"
 
-#: ../src/50-metacity-navigation.xml.in.h:11
+#: ../src/50-metacity-navigation.xml.in.h:12
 msgid "Switch windows of an application"
 msgstr "Bytt mellom et programs vinduer"
 
@@ -602,7 +602,7 @@
 msgid "Reverse switch windows of an application"
 msgstr "Bytt mellom et programs baklengs"
 
-#: ../src/50-metacity-navigation.xml.in.h:10
+#: ../src/50-metacity-navigation.xml.in.h:11
 msgid "Switch applications"
 msgstr "Bytt programmer"
 
@@ -610,7 +610,7 @@
 msgid "Reverse switch applications"
 msgstr "Bytt programmer baklengs"
 
-#: ../src/50-metacity-navigation.xml.in.h:12
+#: ../src/50-metacity-navigation.xml.in.h:13
 msgid "Switch system controls"
 msgstr "Bytt systemkontroller"
 
@@ -618,7 +618,7 @@
 msgid "Reverse switch system controls"
 msgstr "Bytt systemkontroller baklengs"
 
-#: ../src/50-metacity-navigation.xml.in.h:14
+#: ../src/50-metacity-navigation.xml.in.h:15
 msgid "Switch windows of an app directly"
 msgstr "Bla gjennom et programs vinduer direkte"
 
@@ -626,7 +626,7 @@
 msgid "Reverse switch windows of an app directly"
 msgstr "Bla baklengs gjennom et programs vinduer direkte"
 
-#: ../src/50-metacity-navigation.xml.in.h:13
+#: ../src/50-metacity-navigation.xml.in.h:14
 msgid "Switch windows directly"
 msgstr "Bytt vinduer direkte"
 
@@ -634,7 +634,7 @@
 msgid "Reverse switch windows directly"
 msgstr "Bytt vinduer baklengs direkte"
 
-#: ../src/50-metacity-navigation.xml.in.h:15
+#: ../src/50-metacity-navigation.xml.in.h:16
 msgid "Switch system controls directly"
 msgstr "Bytt systemkontroller direkte"
 
@@ -642,7 +642,7 @@
 msgid "Reverse switch system controls directly"
 msgstr "Bytt systemkontroller baklengs direkte"
 
-#: ../src/50-metacity-navigation.xml.in.h:16
+#: ../src/50-metacity-navigation.xml.in.h:17
 msgid "Hide all normal windows"
 msgstr "Skjul alle normale vinduer"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/mousetweaks.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/mousetweaks.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/mousetweaks.po	2013-01-29 09:33:51.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/mousetweaks.po	2014-01-07 06:37:30.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:18+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 15:58+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../data/mousetweaks.ui.h:1
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/nautilus-sendto.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/nautilus-sendto.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/nautilus-sendto.po	2013-01-29 09:34:03.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/nautilus-sendto.po	2014-01-07 06:37:21.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 13:46+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:12+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../src/nautilus-nste.c:90 ../src/nautilus-nste.c:95
 #: ../src/nautilus-sendto.ui.h:1
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/nautilus-share.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/nautilus-share.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/nautilus-share.po	2013-01-29 09:34:03.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/nautilus-share.po	2014-01-07 06:37:28.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 14:50+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 15:27+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../src/nautilus-share.c:127
 #, c-format
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/nautilus.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/nautilus.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/nautilus.po	2013-01-29 09:33:54.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/nautilus.po	2014-01-07 06:37:06.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: nautilus 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 17:45+0000\n"
+"POT-Creation-Date: 2013-09-26 20:33+0000\n"
 "PO-Revision-Date: 2012-08-07 00:01+0000\n"
 "Last-Translator: Roy S <Unknown>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 11:56+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:07+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: no\n"
 
 #: ../data/nautilus.xml.in.h:1
@@ -31,9 +31,9 @@
 
 #. Set initial window title
 #: ../data/nautilus.desktop.in.in.h:1
-#: ../src/nautilus-file-management-properties.ui.h:27
-#: ../src/nautilus-properties-window.c:4474 ../src/nautilus-window.c:1858
-#: ../src/nautilus-window.c:2058
+#: ../src/nautilus-file-management-properties.ui.h:29
+#: ../src/nautilus-properties-window.c:4478 ../src/nautilus-window.c:2202
+#: ../src/nautilus-window.c:2399
 msgid "Files"
 msgstr "Filer"
 
@@ -41,7 +41,7 @@
 msgid "Access and organize files"
 msgstr "Aksesser og organiser filer"
 
-#: ../data/nautilus.desktop.in.in.h:3 ../debian/nautilus-home.desktop.in.h:3
+#: ../data/nautilus.desktop.in.in.h:4 ../debian/nautilus-home.desktop.in.h:3
 msgid "Open a New Window"
 msgstr "Åpne et nytt vindu"
 
@@ -54,7 +54,7 @@
 msgstr "Hjemmemappe"
 
 #. tooltip
-#: ../src/nautilus-places-sidebar.c:518 ../src/nautilus-window-menus.c:534
+#: ../src/nautilus-window-menus.c:548
 msgid "Open your personal folder"
 msgstr "Åpne din personlige mappe"
 
@@ -66,8 +66,8 @@
 msgid "Y"
 msgstr "Y"
 
-#: ../eel/eel-editable-label.c:313 ../libnautilus-private/nautilus-file.c:6159
-#: ../libnautilus-private/nautilus-file.c:6160
+#: ../eel/eel-editable-label.c:313 ../libnautilus-private/nautilus-file.c:6172
+#: ../libnautilus-private/nautilus-file.c:6173
 msgid "Text"
 msgstr "Tekst"
 
@@ -114,11 +114,11 @@
 "The position of the opposite end of the selection from the cursor in chars."
 msgstr "Posisjonen for motsatt ende av utvalget fra markøren målt i tegn."
 
-#: ../eel/eel-editable-label.c:3088
+#: ../eel/eel-editable-label.c:3092
 msgid "Select All"
 msgstr "Velg alt"
 
-#: ../eel/eel-editable-label.c:3099
+#: ../eel/eel-editable-label.c:3104
 msgid "Input Methods"
 msgstr "Inndatametoder"
 
@@ -137,28 +137,22 @@
 #: ../libnautilus-private/nautilus-bookmark.c:108
 #: ../libnautilus-private/nautilus-desktop-link.c:134
 #: ../libnautilus-private/nautilus-file-utilities.c:275
-#: ../src/nautilus-pathbar.c:295 ../src/nautilus-places-sidebar.c:516
-#: ../src/nautilus-query-editor.c:1164
-#: ../src/nautilus-shell-search-provider.c:310
+#: ../src/nautilus-list-view.c:1827 ../src/nautilus-pathbar.c:295
+#: ../src/nautilus-query-editor.c:1096
+#: ../src/nautilus-shell-search-provider.c:288
 msgid "Home"
 msgstr "Hjem"
 
-#. name, stock id
-#. label, accelerator
 #. tooltip
 #: ../libnautilus-private/nautilus-clipboard.c:359
 msgid "Cut the selected text to the clipboard"
 msgstr "Klipp ut valgt tekst til utklippstavlen"
 
-#. name, stock id
-#. label, accelerator
 #. tooltip
 #: ../libnautilus-private/nautilus-clipboard.c:363
 msgid "Copy the selected text to the clipboard"
 msgstr "Kopier valgt tekst til utklippstavlen"
 
-#. name, stock id
-#. label, accelerator
 #. tooltip
 #: ../libnautilus-private/nautilus-clipboard.c:367
 msgid "Paste the text stored on the clipboard"
@@ -166,7 +160,7 @@
 
 #. name, stock id
 #. label, accelerator
-#: ../libnautilus-private/nautilus-clipboard.c:370 ../src/nautilus-view.c:7176
+#: ../libnautilus-private/nautilus-clipboard.c:370 ../src/nautilus-view.c:7230
 msgid "Select _All"
 msgstr "Velg _alt"
 
@@ -175,40 +169,40 @@
 msgid "Select all the text in a text field"
 msgstr "Marker all tekst i et tekstfelt"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:372
+#: ../libnautilus-private/nautilus-column-chooser.c:375
 msgid "Move _Up"
 msgstr "Flytt _opp"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:382
+#: ../libnautilus-private/nautilus-column-chooser.c:384
 msgid "Move Dow_n"
 msgstr "Flytt _ned"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:395
+#: ../libnautilus-private/nautilus-column-chooser.c:397
 msgid "Use De_fault"
 msgstr "Bruk _forvalg"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:56
-#: ../src/nautilus-list-view.c:1509
+#: ../libnautilus-private/nautilus-column-utilities.c:57
+#: ../src/nautilus-list-view.c:2040
 msgid "Name"
 msgstr "Navn"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:57
+#: ../libnautilus-private/nautilus-column-utilities.c:58
 msgid "The name and icon of the file."
 msgstr "Navn og ikon for filen."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:63
+#: ../libnautilus-private/nautilus-column-utilities.c:64
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:64
+#: ../libnautilus-private/nautilus-column-utilities.c:65
 msgid "The size of the file."
 msgstr "Størrelse på filen."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:71
+#: ../libnautilus-private/nautilus-column-utilities.c:72
 msgid "Type"
 msgstr "Type"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:72
+#: ../libnautilus-private/nautilus-column-utilities.c:73
 msgid "The type of the file."
 msgstr "Filens type."
 
@@ -216,7 +210,7 @@
 msgid "Date Modified"
 msgstr "Dato endret"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:79
+#: ../libnautilus-private/nautilus-column-utilities.c:80
 msgid "The date the file was modified."
 msgstr "Endringsdato for filen."
 
@@ -224,32 +218,32 @@
 msgid "Date Accessed"
 msgstr "Dato aksessert"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:74
+#: ../libnautilus-private/nautilus-column-utilities.c:88
 msgid "The date the file was accessed."
-msgstr "Dato filen sist ble aksessert."
+msgstr "Dato filen ble sist aksessert."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:87
+#: ../libnautilus-private/nautilus-column-utilities.c:96
 msgid "Owner"
 msgstr "Eier"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:88
+#: ../libnautilus-private/nautilus-column-utilities.c:97
 msgid "The owner of the file."
 msgstr "Filens eier."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:95
+#: ../libnautilus-private/nautilus-column-utilities.c:104
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:96
+#: ../libnautilus-private/nautilus-column-utilities.c:105
 msgid "The group of the file."
 msgstr "Filens gruppe."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:103
-#: ../src/nautilus-properties-window.c:4536
+#: ../libnautilus-private/nautilus-column-utilities.c:112
+#: ../src/nautilus-properties-window.c:4540
 msgid "Permissions"
 msgstr "Rettigheter"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:104
+#: ../libnautilus-private/nautilus-column-utilities.c:113
 msgid "The permissions of the file."
 msgstr "Rettigheter for filen."
 
@@ -261,11 +255,11 @@
 msgid "The permissions of the file, in octal notation."
 msgstr "Rettigheter for filen i oktal notasjon."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:111
+#: ../libnautilus-private/nautilus-column-utilities.c:120
 msgid "MIME Type"
 msgstr "MIME-type"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:112
+#: ../libnautilus-private/nautilus-column-utilities.c:121
 msgid "The mime type of the file."
 msgstr "MIME-type for filen."
 
@@ -277,28 +271,28 @@
 msgid "The SELinux security context of the file."
 msgstr "SELinux sikkerhetskontekst for filen."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:119
+#: ../libnautilus-private/nautilus-column-utilities.c:128
 #: ../src/nautilus-image-properties-page.c:415
 msgid "Location"
 msgstr "Lokasjon"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:120
+#: ../libnautilus-private/nautilus-column-utilities.c:129
 msgid "The location of the file."
 msgstr "Filens lokasjon."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:161
+#: ../libnautilus-private/nautilus-column-utilities.c:170
 msgid "Trashed On"
 msgstr "Lagt i papirkurv"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:162
+#: ../libnautilus-private/nautilus-column-utilities.c:171
 msgid "Date when file was moved to the Trash"
 msgstr "Dato da filen ble lagt i papirkurven"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:168
+#: ../libnautilus-private/nautilus-column-utilities.c:177
 msgid "Original Location"
 msgstr "Opprinnelig lokasjon"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:169
+#: ../libnautilus-private/nautilus-column-utilities.c:178
 msgid "Original location of file before moved to the Trash"
 msgstr "Opprinnelig lokasjon for filen før den ble flyttet til papirkurven"
 
@@ -327,28 +321,28 @@
 msgstr ""
 "Velg «Avmonter volum» i volumets kontekstmeny hvis du vil avmontere volumet."
 
-#: ../libnautilus-private/nautilus-dnd.c:767
+#: ../libnautilus-private/nautilus-dnd.c:774
 msgid "_Move Here"
 msgstr "_Flytt hit"
 
-#: ../libnautilus-private/nautilus-dnd.c:772
+#: ../libnautilus-private/nautilus-dnd.c:779
 msgid "_Copy Here"
 msgstr "_Kopier hit"
 
-#: ../libnautilus-private/nautilus-dnd.c:777
+#: ../libnautilus-private/nautilus-dnd.c:784
 msgid "_Link Here"
 msgstr "_Lag lenke her"
 
-#: ../libnautilus-private/nautilus-dnd.c:782
+#: ../libnautilus-private/nautilus-dnd.c:789
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
-#: ../libnautilus-private/nautilus-dnd.c:789
+#: ../libnautilus-private/nautilus-dnd.c:796
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: ../libnautilus-private/nautilus-file.c:1209
-#: ../libnautilus-private/nautilus-vfs-file.c:356
+#: ../libnautilus-private/nautilus-vfs-file.c:371
 msgid "This file cannot be mounted"
 msgstr "Denne filen kan ikke monteres"
 
@@ -361,7 +355,7 @@
 msgstr "Denne filen kan ikke utløses"
 
 #: ../libnautilus-private/nautilus-file.c:1321
-#: ../libnautilus-private/nautilus-vfs-file.c:534
+#: ../libnautilus-private/nautilus-vfs-file.c:549
 msgid "This file cannot be started"
 msgstr "Denne filen kan ikke startes"
 
@@ -533,46 +527,46 @@
 msgid "%m/%d/%y"
 msgstr "%d.%m.%y"
 
-#: ../libnautilus-private/nautilus-file.c:4935
+#: ../libnautilus-private/nautilus-file.c:4948
 #, c-format
 msgid "Not allowed to set permissions"
 msgstr "Har ikke lov til å sette rettigheter"
 
-#: ../libnautilus-private/nautilus-file.c:5230
+#: ../libnautilus-private/nautilus-file.c:5243
 #, c-format
 msgid "Not allowed to set owner"
 msgstr "Har ikke rettigheter til å sette eier"
 
-#: ../libnautilus-private/nautilus-file.c:5248
+#: ../libnautilus-private/nautilus-file.c:5261
 #, c-format
 msgid "Specified owner '%s' doesn't exist"
 msgstr "Oppgitt eier, «%s», eksisterer ikke"
 
-#: ../libnautilus-private/nautilus-file.c:5512
+#: ../libnautilus-private/nautilus-file.c:5525
 #, c-format
 msgid "Not allowed to set group"
 msgstr "Ingen tilgang til å sette gruppe"
 
-#: ../libnautilus-private/nautilus-file.c:5530
+#: ../libnautilus-private/nautilus-file.c:5543
 #, c-format
 msgid "Specified group '%s' doesn't exist"
 msgstr "Oppgitt gruppe «%s» eksisterer ikke"
 
-#: ../libnautilus-private/nautilus-file.c:5688
+#: ../libnautilus-private/nautilus-file.c:5701
 #, c-format
 msgid "%'u item"
 msgid_plural "%'u items"
 msgstr[0] "%'u oppføring"
 msgstr[1] "%'u oppføringer"
 
-#: ../libnautilus-private/nautilus-file.c:5689
+#: ../libnautilus-private/nautilus-file.c:5702
 #, c-format
 msgid "%'u folder"
 msgid_plural "%'u folders"
 msgstr[0] "%'u mappe"
 msgstr[1] "%'u mapper"
 
-#: ../libnautilus-private/nautilus-file.c:5690
+#: ../libnautilus-private/nautilus-file.c:5703
 #, c-format
 msgid "%'u file"
 msgid_plural "%'u files"
@@ -580,37 +574,37 @@
 msgstr[1] "%'u filer"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:6086
-#: ../libnautilus-private/nautilus-file.c:6102
+#: ../libnautilus-private/nautilus-file.c:6099
+#: ../libnautilus-private/nautilus-file.c:6115
 msgid "? items"
 msgstr "? oppføringer"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:6092
+#: ../libnautilus-private/nautilus-file.c:6105
 msgid "? bytes"
 msgstr "? bytes"
 
-#: ../libnautilus-private/nautilus-file.c:6252
+#: ../libnautilus-private/nautilus-file.c:6258
 msgid "unknown type"
 msgstr "ukjent type"
 
-#: ../libnautilus-private/nautilus-file.c:6255
+#: ../libnautilus-private/nautilus-file.c:6261
 msgid "unknown MIME type"
 msgstr "ukjent MIME-type"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #. 
-#: ../libnautilus-private/nautilus-file.c:6123
-#: ../src/nautilus-properties-window.c:1181
+#: ../libnautilus-private/nautilus-file.c:6136
+#: ../src/nautilus-properties-window.c:1183
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../libnautilus-private/nautilus-file.c:6319
+#: ../libnautilus-private/nautilus-file.c:6325
 msgid "program"
 msgstr "program"
 
-#: ../libnautilus-private/nautilus-file.c:6339
+#: ../libnautilus-private/nautilus-file.c:6345
 msgid "link"
 msgstr "lenke"
 
@@ -619,14 +613,14 @@
 #. * to that kind of file (e.g. "link to folder").
 #. 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file.c:6255
-#: ../libnautilus-private/nautilus-file-operations.c:377
+#: ../libnautilus-private/nautilus-file.c:6268
+#: ../libnautilus-private/nautilus-file-operations.c:379
 #: ../src/nautilus-view-dnd.c:124
 #, c-format
 msgid "Link to %s"
 msgstr "Lenke til %s"
 
-#: ../libnautilus-private/nautilus-file.c:6361
+#: ../libnautilus-private/nautilus-file.c:6367
 msgid "link (broken)"
 msgstr "lenke (ødelagt)"
 
@@ -635,13 +629,13 @@
 msgid "Merge folder \"%s\"?"
 msgstr "Flett mappe «%s»?"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:145
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:147
 msgid ""
 "Merging will ask for confirmation before replacing any files in the folder "
 "that conflict with the files being copied."
 msgstr ""
-"Fletting vil be om bekreftelse før filer i mappen som er i konflikt med "
-"filene som kopieres erstattes."
+"Du vil bli spurt før eventuelle filer som er i konflikt med filene som "
+"kopieres, blir erstattet."
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:150
 #, c-format
@@ -658,9 +652,9 @@
 msgid "Another folder with the same name already exists in \"%s\"."
 msgstr "En annen mappe med samme navn eksisterer allerede i «%s»."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:163
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:165
 msgid "Replacing it will remove all files in the folder."
-msgstr "Hvis du erstatter den vil dette fjerne alle filer i mappen."
+msgstr "Viss du erstatter den, slettes alle filer den eksisterende mappen."
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:165
 #, c-format
@@ -677,7 +671,7 @@
 msgid "Replace file \"%s\"?"
 msgstr "Erstatt fil «%s»?"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:174
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:176
 msgid "Replacing it will overwrite its content."
 msgstr "Hvis du erstatter den vil du skrive over innholdet."
 
@@ -696,122 +690,122 @@
 msgid "Another file with the same name already exists in \"%s\"."
 msgstr "En annen fil med samme navn eksisterer allerede i «%s»."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:252
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:256
 msgid "Original file"
 msgstr "Originalfil"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:253
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:284
-#: ../src/nautilus-properties-window.c:3275
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:257
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:288
+#: ../src/nautilus-properties-window.c:3279
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:256
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:287
-#: ../src/nautilus-properties-window.c:3257
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:260
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:291
+#: ../src/nautilus-properties-window.c:3261
 msgid "Type:"
 msgstr "Type:"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:259
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:290
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:263
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:294
 msgid "Last modified:"
 msgstr "Sist endret:"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:283
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:287
 msgid "Replace with"
 msgstr "Erstatt med"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:312
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:316
 msgid "Merge"
 msgstr "Flett"
 
 #. Setup the expander for the rename action
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:505
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:509
 msgid "_Select a new name for the destination"
 msgstr "_Velg et nytt navn for målet"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:519
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:523
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:317
 msgid "Reset"
 msgstr "Nullstill"
 
 #. Setup the checkbox to apply the action to all files
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:531
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:535
 msgid "Apply this action to all files"
 msgstr "Bruk denne handlingen på alle filer"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:542
-#: ../libnautilus-private/nautilus-file-operations.c:185
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:546
+#: ../libnautilus-private/nautilus-file-operations.c:186
 msgid "_Skip"
 msgstr "_Hopp over"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:547
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:551
 msgid "Re_name"
 msgstr "E_ndre navn"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:553
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:557
 msgid "Replace"
 msgstr "Erstatt"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:625
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:629
 msgid "File conflict"
 msgstr "Filkonflikt"
 
-#: ../libnautilus-private/nautilus-file-operations.c:186
+#: ../libnautilus-private/nautilus-file-operations.c:187
 msgid "S_kip All"
 msgstr "Ho_pp over alle"
 
-#: ../libnautilus-private/nautilus-file-operations.c:187
+#: ../libnautilus-private/nautilus-file-operations.c:188
 msgid "_Retry"
 msgstr "P_røv igjen"
 
-#: ../libnautilus-private/nautilus-file-operations.c:188
+#: ../libnautilus-private/nautilus-file-operations.c:190
 msgid "Delete _All"
 msgstr "Slett _alle"
 
-#: ../libnautilus-private/nautilus-file-operations.c:189
+#: ../libnautilus-private/nautilus-file-operations.c:191
 msgid "_Replace"
 msgstr "E_rstatt"
 
-#: ../libnautilus-private/nautilus-file-operations.c:190
+#: ../libnautilus-private/nautilus-file-operations.c:192
 msgid "Replace _All"
 msgstr "Erstatt _alle"
 
-#: ../libnautilus-private/nautilus-file-operations.c:191
+#: ../libnautilus-private/nautilus-file-operations.c:193
 msgid "_Merge"
 msgstr "_Flett"
 
-#: ../libnautilus-private/nautilus-file-operations.c:192
+#: ../libnautilus-private/nautilus-file-operations.c:194
 msgid "Merge _All"
 msgstr "Flett _alle"
 
-#: ../libnautilus-private/nautilus-file-operations.c:193
+#: ../libnautilus-private/nautilus-file-operations.c:195
 msgid "Copy _Anyway"
 msgstr "Kopier _likevel"
 
-#: ../libnautilus-private/nautilus-file-operations.c:278
+#: ../libnautilus-private/nautilus-file-operations.c:280
 #, c-format
 msgid "%'d second"
 msgid_plural "%'d seconds"
 msgstr[0] "%'d sekund"
 msgstr[1] "%'d sekunder"
 
-#: ../libnautilus-private/nautilus-file-operations.c:283
-#: ../libnautilus-private/nautilus-file-operations.c:294
+#: ../libnautilus-private/nautilus-file-operations.c:285
+#: ../libnautilus-private/nautilus-file-operations.c:296
 #, c-format
 msgid "%'d minute"
 msgid_plural "%'d minutes"
 msgstr[0] "%'d minutt"
 msgstr[1] "%'d minutter"
 
-#: ../libnautilus-private/nautilus-file-operations.c:293
+#: ../libnautilus-private/nautilus-file-operations.c:295
 #, c-format
 msgid "%'d hour"
 msgid_plural "%'d hours"
 msgstr[0] "%'d time"
 msgstr[1] "%'d timer"
 
-#: ../libnautilus-private/nautilus-file-operations.c:301
+#: ../libnautilus-private/nautilus-file-operations.c:303
 #, c-format
 msgid "approximately %'d hour"
 msgid_plural "approximately %'d hours"
@@ -819,7 +813,7 @@
 msgstr[1] "omtrent %'d timer"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:381
+#: ../libnautilus-private/nautilus-file-operations.c:383
 #, c-format
 msgid "Another link to %s"
 msgstr "En annen lenke til %s"
@@ -828,25 +822,25 @@
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #. 
-#: ../libnautilus-private/nautilus-file-operations.c:397
+#: ../libnautilus-private/nautilus-file-operations.c:399
 #, c-format
 msgid "%'dst link to %s"
 msgstr "%'dste lenke til %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:401
+#: ../libnautilus-private/nautilus-file-operations.c:403
 #, c-format
 msgid "%'dnd link to %s"
 msgstr "%'dre lenke til %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:405
+#: ../libnautilus-private/nautilus-file-operations.c:407
 #, c-format
 msgid "%'drd link to %s"
 msgstr "%'ddje lenke til %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:409
+#: ../libnautilus-private/nautilus-file-operations.c:411
 #, c-format
 msgid "%'dth link to %s"
 msgstr "%'dde lenke til %s"
@@ -856,12 +850,12 @@
 #. * make some or all of them match.
 #. 
 #. localizers: tag used to detect the first copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:448
+#: ../libnautilus-private/nautilus-file-operations.c:450
 msgid " (copy)"
 msgstr " (kopi)"
 
 #. localizers: tag used to detect the second copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:450
+#: ../libnautilus-private/nautilus-file-operations.c:452
 msgid " (another copy)"
 msgstr " (ny kopi)"
 
@@ -869,36 +863,36 @@
 #. localizers: tag used to detect the x12th copy of a file
 #. localizers: tag used to detect the x13th copy of a file
 #. localizers: tag used to detect the xxth copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:453
 #: ../libnautilus-private/nautilus-file-operations.c:455
 #: ../libnautilus-private/nautilus-file-operations.c:457
-#: ../libnautilus-private/nautilus-file-operations.c:467
+#: ../libnautilus-private/nautilus-file-operations.c:459
+#: ../libnautilus-private/nautilus-file-operations.c:469
 msgid "th copy)"
 msgstr ". (kopi)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:460
+#: ../libnautilus-private/nautilus-file-operations.c:462
 msgid "st copy)"
 msgstr ". (kopi)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:462
+#: ../libnautilus-private/nautilus-file-operations.c:464
 msgid "nd copy)"
 msgstr ". (kopi)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:464
+#: ../libnautilus-private/nautilus-file-operations.c:466
 msgid "rd copy)"
 msgstr ". (kopi)"
 
 #. localizers: appended to first file copy
-#: ../libnautilus-private/nautilus-file-operations.c:481
+#: ../libnautilus-private/nautilus-file-operations.c:483
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopi)%s"
 
 #. localizers: appended to second file copy
-#: ../libnautilus-private/nautilus-file-operations.c:483
+#: ../libnautilus-private/nautilus-file-operations.c:485
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (ny kopi)%s"
@@ -907,10 +901,10 @@
 #. localizers: appended to x12th file copy
 #. localizers: appended to x13th file copy
 #. localizers: appended to xxth file copy
-#: ../libnautilus-private/nautilus-file-operations.c:486
 #: ../libnautilus-private/nautilus-file-operations.c:488
 #: ../libnautilus-private/nautilus-file-operations.c:490
-#: ../libnautilus-private/nautilus-file-operations.c:504
+#: ../libnautilus-private/nautilus-file-operations.c:492
+#: ../libnautilus-private/nautilus-file-operations.c:506
 #, c-format
 msgid "%s (%'dth copy)%s"
 msgstr "%s (%'dde kopi)%s"
@@ -920,30 +914,30 @@
 #. * strings look like "%s (copy %'d)%s".
 #. 
 #. localizers: appended to x1st file copy
-#: ../libnautilus-private/nautilus-file-operations.c:498
+#: ../libnautilus-private/nautilus-file-operations.c:500
 #, c-format
 msgid "%s (%'dst copy)%s"
 msgstr "%s (%'dste kopi)%s"
 
 #. localizers: appended to x2nd file copy
-#: ../libnautilus-private/nautilus-file-operations.c:500
+#: ../libnautilus-private/nautilus-file-operations.c:502
 #, c-format
 msgid "%s (%'dnd copy)%s"
 msgstr "%s (%'ddre kopi)%s"
 
 #. localizers: appended to x3rd file copy
-#: ../libnautilus-private/nautilus-file-operations.c:502
+#: ../libnautilus-private/nautilus-file-operations.c:504
 #, c-format
 msgid "%s (%'drd copy)%s"
 msgstr "%s (%'ddje kopi)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: ../libnautilus-private/nautilus-file-operations.c:603
+#: ../libnautilus-private/nautilus-file-operations.c:605
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: ../libnautilus-private/nautilus-file-operations.c:611
+#: ../libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid " (%'d"
 msgstr " (%'d"
@@ -952,7 +946,7 @@
 msgid "Are you sure you want to permanently delete \"%B\" from the trash?"
 msgstr "Er du sikker på at du vil slette «%B» fra papirkurven permanent?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1326
+#: ../libnautilus-private/nautilus-file-operations.c:1359
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %'d selected item from the "
@@ -966,23 +960,22 @@
 "Er du sikker på at du vil slette %'d valgte oppføringer i papirkurven "
 "permanent?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1336
-#: ../libnautilus-private/nautilus-file-operations.c:1402
+#: ../libnautilus-private/nautilus-file-operations.c:1369
+#: ../libnautilus-private/nautilus-file-operations.c:1435
 msgid "If you delete an item, it will be permanently lost."
 msgstr "Hvis du sletter en oppføring vil den være borte for godt."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1356
+#: ../libnautilus-private/nautilus-file-operations.c:1389
 msgid "Empty all items from Trash?"
 msgstr "Tøm alle oppføringer i papirkurven?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1360
+#: ../libnautilus-private/nautilus-file-operations.c:1393
 msgid "All items in the Trash will be permanently deleted."
 msgstr "Alle oppføringer i papirkurven vil bli slettet for godt."
 
-#. Empty Trash menu item
-#: ../libnautilus-private/nautilus-file-operations.c:1363
-#: ../libnautilus-private/nautilus-file-operations.c:2241
-#: ../src/nautilus-places-sidebar.c:2764
+#: ../libnautilus-private/nautilus-file-operations.c:1396
+#: ../libnautilus-private/nautilus-file-operations.c:2272
+#: ../src/nautilus-window.c:806
 msgid "Empty _Trash"
 msgstr "_Tøm papirkurv"
 
@@ -990,7 +983,7 @@
 msgid "Are you sure you want to permanently delete \"%B\"?"
 msgstr "Er du sikker på at du vil slette «%B» permanent?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1393
+#: ../libnautilus-private/nautilus-file-operations.c:1426
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
 msgid_plural ""
@@ -999,31 +992,31 @@
 msgstr[1] ""
 "Er du sikker på at du vil slette %'d valgte oppføringer permanent?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1436
+#: ../libnautilus-private/nautilus-file-operations.c:1469
 #, c-format
 msgid "%'d file left to delete"
 msgid_plural "%'d files left to delete"
 msgstr[0] "%'d fil igjen å slette"
 msgstr[1] "%'d filer igjen å slette"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1442
+#: ../libnautilus-private/nautilus-file-operations.c:1475
 msgid "Deleting files"
 msgstr "Sletter filer"
 
 #. To translators: %T will expand to a time like "2 minutes".
 #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
 #. 
-#: ../libnautilus-private/nautilus-file-operations.c:1456
+#: ../libnautilus-private/nautilus-file-operations.c:1489
 msgid "%T left"
 msgid_plural "%T left"
 msgstr[0] "%T gjenstår"
 msgstr[1] "%T gjenstår"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1523
-#: ../libnautilus-private/nautilus-file-operations.c:1557
-#: ../libnautilus-private/nautilus-file-operations.c:1596
-#: ../libnautilus-private/nautilus-file-operations.c:1673
-#: ../libnautilus-private/nautilus-file-operations.c:2501
+#: ../libnautilus-private/nautilus-file-operations.c:1556
+#: ../libnautilus-private/nautilus-file-operations.c:1590
+#: ../libnautilus-private/nautilus-file-operations.c:1629
+#: ../libnautilus-private/nautilus-file-operations.c:1705
+#: ../libnautilus-private/nautilus-file-operations.c:2532
 msgid "Error while deleting."
 msgstr "Feil under sletting."
 
@@ -1043,8 +1036,8 @@
 msgstr ""
 "Det oppsto en feil under henting av informasjon om filene i mappe «%B»."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1539
-#: ../libnautilus-private/nautilus-file-operations.c:3579
+#: ../libnautilus-private/nautilus-file-operations.c:1572
+#: ../libnautilus-private/nautilus-file-operations.c:3610
 msgid "_Skip files"
 msgstr "_Hopp over filer"
 
@@ -1061,19 +1054,19 @@
 msgid "There was an error reading the folder \"%B\"."
 msgstr "Det oppsto en feil under lesing av mappe «%B»."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1597
+#: ../libnautilus-private/nautilus-file-operations.c:1630
 msgid "Could not remove the folder %B."
 msgstr "Kunne ikke fjerne mappen %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1674
+#: ../libnautilus-private/nautilus-file-operations.c:1706
 msgid "There was an error deleting %B."
 msgstr "Det oppsto en feil under sletting av %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1754
+#: ../libnautilus-private/nautilus-file-operations.c:1785
 msgid "Moving files to trash"
 msgstr "Flytter filer til papirkurv"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1756
+#: ../libnautilus-private/nautilus-file-operations.c:1787
 #, c-format
 msgid "%'d file left to trash"
 msgid_plural "%'d files left to trash"
@@ -1089,27 +1082,27 @@
 msgid "The file \"%B\" cannot be moved to the trash."
 msgstr "Fil «%B» kan ikke flyttes til papirkurven."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1988
+#: ../libnautilus-private/nautilus-file-operations.c:2019
 msgid "Trashing Files"
 msgstr "Legger filer i papirkurven"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1990
+#: ../libnautilus-private/nautilus-file-operations.c:2021
 msgid "Deleting Files"
 msgstr "Sletter filer"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2072
+#: ../libnautilus-private/nautilus-file-operations.c:2103
 msgid "Unable to eject %V"
 msgstr "Kan ikke løse ut %V"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2074
+#: ../libnautilus-private/nautilus-file-operations.c:2105
 msgid "Unable to unmount %V"
 msgstr "Kan ikke avmontere %V"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2231
+#: ../libnautilus-private/nautilus-file-operations.c:2262
 msgid "Do you want to empty the trash before you unmount?"
 msgstr "Vil du tømme papirkurven før du avmonterer?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2233
+#: ../libnautilus-private/nautilus-file-operations.c:2264
 msgid ""
 "In order to regain the free space on this volume the trash must be emptied. "
 "All trashed items on the volume will be permanently lost."
@@ -1117,7 +1110,7 @@
 "Papirkurven må tømmes for å få tilbake ledig plass på dette volumet. Alle "
 "oppføringer i papirkurven vil bli borte permanent."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2239
+#: ../libnautilus-private/nautilus-file-operations.c:2270
 msgid "Do _not Empty Trash"
 msgstr "Ikke tø_m papirkurv"
 
@@ -1126,48 +1119,48 @@
 msgid "Unable to mount %s"
 msgstr "Kan ikke montere %s"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2448
+#: ../libnautilus-private/nautilus-file-operations.c:2479
 #, c-format
 msgid "Preparing to copy %'d file (%S)"
 msgid_plural "Preparing to copy %'d files (%S)"
 msgstr[0] "Forbereder kopiering av %'d fil (%S) …"
 msgstr[1] "Forbereder kopiering av %'d filer (%S) …"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2454
+#: ../libnautilus-private/nautilus-file-operations.c:2485
 #, c-format
 msgid "Preparing to move %'d file (%S)"
 msgid_plural "Preparing to move %'d files (%S)"
 msgstr[0] "Forbereder flytting av %'d fil (%S) …"
 msgstr[1] "Forbereder flytting av %'d filer (%S) …"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2460
+#: ../libnautilus-private/nautilus-file-operations.c:2491
 #, c-format
 msgid "Preparing to delete %'d file (%S)"
 msgid_plural "Preparing to delete %'d files (%S)"
 msgstr[0] "Forbereder sletting av %'d fil (%S) …"
 msgstr[1] "Forbereder sletting av %'d filer (%S) …"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2466
+#: ../libnautilus-private/nautilus-file-operations.c:2497
 #, c-format
 msgid "Preparing to trash %'d file"
 msgid_plural "Preparing to trash %'d files"
 msgstr[0] "Forbereder kasting av %'d fil"
 msgstr[1] "Forbereder kasting av %'d filer"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2497
-#: ../libnautilus-private/nautilus-file-operations.c:3430
-#: ../libnautilus-private/nautilus-file-operations.c:3562
-#: ../libnautilus-private/nautilus-file-operations.c:3607
+#: ../libnautilus-private/nautilus-file-operations.c:2528
+#: ../libnautilus-private/nautilus-file-operations.c:3461
+#: ../libnautilus-private/nautilus-file-operations.c:3593
+#: ../libnautilus-private/nautilus-file-operations.c:3638
 msgid "Error while copying."
 msgstr "Feil under kopiering."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2499
-#: ../libnautilus-private/nautilus-file-operations.c:3560
-#: ../libnautilus-private/nautilus-file-operations.c:3605
+#: ../libnautilus-private/nautilus-file-operations.c:2530
+#: ../libnautilus-private/nautilus-file-operations.c:3591
+#: ../libnautilus-private/nautilus-file-operations.c:3636
 msgid "Error while moving."
 msgstr "Feil under flytting."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2503
+#: ../libnautilus-private/nautilus-file-operations.c:2534
 msgid "Error while moving files to trash."
 msgstr "Feil under flytting av filer til papirkurv."
 
@@ -1204,30 +1197,30 @@
 msgid "Error while copying to \"%B\"."
 msgstr "Feil under kopiering til «%B»."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2782
+#: ../libnautilus-private/nautilus-file-operations.c:2813
 msgid "You do not have permissions to access the destination folder."
 msgstr "Du har ikke rettigheter til å aksessere målmappen."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2784
+#: ../libnautilus-private/nautilus-file-operations.c:2815
 msgid "There was an error getting information about the destination."
 msgstr "Det oppsto en feil under henting av informsjon om målet."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2827
+#: ../libnautilus-private/nautilus-file-operations.c:2858
 msgid "The destination is not a folder."
 msgstr "Målet er ikke en mappe."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2866
+#: ../libnautilus-private/nautilus-file-operations.c:2897
 msgid ""
 "There is not enough space on the destination. Try to remove files to make "
 "space."
 msgstr "Ikke nok plass på målet. Prøve å fjerne filer for å frigjøre plass."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2868
+#: ../libnautilus-private/nautilus-file-operations.c:2899
 #, c-format
 msgid "%S more space is required to copy to the destination."
 msgstr "%S mer plass kreves for å kopiere til målet."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2896
+#: ../libnautilus-private/nautilus-file-operations.c:2927
 msgid "The destination is read-only."
 msgstr "Målet er skrivebeskyttet."
 
@@ -1263,13 +1256,13 @@
 msgid "Copying file %'d of %'d to \"%B\""
 msgstr "Kopierer fil %'d av %'d til «%B»"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2997
+#: ../libnautilus-private/nautilus-file-operations.c:3028
 #, c-format
 msgid "Duplicating file %'d of %'d"
 msgstr "Dupliserer fil %'d av %'d"
 
 #. To translators: %S will expand to a size like "2 bytes" or "3 MB", so something like "4 kb of 4 MB"
-#: ../libnautilus-private/nautilus-file-operations.c:3016
+#: ../libnautilus-private/nautilus-file-operations.c:3047
 #, c-format
 msgid "%S of %S"
 msgstr "%S av %S"
@@ -1279,7 +1272,7 @@
 #. *
 #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
 #. 
-#: ../libnautilus-private/nautilus-file-operations.c:3027
+#: ../libnautilus-private/nautilus-file-operations.c:3058
 msgid "%S of %S — %T left (%S/sec)"
 msgid_plural "%S of %S — %T left (%S/sec)"
 msgstr[0] "%S av %S -- %T igjen (%S/sek)"
@@ -1318,7 +1311,7 @@
 msgid "Error while moving \"%B\"."
 msgstr "Feil under flytting av «%B»."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3658
+#: ../libnautilus-private/nautilus-file-operations.c:3689
 msgid "Could not remove the source folder."
 msgstr "Kunne ikke fjerne kildemappen."
 
@@ -1329,57 +1322,57 @@
 msgid "Error while copying \"%B\"."
 msgstr "Feil under kopiering av «%B»."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3744
+#: ../libnautilus-private/nautilus-file-operations.c:3774
 #, c-format
 msgid "Could not remove files from the already existing folder %F."
 msgstr "Kunne ikke fjerne filer fra allerede eksisterende mappe %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3785
+#: ../libnautilus-private/nautilus-file-operations.c:3815
 #, c-format
 msgid "Could not remove the already existing file %F."
 msgstr "Kunne ikke fjerne allerede eksisterende fil %F."
 
 #. the run_warning() frees all strings passed in automatically
-#: ../libnautilus-private/nautilus-file-operations.c:4105
-#: ../libnautilus-private/nautilus-file-operations.c:4808
+#: ../libnautilus-private/nautilus-file-operations.c:4135
+#: ../libnautilus-private/nautilus-file-operations.c:4835
 msgid "You cannot move a folder into itself."
 msgstr "Du kan ikke flytte en mappe til seg selv."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4106
-#: ../libnautilus-private/nautilus-file-operations.c:4809
+#: ../libnautilus-private/nautilus-file-operations.c:4136
+#: ../libnautilus-private/nautilus-file-operations.c:4836
 msgid "You cannot copy a folder into itself."
 msgstr "Du kan ikke kopiere en mappe til seg selv."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4107
-#: ../libnautilus-private/nautilus-file-operations.c:4810
+#: ../libnautilus-private/nautilus-file-operations.c:4137
+#: ../libnautilus-private/nautilus-file-operations.c:4837
 msgid "The destination folder is inside the source folder."
 msgstr "Målmappen er inne i kildemappen."
 
 #. the run_warning() frees all strings passed in automatically
-#: ../libnautilus-private/nautilus-file-operations.c:4138
+#: ../libnautilus-private/nautilus-file-operations.c:4167
 msgid "You cannot move a file over itself."
 msgstr "Du kan ikke flytte en fil over seg selv."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4139
+#: ../libnautilus-private/nautilus-file-operations.c:4168
 msgid "You cannot copy a file over itself."
 msgstr "Du kan ikke kopiere en fil over seg selv."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4140
+#: ../libnautilus-private/nautilus-file-operations.c:4169
 msgid "The source file would be overwritten by the destination."
 msgstr "Kildefilen ville blitt overskrevet av målet."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4354
+#: ../libnautilus-private/nautilus-file-operations.c:4382
 #, c-format
 msgid "Could not remove the already existing file with the same name in %F."
 msgstr "Kunne ikke fjerne eksisterende fil med samme navn i %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4424
+#: ../libnautilus-private/nautilus-file-operations.c:4452
 #, c-format
 msgid "There was an error copying the file into %F."
 msgstr "En feil oppsto under kopiering av filen til %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4656
-#: ../libnautilus-private/nautilus-file-operations.c:4690
+#: ../libnautilus-private/nautilus-file-operations.c:4683
+#: ../libnautilus-private/nautilus-file-operations.c:4717
 msgid "Copying Files"
 msgstr "Kopierer filer"
 
@@ -1387,19 +1380,19 @@
 msgid "Preparing to Move to \"%B\""
 msgstr "Forbereder flytting til «%B»"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4722
+#: ../libnautilus-private/nautilus-file-operations.c:4749
 #, c-format
 msgid "Preparing to move %'d file"
 msgid_plural "Preparing to move %'d files"
 msgstr[0] "Forbereder flytting av %'d fil"
 msgstr[1] "Forbereder flytting av %'d filer"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4966
+#: ../libnautilus-private/nautilus-file-operations.c:4993
 #, c-format
 msgid "There was an error moving the file into %F."
 msgstr "Det oppsto en feil ved flytting av filen til %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5228
+#: ../libnautilus-private/nautilus-file-operations.c:5255
 msgid "Moving Files"
 msgstr "Flytter filer"
 
@@ -1407,93 +1400,93 @@
 msgid "Creating links in \"%B\""
 msgstr "Oppretter lenker i «%B»"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5267
+#: ../libnautilus-private/nautilus-file-operations.c:5294
 #, c-format
 msgid "Making link to %'d file"
 msgid_plural "Making links to %'d files"
 msgstr[0] "Oppretter lenke til %'d fil"
 msgstr[1] "Oppretter lenker til %'d filer"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5402
+#: ../libnautilus-private/nautilus-file-operations.c:5429
 msgid "Error while creating link to %B."
 msgstr "Feil under oppretting av lenke til «%B»."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5404
+#: ../libnautilus-private/nautilus-file-operations.c:5431
 msgid "Symbolic links only supported for local files"
 msgstr "Symbolske lenker er kun støttet for lokale filer."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5407
+#: ../libnautilus-private/nautilus-file-operations.c:5434
 msgid "The target doesn't support symbolic links."
 msgstr "Målet støtter ikke symbolske lenker."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5410
+#: ../libnautilus-private/nautilus-file-operations.c:5437
 #, c-format
 msgid "There was an error creating the symlink in %F."
 msgstr "Det oppsto en feil ved oppretting av symbolsk lenke i %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5729
+#: ../libnautilus-private/nautilus-file-operations.c:5756
 msgid "Setting permissions"
 msgstr "Setter rettigheter"
 
 #. localizers: the initial name of a new folder
-#: ../libnautilus-private/nautilus-file-operations.c:5994
+#: ../libnautilus-private/nautilus-file-operations.c:6021
 msgid "Untitled Folder"
 msgstr "Mappe uten navn"
 
 #. localizers: the initial name of a new template document
-#: ../libnautilus-private/nautilus-file-operations.c:6000
+#: ../libnautilus-private/nautilus-file-operations.c:6027
 #, c-format
 msgid "Untitled %s"
 msgstr "%s uten navn"
 
 #. localizers: the initial name of a new empty document
-#: ../libnautilus-private/nautilus-file-operations.c:6006
+#: ../libnautilus-private/nautilus-file-operations.c:6033
 msgid "Untitled Document"
 msgstr "Dokument uten navn"
 
-#: ../libnautilus-private/nautilus-file-operations.c:6184
+#: ../libnautilus-private/nautilus-file-operations.c:6211
 msgid "Error while creating directory %B."
 msgstr "Feil under oppretting av katalog %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:6186
+#: ../libnautilus-private/nautilus-file-operations.c:6213
 msgid "Error while creating file %B."
 msgstr "Feil under oppretting av fil «%B»."
 
-#: ../libnautilus-private/nautilus-file-operations.c:6188
+#: ../libnautilus-private/nautilus-file-operations.c:6215
 #, c-format
 msgid "There was an error creating the directory in %F."
 msgstr "Det oppsto en feil under oppretting av katalog i %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:6457
+#: ../libnautilus-private/nautilus-file-operations.c:6484
 msgid "Emptying Trash"
 msgstr "Tømmer papirkurv"
 
-#: ../libnautilus-private/nautilus-file-operations.c:6505
-#: ../libnautilus-private/nautilus-file-operations.c:6546
-#: ../libnautilus-private/nautilus-file-operations.c:6581
-#: ../libnautilus-private/nautilus-file-operations.c:6616
+#: ../libnautilus-private/nautilus-file-operations.c:6532
+#: ../libnautilus-private/nautilus-file-operations.c:6573
+#: ../libnautilus-private/nautilus-file-operations.c:6608
+#: ../libnautilus-private/nautilus-file-operations.c:6643
 msgid "Unable to mark launcher trusted (executable)"
 msgstr "Kan ikke merke oppstartsfil med tillit (kjørbar)"
 
 #. Reset to default info
 #: ../libnautilus-private/nautilus-file-undo-operations.c:135
-#: ../src/nautilus-view.c:2506
+#: ../src/nautilus-view.c:2553
 msgid "Undo"
 msgstr "Angre"
 
 #: ../libnautilus-private/nautilus-file-undo-operations.c:138
-#: ../src/nautilus-view.c:2507
+#: ../src/nautilus-view.c:2554
 msgid "Undo last action"
 msgstr "Angre forrige handling"
 
 #. Reset to default info
 #: ../libnautilus-private/nautilus-file-undo-operations.c:142
-#: ../src/nautilus-view.c:2525
+#: ../src/nautilus-view.c:2572
 msgid "Redo"
 msgstr "Gjør om"
 
 #: ../libnautilus-private/nautilus-file-undo-operations.c:145
-#: ../src/nautilus-view.c:2526
+#: ../src/nautilus-view.c:2573
 msgid "Redo last undone action"
 msgstr "Gjør om angret handling"
 
@@ -1847,11 +1840,11 @@
 msgid "Could not determine original location of \"%s\" "
 msgstr "Kunne ikke bestemme opprinnelig lokasjon for «%s» "
 
-#: ../libnautilus-private/nautilus-file-utilities.c:1188
+#: ../libnautilus-private/nautilus-file-utilities.c:1260
 msgid "The item cannot be restored from trash"
 msgstr "Oppføringen kan ikke gjenopprettes fra papirkurven"
 
-#: ../libnautilus-private/nautilus-canvas-container.c:2380
+#: ../libnautilus-private/nautilus-canvas-container.c:2448
 msgid "The selection rectangle"
 msgstr "Utvalgsrektangelet"
 
@@ -1905,32 +1898,32 @@
 msgid "Set as default"
 msgstr "Sett som forvalg"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:311
+#: ../libnautilus-private/nautilus-program-choosing.c:313
 msgid "Sorry, but you cannot execute commands from a remote site."
 msgstr "Beklager, du kan ikke kjøre kommandoer fra en ekstern tjener."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:313
+#: ../libnautilus-private/nautilus-program-choosing.c:315
 msgid "This is disabled due to security considerations."
 msgstr "Dette er deaktivert av sikkerhetshensyn."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:324
-#: ../libnautilus-private/nautilus-program-choosing.c:392
+#: ../libnautilus-private/nautilus-program-choosing.c:326
+#: ../libnautilus-private/nautilus-program-choosing.c:394
 msgid "There was an error launching the application."
 msgstr "En feil oppsto under oppstart av programmet."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:349
-#: ../libnautilus-private/nautilus-program-choosing.c:360
+#: ../libnautilus-private/nautilus-program-choosing.c:351
+#: ../libnautilus-private/nautilus-program-choosing.c:362
 msgid "This drop target only supports local files."
 msgstr "Mål for slipp støtter kun lokale filer."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:350
+#: ../libnautilus-private/nautilus-program-choosing.c:352
 msgid ""
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "For å åpne eksterne filer må du kopiere dem til en lokal mappe og slippe dem "
 "igjen."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:361
+#: ../libnautilus-private/nautilus-program-choosing.c:363
 msgid ""
 "To open non-local files copy them to a local folder and then drop them "
 "again. The local files you dropped have already been opened."
@@ -1938,7 +1931,7 @@
 "For å åpne eksterne filer må du kopiere dem til en lokal mappe og slippe dem "
 "igjen. De lokale filene du slapp er allerede åpnet."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:390
+#: ../libnautilus-private/nautilus-program-choosing.c:392
 msgid "Details: "
 msgstr "Detaljer: "
 
@@ -1947,10 +1940,10 @@
 msgid "Preparing"
 msgstr "Forbereder"
 
-#: ../libnautilus-private/nautilus-query.c:205
-#: ../libnautilus-private/nautilus-search-directory-file.c:160
-#: ../libnautilus-private/nautilus-search-directory-file.c:186
-#: ../libnautilus-private/nautilus-search-directory-file.c:220
+#: ../libnautilus-private/nautilus-query.c:208
+#: ../libnautilus-private/nautilus-search-directory-file.c:161
+#: ../libnautilus-private/nautilus-search-directory-file.c:213
+#: ../libnautilus-private/nautilus-search-directory-file.c:258
 msgid "Search"
 msgstr "Søk"
 
@@ -1990,6 +1983,8 @@
 "current tab. If set to \"end\", then new tabs are appended to the end of the "
 "tab list."
 msgstr ""
+"Sett til «after-current-tab» for at nye faner skal plasseres etter gjeldende "
+"fane. Sett til «end» for å åpne nye faner på slutten av fanelisten."
 
 #: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:3
 msgid "Enables the classic Nautilus behavior, where all windows are browsers"
@@ -2285,7 +2280,7 @@
 msgid "Whether to show hidden files"
 msgstr "Om skjulte filer skal vises"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:36
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:46
 msgid ""
 "If set to true, then hidden files are shown by default in the file manager. "
 "Hidden files are either dotfiles, listed in the folder's .hidden file or "
@@ -2307,6 +2302,12 @@
 "their executable name and any command line options. If the executable name "
 "is not set to a full path, it will be searched for in the search path."
 msgstr ""
+"Hvis dette er valgt, legger Nautilus til URI-er for valgte filer og "
+"behandler resultatet som en kommando for buntendring av filnavn. Programmer "
+"for buntvis navnendring kan registrere seg selv i denne nøkkelen ved å føre "
+"den opp som en mellomromsdelt tekst med det kjørbare navnet og eventuelle "
+"kommandolinjevalg. Hvis det kjørbare navnet ikke er en fullstendig filsti, "
+"søkes det etter i søkestien."
 
 #: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:39
 msgid "List of possible captions on icons"
@@ -2442,19 +2443,19 @@
 "Nautilus viser kun kataloger i trevisningen i sidepanelet hvis satt til "
 "«true». Ellers vises både kataloger og filer."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:54
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:56
 msgid "Desktop font"
 msgstr "Skrift for skrivebord"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:55
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:57
 msgid "The font _description used for the icons on the desktop."
 msgstr "Beskrivelse av skrifter for ikonene på skrivebordet."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:56
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:58
 msgid "Home icon visible on desktop"
 msgstr "Vis Hjem-ikonet på skrivebordet"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:57
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:59
 msgid ""
 "If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
@@ -2474,11 +2475,11 @@
 "Et ikon med en lenke til datamaskinen plasseres på skrivebordet hvis denne "
 "settes til «true»."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:58
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:60
 msgid "Trash icon visible on desktop"
 msgstr "Papirkurvikon synlig på skrivebordet"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:59
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:61
 msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
@@ -2486,11 +2487,11 @@
 "Et ikon med en lenke til papirkurven plasseres på skrivebordet hvis denne "
 "settes til «true»."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:60
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:62
 msgid "Show mounted volumes on the desktop"
 msgstr "Vis monterte volum på skrivebordet"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:61
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:63
 msgid ""
 "If this is set to true, icons linking to mounted volumes will be put on the "
 "desktop."
@@ -2498,11 +2499,11 @@
 "Ikoner med en lenke til monterte volum plasseres på skrivebordet hvis denne "
 "settes til «true»."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:62
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:64
 msgid "Network Servers icon visible on the desktop"
 msgstr "Nettverk-ikonet er synlig på skrivebordet"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:63
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:65
 msgid ""
 "If this is set to true, an icon linking to the Network Servers view will be "
 "put on the desktop."
@@ -2522,31 +2523,31 @@
 "Dette navnet kan settes hvis du ønsker et tilpasset navn for ikon for "
 "datamaskin på skrivebordet."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:64
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:66
 msgid "Desktop home icon name"
 msgstr "Ikonnavn for Hjem på skrivebordet"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:65
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:67
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
 msgstr "Tilpasset navn for hjemmeikonet på skrivebordet."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:66
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:68
 msgid "Desktop trash icon name"
 msgstr "Ikonnavn for Papirkurv på skrivebordet"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:67
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:69
 msgid ""
 "This name can be set if you want a custom name for the trash icon on the "
 "desktop."
 msgstr "Tilpasset navn for papirkurvikonet på skrivebordet."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:68
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:70
 msgid "Network servers icon name"
 msgstr "Ikonnavn for nettverkstjenere"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:69
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:71
 msgid ""
 "This name can be set if you want a custom name for the network servers icon "
 "on the desktop."
@@ -2554,7 +2555,7 @@
 "Dette navnet kan settes hvis du ønsker et tilpasset navn for ikonet for "
 "nettverkstjenere på skrivebordet."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:70
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:72
 msgid ""
 "An integer specifying how parts of overlong file names should be replaced by "
 "ellipses on the desktop. If the number is larger than 0, the file name will "
@@ -2566,11 +2567,11 @@
 "overskride antallet linjer. Hvis tallet er 0 eller mindre er det ingen "
 "grense på antallet viste linjer."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:71
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:73
 msgid "Fade the background on change"
 msgstr "Glidende overgang for bakgrunnen ved endring"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:72
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:74
 msgid ""
 "If set to true, then Nautilus will use a fade effect to change the desktop "
 "background."
@@ -2578,11 +2579,11 @@
 "Nautilus endrer skrivebordet med glidende overgang hvis denne er satt til "
 "«true»."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:73
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:75
 msgid "The geometry string for a navigation window."
 msgstr "Geometristreng for et navigeringsvindu."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:74
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:76
 msgid ""
 "A string containing the saved geometry and coordinates string for navigation "
 "windows."
@@ -2590,19 +2591,19 @@
 "En streng som inneholder lagret geometri og koordinatstreng for "
 "navigeringsvinduer."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:75
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:77
 msgid "Whether the navigation window should be maximized."
 msgstr "Om navigeringsvinduet skal være maksimert."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:76
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:78
 msgid "Whether the navigation window should be maximized by default."
 msgstr "Om navigeringsvinduet skal være maksimert som forvalg."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:77
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:79
 msgid "Width of the side pane"
 msgstr "Bredde på sidepanelet"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:78
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:80
 msgid "The default width of the side pane in new windows."
 msgstr "Forvalgt bredde for sidepanelet i nye vinduer."
 
@@ -2614,11 +2615,11 @@
 msgid "If set to true, newly opened windows will have toolbars visible."
 msgstr "Nye vinduer har verktøylinjen synlig hvis satt til «true»."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:79
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:81
 msgid "Show location bar in new windows"
 msgstr "Vis adressefelt i nye vinduer"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:80
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:82
 msgid ""
 "If set to true, newly opened windows will have the location bar visible."
 msgstr "Nye vinduer har adressefeltet synlig hvis satt til «true»."
@@ -2632,11 +2633,11 @@
 "If set to true, newly opened windows will have the status bar visible."
 msgstr "Nye vinduer ha statuslinjen synlig hvis satt til «true»."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:81
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:83
 msgid "Show side pane in new windows"
 msgstr "Vis sidelinje i nye vinduer"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:82
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:84
 msgid "If set to true, newly opened windows will have the side pane visible."
 msgstr "Nye vinduer har sidepanelet synlig hvis satt til «true»."
 
@@ -2687,7 +2688,7 @@
 "Vennligst opprett disse mappene før du kjører Nautilus, eller sett "
 "rettigheter slik at Nautilus kan opprette dem."
 
-#: ../src/nautilus-application.c:372
+#: ../src/nautilus-application.c:366
 msgid ""
 "Nautilus 3.0 deprecated this directory and tried migrating this "
 "configuration to ~/.config/nautilus"
@@ -2695,54 +2696,54 @@
 "Nautilus 3.0 bruker ikke denne katalogen lenger og prøvde å migrere "
 "konfigurasjonen til ~/.config/nautilus"
 
-#: ../src/nautilus-application.c:1022
+#: ../src/nautilus-application.c:1085
 msgid "--check cannot be used with other options."
 msgstr "--check kan ikke brukes med sammen med andre flagg."
 
-#: ../src/nautilus-application.c:1028
+#: ../src/nautilus-application.c:1091
 msgid "--quit cannot be used with URIs."
 msgstr "--quit kan ikke brukes med URIer."
 
-#: ../src/nautilus-application.c:1035
+#: ../src/nautilus-application.c:1098
 msgid "--geometry cannot be used with more than one URI."
 msgstr "--geometry kan ikke brukes med mer enn én URI."
 
-#: ../src/nautilus-application.c:1139
+#: ../src/nautilus-application.c:1209
 msgid "Perform a quick set of self-check tests."
 msgstr "Utfør et raskt sett med selvsjekk-tester."
 
-#: ../src/nautilus-application.c:1145
+#: ../src/nautilus-application.c:1215
 msgid "Show the version of the program."
 msgstr "Vis versjonen av programmet."
 
-#: ../src/nautilus-application.c:1147
+#: ../src/nautilus-application.c:1217
 msgid "Create the initial window with the given geometry."
 msgstr "Opprett startvinduet med en oppgitt geometri."
 
-#: ../src/nautilus-application.c:1147
+#: ../src/nautilus-application.c:1217
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: ../src/nautilus-application.c:1149
+#: ../src/nautilus-application.c:1221
 msgid "Only create windows for explicitly specified URIs."
-msgstr "Kun opprett Nautilus-vinduer for eksplisitt spesifiserte URIer."
+msgstr "Kun opprett vinduer for eksplisitt spesifiserte URIer."
 
-#: ../src/nautilus-application.c:1151
+#: ../src/nautilus-application.c:976
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 "Ikke tegn opp skrivebordet (ignorer brukervalg satt i brukervalg-dialogen)."
 
-#: ../src/nautilus-application.c:1153
+#: ../src/nautilus-application.c:1227
 msgid "Quit Nautilus."
 msgstr "Avslutt Nautilus."
 
-#: ../src/nautilus-application.c:1156
+#: ../src/nautilus-application.c:1230
 msgid "[URI...]"
 msgstr "[URI …]"
 
-#: ../src/nautilus-application.c:1169
+#: ../src/nautilus-application.c:1242
 msgid ""
 "\n"
 "\n"
@@ -2788,13 +2789,13 @@
 "\n"
 "Trykk Avbryt hvis du er i tvil."
 
-#: ../src/nautilus-autorun-software.c:240 ../src/nautilus-mime-actions.c:724
+#: ../src/nautilus-autorun-software.c:241 ../src/nautilus-mime-actions.c:724
 msgid "_Run"
 msgstr "Kjø_r"
 
-#: ../src/nautilus-application.c:851
-#: ../src/nautilus-file-management-properties.c:196
-#: ../src/nautilus-window-menus.c:253
+#: ../src/nautilus-application.c:911
+#: ../src/nautilus-file-management-properties.c:197
+#: ../src/nautilus-window-menus.c:254
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -2882,7 +2883,7 @@
 msgstr "Fortsett"
 
 #: ../src/nautilus-connect-server-dialog.c:104
-#: ../src/nautilus-properties-window.c:5192 ../src/nautilus-view.c:1438
+#: ../src/nautilus-properties-window.c:5196 ../src/nautilus-view.c:1471
 msgid "There was an error displaying help."
 msgstr "Det oppsto en feil under vising av hjelp."
 
@@ -2920,7 +2921,7 @@
 msgid "Sh_are:"
 msgstr "_Delt ressurs:"
 
-#: ../src/nautilus-view.c:1620
+#: ../src/nautilus-view.c:1653
 msgid "_Folder:"
 msgstr "_Mappe:"
 
@@ -2970,39 +2971,39 @@
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-desktop-canvas-view.c:706 ../src/nautilus-view.c:7146
-#: ../src/nautilus-view.c:8679
+#: ../src/nautilus-desktop-canvas-view.c:621 ../src/nautilus-view.c:7202
+#: ../src/nautilus-view.c:8747
 msgid "E_mpty Trash"
 msgstr "Tø_m papirkurv"
 
 #. label, accelerator
-#: ../src/nautilus-desktop-canvas-view.c:743
+#: ../src/nautilus-desktop-canvas-view.c:658
 msgid "Change Desktop _Background"
 msgstr "Endre skrivebords_bakgrunn"
 
 #. tooltip
-#: ../src/nautilus-desktop-canvas-view.c:745
+#: ../src/nautilus-desktop-canvas-view.c:660
 msgid ""
 "Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
 "Vis et vindu som lar deg velge mønster eller farge for skrivebordsbakgrunnen"
 
 #. label, accelerator
-#: ../src/nautilus-desktop-canvas-view.c:750
+#: ../src/nautilus-desktop-canvas-view.c:665
 msgid "Empty Trash"
 msgstr "Tøm papirkurv"
 
 #. tooltip
-#: ../src/nautilus-desktop-canvas-view.c:752 ../src/nautilus-trash-bar.c:213
-#: ../src/nautilus-view.c:7147
+#: ../src/nautilus-desktop-canvas-view.c:667 ../src/nautilus-trash-bar.c:213
+#: ../src/nautilus-view.c:7203
 msgid "Delete all items in the Trash"
 msgstr "Slett alle oppføringer i papirkurven"
 
-#: ../src/nautilus-desktop-canvas-view.c:851
+#: ../src/nautilus-desktop-canvas-view.c:789
 msgid "The desktop view encountered an error."
 msgstr "Visning av skrivebord ble utsatt for en feil."
 
-#: ../src/nautilus-desktop-canvas-view.c:852
+#: ../src/nautilus-desktop-canvas-view.c:790
 msgid "The desktop view encountered an error while starting up."
 msgstr "Visning av skrivebord ble utsatt for en feil under oppstart."
 
@@ -3033,8 +3034,7 @@
 msgstr "Ubuntuhjelp"
 
 #. hardcode "Desktop"
-#: ../src/nautilus-desktop-window.c:92 ../src/nautilus-desktop-window.c:263
-#: ../src/nautilus-places-sidebar.c:528
+#: ../src/nautilus-desktop-window.c:92 ../src/nautilus-desktop-window.c:245
 msgid "Desktop"
 msgstr "Skrivebord"
 
@@ -3146,9 +3146,9 @@
 msgstr "Endrer navn fra «%s» til «%s»."
 
 #. Translators: this is referred to captions under icons.
-#: ../src/nautilus-file-management-properties.c:280
-#: ../src/nautilus-properties-window.c:4049
-#: ../src/nautilus-properties-window.c:4076
+#: ../src/nautilus-file-management-properties.c:281
+#: ../src/nautilus-properties-window.c:4053
+#: ../src/nautilus-properties-window.c:4080
 msgid "None"
 msgstr "Ingen"
 
@@ -3288,7 +3288,7 @@
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../src/nautilus-file-management-properties.ui.h:24
+#: ../src/nautilus-file-management-properties.ui.h:26
 msgid "Display"
 msgstr "Vis"
 
@@ -3296,11 +3296,11 @@
 msgid "<b>List Columns</b>"
 msgstr "<b>Listekolonner</b>"
 
-#: ../src/nautilus-file-management-properties.ui.h:25
+#: ../src/nautilus-file-management-properties.ui.h:27
 msgid "Choose the order of information to appear in the list view."
 msgstr "Velg rekkefølgen for informasjonen som skal vises i listevisning."
 
-#: ../src/nautilus-file-management-properties.ui.h:26
+#: ../src/nautilus-file-management-properties.ui.h:28
 msgid "List Columns"
 msgstr "Listekolonner"
 
@@ -3316,11 +3316,11 @@
 msgid "<b>Other Previewable Files</b>"
 msgstr "<b>Andre filer som kan forhåndsvises</b>"
 
-#: ../src/nautilus-file-management-properties.ui.h:28
+#: ../src/nautilus-file-management-properties.ui.h:30
 msgid "Show _thumbnails:"
 msgstr "Vis minia_tyrer:"
 
-#: ../src/nautilus-file-management-properties.ui.h:29
+#: ../src/nautilus-file-management-properties.ui.h:31
 msgid "_Only for files smaller than:"
 msgstr "_Kun for filer mindre enn:"
 
@@ -3328,26 +3328,21 @@
 msgid "<b>Folders</b>"
 msgstr "<b>Mapper</b>"
 
-#: ../src/nautilus-file-management-properties.ui.h:31
+#: ../src/nautilus-file-management-properties.ui.h:33
 msgid "Count _number of items:"
 msgstr "Vis a_ntall oppføringer:"
 
-#: ../src/nautilus-file-management-properties.ui.h:32
+#: ../src/nautilus-file-management-properties.ui.h:34
 msgid "Preview"
 msgstr "Forhåndsvis"
 
-#. translators: this is used in the view selection dropdown
-#. * of navigation windows and in the preferences dialog
-#: ../src/nautilus-canvas-view.c:2292
-#: ../src/nautilus-canvas-view-container.c:571
-#: ../src/nautilus-file-management-properties.ui.h:33
+#: ../src/nautilus-canvas-view-container.c:573
+#: ../src/nautilus-file-management-properties.ui.h:35
 msgid "Icon View"
 msgstr "Ikonvisning"
 
-#. translators: this is used in the view selection dropdown
-#. * of navigation windows and in the preferences dialog
-#: ../src/nautilus-file-management-properties.ui.h:34
-#: ../src/nautilus-list-view.c:1578 ../src/nautilus-list-view.c:3023
+#: ../src/nautilus-file-management-properties.ui.h:24
+#: ../src/nautilus-list-view.c:2136
 msgid "List View"
 msgstr "Listevisning"
 
@@ -3358,114 +3353,114 @@
 msgid "Compact View"
 msgstr "Kompakt visning"
 
-#: ../src/nautilus-file-management-properties.ui.h:35
+#: ../src/nautilus-file-management-properties.ui.h:36
 msgid "Always"
 msgstr "Alltid"
 
-#: ../src/nautilus-file-management-properties.ui.h:36
+#: ../src/nautilus-file-management-properties.ui.h:37
 msgid "Local Files Only"
 msgstr "Kun lokale filer"
 
-#: ../src/nautilus-file-management-properties.ui.h:37
+#: ../src/nautilus-file-management-properties.ui.h:38
 msgid "Never"
 msgstr "Aldri"
 
-#: ../src/nautilus-file-management-properties.ui.h:38
+#: ../src/nautilus-file-management-properties.ui.h:39
 msgid "By Name"
 msgstr "Etter navn"
 
-#: ../src/nautilus-file-management-properties.ui.h:39
+#: ../src/nautilus-file-management-properties.ui.h:40
 msgid "By Size"
 msgstr "Etter størrelse"
 
-#: ../src/nautilus-file-management-properties.ui.h:40
+#: ../src/nautilus-file-management-properties.ui.h:41
 msgid "By Type"
 msgstr "Etter type"
 
-#: ../src/nautilus-file-management-properties.ui.h:41
+#: ../src/nautilus-file-management-properties.ui.h:42
 msgid "By Modification Date"
 msgstr "Etter endringsdato"
 
-#: ../src/nautilus-file-management-properties.ui.h:42
+#: ../src/nautilus-file-management-properties.ui.h:43
 msgid "By Access Date"
 msgstr "Etter dato for aksess"
 
-#: ../src/nautilus-file-management-properties.ui.h:43
+#: ../src/nautilus-file-management-properties.ui.h:44
 msgid "By Trashed Date"
 msgstr "Etter når den ble lagt i papirkurven"
 
-#: ../src/nautilus-file-management-properties.ui.h:45
+#: ../src/nautilus-file-management-properties.ui.h:46
 #, no-c-format
 msgid "33%"
 msgstr "33%"
 
-#: ../src/nautilus-file-management-properties.ui.h:47
+#: ../src/nautilus-file-management-properties.ui.h:48
 #, no-c-format
 msgid "50%"
 msgstr "50%"
 
-#: ../src/nautilus-file-management-properties.ui.h:49
+#: ../src/nautilus-file-management-properties.ui.h:50
 #, no-c-format
 msgid "66%"
 msgstr "66%"
 
-#: ../src/nautilus-file-management-properties.ui.h:51
+#: ../src/nautilus-file-management-properties.ui.h:52
 #, no-c-format
 msgid "100%"
 msgstr "100%"
 
-#: ../src/nautilus-file-management-properties.ui.h:53
+#: ../src/nautilus-file-management-properties.ui.h:54
 #, no-c-format
 msgid "150%"
 msgstr "150%"
 
-#: ../src/nautilus-file-management-properties.ui.h:55
+#: ../src/nautilus-file-management-properties.ui.h:56
 #, no-c-format
 msgid "200%"
 msgstr "200%"
 
-#: ../src/nautilus-file-management-properties.ui.h:57
+#: ../src/nautilus-file-management-properties.ui.h:58
 #, no-c-format
 msgid "400%"
 msgstr "400%"
 
-#: ../src/nautilus-file-management-properties.ui.h:58
+#: ../src/nautilus-file-management-properties.ui.h:59
 msgid "100 KB"
 msgstr "100 KB"
 
-#: ../src/nautilus-file-management-properties.ui.h:59
+#: ../src/nautilus-file-management-properties.ui.h:60
 msgid "500 KB"
 msgstr "500 KB"
 
-#: ../src/nautilus-file-management-properties.ui.h:60
+#: ../src/nautilus-file-management-properties.ui.h:61
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../src/nautilus-file-management-properties.ui.h:61
+#: ../src/nautilus-file-management-properties.ui.h:62
 msgid "3 MB"
 msgstr "3 MB"
 
-#: ../src/nautilus-file-management-properties.ui.h:62
+#: ../src/nautilus-file-management-properties.ui.h:63
 msgid "5 MB"
 msgstr "5 MB"
 
-#: ../src/nautilus-file-management-properties.ui.h:63
+#: ../src/nautilus-file-management-properties.ui.h:64
 msgid "10 MB"
 msgstr "10 MB"
 
-#: ../src/nautilus-file-management-properties.ui.h:64
+#: ../src/nautilus-file-management-properties.ui.h:65
 msgid "100 MB"
 msgstr "100 MB"
 
-#: ../src/nautilus-file-management-properties.ui.h:65
+#: ../src/nautilus-file-management-properties.ui.h:66
 msgid "1 GB"
 msgstr "1 GB"
 
-#: ../src/nautilus-file-management-properties.ui.h:66
+#: ../src/nautilus-file-management-properties.ui.h:67
 msgid "2 GB"
 msgstr "2 GB"
 
-#: ../src/nautilus-file-management-properties.ui.h:67
+#: ../src/nautilus-file-management-properties.ui.h:68
 msgid "4 GB"
 msgstr "4 GB"
 
@@ -3473,7 +3468,7 @@
 msgid "by _Name"
 msgstr "etter _navn"
 
-#: ../src/nautilus-canvas-view.c:1173
+#: ../src/nautilus-canvas-view.c:1127
 msgid "Keep icons sorted by name in rows"
 msgstr "Behold ikoner sortert etter navn i rader"
 
@@ -3481,7 +3476,7 @@
 msgid "by _Size"
 msgstr "etter _størrelse"
 
-#: ../src/nautilus-canvas-view.c:1177
+#: ../src/nautilus-canvas-view.c:1131
 msgid "Keep icons sorted by size in rows"
 msgstr "Behold ikoner sortert etter størrelse i rader"
 
@@ -3489,7 +3484,7 @@
 msgid "by _Type"
 msgstr "etter _type"
 
-#: ../src/nautilus-canvas-view.c:1181
+#: ../src/nautilus-canvas-view.c:1135
 msgid "Keep icons sorted by type in rows"
 msgstr "Behold ikoner sortert etter type i rader"
 
@@ -3497,7 +3492,7 @@
 msgid "by Modification _Date"
 msgstr "etter endrings_dato"
 
-#: ../src/nautilus-canvas-view.c:1185
+#: ../src/nautilus-canvas-view.c:1139
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Behold ikoner sortert etter endringsdato i rader"
 
@@ -3505,12 +3500,12 @@
 msgid "by T_rash Time"
 msgstr "etter tid den ble lagt i papi_rkurven"
 
-#: ../src/nautilus-canvas-view.c:1189
+#: ../src/nautilus-canvas-view.c:1147
 msgid "Keep icons sorted by trash time in rows"
 msgstr "Behold ikoner sortert etter tiden den ble lagt i papirkurven"
 
 #. label, accelerator
-#: ../src/nautilus-desktop-canvas-view.c:757
+#: ../src/nautilus-desktop-canvas-view.c:672
 msgid "_Organize Desktop by Name"
 msgstr "_Organiser skrivebordet etter navn"
 
@@ -3519,8 +3514,9 @@
 msgid "Arran_ge Items"
 msgstr "_Plasser oppføringer"
 
+#. name, stock id
 #. label, accelerator
-#: ../src/nautilus-desktop-canvas-view.c:785
+#: ../src/nautilus-icon-view.c:1299
 msgid "Resize Icon..."
 msgstr "Endre størrelse på ikon …"
 
@@ -3530,13 +3526,13 @@
 msgstr "Gjør det mulig å endre størrelse på valgt ikon"
 
 #. label, accelerator
-#: ../src/nautilus-desktop-canvas-view.c:730
-#: ../src/nautilus-desktop-canvas-view.c:771
+#: ../src/nautilus-desktop-canvas-view.c:645
+#: ../src/nautilus-desktop-canvas-view.c:686
 msgid "Restore Icons' Original Si_zes"
 msgstr "G_jenopprett ikonenes opprinnelige størrelser"
 
 #. tooltip
-#: ../src/nautilus-icon-view.c:1304
+#: ../src/nautilus-desktop-canvas-view.c:688
 msgid "Restore each selected icon to its original size"
 msgstr "Gjenopprett original størrelse for alle valgte ikoner"
 
@@ -3547,7 +3543,7 @@
 msgstr "_Organiser etter navn"
 
 #. tooltip
-#: ../src/nautilus-desktop-canvas-view.c:759
+#: ../src/nautilus-desktop-canvas-view.c:674
 msgid "Reposition icons to better fit in the window and avoid overlapping"
 msgstr ""
 "Plasser ikonene på nytt slik at de passer bedre til vinduene og unngår "
@@ -3555,72 +3551,72 @@
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-canvas-view.c:1155
+#: ../src/nautilus-canvas-view.c:1109
 msgid "Re_versed Order"
 msgstr "Om_vendt rekkefølge"
 
 #. tooltip
-#: ../src/nautilus-canvas-view.c:1156
+#: ../src/nautilus-canvas-view.c:1110
 msgid "Display icons in the opposite order"
 msgstr "Vis ikoner i omvendt rekkefølge"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-canvas-view.c:1160
+#: ../src/nautilus-canvas-view.c:1114
 msgid "_Keep Aligned"
 msgstr "_Behold justert"
 
 #. tooltip
-#: ../src/nautilus-canvas-view.c:1161
+#: ../src/nautilus-canvas-view.c:1115
 msgid "Keep icons lined up on a grid"
 msgstr "Behold ikoner justert i et rutenett"
 
-#: ../src/nautilus-canvas-view.c:1168
+#: ../src/nautilus-canvas-view.c:1122
 msgid "_Manually"
 msgstr "_Manuelt"
 
-#: ../src/nautilus-canvas-view.c:1169
+#: ../src/nautilus-canvas-view.c:1123
 msgid "Leave icons wherever they are dropped"
 msgstr "La ikoner bli hvor de slippes"
 
-#: ../src/nautilus-canvas-view.c:1172
+#: ../src/nautilus-canvas-view.c:1126
 msgid "By _Name"
 msgstr "Etter _navn"
 
-#: ../src/nautilus-canvas-view.c:1176
+#: ../src/nautilus-canvas-view.c:1130
 msgid "By _Size"
 msgstr "Etter _størrelse"
 
-#: ../src/nautilus-canvas-view.c:1180
+#: ../src/nautilus-canvas-view.c:1134
 msgid "By _Type"
 msgstr "Etter _type"
 
-#: ../src/nautilus-canvas-view.c:1184
+#: ../src/nautilus-canvas-view.c:1138
 msgid "By Modification _Date"
 msgstr "Etter endrings_dato"
 
-#: ../src/nautilus-canvas-view.c:1188
+#: ../src/nautilus-canvas-view.c:1146
 msgid "By T_rash Time"
 msgstr "Etter når den ble lagt i papi_rkurven"
 
-#: ../src/nautilus-desktop-canvas-view.c:731
+#: ../src/nautilus-desktop-canvas-view.c:646
 msgid "Restore Icon's Original Si_ze"
 msgstr "G_jenopprett ikonets opprinnelige størrelse"
 
 #. translators: this is used in the view menu
-#: ../src/nautilus-canvas-view.c:2294
+#: ../src/nautilus-canvas-view.c:2308
 msgid "_Icons"
 msgstr "_Ikoner"
 
-#: ../src/nautilus-canvas-view.c:2295
+#: ../src/nautilus-canvas-view.c:2309
 msgid "The icon view encountered an error."
 msgstr "Ikonvisningen ble utsatt for en feil."
 
-#: ../src/nautilus-canvas-view.c:2296
+#: ../src/nautilus-canvas-view.c:2310
 msgid "The icon view encountered an error while starting up."
 msgstr "Ikonvisningen ble utsatt for en feil under oppstart."
 
-#: ../src/nautilus-canvas-view.c:2297
+#: ../src/nautilus-canvas-view.c:2311
 msgid "Display this location with the icon view."
 msgstr "Vis denne lokasjonen med ikonvisning."
 
@@ -3733,59 +3729,59 @@
 msgid "loading..."
 msgstr "laster …"
 
-#: ../libnautilus-private/nautilus-file.c:6156
+#: ../libnautilus-private/nautilus-file.c:6169
 #: ../src/nautilus-image-properties-page.c:769
 msgid "Image"
 msgstr "Bilde"
 
-#: ../src/nautilus-list-model.c:370
+#: ../src/nautilus-list-model.c:390
 msgid "(Empty)"
 msgstr "(Tom)"
 
-#: ../src/nautilus-image-properties-page.c:655
-#: ../src/nautilus-list-model.c:378 ../src/nautilus-window-slot.c:417
-#: ../src/nautilus-window-slot.c:469
+#: ../src/nautilus-list-model.c:395 ../src/nautilus-tree-sidebar-model.c:1252
+#: ../src/nautilus-window-manage-views.c:1140
+#: ../src/nautilus-window-slot.c:201
 msgid "Loading..."
 msgstr "Laster …"
 
-#: ../src/nautilus-list-view.c:2277
+#: ../src/nautilus-list-view.c:2942
 #, c-format
 msgid "%s Visible Columns"
 msgstr "%s synlige kolonner"
 
-#: ../src/nautilus-list-view.c:2297
+#: ../src/nautilus-list-view.c:2962
 msgid "Choose the order of information to appear in this folder:"
 msgstr "Velg rekkefølgen for informasjonen som skal vises i denne mappen"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-list-view.c:2410
+#: ../src/nautilus-list-view.c:2614
 msgid "Visible _Columns..."
 msgstr "Synlige _kolonner …"
 
 #. tooltip
-#: ../src/nautilus-list-view.c:2353
+#: ../src/nautilus-list-view.c:3018
 msgid "Select the columns visible in this folder"
 msgstr "Velg synlige kolonner i denne mappen"
 
 #. translators: this is used in the view menu
-#: ../src/nautilus-list-view.c:3025
+#: ../src/nautilus-list-view.c:3327
 msgid "_List"
 msgstr "_Liste"
 
-#: ../src/nautilus-list-view.c:3026
+#: ../src/nautilus-list-view.c:3328
 msgid "The list view encountered an error."
 msgstr "Listevisningen ble utsatt for en feil."
 
-#: ../src/nautilus-list-view.c:3027
+#: ../src/nautilus-list-view.c:3329
 msgid "The list view encountered an error while starting up."
 msgstr "Listevisningen ble utsatt for en feil under oppstart."
 
-#: ../src/nautilus-list-view.c:3028
+#: ../src/nautilus-list-view.c:3330
 msgid "Display this location with the list view."
 msgstr "Vis denne lokasjonen med listevisning."
 
-#: ../src/nautilus-properties-window.c:3284
+#: ../src/nautilus-properties-window.c:3288
 msgid "Location:"
 msgstr "Adresse:"
 
@@ -3828,9 +3824,9 @@
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-mime-actions.c:652 ../src/nautilus-view.c:7204
-#: ../src/nautilus-view.c:7318 ../src/nautilus-view.c:8292
-#: ../src/nautilus-view.c:8596
+#: ../src/nautilus-mime-actions.c:652 ../src/nautilus-view.c:7258
+#: ../src/nautilus-view.c:7372 ../src/nautilus-view.c:8346
+#: ../src/nautilus-view.c:8664
 msgid "Mo_ve to Trash"
 msgstr "Fl_ytt til papirkurv"
 
@@ -3853,7 +3849,7 @@
 msgstr "_Vis"
 
 #: ../src/nautilus-mime-actions.c:1057 ../src/nautilus-mime-actions.c:1792
-#: ../src/nautilus-view.c:955
+#: ../src/nautilus-view.c:961
 msgid "Are you sure you want to open all files?"
 msgstr "Er du sikker på at du vil åpne alle filer?"
 
@@ -3954,29 +3950,29 @@
 msgstr[0] "Åpner %d oppføring."
 msgstr[1] "Åpner %d oppføringer."
 
-#: ../src/nautilus-notebook.c:371
+#: ../src/nautilus-notebook.c:383
 msgid "Close tab"
 msgstr "Lukk fane"
 
-#: ../src/nautilus-places-sidebar.c:237
+#: ../src/nautilus-places-sidebar.c:241
 msgid "Devices"
 msgstr "Enheter"
 
-#: ../src/nautilus-bookmarks-window.c:710 ../src/nautilus-places-sidebar.c:245
+#: ../src/nautilus-bookmarks-window.c:710
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
-#: ../src/nautilus-places-sidebar.c:596 ../src/nautilus-places-sidebar.c:621
-#: ../src/nautilus-places-sidebar.c:796
+#: ../src/nautilus-places-sidebar.c:608 ../src/nautilus-places-sidebar.c:633
+#: ../src/nautilus-places-sidebar.c:816
 #, c-format
 msgid "Mount and open %s"
 msgstr "Monter og åpne %s"
 
-#: ../src/nautilus-places-sidebar.c:3353
+#: ../src/nautilus-places-sidebar.c:3474
 msgid "Computer"
 msgstr "Datamaskin"
 
-#: ../src/nautilus-places-sidebar.c:530
+#: ../src/nautilus-places-sidebar.c:542
 msgid "Open the contents of your desktop in a folder"
 msgstr "Åpne innholdet på ditt skrivebord i en mappe"
 
@@ -3984,175 +3980,166 @@
 msgid "File System"
 msgstr "Filsystem"
 
-#: ../src/nautilus-places-sidebar.c:696
+#: ../src/nautilus-places-sidebar.c:708
 msgid "Open the contents of the File System"
 msgstr "Åpne innholdet i filsystemet"
 
 #. trash
 #: ../src/nautilus-file-management-properties.ui.h:19
-#: ../src/nautilus-places-sidebar.c:542
-#: ../src/nautilus-shell-search-provider.c:315 ../src/nautilus-trash-bar.c:195
+#: ../src/nautilus-shell-search-provider.c:293 ../src/nautilus-trash-bar.c:195
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: ../src/nautilus-places-sidebar.c:544
+#: ../src/nautilus-places-sidebar.c:556
 msgid "Open the trash"
 msgstr "Åpne papirkurven"
 
-#: ../src/nautilus-places-sidebar.c:774
+#: ../src/nautilus-places-sidebar.c:786
 msgid "Network"
 msgstr "Nettverk"
 
-#: ../src/nautilus-places-sidebar.c:780
+#: ../src/nautilus-places-sidebar.c:792
 msgid "Browse Network"
 msgstr "Bla gjennom nettverk"
 
-#: ../src/nautilus-places-sidebar.c:782
+#: ../src/nautilus-places-sidebar.c:794
 msgid "Browse the contents of the network"
 msgstr "Bla gjennom innholdet på nettverket"
 
-#. Adjust start/stop items to reflect the type of the drive
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:1678 ../src/nautilus-places-sidebar.c:2748
-#: ../src/nautilus-view.c:7246 ../src/nautilus-view.c:7270
-#: ../src/nautilus-view.c:7342 ../src/nautilus-view.c:7928
-#: ../src/nautilus-view.c:7932 ../src/nautilus-view.c:8015
-#: ../src/nautilus-view.c:8019 ../src/nautilus-view.c:8117
-#: ../src/nautilus-view.c:8121
+#: ../src/nautilus-view.c:7300 ../src/nautilus-view.c:7324
+#: ../src/nautilus-view.c:7396 ../src/nautilus-view.c:7982
+#: ../src/nautilus-view.c:7986 ../src/nautilus-view.c:8069
+#: ../src/nautilus-view.c:8073 ../src/nautilus-view.c:8171
+#: ../src/nautilus-view.c:8175
 msgid "_Start"
 msgstr "_Start"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:1679 ../src/nautilus-places-sidebar.c:2755
-#: ../src/nautilus-view.c:7250 ../src/nautilus-view.c:7274
-#: ../src/nautilus-view.c:7346 ../src/nautilus-view.c:7957
-#: ../src/nautilus-view.c:8044 ../src/nautilus-view.c:8146
-#: ../src/nautilus-window-menus.c:469
+#: ../src/nautilus-view.c:7304 ../src/nautilus-view.c:7328
+#: ../src/nautilus-view.c:7400 ../src/nautilus-view.c:8011
+#: ../src/nautilus-view.c:8098 ../src/nautilus-view.c:8200
+#: ../src/nautilus-window-menus.c:483
 msgid "_Stop"
 msgstr "_Stopp"
 
 #. start() for type G_DRIVE_START_STOP_TYPE_SHUTDOWN is normally not used
-#: ../src/nautilus-places-sidebar.c:1684
+#: ../src/nautilus-places-sidebar.c:1718
 msgid "_Power On"
 msgstr "_Slå på"
 
-#: ../src/nautilus-places-sidebar.c:1685 ../src/nautilus-view.c:7961
-#: ../src/nautilus-view.c:8048 ../src/nautilus-view.c:8150
+#: ../src/nautilus-view.c:8015 ../src/nautilus-view.c:8102
+#: ../src/nautilus-view.c:8204
 msgid "_Safely Remove Drive"
 msgstr "_Fjern stasjon på en trygg måte"
 
-#: ../src/nautilus-places-sidebar.c:1688
+#: ../src/nautilus-places-sidebar.c:1722
 msgid "_Connect Drive"
 msgstr "_Koble til stasjon"
 
-#: ../src/nautilus-places-sidebar.c:1689
+#: ../src/nautilus-places-sidebar.c:1723
 msgid "_Disconnect Drive"
 msgstr "Ko_ble fra stasjon"
 
-#: ../src/nautilus-places-sidebar.c:1692
+#: ../src/nautilus-places-sidebar.c:1726
 msgid "_Start Multi-disk Device"
 msgstr "_Start enhet med flere disker"
 
-#: ../src/nautilus-places-sidebar.c:1693
+#: ../src/nautilus-places-sidebar.c:1727
 msgid "_Stop Multi-disk Device"
 msgstr "_Stopp enhet med flere disker"
 
-#. stop() for type G_DRIVE_START_STOP_TYPE_PASSWORD is normally not used
-#: ../src/nautilus-places-sidebar.c:1697 ../src/nautilus-view.c:8031
-#: ../src/nautilus-view.c:8133
+#: ../src/nautilus-view.c:8085 ../src/nautilus-view.c:8187
 msgid "_Unlock Drive"
 msgstr "Lås _opp stasjon"
 
-#: ../src/nautilus-places-sidebar.c:1698 ../src/nautilus-view.c:7973
-#: ../src/nautilus-view.c:8060 ../src/nautilus-view.c:8162
+#: ../src/nautilus-view.c:8027 ../src/nautilus-view.c:8114
+#: ../src/nautilus-view.c:8216
 msgid "_Lock Drive"
 msgstr "_Lås stasjon"
 
-#: ../src/nautilus-places-sidebar.c:1775 ../src/nautilus-places-sidebar.c:2384
+#: ../src/nautilus-places-sidebar.c:1809 ../src/nautilus-places-sidebar.c:2453
 #, c-format
 msgid "Unable to start %s"
 msgstr "Kan ikke starte %s"
 
-#: ../src/nautilus-places-sidebar.c:2143 ../src/nautilus-places-sidebar.c:2171
-#: ../src/nautilus-places-sidebar.c:2199
+#: ../src/nautilus-places-sidebar.c:2212 ../src/nautilus-places-sidebar.c:2240
+#: ../src/nautilus-places-sidebar.c:2268
 #, c-format
 msgid "Unable to eject %s"
 msgstr "Kan ikke løse ut %s"
 
-#: ../src/nautilus-places-sidebar.c:2339
+#: ../src/nautilus-places-sidebar.c:2408
 #, c-format
 msgid "Unable to poll %s for media changes"
 msgstr "Kan ikke sjekke %s for bytte av medie"
 
-#: ../src/nautilus-places-sidebar.c:2439
+#: ../src/nautilus-places-sidebar.c:2508
 #, c-format
 msgid "Unable to stop %s"
 msgstr "Kan ikke stoppe %s"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:2670 ../src/nautilus-view.c:7118
-#: ../src/nautilus-view.c:8520
+#: ../src/nautilus-properties-window.c:5468 ../src/nautilus-view.c:7170
+#: ../src/nautilus-view.c:8588
 msgid "_Open"
 msgstr "_Åpne"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:2678 ../src/nautilus-view.c:7130
-#: ../src/nautilus-view.c:7300 ../src/nautilus-view.c:8241
-#: ../src/nautilus-view.c:8574
+#: ../src/nautilus-view.c:7186 ../src/nautilus-view.c:7354
+#: ../src/nautilus-view.c:8295 ../src/nautilus-view.c:8642
 msgid "Open in New _Tab"
 msgstr "Åpne i ny _fane"
 
-#: ../src/nautilus-places-sidebar.c:2685 ../src/nautilus-view.c:8233
-#: ../src/nautilus-view.c:8554
+#: ../src/nautilus-view.c:8287 ../src/nautilus-view.c:8622
 msgid "Open in New _Window"
 msgstr "Åpne i nytt _vindu"
 
-#: ../src/nautilus-places-sidebar.c:2693
+#: ../src/nautilus-places-sidebar.c:2803
 msgid "_Add Bookmark"
 msgstr "_Legg til bokmerke"
 
 #: ../src/nautilus-bookmarks-window.ui.h:1
-#: ../src/nautilus-places-sidebar.c:2699
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../src/nautilus-places-sidebar.c:2664
+#: ../src/nautilus-places-sidebar.c:2643
 msgid "Rename..."
 msgstr "Endre navn …"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:2720 ../src/nautilus-view.c:7234
-#: ../src/nautilus-view.c:7258 ../src/nautilus-view.c:7330
+#: ../src/nautilus-view.c:7288 ../src/nautilus-view.c:7312
+#: ../src/nautilus-view.c:7384
 msgid "_Mount"
 msgstr "_Monter"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:2727 ../src/nautilus-view.c:7238
-#: ../src/nautilus-view.c:7262 ../src/nautilus-view.c:7334
+#: ../src/nautilus-view.c:7292 ../src/nautilus-view.c:7316
+#: ../src/nautilus-view.c:7388
 msgid "_Unmount"
 msgstr "_Avmonter"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:2734 ../src/nautilus-view.c:7242
-#: ../src/nautilus-view.c:7266 ../src/nautilus-view.c:7338
+#: ../src/nautilus-view.c:7296 ../src/nautilus-view.c:7320
+#: ../src/nautilus-view.c:7392
 msgid "_Eject"
 msgstr "Løs _ut"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:2741 ../src/nautilus-view.c:7254
-#: ../src/nautilus-view.c:7278 ../src/nautilus-view.c:7350
+#: ../src/nautilus-view.c:7308 ../src/nautilus-view.c:7332
+#: ../src/nautilus-view.c:7404
 msgid "_Detect Media"
 msgstr "_Gjenkjenn media"
 
-#: ../src/nautilus-places-sidebar.c:2776
+#: ../src/nautilus-window.c:820
 msgid "_Properties"
 msgstr "E_genskaper"
 
@@ -4179,73 +4166,73 @@
 msgid "All file operations have been successfully completed"
 msgstr "Alle filoperasjoner er fullført"
 
-#: ../src/nautilus-properties-window.c:490
+#: ../src/nautilus-properties-window.c:500
 msgid "You cannot assign more than one custom icon at a time!"
 msgstr "Du kan ikke tilegne mer enn ett egendefinert ikon om gangen!"
 
-#: ../src/nautilus-properties-window.c:491
+#: ../src/nautilus-properties-window.c:501
 msgid "Please drag just one image to set a custom icon."
 msgstr "Vennligst dra kun ett bilde for å sette egendefinert ikon."
 
-#: ../src/nautilus-properties-window.c:502
+#: ../src/nautilus-properties-window.c:512
 msgid "The file that you dropped is not local."
 msgstr "Filen du slapp er ikke lokal."
 
-#: ../src/nautilus-properties-window.c:503
-#: ../src/nautilus-properties-window.c:509
+#: ../src/nautilus-properties-window.c:513
+#: ../src/nautilus-properties-window.c:519
 msgid "You can only use local images as custom icons."
 msgstr "Du kan kun bruke lokale bilder som egendefinerte ikoner."
 
-#: ../src/nautilus-properties-window.c:508
+#: ../src/nautilus-properties-window.c:518
 msgid "The file that you dropped is not an image."
 msgstr "Filen du slapp er ikke et bilde."
 
-#: ../src/nautilus-properties-window.c:630
+#: ../src/nautilus-properties-window.c:633
 msgid "_Name:"
 msgid_plural "_Names:"
 msgstr[0] "_Navn:"
 msgstr[1] "_Navn:"
 
-#: ../src/nautilus-properties-window.c:825
+#: ../src/nautilus-properties-window.c:828
 #, c-format
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ../src/nautilus-properties-window.c:833
+#: ../src/nautilus-properties-window.c:836
 #, c-format
 msgid "%s Properties"
 msgstr "Egenskaper for %s"
 
-#: ../src/nautilus-properties-window.c:1222
+#: ../src/nautilus-properties-window.c:1224
 #, c-format
 msgctxt "MIME type description (MIME type)"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/nautilus-properties-window.c:1430
+#: ../src/nautilus-properties-window.c:1432
 msgid "Cancel Group Change?"
 msgstr "Avbryt endring av gruppe?"
 
-#: ../src/nautilus-properties-window.c:1845
+#: ../src/nautilus-properties-window.c:1847
 msgid "Cancel Owner Change?"
 msgstr "Avbryt endring av eier?"
 
-#: ../src/nautilus-properties-window.c:2161
+#: ../src/nautilus-properties-window.c:2163
 msgid "nothing"
 msgstr "ingenting"
 
-#: ../src/nautilus-properties-window.c:2163
+#: ../src/nautilus-properties-window.c:2165
 msgid "unreadable"
 msgstr "ulesbar"
 
-#: ../src/nautilus-properties-window.c:2171
+#: ../src/nautilus-properties-window.c:2173
 #, c-format
 msgid "%'d item, with size %s"
 msgid_plural "%'d items, totalling %s"
 msgstr[0] "%'d oppføring, med størrelse %s"
 msgstr[1] "%'d oppføringer, med størrelse %s"
 
-#: ../src/nautilus-properties-window.c:2180
+#: ../src/nautilus-properties-window.c:2182
 msgid "(some contents unreadable)"
 msgstr "(noe innhold ikke lesbart)"
 
@@ -4255,49 +4242,49 @@
 #. * 2-line value. Maybe there's a better way to do this, but I
 #. * couldn't think of one.
 #. 
-#: ../src/nautilus-properties-window.c:2197
+#: ../src/nautilus-properties-window.c:2199
 msgid "Contents:"
 msgstr "Innhold:"
 
 #. Translators: "used" refers to the capacity of the filesystem
-#: ../src/nautilus-properties-window.c:3053
+#: ../src/nautilus-properties-window.c:3057
 msgid "used"
 msgstr "brukt"
 
 #. Translators: "free" refers to the capacity of the filesystem
-#: ../src/nautilus-properties-window.c:3059
+#: ../src/nautilus-properties-window.c:3063
 msgid "free"
 msgstr "ledig"
 
-#: ../src/nautilus-properties-window.c:3061
+#: ../src/nautilus-properties-window.c:3065
 msgid "Total capacity:"
 msgstr "Total kapasitet:"
 
-#: ../src/nautilus-properties-window.c:3064
+#: ../src/nautilus-properties-window.c:3068
 msgid "Filesystem type:"
 msgstr "Type filsystem:"
 
-#: ../src/nautilus-properties-window.c:3200
+#: ../src/nautilus-properties-window.c:3204
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: ../src/nautilus-properties-window.c:3265
+#: ../src/nautilus-properties-window.c:3269
 msgid "Link target:"
 msgstr "Lenkemål:"
 
-#: ../src/nautilus-properties-window.c:3292
+#: ../src/nautilus-properties-window.c:3296
 msgid "Volume:"
 msgstr "Volum:"
 
-#: ../src/nautilus-properties-window.c:3301
+#: ../src/nautilus-properties-window.c:3305
 msgid "Accessed:"
 msgstr "Aksessert:"
 
-#: ../src/nautilus-properties-window.c:3305
+#: ../src/nautilus-properties-window.c:3309
 msgid "Modified:"
 msgstr "Endret:"
 
-#: ../src/nautilus-properties-window.c:3315
+#: ../src/nautilus-properties-window.c:3319
 msgid "Free space:"
 msgstr "Ledig plass:"
 
@@ -4316,61 +4303,61 @@
 #. translators: this gets concatenated to "no read",
 #. * "no access", etc. (see following strings)
 #. 
-#: ../src/nautilus-properties-window.c:3966
-#: ../src/nautilus-properties-window.c:3977
-#: ../src/nautilus-properties-window.c:3989
+#: ../src/nautilus-properties-window.c:3970
+#: ../src/nautilus-properties-window.c:3981
+#: ../src/nautilus-properties-window.c:3993
 msgid "no "
 msgstr "nei "
 
-#: ../src/nautilus-properties-window.c:3969
+#: ../src/nautilus-properties-window.c:3973
 msgid "list"
 msgstr "liste"
 
-#: ../src/nautilus-properties-window.c:3971
+#: ../src/nautilus-properties-window.c:3975
 msgid "read"
 msgstr "les"
 
-#: ../src/nautilus-properties-window.c:3980
+#: ../src/nautilus-properties-window.c:3984
 msgid "create/delete"
 msgstr "opprett/slett"
 
-#: ../src/nautilus-properties-window.c:3982
+#: ../src/nautilus-properties-window.c:3986
 msgid "write"
 msgstr "skriv"
 
-#: ../src/nautilus-properties-window.c:3991
+#: ../src/nautilus-properties-window.c:3995
 msgid "access"
 msgstr "tilgang"
 
-#: ../src/nautilus-properties-window.c:4116
+#: ../src/nautilus-properties-window.c:4120
 msgid "Access:"
 msgstr "Tilgang:"
 
-#: ../src/nautilus-properties-window.c:4118
+#: ../src/nautilus-properties-window.c:4122
 msgid "Folder access:"
 msgstr "Mappetilgang:"
 
-#: ../src/nautilus-properties-window.c:4120
+#: ../src/nautilus-properties-window.c:4124
 msgid "File access:"
 msgstr "Filtilgang:"
 
-#: ../src/nautilus-properties-window.c:4056
+#: ../src/nautilus-properties-window.c:4060
 msgid "List files only"
 msgstr "Vis kun filer"
 
-#: ../src/nautilus-properties-window.c:4062
+#: ../src/nautilus-properties-window.c:4066
 msgid "Access files"
 msgstr "Aksesser filer"
 
-#: ../src/nautilus-properties-window.c:4068
+#: ../src/nautilus-properties-window.c:4072
 msgid "Create and delete files"
 msgstr "Opprett og slett filer"
 
-#: ../src/nautilus-properties-window.c:4083
+#: ../src/nautilus-properties-window.c:4087
 msgid "Read-only"
 msgstr "Skrivebeskyttet"
 
-#: ../src/nautilus-properties-window.c:4089
+#: ../src/nautilus-properties-window.c:4093
 msgid "Read and write"
 msgstr "Skriv og les"
 
@@ -4390,37 +4377,37 @@
 msgid "_Sticky"
 msgstr "K_lebrig"
 
-#: ../src/nautilus-properties-window.c:4209
+#: ../src/nautilus-properties-window.c:4213
 msgid "_Owner:"
 msgstr "_Eier:"
 
-#: ../src/nautilus-properties-window.c:4217
-#: ../src/nautilus-properties-window.c:4481
+#: ../src/nautilus-properties-window.c:4221
+#: ../src/nautilus-properties-window.c:4485
 msgid "Owner:"
 msgstr "Eier:"
 
-#: ../src/nautilus-properties-window.c:4239
+#: ../src/nautilus-properties-window.c:4243
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../src/nautilus-properties-window.c:4247
-#: ../src/nautilus-properties-window.c:4495
+#: ../src/nautilus-properties-window.c:4251
+#: ../src/nautilus-properties-window.c:4499
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: ../src/nautilus-properties-window.c:4268
+#: ../src/nautilus-properties-window.c:4272
 msgid "Others"
 msgstr "Andre"
 
-#: ../src/nautilus-properties-window.c:4283
+#: ../src/nautilus-properties-window.c:4287
 msgid "Execute:"
 msgstr "Kjør:"
 
-#: ../src/nautilus-properties-window.c:4286
+#: ../src/nautilus-properties-window.c:4290
 msgid "Allow _executing file as program"
 msgstr "Tillat _kjøring av filen som et program"
 
-#: ../src/nautilus-properties-window.c:4509
+#: ../src/nautilus-properties-window.c:4513
 msgid "Others:"
 msgstr "Andre:"
 
@@ -4436,7 +4423,7 @@
 msgid "Text view:"
 msgstr "Tekstvisning:"
 
-#: ../src/nautilus-properties-window.c:4550
+#: ../src/nautilus-properties-window.c:4554
 msgid "You are not the owner, so you cannot change these permissions."
 msgstr "Du er ikke eier og kan derfor ikke endre disse rettighetene."
 
@@ -4457,23 +4444,23 @@
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Rettighetene for «%s» kunne ikke bestemmes."
 
-#: ../src/nautilus-properties-window.c:4593
+#: ../src/nautilus-properties-window.c:4597
 msgid "The permissions of the selected file could not be determined."
 msgstr "Rettigheter for «%s» kunne ikke bestemmes."
 
-#: ../src/nautilus-properties-window.c:4837
+#: ../src/nautilus-properties-window.c:4841
 msgid "Open With"
 msgstr "Åpne med"
 
-#: ../src/nautilus-properties-window.c:5160
+#: ../src/nautilus-properties-window.c:5164
 msgid "Creating Properties window."
 msgstr "Oppretter egenskaper-vindu."
 
-#: ../src/nautilus-properties-window.c:5460
+#: ../src/nautilus-properties-window.c:5464
 msgid "Select Custom Icon"
 msgstr "Velg egendefinert ikon"
 
-#: ../src/nautilus-query-editor.c:103
+#: ../src/nautilus-query-editor.c:102
 msgid "File Type"
 msgstr "Filtype"
 
@@ -4481,58 +4468,58 @@
 msgid "Select folder to search in"
 msgstr "Velg mappen du vil søke i"
 
-#: ../src/nautilus-query-editor.c:392
+#: ../src/nautilus-query-editor.c:322
 msgid "Documents"
 msgstr "Dokumenter"
 
-#: ../src/nautilus-query-editor.c:410
+#: ../src/nautilus-query-editor.c:340
 msgid "Music"
 msgstr "Musikk"
 
-#: ../libnautilus-private/nautilus-file.c:6162
-#: ../src/nautilus-query-editor.c:425
+#: ../libnautilus-private/nautilus-file.c:6175
+#: ../src/nautilus-query-editor.c:355
 msgid "Video"
 msgstr "Video"
 
-#: ../src/nautilus-query-editor.c:441
+#: ../src/nautilus-query-editor.c:371
 msgid "Picture"
 msgstr "Bilde"
 
-#: ../src/nautilus-query-editor.c:461
+#: ../src/nautilus-query-editor.c:391
 msgid "Illustration"
 msgstr "Illustrasjon"
 
-#: ../libnautilus-private/nautilus-file.c:6167
-#: ../src/nautilus-query-editor.c:475
+#: ../libnautilus-private/nautilus-file.c:6180
+#: ../src/nautilus-query-editor.c:405
 msgid "Spreadsheet"
 msgstr "Regneark"
 
-#: ../libnautilus-private/nautilus-file.c:6166
-#: ../src/nautilus-query-editor.c:491
+#: ../libnautilus-private/nautilus-file.c:6179
+#: ../src/nautilus-query-editor.c:421
 msgid "Presentation"
 msgstr "Presentasjon"
 
-#: ../src/nautilus-query-editor.c:500
+#: ../src/nautilus-query-editor.c:430
 msgid "Pdf / Postscript"
 msgstr "PDF / PostScript"
 
-#: ../src/nautilus-query-editor.c:508
+#: ../src/nautilus-query-editor.c:438
 msgid "Text File"
 msgstr "Tekstfil:"
 
-#: ../src/nautilus-query-editor.c:587
+#: ../src/nautilus-query-editor.c:517
 msgid "Select type"
 msgstr "Velg type"
 
-#: ../src/nautilus-query-editor.c:672
+#: ../src/nautilus-query-editor.c:602
 msgid "Any"
 msgstr "Enhver"
 
-#: ../src/nautilus-query-editor.c:687
+#: ../src/nautilus-query-editor.c:660
 msgid "Other Type..."
 msgstr "Annen type …"
 
-#: ../src/nautilus-query-editor.c:956
+#: ../src/nautilus-query-editor.c:888
 msgid "Remove this criterion from the search"
 msgstr "Fjern dette kriteriet fra søket"
 
@@ -4544,7 +4531,7 @@
 msgid "Edit the saved search"
 msgstr "Rediger lagret søk"
 
-#: ../src/nautilus-query-editor.c:1063
+#: ../src/nautilus-query-editor.c:995
 msgid "Add a new criterion to this search"
 msgstr "Legg til nytt kriterie for dette søket"
 
@@ -4601,18 +4588,17 @@
 msgid "Create New _Folder"
 msgstr "_Lag ny mappe"
 
-#. We make accelerator "" instead of null here to not inherit the stock
-#. accelerator for paste
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7164 ../src/nautilus-view.c:7313
+#: ../src/nautilus-view.c:7218 ../src/nautilus-view.c:7367
 msgid "_Paste Into Folder"
 msgstr "_Lim filer inn i mappe"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7208 ../src/nautilus-view.c:7322
-#: ../src/nautilus-view.c:8627
+#: ../libnautilus-private/nautilus-file-operations.c:189
+#: ../src/nautilus-view.c:7262 ../src/nautilus-view.c:7376
+#: ../src/nautilus-view.c:8695
 msgid "_Delete"
 msgstr "Sle_tt"
 
@@ -4620,49 +4606,49 @@
 msgid "Network Neighbourhood"
 msgstr "Nettverksnabolaget"
 
-#: ../src/nautilus-view.c:957
+#: ../src/nautilus-view.c:963
 #, c-format
 msgid "This will open %'d separate tab."
 msgid_plural "This will open %'d separate tabs."
 msgstr[0] "Dette vil åpne %'d separat fane."
 msgstr[1] "Dette vil åpne %'d separate faner."
 
-#: ../src/nautilus-view.c:960
+#: ../src/nautilus-view.c:966
 #, c-format
 msgid "This will open %'d separate window."
 msgid_plural "This will open %'d separate windows."
 msgstr[0] "Dette vil åpne %'d separat vindu."
 msgstr[1] "Dette vil åpne %'d separate vinduer."
 
-#: ../src/nautilus-view.c:1458
+#: ../src/nautilus-view.c:1491
 msgid "Select Items Matching"
 msgstr "Velg oppføringer med treff"
 
-#: ../src/nautilus-view.c:1473
+#: ../src/nautilus-view.c:1506
 msgid "_Pattern:"
 msgstr "_Mønster:"
 
-#: ../src/nautilus-view.c:1479
+#: ../src/nautilus-view.c:1512
 msgid "Examples: "
 msgstr "Eksempler: "
 
-#: ../src/nautilus-view.c:1580
+#: ../src/nautilus-view.c:1613
 msgid "Save Search as"
 msgstr "Lagre søk som"
 
-#: ../src/nautilus-view.c:1603
+#: ../src/nautilus-view.c:1636
 msgid "Search _name:"
 msgstr "_Navn på søk:"
 
-#: ../src/nautilus-view.c:1625
+#: ../src/nautilus-view.c:1658
 msgid "Select Folder to Save Search In"
 msgstr "Velg mappe for lagring av søk"
 
-#: ../src/nautilus-view.c:2687
+#: ../src/nautilus-view.c:2737
 msgid "Content View"
 msgstr "Innholdsvisning"
 
-#: ../src/nautilus-view.c:2688
+#: ../src/nautilus-view.c:2738
 msgid "View of the current folder"
 msgstr "Visning for aktiv mappe"
 
@@ -4671,7 +4657,7 @@
 msgid "\"%s\" selected"
 msgstr "«%s» valgt"
 
-#: ../src/nautilus-view.c:2885
+#: ../src/nautilus-view.c:2937
 #, c-format
 msgid "%'d folder selected"
 msgid_plural "%'d folders selected"
@@ -4693,7 +4679,7 @@
 msgstr[0] " (med totalt %'d oppføring)"
 msgstr[1] " (med totalt %'d oppføringer)"
 
-#: ../src/nautilus-view.c:2921
+#: ../src/nautilus-view.c:2973
 #, c-format
 msgid "%'d item selected"
 msgid_plural "%'d items selected"
@@ -4701,7 +4687,7 @@
 msgstr[1] "%'d oppføringer valgt"
 
 #. Folders selected also, use "other" terminology
-#: ../src/nautilus-view.c:2928
+#: ../src/nautilus-view.c:2980
 #, c-format
 msgid "%'d other item selected"
 msgid_plural "%'d other items selected"
@@ -4764,7 +4750,7 @@
 msgid "%s%s, %s, %s"
 msgstr "%s%s, %s, %s"
 
-#: ../src/nautilus-view.c:4339
+#: ../src/nautilus-view.c:4391
 #, c-format
 msgid "Open With %s"
 msgstr "Åpne med %s"
@@ -4887,7 +4873,7 @@
 msgid "Unable to eject location"
 msgstr "Kan ikke løse ut lokasjon"
 
-#: ../src/nautilus-view.c:6505
+#: ../src/nautilus-view.c:6557
 msgid "Unable to stop drive"
 msgstr "Kan ikke stoppe stasjon"
 
@@ -4896,8 +4882,8 @@
 msgid "Connect to Server %s"
 msgstr "Koble til tjener %s"
 
-#: ../src/nautilus-view.c:7936 ../src/nautilus-view.c:8023
-#: ../src/nautilus-view.c:8125
+#: ../src/nautilus-view.c:7990 ../src/nautilus-view.c:8077
+#: ../src/nautilus-view.c:8179
 msgid "_Connect"
 msgstr "_Koble til"
 
@@ -4911,21 +4897,21 @@
 msgstr "Lag nytt _dokument"
 
 #. name, stock id, label
-#: ../src/nautilus-view.c:7099
+#: ../src/nautilus-view.c:7151
 msgid "Open Wit_h"
 msgstr "Åpne _med"
 
-#: ../src/nautilus-view.c:7100
+#: ../src/nautilus-view.c:7152
 msgid "Choose a program with which to open the selected item"
 msgstr "Velg et program du vil åpne valgte oppføring med"
 
 #. tooltip
-#: ../src/nautilus-view.c:7103 ../src/nautilus-view.c:8667
+#: ../src/nautilus-view.c:7155 ../src/nautilus-view.c:8735
 msgid "View or modify the properties of each selected item"
 msgstr "Vis eller modifiser egenskapene for hver av de valgte oppføringene"
 
 #. tooltip
-#: ../src/nautilus-view.c:7111
+#: ../src/nautilus-view.c:7163
 msgid "Create a new empty folder inside this folder"
 msgstr "Lag en ny tom mappe i denne mappen"
 
@@ -4937,17 +4923,17 @@
 #. name, stock id
 #. translators: this is used to indicate that a document doesn't contain anything
 #. label, accelerator
-#: ../src/nautilus-view.c:7155
+#: ../src/nautilus-view.c:7133
 msgid "_Empty Document"
 msgstr "_Tomt dokument"
 
 #. tooltip
-#: ../src/nautilus-view.c:7156
+#: ../src/nautilus-view.c:7134
 msgid "Create a new empty document inside this folder"
 msgstr "Lag et nytt tomt dokument i denne mappen"
 
 #. tooltip
-#: ../src/nautilus-view.c:7119
+#: ../src/nautilus-view.c:7171
 msgid "Open the selected item in this window"
 msgstr "Åpne valgt oppføring i dette vinduet"
 
@@ -4956,73 +4942,67 @@
 #. Location-specific actions
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7126 ../src/nautilus-view.c:7296
+#: ../src/nautilus-view.c:7182 ../src/nautilus-view.c:7350
 msgid "Open in Navigation Window"
 msgstr "Åpne i et navigeringsvindu"
 
 #. tooltip
-#: ../src/nautilus-view.c:7127
+#: ../src/nautilus-view.c:7183
 msgid "Open each selected item in a navigation window"
 msgstr "Åpne hver valgt oppføring i et navigeringsvindu"
 
 #. tooltip
-#: ../src/nautilus-view.c:7131
+#: ../src/nautilus-view.c:7187
 msgid "Open each selected item in a new tab"
 msgstr "Åpne hver valgt oppføring i en ny fane"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7175
+#: ../src/nautilus-view.c:6984
 msgid "Other _Application..."
 msgstr "_Annet program …"
 
 #. tooltip
-#: ../src/nautilus-view.c:7135 ../src/nautilus-view.c:7139
+#: ../src/nautilus-view.c:7191 ../src/nautilus-view.c:7195
 msgid "Choose another application with which to open the selected item"
 msgstr "Velg et annet program du vil åpne valgt oppføring med"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7179
+#: ../src/nautilus-view.c:6988
 msgid "Open With Other _Application..."
 msgstr "Åpne med et annet _program …"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7142
+#: ../src/nautilus-view.c:7198
 msgid "_Open Scripts Folder"
 msgstr "_Åpne skript-mappe"
 
 #. tooltip
-#: ../src/nautilus-view.c:7143
+#: ../src/nautilus-view.c:7199
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Vis mappen som inneholder skriptene som vises i denne menyen"
 
-#. name, stock id
-#. label, accelerator
 #. tooltip
-#: ../src/nautilus-view.c:7151
+#: ../src/nautilus-view.c:7207
 msgid "Prepare the selected files to be moved with a Paste command"
 msgstr "Gjør klar valgte filer for flytting med kommandoen «Lim inn filer»"
 
-#. name, stock id
-#. label, accelerator
 #. tooltip
-#: ../src/nautilus-view.c:7155
+#: ../src/nautilus-view.c:7211
 msgid "Prepare the selected files to be copied with a Paste command"
 msgstr "Gjør klar valgte filer for kopiering med kommandoen «Lim inn filer»"
 
-#. name, stock id
-#. label, accelerator
 #. tooltip
-#: ../src/nautilus-view.c:7159
+#: ../src/nautilus-view.c:7215
 msgid "Move or copy files previously selected by a Cut or Copy command"
 msgstr ""
 "Flytt eller kopier filer som er valgt tidligere med kommandoene «Klipp ut "
 "filer» eller «Kopier filer»"
 
 #. tooltip
-#: ../src/nautilus-view.c:7165
+#: ../src/nautilus-view.c:7219
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into the "
 "selected folder"
@@ -5041,29 +5021,29 @@
 msgstr "Fl_ytt til"
 
 #. tooltip
-#: ../src/nautilus-view.c:7177
+#: ../src/nautilus-view.c:7231
 msgid "Select all items in this window"
 msgstr "Velg alle oppføringer i dette vinduet"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7221
+#: ../src/nautilus-view.c:7024
 msgid "Select I_tems Matching..."
 msgstr "Velg oppføringer med _treff …"
 
 #. tooltip
-#: ../src/nautilus-view.c:7181
+#: ../src/nautilus-view.c:7235
 msgid "Select items in this window matching a given pattern"
 msgstr "Velg oppføringer i dette vinduet som passer et gitt mønster"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7184
+#: ../src/nautilus-view.c:7238
 msgid "_Invert Selection"
 msgstr "_Reverser om valg"
 
 #. tooltip
-#: ../src/nautilus-view.c:7185
+#: ../src/nautilus-view.c:7239
 msgid "Select all and only the items that are not currently selected"
 msgstr "Velg alle oppføringer som ikke er valgt nå"
 
@@ -5080,14 +5060,14 @@
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7188 ../src/nautilus-view.c:8650
+#: ../src/nautilus-view.c:7242 ../src/nautilus-view.c:8718
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Opprett len_ke"
 msgstr[1] "Opprett len_ker"
 
 #. tooltip
-#: ../src/nautilus-view.c:7189
+#: ../src/nautilus-view.c:7243
 msgid "Create a symbolic link for each selected item"
 msgstr "Opprett en symbolsk lenke for hver valgt oppføring"
 
@@ -5098,45 +5078,45 @@
 msgstr "Gi _nytt navn …"
 
 #. tooltip
-#: ../src/nautilus-view.c:7193
+#: ../src/nautilus-view.c:7247
 msgid "Rename selected item"
 msgstr "Endre navn på valgt oppføring"
 
 #. tooltip
-#: ../src/nautilus-view.c:7205 ../src/nautilus-view.c:8597
+#: ../src/nautilus-view.c:7259 ../src/nautilus-view.c:8665
 msgid "Move each selected item to the Trash"
 msgstr "Flytt hver valgt oppføring til papirkurven"
 
 #. tooltip
-#: ../src/nautilus-view.c:7209 ../src/nautilus-view.c:8628
+#: ../src/nautilus-view.c:7263 ../src/nautilus-view.c:8696
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Slett hver valgt oppføring, uten å flytte dem til papirkurven"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7212 ../src/nautilus-view.c:7326
+#: ../src/nautilus-view.c:7266 ../src/nautilus-view.c:7380
 msgid "_Restore"
 msgstr "Gjenopp_rett"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7216
+#: ../src/nautilus-view.c:7270
 msgid "_Undo"
 msgstr "_Angre"
 
 #. tooltip
-#: ../src/nautilus-view.c:7217
+#: ../src/nautilus-view.c:7271
 msgid "Undo the last action"
 msgstr "Angre siste handling"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7220
+#: ../src/nautilus-view.c:7274
 msgid "_Redo"
 msgstr "Gjø_r om"
 
 #. tooltip
-#: ../src/nautilus-view.c:7221
+#: ../src/nautilus-view.c:7275
 msgid "Redo the last undone action"
 msgstr "Gjør om siste angrede handling"
 
@@ -5148,12 +5128,12 @@
 #. 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7230
+#: ../src/nautilus-view.c:7284
 msgid "Reset View to _Defaults"
 msgstr "_Sett visning til forvalg"
 
 #. tooltip
-#: ../src/nautilus-view.c:7231
+#: ../src/nautilus-view.c:7285
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Nullstill sorteringsrekkefølge og zoom-nivå til brukervalg for denne "
@@ -5171,115 +5151,111 @@
 msgstr "Opprett en permanent tilkobling til denne tjeneren"
 
 #. tooltip
-#: ../src/nautilus-view.c:7235
+#: ../src/nautilus-view.c:7289
 msgid "Mount the selected volume"
 msgstr "Monter valgt volum"
 
 #. tooltip
-#: ../src/nautilus-view.c:7239
+#: ../src/nautilus-view.c:7293
 msgid "Unmount the selected volume"
 msgstr "Avmonter valgt volum"
 
 #. tooltip
-#: ../src/nautilus-view.c:7243
+#: ../src/nautilus-view.c:7297
 msgid "Eject the selected volume"
 msgstr "Løs ut valgt volum"
 
 #. tooltip
-#: ../src/nautilus-view.c:7247
+#: ../src/nautilus-view.c:7301
 msgid "Start the selected volume"
 msgstr "Start valgt volum"
 
 #. tooltip
-#: ../src/nautilus-view.c:7251 ../src/nautilus-view.c:8147
+#: ../src/nautilus-view.c:7305 ../src/nautilus-view.c:8201
 msgid "Stop the selected volume"
 msgstr "Stopp valgt volum"
 
 #. tooltip
-#: ../src/nautilus-view.c:7255 ../src/nautilus-view.c:7279
-#: ../src/nautilus-view.c:7351
+#: ../src/nautilus-view.c:7309 ../src/nautilus-view.c:7333
+#: ../src/nautilus-view.c:7405
 msgid "Detect media in the selected drive"
 msgstr "Gjenkjenn media i valgt stasjon"
 
 #. tooltip
-#: ../src/nautilus-view.c:7259
+#: ../src/nautilus-view.c:7313
 msgid "Mount the volume associated with the open folder"
 msgstr "Monter volum som er assosiert med den åpne mappen"
 
 #. tooltip
-#: ../src/nautilus-view.c:7263
+#: ../src/nautilus-view.c:7317
 msgid "Unmount the volume associated with the open folder"
 msgstr "Avmonter volum som er assosiert med den åpne mappen"
 
 #. tooltip
-#: ../src/nautilus-view.c:7267
+#: ../src/nautilus-view.c:7321
 msgid "Eject the volume associated with the open folder"
 msgstr "Løs ut volum assosiert med den åpne mappen"
 
 #. tooltip
-#: ../src/nautilus-view.c:7271
+#: ../src/nautilus-view.c:7325
 msgid "Start the volume associated with the open folder"
 msgstr "Start volume assosiert med den åpne mappen"
 
 #. tooltip
-#: ../src/nautilus-view.c:7275
+#: ../src/nautilus-view.c:7329
 msgid "Stop the volume associated with the open folder"
 msgstr "Stopp volum som er assosiert med den åpne mappen"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7282
+#: ../src/nautilus-view.c:7336
 msgid "Open File and Close window"
 msgstr "Åpne fil og lukk vindu"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7286
+#: ../src/nautilus-view.c:7340
 msgid "Sa_ve Search"
 msgstr "La_gre søk"
 
 #. tooltip
-#: ../src/nautilus-view.c:7287
+#: ../src/nautilus-view.c:7341
 msgid "Save the edited search"
 msgstr "Lagre redigert søk"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7331
+#: ../src/nautilus-view.c:7138
 msgid "Sa_ve Search As..."
 msgstr "L_agre søk som …"
 
 #. tooltip
-#: ../src/nautilus-view.c:7291
+#: ../src/nautilus-view.c:7345
 msgid "Save the current search as a file"
 msgstr "Lagre dette søket som en fil"
 
 #. tooltip
-#: ../src/nautilus-view.c:7297
+#: ../src/nautilus-view.c:7351
 msgid "Open this folder in a navigation window"
 msgstr "Åpne mappen i et navigeringsvindu"
 
 #. tooltip
-#: ../src/nautilus-view.c:7301
+#: ../src/nautilus-view.c:7355
 msgid "Open this folder in a new tab"
 msgstr "Åpne denne mappen i en ny fane"
 
-#. name, stock id
-#. label, accelerator
 #. tooltip
-#: ../src/nautilus-view.c:7306
+#: ../src/nautilus-view.c:7360
 msgid "Prepare this folder to be moved with a Paste command"
 msgstr "Gjør klar den åpne mappen til å bli flyttet med kommandoen «Lim inn»"
 
-#. name, stock id
-#. label, accelerator
 #. tooltip
-#: ../src/nautilus-view.c:7310
+#: ../src/nautilus-view.c:7364
 msgid "Prepare this folder to be copied with a Paste command"
 msgstr "Gjør klar den åpne mappen til å bli kopiert med kommandoen «Lim inn»"
 
 #. tooltip
-#: ../src/nautilus-view.c:7314
+#: ../src/nautilus-view.c:7368
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into this "
 "folder"
@@ -5288,42 +5264,42 @@
 "filer» eller «Kopier filer» til denne mappen"
 
 #. tooltip
-#: ../src/nautilus-view.c:7319
+#: ../src/nautilus-view.c:7373
 msgid "Move this folder to the Trash"
 msgstr "Flytt denne mappen til papirkurven"
 
 #. tooltip
-#: ../src/nautilus-view.c:7323
+#: ../src/nautilus-view.c:7377
 msgid "Delete this folder, without moving to the Trash"
 msgstr "Slett dennne mappen uten å flytte den til papirkurven"
 
 #. tooltip
-#: ../src/nautilus-view.c:7331
+#: ../src/nautilus-view.c:7385
 msgid "Mount the volume associated with this folder"
 msgstr "Monter volum som er assosiert med denne mappen"
 
 #. tooltip
-#: ../src/nautilus-view.c:7335
+#: ../src/nautilus-view.c:7389
 msgid "Unmount the volume associated with this folder"
 msgstr "Avmonter volum som er assosiert med denne mappen"
 
 #. tooltip
-#: ../src/nautilus-view.c:7339
+#: ../src/nautilus-view.c:7393
 msgid "Eject the volume associated with this folder"
 msgstr "Løs ut volum assosiert med denne mappen"
 
 #. tooltip
-#: ../src/nautilus-view.c:7343
+#: ../src/nautilus-view.c:7397
 msgid "Start the volume associated with this folder"
 msgstr "Start volume som er assosiert med denne mappen"
 
 #. tooltip
-#: ../src/nautilus-view.c:7347
+#: ../src/nautilus-view.c:7401
 msgid "Stop the volume associated with this folder"
 msgstr "Stopp volum som er assosiert med denne mappen"
 
 #. tooltip
-#: ../src/nautilus-view.c:7356 ../src/nautilus-window-menus.c:574
+#: ../src/nautilus-view.c:7410 ../src/nautilus-window-menus.c:596
 msgid "View or modify the properties of this folder"
 msgstr "Vis eller endre egenskaper for denne mappen"
 
@@ -5342,7 +5318,7 @@
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:533 ../src/nautilus-window-menus.c:705
+#: ../src/nautilus-window-menus.c:547 ../src/nautilus-window-menus.c:730
 msgid "_Home"
 msgstr "_Hjem"
 
@@ -5374,7 +5350,7 @@
 msgstr "Kjør eller håndter skript fra %s"
 
 #. Create a script action here specially because its tooltip is dynamic
-#: ../src/nautilus-view.c:7426
+#: ../src/nautilus-view.c:7480
 msgid "_Scripts"
 msgstr "_Skript"
 
@@ -5425,134 +5401,134 @@
 msgstr[0] "Flytt valgt oppføring ut av papirkurven"
 msgstr[1] "Flytt valgte oppføringer ut av papirkurven"
 
-#: ../src/nautilus-view.c:7929 ../src/nautilus-view.c:7933
-#: ../src/nautilus-view.c:8118 ../src/nautilus-view.c:8122
+#: ../src/nautilus-view.c:7983 ../src/nautilus-view.c:7987
+#: ../src/nautilus-view.c:8172 ../src/nautilus-view.c:8176
 msgid "Start the selected drive"
 msgstr "Start valgt stasjon"
 
-#: ../src/nautilus-view.c:7937 ../src/nautilus-view.c:8126
+#: ../src/nautilus-view.c:7991 ../src/nautilus-view.c:8180
 msgid "Connect to the selected drive"
 msgstr "Koble til valgt stasjon"
 
-#: ../src/nautilus-view.c:7940 ../src/nautilus-view.c:8027
-#: ../src/nautilus-view.c:8129
+#: ../src/nautilus-view.c:7994 ../src/nautilus-view.c:8081
+#: ../src/nautilus-view.c:8183
 msgid "_Start Multi-disk Drive"
 msgstr "_Start stasjon med flere disker"
 
-#: ../src/nautilus-view.c:7941 ../src/nautilus-view.c:8130
+#: ../src/nautilus-view.c:7995 ../src/nautilus-view.c:8184
 msgid "Start the selected multi-disk drive"
 msgstr "Start valgt stasjon med flere disker"
 
-#: ../src/nautilus-view.c:7944
+#: ../src/nautilus-view.c:7998
 msgid "U_nlock Drive"
 msgstr "_Lås opp stasjon"
 
-#: ../src/nautilus-view.c:7945 ../src/nautilus-view.c:8134
+#: ../src/nautilus-view.c:7999 ../src/nautilus-view.c:8188
 msgid "Unlock the selected drive"
 msgstr "Lås opp valgt stasjon"
 
-#: ../src/nautilus-view.c:7958
+#: ../src/nautilus-view.c:8012
 msgid "Stop the selected drive"
 msgstr "Stopp valgt stasjon"
 
-#: ../src/nautilus-view.c:7962 ../src/nautilus-view.c:8151
+#: ../src/nautilus-view.c:8016 ../src/nautilus-view.c:8205
 msgid "Safely remove the selected drive"
 msgstr "Fjern valgt stasjon på en trygg måte"
 
-#: ../src/nautilus-view.c:7965 ../src/nautilus-view.c:8052
-#: ../src/nautilus-view.c:8154
+#: ../src/nautilus-view.c:8019 ../src/nautilus-view.c:8106
+#: ../src/nautilus-view.c:8208
 msgid "_Disconnect"
 msgstr "_Koble fra"
 
-#: ../src/nautilus-view.c:7966 ../src/nautilus-view.c:8155
+#: ../src/nautilus-view.c:8020 ../src/nautilus-view.c:8209
 msgid "Disconnect the selected drive"
 msgstr "Koble fra valgt stasjon"
 
-#: ../src/nautilus-view.c:7969 ../src/nautilus-view.c:8056
-#: ../src/nautilus-view.c:8158
+#: ../src/nautilus-view.c:8023 ../src/nautilus-view.c:8110
+#: ../src/nautilus-view.c:8212
 msgid "_Stop Multi-disk Drive"
 msgstr "_Stopp stasjon med flere disker"
 
-#: ../src/nautilus-view.c:7970 ../src/nautilus-view.c:8159
+#: ../src/nautilus-view.c:8024 ../src/nautilus-view.c:8213
 msgid "Stop the selected multi-disk drive"
 msgstr "Stopp valgt stasjon med flere disker"
 
-#: ../src/nautilus-view.c:7974 ../src/nautilus-view.c:8163
+#: ../src/nautilus-view.c:8028 ../src/nautilus-view.c:8217
 msgid "Lock the selected drive"
 msgstr "Lås valgt stasjon"
 
-#: ../src/nautilus-view.c:8016 ../src/nautilus-view.c:8020
+#: ../src/nautilus-view.c:8070 ../src/nautilus-view.c:8074
 msgid "Start the drive associated with the open folder"
 msgstr "Start stasjon assosiert med den åpne mappen"
 
-#: ../src/nautilus-view.c:8024
+#: ../src/nautilus-view.c:8078
 msgid "Connect to the drive associated with the open folder"
 msgstr "Koble til stasjon som er assosiert med den åpne mappen"
 
-#: ../src/nautilus-view.c:8028
+#: ../src/nautilus-view.c:8082
 msgid "Start the multi-disk drive associated with the open folder"
 msgstr "Start stasjon med flere disker som er assosiert med den åpne mappen"
 
-#: ../src/nautilus-view.c:8032
+#: ../src/nautilus-view.c:8086
 msgid "Unlock the drive associated with the open folder"
 msgstr "Lås opp stasjon som er assosiert med den åpne mappen"
 
-#: ../src/nautilus-view.c:8045
+#: ../src/nautilus-view.c:8099
 msgid "_Stop the drive associated with the open folder"
 msgstr "_Stopp stasjon som er assosiert med den åpne mappen"
 
-#: ../src/nautilus-view.c:8049
+#: ../src/nautilus-view.c:8103
 msgid "Safely remove the drive associated with the open folder"
 msgstr "Fjern stasjon assosiert med den åpne mappen på en trygg måte"
 
-#: ../src/nautilus-view.c:8053
+#: ../src/nautilus-view.c:8107
 msgid "Disconnect the drive associated with the open folder"
 msgstr "Koble fra stasjon som er assosiert med den åpne mappen"
 
-#: ../src/nautilus-view.c:8057
+#: ../src/nautilus-view.c:8111
 msgid "Stop the multi-disk drive associated with the open folder"
 msgstr "Stopp stasjon med flere disker som er assosiert med den åpne mappen"
 
-#: ../src/nautilus-view.c:8061
+#: ../src/nautilus-view.c:8115
 msgid "Lock the drive associated with the open folder"
 msgstr "Lås stasjon som er assosiert med den åpne mappen"
 
-#: ../src/nautilus-view.c:8288 ../src/nautilus-view.c:8592
+#: ../src/nautilus-view.c:8342 ../src/nautilus-view.c:8660
 msgid "_Delete Permanently"
 msgstr "_Slett permanent"
 
-#: ../src/nautilus-view.c:8289
+#: ../src/nautilus-view.c:8343
 msgid "Delete the open folder permanently"
 msgstr "Slett åpen mappe permanent"
 
-#: ../src/nautilus-view.c:8293
+#: ../src/nautilus-view.c:8347
 msgid "Move the open folder to the Trash"
 msgstr "Flytt åpen mappe til papirkurv"
 
-#: ../src/nautilus-view.c:8507
+#: ../src/nautilus-view.c:8575
 #, c-format
 msgid "_Open With %s"
 msgstr "_Åpne med %s"
 
-#: ../src/nautilus-view.c:8556
+#: ../src/nautilus-view.c:8624
 #, c-format
 msgid "Open in %'d New _Window"
 msgid_plural "Open in %'d New _Windows"
 msgstr[0] "Åpne i %'d nytt _vindu"
 msgstr[1] "Åpne i %'d nye _vinduer"
 
-#: ../src/nautilus-view.c:8576
+#: ../src/nautilus-view.c:8644
 #, c-format
 msgid "Open in %'d New _Tab"
 msgid_plural "Open in %'d New _Tabs"
 msgstr[0] "Åpne i %'d ny _fane"
 msgstr[1] "Åpne i %'d nye _faner"
 
-#: ../src/nautilus-view.c:8593
+#: ../src/nautilus-view.c:8661
 msgid "Delete all selected items permanently"
 msgstr "Slett alle valgte oppføringer permanent"
 
-#: ../src/nautilus-view.c:8665
+#: ../src/nautilus-view.c:8733
 msgid "View or modify the properties of the open folder"
 msgstr "Vis eller endre egenskaper for åpen mappe"
 
@@ -5577,7 +5553,7 @@
 #. Translator: This is the filename used for when you dnd raw
 #. * data to a directory, if the source didn't supply a name.
 #. 
-#: ../src/nautilus-view-dnd.c:472
+#: ../src/nautilus-view-dnd.c:482
 msgid "dropped data"
 msgstr "data som ble sluppet"
 
@@ -5607,11 +5583,11 @@
 msgstr "%s - Bla gjennom filer"
 
 #. Set initial window title
-#: ../src/nautilus-window.c:1915 ../src/nautilus-window-menus.c:384
+#: ../src/nautilus-window.c:1909 ../src/nautilus-window-menus.c:385
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: ../src/nautilus-window-slot.c:469
+#: ../src/nautilus-window-manage-views.c:1140
 msgid "Searching..."
 msgstr "Søker …"
 
@@ -5675,7 +5651,7 @@
 "Feil: %s\n"
 "Vennligst velg et annet visningsprogram og prøv igjen."
 
-#: ../src/nautilus-window-menus.c:357
+#: ../src/nautilus-window-menus.c:358
 msgid ""
 "Nautilus is free software; you can redistribute it and/or modify it under "
 "the terms of the GNU General Public License as published by the Free "
@@ -5687,7 +5663,7 @@
 "Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) "
 "enhver senere versjon."
 
-#: ../src/nautilus-window-menus.c:361
+#: ../src/nautilus-window-menus.c:362
 msgid ""
 "Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -5698,7 +5674,7 @@
 "GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER ET "
 "BESTEMT FORMÅL. Se GNU General Public License for detaljer."
 
-#: ../src/nautilus-window.c:2039
+#: ../src/nautilus-window.c:2380
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -5711,11 +5687,11 @@
 #. Translators: these two strings here indicate the copyright time span,
 #. * e.g. 1999-2011.
 #. 
-#: ../src/nautilus-window-menus.c:380
+#: ../src/nautilus-window-menus.c:381
 msgid "Copyright © %Id–%Id The Nautilus authors"
 msgstr "Opphavsrett © %Id-%Id Nautilus-utviklerene"
 
-#: ../src/nautilus-window-menus.c:386
+#: ../src/nautilus-window-menus.c:387
 msgid ""
 "Nautilus lets you organize files and folders, both on your computer and "
 "online."
@@ -5727,7 +5703,7 @@
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #. 
-#: ../src/nautilus-window.c:2070
+#: ../src/nautilus-window.c:2411
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -5745,100 +5721,104 @@
 "  Morten https://launchpad.net/~mortenn8035-deactivatedaccount-"
 "deactivatedaccount\n"
 "  OHV https://launchpad.net/~ohviken\n"
-"  Roy S https://launchpad.net/~clean-carrier\n"
+"  Roy S https://launchpad.net/~clean-carrier-deactivatedaccount\n"
+"  Åka Sikrom https://launchpad.net/~akrosikam\n"
 "  Øivind Hoel https://launchpad.net/~eruin"
 
-#: ../src/nautilus-window-menus.c:401
+#: ../src/nautilus-window-menus.c:402
 msgid "Nautilus Web Site"
 msgstr "Nautilus nettsted"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:911
+#: ../src/nautilus-window-menus.c:912
 msgid "_File"
 msgstr "_Fil"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:912
+#: ../src/nautilus-window-menus.c:913
 msgid "_Edit"
 msgstr "R_ediger"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:913
+#: ../src/nautilus-window-menus.c:914
 msgid "_View"
 msgstr "_Vis"
 
 #. name, stock id, label
-#: ../src/nautilus-app-menu.ui.h:7 ../src/nautilus-window-menus.c:456
+#: ../src/nautilus-app-menu.ui.h:5 ../src/nautilus-properties-window.c:4947
+#: ../src/nautilus-view.c:1494 ../src/nautilus-window-menus.c:469
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:458
+#: ../src/nautilus-list-view.c:2948 ../src/nautilus-properties-window.c:4948
+#: ../src/nautilus-window-menus.c:471
 msgid "_Close"
 msgstr "_Lukk"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:459
+#: ../src/nautilus-window-menus.c:472
 msgid "Close this folder"
 msgstr "Lukk denne mappen"
 
-#: ../src/nautilus-app-menu.ui.h:5 ../src/nautilus-window-menus.c:462
+#: ../src/nautilus-app-menu.ui.h:4 ../src/nautilus-window-menus.c:475
 msgid "Prefere_nces"
 msgstr "_Brukervalg"
 
-#: ../src/nautilus-window-menus.c:463
+#: ../src/nautilus-window-menus.c:476
 msgid "Edit Nautilus preferences"
 msgstr "Rediger brukervalg for Nautilus"
 
-#: ../src/nautilus-window-menus.c:925
+#: ../src/nautilus-window-menus.c:926
 msgid "Undo the last text change"
 msgstr "Angre siste tekstendring"
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:465
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:479
 msgid "Open _Parent"
 msgstr "Åpne o_pphav"
 
-#: ../src/nautilus-window-menus.c:466
+#: ../src/nautilus-window-menus.c:480
 msgid "Open the parent folder"
 msgstr "Åpne opphavsmappen"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:470
+#: ../src/nautilus-window-menus.c:484
 msgid "Stop loading the current location"
 msgstr "Stopp lasting av aktiv lokasjon"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:473
+#: ../src/nautilus-window-menus.c:487
 msgid "_Reload"
 msgstr "_Oppdater"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:474
+#: ../src/nautilus-window-menus.c:488
 msgid "Reload the current location"
 msgstr "Last aktiv lokasjon på nytt"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:481
+#: ../src/nautilus-window-menus.c:495
 msgid "_All Topics"
 msgstr "_Alle emner"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:482
+#: ../src/nautilus-window-menus.c:496
 msgid "Display Nautilus help"
 msgstr "Vis hjelp for Nautilus"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:485
+#: ../src/nautilus-window-menus.c:499
 msgid "Search for files"
 msgstr "Søk etter filer"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:486
+#: ../src/nautilus-window-menus.c:500
 msgid ""
 "Locate files based on file name and type. Save your searches for later use."
 msgstr ""
@@ -5846,23 +5826,23 @@
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:489
+#: ../src/nautilus-window-menus.c:503
 msgid "Sort files and folders"
 msgstr "Sorter filer og mapper"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:490
+#: ../src/nautilus-window-menus.c:504
 msgid "Arrange files by name, size, type, or when they were changed."
 msgstr "Sorter filer etter navn, størrelse, type eller når de ble endret."
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:493
+#: ../src/nautilus-window-menus.c:507
 msgid "Find a lost file"
 msgstr "Finn en tapt fil"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:494
+#: ../src/nautilus-window-menus.c:508
 msgid "Follow these tips if you can't find a file you created or downloaded."
 msgstr ""
 "Følgg disse tipsene hvis du ikke kan finne en fil du har laget eller lastet "
@@ -5870,12 +5850,12 @@
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:497
+#: ../src/nautilus-window-menus.c:511
 msgid "Share and transfer files"
 msgstr "Del og overfør filer"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:498
+#: ../src/nautilus-window-menus.c:512
 msgid ""
 "Easily transfer files to your contacts and devices from the file manager."
 msgstr ""
@@ -5884,67 +5864,67 @@
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:501
+#: ../src/nautilus-app-menu.ui.h:6 ../src/nautilus-window-menus.c:515
 msgid "_About"
 msgstr "_Om"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:502
+#: ../src/nautilus-window-menus.c:516
 msgid "Display credits for the creators of Nautilus"
 msgstr "Vis informasjon om dem som laget Nautilus"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:505
+#: ../src/nautilus-window-menus.c:519
 msgid "Zoom _In"
 msgstr "Zoom _inn"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:506
+#: ../src/nautilus-window-menus.c:520
 msgid "Increase the view size"
 msgstr "Øk visningsstørrelse"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:517
+#: ../src/nautilus-window-menus.c:531
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:518
+#: ../src/nautilus-window-menus.c:532
 msgid "Decrease the view size"
 msgstr "Mindre visningsstørrelse"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:525
+#: ../src/nautilus-window-menus.c:539
 msgid "Normal Si_ze"
 msgstr "Normal st_ørrelse"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:526
+#: ../src/nautilus-window-menus.c:540
 msgid "Use the normal view size"
 msgstr "Bruk normal visningsstørrelse"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:540
+#: ../src/nautilus-window-menus.c:992
 msgid "Connect to _Server..."
 msgstr "Koble til _tjener …"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:530
+#: ../src/nautilus-window-menus.c:544
 msgid "Connect to a remote computer or shared disk"
 msgstr "Koble til en ekstern datamaskin eller delt disk"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:999
+#: ../src/nautilus-window-menus.c:1000
 msgid "_Computer"
 msgstr "_Datamaskin"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:1000
+#: ../src/nautilus-window-menus.c:1001
 msgid ""
 "Browse all local and remote disks and folders accessible from this computer"
 msgstr ""
@@ -5953,274 +5933,274 @@
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:1003
+#: ../src/nautilus-window-menus.c:1004
 msgid "_Network"
 msgstr "_Nettverk"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:1004
+#: ../src/nautilus-window-menus.c:1005
 msgid "Browse bookmarked and local network locations"
 msgstr "Bla gjennom nettverkslokasjoner i bokmerker og lokalt"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:1007
+#: ../src/nautilus-window-menus.c:1008
 msgid "T_emplates"
 msgstr "_Maler"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:1008
+#: ../src/nautilus-window-menus.c:1009
 msgid "Open your personal templates folder"
 msgstr "Åpne din personlige malmappe"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:1011
+#: ../src/nautilus-window-menus.c:1012
 msgid "_Trash"
 msgstr "_Papirkurv"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:1012
+#: ../src/nautilus-window-menus.c:1013
 msgid "Open your personal trash folder"
 msgstr "Åpne din personlige papirkurv"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:1014
+#: ../src/nautilus-window-menus.c:1015
 msgid "_Go"
 msgstr "_Gå"
 
-#: ../src/nautilus-app-menu.ui.h:4
+#: ../src/nautilus-app-menu.ui.h:3
 msgid "_Bookmarks"
 msgstr "_Bokmerker"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:1016
+#: ../src/nautilus-window-menus.c:1017
 msgid "_Tabs"
 msgstr "_Faner"
 
-#. name, stock id, label
-#: ../src/nautilus-app-menu.ui.h:1 ../src/nautilus-window-menus.c:536
+#. name, stock id
+#: ../src/nautilus-app-menu.ui.h:1 ../src/nautilus-window-menus.c:551
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: ../src/nautilus-window-menus.c:537
+#: ../src/nautilus-window-menus.c:552
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Åpne et nytt Nautilus-vindu for denne lokasjonen"
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:539
+#. name, stock id
+#: ../src/nautilus-window-menus.c:555
 msgid "New _Tab"
 msgstr "Ny _fane"
 
-#: ../src/nautilus-window-menus.c:540
+#: ../src/nautilus-window-menus.c:556
 msgid "Open another tab for the displayed location"
 msgstr "Åpne en ny fane for denne lokasjonen"
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:542
+#. name, stock id
+#: ../src/nautilus-window-menus.c:559
 msgid "Close _All Windows"
 msgstr "Lukk _alle vinduer"
 
-#: ../src/nautilus-window-menus.c:543
+#: ../src/nautilus-window-menus.c:560
 msgid "Close all Navigation windows"
 msgstr "Lukk alle navigeringsvinduer"
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:545
+#. name, stock id
+#: ../src/nautilus-window-menus.c:563
 msgid "_Back"
 msgstr "_Tilbake"
 
-#: ../src/nautilus-window-menus.c:546
+#: ../src/nautilus-window-menus.c:564
 msgid "Go to the previous visited location"
 msgstr "Gå til forrige besøkte lokasjon"
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:548
+#. name, stock id
+#: ../src/nautilus-window-menus.c:567
 msgid "_Forward"
 msgstr "_Fremover"
 
-#: ../src/nautilus-window-menus.c:549
+#: ../src/nautilus-window-menus.c:568
 msgid "Go to the next visited location"
 msgstr "Gå til neste besøkte lokasjon"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:1032
+#: ../src/nautilus-window-menus.c:1033
 msgid "_Location..."
 msgstr "P_lassering …"
 
-#: ../src/nautilus-window-menus.c:552
+#: ../src/nautilus-window-menus.c:572
 msgid "Specify a location to open"
 msgstr "Oppgi en lokasjon som skal åpnes"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:1035
+#: ../src/nautilus-window-menus.c:1036
 msgid "S_witch to Other Pane"
 msgstr "B_ytt til det andre området"
 
-#: ../src/nautilus-window-menus.c:1036
+#: ../src/nautilus-window-menus.c:1037
 msgid "Move focus to the other pane in a split view window"
 msgstr "Flytt fokus til det andre området i det delte vinduet"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:1038
+#: ../src/nautilus-window-menus.c:1039
 msgid "Sa_me Location as Other Pane"
 msgstr "Sa_mme lokasjon som det andre området"
 
-#: ../src/nautilus-window-menus.c:1039
+#: ../src/nautilus-window-menus.c:1040
 msgid "Go to the same location as in the extra pane"
 msgstr "Gå til samme lokasjon som vises i det andre området"
 
-#: ../src/nautilus-window-menus.c:1042
+#: ../src/nautilus-window-menus.c:1043
 msgid "Add a bookmark for the current location to this menu"
 msgstr "Legg til et bokmerke for nåværende adresse i denne menyen"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:1044
+#: ../src/nautilus-window-menus.c:1045
 msgid "_Edit Bookmarks..."
 msgstr "R_ediger bokmerker …"
 
-#: ../src/nautilus-window-menus.c:1045
+#: ../src/nautilus-window-menus.c:1046
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Vis et vindu som tillater redigering av bokmerkene i denne menyen"
 
-#: ../src/nautilus-window-menus.c:560
+#: ../src/nautilus-window-menus.c:582
 msgid "_Previous Tab"
 msgstr "F_orrige fane"
 
-#: ../src/nautilus-window-menus.c:561
+#: ../src/nautilus-window-menus.c:583
 msgid "Activate previous tab"
 msgstr "Aktiver forrige fane"
 
-#: ../src/nautilus-window-menus.c:563
+#: ../src/nautilus-window-menus.c:585
 msgid "_Next Tab"
 msgstr "_Neste fane"
 
-#: ../src/nautilus-window-menus.c:564
+#: ../src/nautilus-window-menus.c:586
 msgid "Activate next tab"
 msgstr "Aktiver neste fane"
 
-#: ../src/nautilus-window.c:842 ../src/nautilus-window-menus.c:566
+#: ../src/nautilus-window.c:1188 ../src/nautilus-window-menus.c:588
 msgid "Move Tab _Left"
 msgstr "F_lytt fane til venstre"
 
-#: ../src/nautilus-window-menus.c:567
+#: ../src/nautilus-window-menus.c:589
 msgid "Move current tab to left"
 msgstr "Flytt aktiv fane til venstre"
 
-#: ../src/nautilus-window.c:850 ../src/nautilus-window-menus.c:569
+#: ../src/nautilus-window.c:1196 ../src/nautilus-window-menus.c:591
 msgid "Move Tab _Right"
 msgstr "Flytt fane til høy_re"
 
-#: ../src/nautilus-window-menus.c:570
+#: ../src/nautilus-window-menus.c:592
 msgid "Move current tab to right"
 msgstr "Flytt aktiv fane til høyre"
 
-#: ../src/nautilus-window-menus.c:1059
+#: ../src/nautilus-window-menus.c:1060
 msgid "Sidebar"
 msgstr "Sidelinje"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7362
+#: ../src/nautilus-view.c:7416
 msgid "Show _Hidden Files"
 msgstr "Vis skjulte _filer"
 
 #. tooltip
-#: ../src/nautilus-view.c:7363
+#: ../src/nautilus-view.c:7417
 msgid "Toggle the display of hidden files in the current window"
 msgstr "Slå av/på visning av skjulte filer i dette vinduet"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:1069
+#: ../src/nautilus-window-menus.c:1070
 msgid "_Main Toolbar"
 msgstr "_Hovedverktøylinje"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:1070
+#: ../src/nautilus-window-menus.c:1071
 msgid "Change the visibility of this window's main toolbar"
 msgstr "Endre synligheten for dette vinduets hovedverktøylinje"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:584
+#: ../src/nautilus-window-menus.c:610
 msgid "_Show Sidebar"
 msgstr "Vis _sidelinje"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:585
+#: ../src/nautilus-window-menus.c:611
 msgid "Change the visibility of this window's side pane"
 msgstr "Endre synligheten for dette vinduets sidelinje"
 
 #. is_active
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:1079
+#: ../src/nautilus-window-menus.c:1080
 msgid "St_atusbar"
 msgstr "St_atuslinje"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:1080
+#: ../src/nautilus-window-menus.c:1081
 msgid "Change the visibility of this window's statusbar"
 msgstr "Endre synligheten for dette vinduets statuslinje"
 
 #. is_active
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:600
+#: ../src/nautilus-window-menus.c:1085
 msgid "_Search for Files..."
 msgstr "_Søk etter filer …"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:590
+#: ../src/nautilus-window-menus.c:616
 msgid "Search documents and folders by name"
 msgstr "Søk etter dokumenter og mapper etter navn"
 
 #. is_active
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:1089
+#: ../src/nautilus-window-menus.c:1090
 msgid "E_xtra Pane"
 msgstr "E_kstra område"
 
 #. tooltip
-#: ../src/nautilus-window-menus.c:1090
+#: ../src/nautilus-window-menus.c:1091
 msgid "Open an extra folder view side-by-side"
 msgstr "Åpne en ekstra mappevisning ved siden av eksisterende"
 
-#: ../src/nautilus-places-sidebar.c:498
+#: ../src/nautilus-places-sidebar.c:510
 msgid "Places"
 msgstr "Steder"
 
-#: ../src/nautilus-window-menus.c:1097
+#: ../src/nautilus-window-menus.c:1098
 msgid "Select Places as the default sidebar"
 msgstr "Velg Steder som forvalgt sidelinje"
 
-#: ../src/nautilus-window-menus.c:1100
+#: ../src/nautilus-window-menus.c:1101
 msgid "Tree"
 msgstr "Tre"
 
-#: ../src/nautilus-window-menus.c:1100
+#: ../src/nautilus-window-menus.c:1101
 msgid "Select Tree as the default sidebar"
 msgstr "Velg Tre som forvalgt sidelinje"
 
-#: ../src/nautilus-window-menus.c:1119
+#: ../src/nautilus-window-menus.c:1120
 msgid "Back history"
 msgstr "Tilbake"
 
-#: ../src/nautilus-window-menus.c:1135
+#: ../src/nautilus-window-menus.c:1136
 msgid "Forward history"
 msgstr "Fremover"
 
-#: ../src/nautilus-window-menus.c:702
+#: ../src/nautilus-window-menus.c:727
 msgid "_Up"
 msgstr "_Opp"
 
-#: ../src/nautilus-window.c:832
+#: ../src/nautilus-window.c:1178
 msgid "_New Tab"
 msgstr "_Ny fane"
 
-#: ../src/nautilus-window.c:861
+#: ../src/nautilus-window.c:1207
 msgid "_Close Tab"
 msgstr "_Lukk fane"
 
@@ -6275,10 +6255,10 @@
 msgid "Open %s"
 msgstr "Åpne %s"
 
-#: ../src/unity-quicklist-handler.h:70
+#: ../src/unity-quicklist-handler.h:72
 msgid "Show Copy Dialog"
 msgstr "Vis kopieringsdialog"
 
-#: ../src/unity-quicklist-handler.h:71
+#: ../src/unity-quicklist-handler.h:73
 msgid "Cancel All In-progress Actions"
 msgstr "Avbryt alle pågående handlinger"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/ndisgtk.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/ndisgtk.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/ndisgtk.po	2013-01-29 09:33:52.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/ndisgtk.po	2014-01-07 06:37:22.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 13:55+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:22+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../ndisgtk:165
 msgid "Unable to see if hardware is present."
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/nm-applet.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/nm-applet.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/nm-applet.po	2013-01-29 09:33:58.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/nm-applet.po	2014-01-07 06:37:30.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: NetworkManager 0.9.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-19 04:04+0000\n"
+"POT-Creation-Date: 2013-04-18 23:38+0000\n"
 "PO-Revision-Date: 2012-08-07 00:01+0000\n"
 "Last-Translator: Roy S <Unknown>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:14+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 15:54+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../nm-applet.desktop.in.h:1
@@ -83,12 +83,13 @@
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
 msgid "Show the applet in notification area"
-msgstr "Vis miniprogrammet i varslingsområdet"
+msgstr "Vis panelprogrammet i varslingsområdet"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:14
 msgid ""
 "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
+"Sett til FALSE for å slå av visning av panelprogrammet i varslingsområdet."
 
 #: ../nm-connection-editor.desktop.in.h:1
 #: ../src/connection-editor/nm-connection-editor.ui.h:1
@@ -99,113 +100,115 @@
 msgid "Manage and change your network connection settings"
 msgstr "Håndter og endre innstillinger for nettverksforbindelser"
 
-#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
-#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:767
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-wifi.c:859
-#: ../src/applet-device-wimax.c:275
+#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
+#: ../src/applet-device-broadband.c:769 ../src/applet-device-bt.c:90
+#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
+#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
+#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
+#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
 msgid "Available"
 msgstr "Tilgjengelige"
 
-#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
-#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:811
-#: ../src/applet-device-gsm.c:399 ../src/applet-device-wimax.c:419
+#: ../src/applet.c:2525
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Du er nå koblet til «%s»."
 
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
-#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:815
-#: ../src/applet-device-gsm.c:403 ../src/applet-device-wifi.c:1261
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
+#: ../src/applet-device-broadband.c:796 ../src/applet-device-bt.c:102
+#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
+#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
+#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
+#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
 msgid "Connection Established"
 msgstr "Tilkoblingen er satt opp"
 
-#: ../src/applet-device-bt.c:200
+#: ../src/applet-device-bt.c:103
 msgid "You are now connected to the mobile broadband network."
 msgstr "Du er nå koblet til mobilt bredbåndsnettverk."
 
-#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
-#: ../src/mobile-helpers.c:606
+#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
+#: ../src/mobile-helpers.c:582
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Forbereder mobil bredbåndsforbindelse «%s» …"
 
-#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
-#: ../src/mobile-helpers.c:609
+#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
+#: ../src/mobile-helpers.c:585
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Konfigurerer mobil bredbåndsforbindelse «%s» …"
 
-#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
-#: ../src/mobile-helpers.c:612
+#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
+#: ../src/mobile-helpers.c:588
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Brukerautentisering kreves for mobil bredbåndsforbindelse «%s» …"
 
-#: ../src/applet.c:2608 ../src/applet-device-bt.c:235
-#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:615
+#: ../src/applet.c:2808 ../src/applet-device-bt.c:136
+#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Ber om en nettverksadresse for «%s» …"
 
-#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:632
+#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobil bredbåndsforbindelse «%s» er aktiv"
 
-#: ../src/connection-editor/page-mobile.c:715 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:270
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:713
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:424
+#: ../src/applet-device-broadband.c:715 ../src/applet-device-cdma.c:247
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:421
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilt bredbånd (%s)"
 
-#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:715
+#: ../src/applet-device-broadband.c:717 ../src/applet-device-cdma.c:249
 #: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:113
-#: ../src/connection-editor/page-mobile.c:389
+#: ../src/connection-editor/new-connection.c:114
+#: ../src/connection-editor/page-mobile.c:351
 #: ../src/libnm-gtk/nm-ui-utils.c:333
 msgid "Mobile Broadband"
 msgstr "Mobilt bredbånd"
 
 #. Default connection item
-#: ../src/applet-device-cdma.c:316
+#: ../src/applet-device-cdma.c:314
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "Ny mobil bredbåndstilkobling (CDMA) …"
 
-#: ../src/applet-device-cdma.c:350
+#: ../src/applet-device-cdma.c:341
 msgid "You are now connected to the CDMA network."
 msgstr "Du er nå tilkoblet CDMA-nettverk."
 
-#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:627
+#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Mobil bredbåndsforbindelse «%s» er aktiv: (%d%%%s%s)"
 
-#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:630
+#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
 msgid "roaming"
 msgstr "roaming"
 
-#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
+#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
 msgid "CDMA network."
 msgstr "CDMA-nettverk."
 
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:953
-#: ../src/applet-device-gsm.c:677
+#: ../src/applet-device-broadband.c:933 ../src/applet-device-cdma.c:403
+#: ../src/applet-device-gsm.c:662
 msgid "You are now registered on the home network."
 msgstr "Du er nå registrert på hjemmenettverket."
 
-#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:959
-#: ../src/applet-device-gsm.c:683
+#: ../src/applet-device-broadband.c:939 ../src/applet-device-cdma.c:409
+#: ../src/applet-device-gsm.c:668
 msgid "You are now registered on a roaming network."
 msgstr "Du er nå registrert på et roaming nettverk."
 
-#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:266
+#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
+#: ../src/mobile-helpers.c:268
 msgid "GSM"
 msgstr "GSM"
 
@@ -214,46 +217,46 @@
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "Ny tilkobling med mobilt bredbånd (GSM) …"
 
-#: ../src/applet-device-gsm.c:676 ../src/applet-device-gsm.c:682
+#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
 msgid "GSM network."
 msgstr "GSM-nettverk."
 
-#: ../src/mobile-helpers.c:471
+#: ../src/mobile-helpers.c:451
 msgid "PIN code required"
 msgstr "PIN-kode kreves"
 
-#: ../src/mobile-helpers.c:479
+#: ../src/mobile-helpers.c:459
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN-kode kreves for enhet for mobilt bredbånd"
 
-#: ../src/mobile-helpers.c:297
+#: ../src/mobile-helpers.c:318
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN-kode for SIM-kort «%s» på «%s»"
 
-#: ../src/applet-device-broadband.c:207 ../src/applet-device-gsm.c:495
+#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Feil PIN-kode. Vennligst kontakt leverandøren."
 
-#: ../src/applet-device-broadband.c:165 ../src/applet-device-gsm.c:518
+#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Feil PUK-kode. Vennligst kontakt leverandøren."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:258 ../src/applet-device-gsm.c:545
+#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:532
 msgid "Sending unlock code..."
 msgstr "Send kode for å låse opp …"
 
-#: ../src/applet-dialogs.c:1310
+#: ../src/applet-dialogs.c:1261
 msgid "SIM PIN unlock required"
 msgstr "Du må låse opp PIN-koden for SIM"
 
-#: ../src/applet-dialogs.c:1311
+#: ../src/applet-dialogs.c:1262
 msgid "SIM PIN Unlock Required"
 msgstr "Du må låse opp PIN-kode for SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1313
+#: ../src/applet-dialogs.c:1264
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -262,25 +265,25 @@
 "Mobil bredbåndsenhet «%s» krever en PIN-kode for SIM før den kan brukes."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1315
+#: ../src/applet-dialogs.c:1266
 msgid "PIN code:"
 msgstr "PIN-kode:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1319
+#: ../src/applet-dialogs.c:1270
 msgid "Show PIN code"
 msgstr "Vis PIN-kode"
 
-#: ../src/applet-dialogs.c:1321
+#: ../src/applet-dialogs.c:1272
 msgid "SIM PUK unlock required"
 msgstr "Du må låse opp PUK-kode for SIM"
 
-#: ../src/applet-dialogs.c:1322
+#: ../src/applet-dialogs.c:1273
 msgid "SIM PUK Unlock Required"
 msgstr "Du må låse opp PUK-kode for SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1324
+#: ../src/applet-dialogs.c:1275
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -289,26 +292,26 @@
 "Mobil bredbåndsenhet «%s» krever en PUK-kode for SIM før den kan brukes."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1326
+#: ../src/applet-dialogs.c:1277
 msgid "PUK code:"
 msgstr "PUK-kode:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1280
 msgid "New PIN code:"
 msgstr "Ny PIN-kode:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1282
 msgid "Re-enter new PIN code:"
 msgstr "Tast inn ny PIN-kode igjen:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1287
 msgid "Show PIN/PUK codes"
 msgstr "Vis PIN/PUK-koder"
 
-#: ../src/applet-device-ethernet.c:62
+#: ../src/applet-device-ethernet.c:44
 msgid "Auto Ethernet"
 msgstr "Automatisk Ethernet"
 
@@ -331,11 +334,12 @@
 msgstr "Kablet nettverk"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1565 ../src/applet-device-ethernet.c:229
+#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
+#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
 msgid "disconnected"
 msgstr "frakoblet"
 
-#: ../src/applet.c:2599 ../src/applet-device-ethernet.c:269
+#: ../src/applet-device-ethernet.c:270
 msgid "Wired network"
 msgstr "Trådbasert nettverk"
 
@@ -364,7 +368,7 @@
 msgid "Wired network connection '%s' active"
 msgstr "Kablet nettverkforbindelse «%s» er aktiv"
 
-#: ../src/applet-device-ethernet.c:491
+#: ../src/applet-device-ethernet.c:365
 msgid "DSL authentication"
 msgstr "DSL-autentisering"
 
@@ -376,13 +380,13 @@
 msgid "Create _New Wireless Network..."
 msgstr "Lag _nytt trådløst nettverk …"
 
-#: ../src/applet-device-wifi.c:293
+#: ../src/applet-device-wifi.c:291
 msgid "(none)"
 msgstr "(ingen)"
 
 #: ../src/applet-device-wifi.c:466
 msgid "ad-hoc"
-msgstr ""
+msgstr "ad-hoc"
 
 #: ../src/applet-device-wifi.c:474
 msgid "secure."
@@ -412,7 +416,7 @@
 msgid "wireless is disabled by hardware switch"
 msgstr "trådløs er slått av med bryter"
 
-#: ../src/applet-device-wifi.c:886
+#: ../src/applet-device-wifi.c:864
 msgid "More networks"
 msgstr "Flere nettverk"
 
@@ -424,7 +428,7 @@
 msgid "Use the network menu to connect to a wireless network"
 msgstr "Bruk nettverksmenyen for å koble til et trådløst nettverk"
 
-#: ../src/applet.c:986 ../src/applet-device-wifi.c:1069
+#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
 msgid "Don't show this message again"
 msgstr "Ikke vis denne meldingen igjen"
 
@@ -458,24 +462,24 @@
 msgid "Wireless network connection '%s' active"
 msgstr "Trådløs nettverkstilkobling «%s» er aktiv"
 
-#: ../src/applet-device-wimax.c:227
+#: ../src/applet-device-wimax.c:228
 #, c-format
 msgid "WiMAX Mobile Broadband (%s)"
 msgstr "WiMAX mobilt bredbånd (%s)"
 
-#: ../src/applet-device-wimax.c:229
+#: ../src/applet-device-wimax.c:230
 msgid "WiMAX Mobile Broadband"
 msgstr "WiMAX mobilt bredbånd"
 
-#: ../src/applet-device-wimax.c:255
+#: ../src/applet-device-wimax.c:256
 msgid "WiMAX is disabled"
 msgstr "WiMAX er slått av"
 
-#: ../src/applet-device-wimax.c:256
+#: ../src/applet-device-wimax.c:257
 msgid "WiMAX is disabled by hardware switch"
 msgstr "WiMAX er slått av med bryter"
 
-#: ../src/applet-device-wimax.c:424
+#: ../src/applet-device-wimax.c:402
 msgid "You are now connected to the WiMAX network."
 msgstr "Du er nå tilkoblet WiMAX-nettverket."
 
@@ -484,9 +488,9 @@
 msgstr "Feil under visning av tilkoblingsinformasjon:"
 
 #: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:406
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnm-gtk/nm-wifi-dialog.c:918
+#: ../src/wireless-security/wireless-security.c:441
 msgid "LEAP"
 msgstr "LEAP"
 
@@ -494,195 +498,194 @@
 msgid "Dynamic WEP"
 msgstr "Dynamisk WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
+#: ../src/applet-dialogs.c:244
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:243
+#: ../src/applet-dialogs.c:240
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnm-gtk/nm-wifi-dialog.c:875
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:274
 #, c-format
 msgid "%s (default)"
 msgstr "%s (forvalg)"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:481
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:483
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/applet-dialogs.c:361
+#: ../src/applet-dialogs.c:358
 #, c-format
 msgid "%d dB"
 msgstr "%d dB"
 
-#: ../src/applet-dialogs.c:363
+#: ../src/applet-dialogs.c:360
 msgctxt "WiMAX CINR"
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../src/applet-dialogs.c:375
+#: ../src/applet-dialogs.c:372
 msgctxt "WiMAX Base Station ID"
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:407
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:410
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:417
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:419
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
+#: ../src/applet-dialogs.c:423
 #, c-format
 msgid "WiMAX (%s)"
 msgstr "WiMAX (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
+#: ../src/applet-dialogs.c:429 ../src/applet-dialogs.c:788
 #: ../src/connection-editor/page-general.c:327
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:433
 msgid "Interface:"
 msgstr "Grensesnitt:"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:449
 msgid "Hardware Address:"
 msgstr "Maskinvareadresse:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:457
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:486
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:496
 msgid "Security:"
 msgstr "Sikkerhet:"
 
-#: ../src/applet-dialogs.c:512
+#: ../src/applet-dialogs.c:509
 msgid "CINR:"
 msgstr "CINR:"
 
-#: ../src/applet-dialogs.c:525
+#: ../src/applet-dialogs.c:522
 msgid "BSID:"
 msgstr "BSID:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:539
 msgid "IPv4"
 msgstr "IPv4"
 
 #. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
+#: ../src/applet-dialogs.c:550 ../src/applet-dialogs.c:657
 msgid "IP Address:"
 msgstr "IP-adresse:"
 
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
+#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:568
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/applet-dialogs.c:569
+#: ../src/applet-dialogs.c:566
 msgid "Broadcast Address:"
 msgstr "Kringkastingsadresse:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:578
+#: ../src/applet-dialogs.c:575
 msgid "Subnet Mask:"
 msgstr "Subnettmaske:"
 
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:577
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:585 ../src/applet-dialogs.c:672
 msgid "Default Route:"
 msgstr "Forvalgt rute:"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:597
 msgid "Primary DNS:"
 msgstr "Primær DNS:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:606
 msgid "Secondary DNS:"
 msgstr "Sekundær DNS:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:616
 msgid "Ternary DNS:"
 msgstr "Ternær DNS:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:631
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:640
 msgid "Ignored"
 msgstr "Ignorert"
 
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:793
 msgid "VPN Type:"
 msgstr "Type VPN:"
 
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:800
 msgid "VPN Gateway:"
 msgstr "VPN-gateway:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:806
 msgid "VPN Username:"
 msgstr "Brukernavn for VPN:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:812
 msgid "VPN Banner:"
 msgstr "VPN-topptekst:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:818
 msgid "Base Connection:"
 msgstr "Grunntilkobling:"
 
-#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
+#: ../src/applet-dialogs.c:820 ../src/libnm-gtk/nm-ui-utils.c:347
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:883
 msgid "No valid active connections found!"
 msgstr "Ingen gyldige aktive tilkoblinger funnet!"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:911
 msgid ""
 "Copyright © 2004-2011 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -691,34 +694,34 @@
 "Opphavsrett © 2004-2011 Red Hat, Inc.\n"
 "Opphavsrett © 2005-2008 Novell, Inc."
 
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:914
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Panelprogram for håndtering av dine nettverksenheter og -tilkoblinger."
 
-#: ../src/applet-dialogs.c:944
+#: ../src/applet-dialogs.c:916
 msgid "NetworkManager Website"
 msgstr "NetworkManager nettsted"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:931
 msgid "Missing resources"
 msgstr "Mangler ressurser"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:956
 msgid "Mobile broadband network password"
 msgstr "Passord for tilkoblign med mobilt bredbånd"
 
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:965
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Et passord kreves for å koble til «%s»."
 
-#: ../src/applet-dialogs.c:1012
+#: ../src/applet-dialogs.c:980
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/applet.c:1075
+#: ../src/applet.c:1046
 #, c-format
 msgid ""
 "\n"
@@ -728,7 +731,7 @@
 "\n"
 "VPN-tilkobling «%s» feilet fordi nettverksforbindelsen ble avbrutt."
 
-#: ../src/applet.c:1078
+#: ../src/applet.c:1049
 #, c-format
 msgid ""
 "\n"
@@ -737,7 +740,7 @@
 "\n"
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten stoppet uventet."
 
-#: ../src/applet.c:1081
+#: ../src/applet.c:1052
 #, c-format
 msgid ""
 "\n"
@@ -748,7 +751,7 @@
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten returnerte ugyldig "
 "konfigurasjon."
 
-#: ../src/applet.c:1084
+#: ../src/applet.c:1055
 #, c-format
 msgid ""
 "\n"
@@ -757,7 +760,7 @@
 "\n"
 "VPN-tilkobling «%s» feilet pga tidsavbrudd for tilkoblingsforsøket."
 
-#: ../src/applet.c:1087
+#: ../src/applet.c:1058
 #, c-format
 msgid ""
 "\n"
@@ -766,7 +769,7 @@
 "\n"
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten ikke startet i tide."
 
-#: ../src/applet.c:1090
+#: ../src/applet.c:1061
 #, c-format
 msgid ""
 "\n"
@@ -775,7 +778,7 @@
 "\n"
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten ikke klarte å starte opp."
 
-#: ../src/applet.c:1093
+#: ../src/applet.c:1064
 #, c-format
 msgid ""
 "\n"
@@ -784,7 +787,7 @@
 "\n"
 "VPN-tilkobling «%s» feilet fordi det ikke finnes gyldige VPN-passord."
 
-#: ../src/applet.c:1096
+#: ../src/applet.c:1067
 #, c-format
 msgid ""
 "\n"
@@ -793,7 +796,7 @@
 "\n"
 "VPN-tilkobling «%s» feilet pga ugyldig hemmelighet for VPN."
 
-#: ../src/applet.c:1103
+#: ../src/applet.c:1074
 #, c-format
 msgid ""
 "\n"
@@ -802,7 +805,7 @@
 "\n"
 "VPN-tilkobling «%s» feilet."
 
-#: ../src/applet.c:1121
+#: ../src/applet.c:1092
 #, c-format
 msgid ""
 "\n"
@@ -812,7 +815,7 @@
 "\n"
 "VPN-tilkobling «%s» ble koblet fra fordi nettverkstilkoblingen ble avbrutt."
 
-#: ../src/applet.c:1124
+#: ../src/applet.c:1095
 #, c-format
 msgid ""
 "\n"
@@ -821,7 +824,7 @@
 "\n"
 "VPN-tilkobling «%s» koblet fra fordi VPN-tjenesten stoppet."
 
-#: ../src/applet.c:1130
+#: ../src/applet.c:1101
 #, c-format
 msgid ""
 "\n"
@@ -830,15 +833,15 @@
 "\n"
 "VPN-tilkobling «%s» koblet fra."
 
-#: ../src/applet.c:1164
+#: ../src/applet.c:1135
 msgid "VPN Login Message"
 msgstr "Påloggingsmelding for VPN"
 
-#: ../src/applet.c:1170 ../src/applet.c:1178 ../src/applet.c:1228
+#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
 msgid "VPN Connection Failed"
 msgstr "VPN-tilkobling feilet"
 
-#: ../src/applet.c:1235
+#: ../src/applet.c:1206
 #, c-format
 msgid ""
 "\n"
@@ -851,7 +854,7 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:1238
+#: ../src/applet.c:1209
 #, c-format
 msgid ""
 "\n"
@@ -864,48 +867,48 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:1553
+#: ../src/applet.c:1533
 msgid "device not ready (firmware missing)"
 msgstr "enheten er ikke klar (fastvare mangler)"
 
-#: ../src/applet.c:1555
+#: ../src/applet.c:1535
 msgid "device not ready"
 msgstr "enheten er ikke klar"
 
-#: ../src/applet.c:1581
+#: ../src/applet.c:1561
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../src/applet.c:1595
+#: ../src/applet.c:1575
 msgid "device not managed"
 msgstr "enheten er ikke håndtert"
 
-#: ../src/applet.c:1639
+#: ../src/applet.c:1735
 msgid "No network devices available"
 msgstr "Ingen nettverksenheter tilgjengelig"
 
-#: ../src/applet.c:1727
+#: ../src/applet.c:1788
 msgid "_VPN Connections"
 msgstr "_VPN-tilkoblinger"
 
-#: ../src/applet.c:1784
+#: ../src/applet.c:1845
 msgid "_Configure VPN..."
 msgstr "_Sett opp VPN …"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1849
 msgid "_Disconnect VPN"
 msgstr "Ko_ble fra VPN"
 
-#: ../src/applet.c:1882
+#: ../src/applet.c:1965
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager kjører ikke …"
 
-#: ../src/applet.c:1887 ../src/applet.c:2739
+#: ../src/applet.c:1970 ../src/applet.c:2940
 msgid "Networking disabled"
 msgstr "Nettverk slått av"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2108
+#: ../src/applet.c:2190
 msgid "Enable _Networking"
 msgstr "Slå på _nettverk"
 
@@ -915,104 +918,104 @@
 msgstr "Slå på _trådløs"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2126
+#: ../src/applet.c:2208
 msgid "Enable _Mobile Broadband"
 msgstr "Slå på _mobilt bredbånd"
 
 #. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2135
+#: ../src/applet.c:2217
 msgid "Enable WiMA_X Mobile Broadband"
 msgstr "Slå på WiMA_X mobilt bredbånd"
 
 #. Toggle notifications item
-#: ../src/applet.c:2146
+#: ../src/applet.c:2228
 msgid "Enable N_otifications"
 msgstr "Slå på _varsling"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2157
+#: ../src/applet.c:2239
 msgid "Connection _Information"
 msgstr "Tilkoblings_informasjon"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2167
+#: ../src/applet.c:2249
 msgid "Edit Connections..."
 msgstr "Rediger tilkoblinger …"
 
 #. Help item
-#: ../src/applet.c:2181
+#: ../src/applet.c:2263
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. About item
-#: ../src/applet.c:2190
+#: ../src/applet.c:2272
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/applet.c:2744
+#: ../src/applet.c:2945
 msgid "No network connection"
 msgstr "Ingen nettverksforbindelse"
 
-#: ../src/applet.c:2509
+#: ../src/applet.c:2545
 msgid "Disconnected - you are now offline"
 msgstr "Koblet fra - du er nå frakoblet"
 
-#: ../src/applet.c:2368
+#: ../src/applet.c:2566
 msgid "Disconnected"
 msgstr "Frakoblet"
 
-#: ../src/applet.c:2596
+#: ../src/applet.c:2632
 msgid "Wireless network"
 msgstr "Trådløst nettverk"
 
-#: ../src/applet.c:2602
+#: ../src/applet.c:2638
 msgid "Modem network"
-msgstr ""
+msgstr "Modem-nettverk"
 
-#: ../src/applet.c:2602
+#: ../src/applet.c:2802
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Forbereder nettverkstilkobling «%s» …"
 
-#: ../src/applet.c:2605
+#: ../src/applet.c:2805
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Brukerautentisering kreves for nettverkstilkobling «%s» …"
 
-#: ../src/applet.c:2611
+#: ../src/applet.c:2811
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Nettverkstilkobling «%s» er aktiv"
 
-#: ../src/applet.c:2694
+#: ../src/applet.c:2894
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Starter VPN-tilkobling «%s» …"
 
-#: ../src/applet.c:2697
+#: ../src/applet.c:2897
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Brukerautentisering kreves for VPN-tilkobling «%s» …"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2900
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Ber om en nettverksadresse på VPN for «%s» …"
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2903
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-tilkobling «%s» er aktiv"
 
-#: ../src/applet.c:3445
+#: ../src/applet.c:3615
 msgid "NetworkManager Applet"
 msgstr "NetworkManager panelprogram"
 
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "Automatically unlock this device"
 msgstr "Lås opp denne enheten automatisk"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:1
 msgid "_Unlock"
 msgstr "Lås _opp"
 
@@ -1033,11 +1036,11 @@
 msgid "_Network name:"
 msgstr "_Nettverksnavn:"
 
-#: ../src/connection-editor/ce-page.c:72
+#: ../src/connection-editor/ce-page.c:67
 msgid "automatic"
 msgstr "automatisk"
 
-#: ../src/connection-editor/ce-page.c:356
+#: ../src/connection-editor/ce-page.c:342
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Klarte ikke å oppdatere hemmelighet for tilkobling på grunn av en ukjent "
@@ -1088,7 +1091,7 @@
 #: ../src/connection-editor/ce-page-dsl.ui.h:3
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../src/wireless-security/eap-method-tls.ui.h:7
 #: ../src/wireless-security/ws-leap.ui.h:3
 #: ../src/wireless-security/ws-wpa-psk.ui.h:3
 msgid "Sho_w password"
@@ -1096,6 +1099,7 @@
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
 #: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
 #: ../src/wireless-security/eap-method-leap.ui.h:2
 #: ../src/wireless-security/eap-method-simple.ui.h:2
 #: ../src/wireless-security/ws-leap.ui.h:2
@@ -1178,13 +1182,10 @@
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
 #: ../src/connection-editor/ce-page-ip6.ui.h:11
-#: ../src/connection-editor/page-ip4.c:299
-#: ../src/connection-editor/page-ip6.c:298
 msgid "_DNS servers:"
 msgstr "_DNS-tjenere"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1556,49 +1557,49 @@
 "finner riktig type VPN-tilkobling i listen er det mulig at du ikke har "
 "korrekt VPN-tillegg installert."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:6
+#: ../src/connection-editor/ce-new-connection.ui.h:2
 msgid "Create…"
 msgstr "Opprett..."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip4.c:928
-#: ../src/connection-editor/page-ip6.c:894
+#: ../src/connection-editor/ip4-routes-dialog.c:724
+#: ../src/connection-editor/ip6-routes-dialog.c:666
+#: ../src/connection-editor/page-ip4.c:924
+#: ../src/connection-editor/page-ip6.c:887
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/page-ip4.c:945
+#: ../src/connection-editor/ip4-routes-dialog.c:741
+#: ../src/connection-editor/page-ip4.c:941
 msgid "Netmask"
 msgstr "Nettmaske"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-#: ../src/connection-editor/page-ip4.c:962
-#: ../src/connection-editor/page-ip6.c:928
+#: ../src/connection-editor/ip4-routes-dialog.c:758
+#: ../src/connection-editor/ip6-routes-dialog.c:700
+#: ../src/connection-editor/page-ip4.c:958
+#: ../src/connection-editor/page-ip6.c:921
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:813
-#: ../src/connection-editor/ip6-routes-dialog.c:755
+#: ../src/connection-editor/ip4-routes-dialog.c:775
+#: ../src/connection-editor/ip6-routes-dialog.c:717
 msgid "Metric"
 msgstr "Metrisk"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip6.c:911
+#: ../src/connection-editor/ip6-routes-dialog.c:683
+#: ../src/connection-editor/page-ip6.c:904
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/new-connection.c:125
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/new-connection.c:126
+#: ../src/connection-editor/page-dsl.c:137
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/page-dsl.c:143
+#: ../src/connection-editor/page-dsl.c:139
 msgid "Could not load DSL user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for DSL."
 
-#: ../src/connection-editor/page-dsl.c:235
+#: ../src/connection-editor/page-dsl.c:231
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-tilkobling %d"
@@ -1650,16 +1651,16 @@
 msgid "Disabled"
 msgstr "Slått av"
 
-#: ../src/connection-editor/page-ip4.c:860
+#: ../src/connection-editor/page-ip4.c:856
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Rediger IPv4-ruter for %s"
 
-#: ../src/connection-editor/page-ip4.c:1011
+#: ../src/connection-editor/page-ip4.c:1008
 msgid "IPv4 Settings"
 msgstr "IPv4-innstillinger"
 
-#: ../src/connection-editor/page-ip4.c:1013
+#: ../src/connection-editor/page-ip4.c:1010
 msgid "Could not load IPv4 user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for IPv4"
 
@@ -1668,7 +1669,6 @@
 msgstr "Automatisk, kun adresser"
 
 #: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -1676,33 +1676,33 @@
 msgid "Automatic, DHCP only"
 msgstr "Automatisk. Kun DHCP"
 
-#: ../src/connection-editor/page-ip6.c:826
+#: ../src/connection-editor/page-ip6.c:819
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Rediger IPv6-ruter for %s"
 
-#: ../src/connection-editor/page-ip6.c:975
+#: ../src/connection-editor/page-ip6.c:969
 msgid "IPv6 Settings"
 msgstr "IPv6-innstillinger"
 
-#: ../src/connection-editor/page-ip6.c:977
+#: ../src/connection-editor/page-ip6.c:971
 msgid "Could not load IPv6 user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for IPv6."
 
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/page-mobile.c:353
 msgid "Could not load mobile broadband user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for mobilt bredbånd."
 
-#: ../src/connection-editor/page-mobile.c:408
+#: ../src/connection-editor/page-mobile.c:370
 msgid "Unsupported mobile broadband connection type."
 msgstr "Ikke støttet type mobil bredbåndsforbindelse."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:658
+#: ../src/connection-editor/page-mobile.c:620
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Velg type tilbyder for mobilt bredbånd"
 
-#: ../src/connection-editor/page-mobile.c:693
+#: ../src/connection-editor/page-mobile.c:647
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1710,61 +1710,61 @@
 "Velg tekonlogien din bredbåndstilbyder for mobil bruker. Spør tilbyderen "
 "hvis du er usikker."
 
-#: ../src/connection-editor/page-mobile.c:698
+#: ../src/connection-editor/page-mobile.c:652
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Min tilbyder bruker _GSM-basert teknologi (f.eks GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:705
+#: ../src/connection-editor/page-mobile.c:659
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Min tilbyder bruker C_DMA-basert teknologi (f.eks 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-ppp.c:137
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:138
+#: ../src/wireless-security/eap-method-ttls.c:248
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:139
+#: ../src/wireless-security/eap-method-ttls.c:298
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:140
 #: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../src/wireless-security/eap-method-peap.c:264
+#: ../src/wireless-security/eap-method-ttls.c:281
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:141
+#: ../src/wireless-security/eap-method-ttls.c:265
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:144
 msgid "none"
 msgstr "ingen"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../src/connection-editor/page-ppp.c:204
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Rediger PPP-autentiseringsmetoder for %s"
 
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:287
 msgid "PPP Settings"
 msgstr "PPP-innstillinger"
 
-#: ../src/connection-editor/page-ppp.c:286
+#: ../src/connection-editor/page-ppp.c:289
 msgid "Could not load PPP user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for PPP."
 
-#: ../src/connection-editor/new-connection.c:162
-#: ../src/connection-editor/new-connection.c:302
+#: ../src/connection-editor/new-connection.c:169
+#: ../src/connection-editor/new-connection.c:309
 #: ../src/connection-editor/page-vpn.c:113
 msgid "VPN"
 msgstr "VPN"
@@ -1784,10 +1784,10 @@
 msgid "VPN connection %d"
 msgstr "VPN-tilkobling %d"
 
-#: ../src/connection-editor/page-ethernet.c:90
-#: ../src/connection-editor/page-infiniband.c:74
-#: ../src/connection-editor/page-wifi.c:113
-#: ../src/connection-editor/page-wimax.c:70
+#: ../src/connection-editor/page-ethernet.c:81
+#: ../src/connection-editor/page-infiniband.c:65
+#: ../src/connection-editor/page-wifi.c:95
+#: ../src/connection-editor/page-wimax.c:61
 msgid ""
 "This option locks this connection to the network device specified by its "
 "permanent MAC address entered here.  Example: 00:11:22:33:44:55"
@@ -1795,7 +1795,7 @@
 "Dette valget låser denne tilkoblingen til nettverksenheten spesifisert av "
 "den permanente MAC-adressen som oppgis her. Eksempel: 00:11:22:33:44:55"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
 msgid "Wired"
 msgstr "Kablet"
 
@@ -1817,18 +1817,18 @@
 msgstr ""
 "Klarte ikke å laste brukergrensesnitt for sikkerhet for kablet nettverk."
 
-#: ../src/connection-editor/page-8021x-security.c:141
+#: ../src/connection-editor/page-8021x-security.c:137
 msgid "Use 802.1_X security for this connection"
 msgstr "Bruk 802.1_X-sikkerhet for denne tilkoblingen"
 
-#: ../src/connection-editor/page-wifi.c:190
-#: ../src/connection-editor/page-wifi.c:194
-#: ../src/connection-editor/page-wifi.c:215
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:176
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "default"
 msgstr "forvalg"
 
-#: ../src/connection-editor/page-wifi.c:219
+#: ../src/connection-editor/page-wifi.c:201
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
@@ -1848,28 +1848,28 @@
 msgid "Wireless connection %d"
 msgstr "Trådløs nettverksforbindelse %d"
 
-#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/libnm-gtk/nm-wifi-dialog.c:892
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit nøkkel (Heksadesimal eller ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:296
+#: ../src/libnm-gtk/nm-wifi-dialog.c:901
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit passord"
 
-#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../src/connection-editor/page-wifi-security.c:322
+#: ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisk WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:336
+#: ../src/libnm-gtk/nm-wifi-dialog.c:945
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 personlig"
 
-#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:350
+#: ../src/libnm-gtk/nm-wifi-dialog.c:959
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
@@ -1887,16 +1887,16 @@
 msgid "Could not load WiFi security user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for trådløs sikkerhet."
 
-#: ../src/connection-editor/nm-connection-editor.c:118
+#: ../src/connection-editor/nm-connection-editor.c:122
 #, c-format
 msgid "Editing %s"
 msgstr "Redigerer %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:122
+#: ../src/connection-editor/nm-connection-editor.c:126
 msgid "Editing un-named connection"
 msgstr "Redigerer tilkobling uten navn"
 
-#: ../src/connection-editor/nm-connection-editor.c:282
+#: ../src/connection-editor/nm-connection-editor.c:286
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -1908,19 +1908,19 @@
 msgid "Error creating connection editor dialog."
 msgstr "Feil under oppretting av dialog for redigering av tilkobling."
 
-#: ../src/connection-editor/nm-connection-editor.c:408
+#: ../src/connection-editor/nm-connection-editor.c:417
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../src/connection-editor/nm-connection-editor.c:409
+#: ../src/connection-editor/nm-connection-editor.c:418
 msgid "Save any changes made to this connection."
 msgstr "Lagre alle endringer som er gjort på denne tilkoblingen."
 
-#: ../src/connection-editor/nm-connection-editor.c:410
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save..."
 msgstr "_Lagre …"
 
-#: ../src/connection-editor/nm-connection-editor.c:411
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Autentiser for å lagre denne tilkoblingen for alle brukere på denne maskinen."
@@ -1990,15 +1990,15 @@
 msgstr[0] "%d år siden"
 msgstr[1] "%d år siden"
 
-#: ../src/connection-editor/nm-connection-editor.c:952
+#: ../src/connection-editor/nm-connection-editor.c:903
 msgid "Connection add failed"
 msgstr "Klarte ikke å legge til tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:536
+#: ../src/connection-editor/nm-connection-editor.c:943
 msgid "Error saving connection"
 msgstr "Feil under lagring av tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:537
+#: ../src/connection-editor/nm-connection-editor.c:944
 #, c-format
 msgid "The property '%s' / '%s' is invalid: %d"
 msgstr "Egenskap «%s» / «%s» er ugyldig: %d"
@@ -2008,18 +2008,18 @@
 msgid "An unknown error occurred."
 msgstr "En ukjent feil oppsto."
 
-#: ../src/connection-editor/nm-connection-editor.c:631
+#: ../src/connection-editor/nm-connection-editor.c:572
 msgid "Error initializing editor"
 msgstr "Feil under initiering av redigering"
 
-#: ../src/connection-editor/new-connection.c:371
+#: ../src/connection-editor/new-connection.c:378
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Dialog for redigering av tilkobling kunne ikke startes pga en ukjent feil."
 
-#: ../src/connection-editor/new-connection.c:380
+#: ../src/connection-editor/new-connection.c:387
 msgid "Could not create new connection"
 msgstr "Kunne ikke lage en ny tilkobling"
 
@@ -2027,15 +2027,15 @@
 msgid "Could not edit new connection"
 msgstr "Kunne ikke redigere ny tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:436
 msgid "Could not edit connection"
 msgstr "Kunne ikke redigere tilkobling"
 
-#: ../src/connection-editor/new-connection.c:515
+#: ../src/connection-editor/new-connection.c:522
 msgid "Connection delete failed"
 msgstr "Sletting av tilkobling feilet"
 
-#: ../src/connection-editor/new-connection.c:562
+#: ../src/connection-editor/new-connection.c:569
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Sikker på at du vil slette denne tilkoblingen %s?"
@@ -2058,11 +2058,11 @@
 msgid "Could not edit imported connection"
 msgstr "Kunne ikke redigere importert tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:631
+#: ../src/connection-editor/nm-connection-list.c:632
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/connection-editor/nm-connection-list.c:644
+#: ../src/connection-editor/nm-connection-list.c:645
 msgid "Last Used"
 msgstr "Sist brukt"
 
@@ -2075,51 +2075,53 @@
 #. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:685
+#: ../src/connection-editor/ce-page-team.ui.h:4
+#: ../src/connection-editor/nm-connection-list.c:686
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:687
 msgid "Edit the selected connection"
 msgstr "Rediger valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:688
 msgid "_Edit..."
 msgstr "R_ediger …"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:689
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentiser for å redigere valgt tilkobling."
 
 #. Delete
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:702
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#: ../src/connection-editor/nm-connection-list.c:703
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:704
 msgid "Delete the selected connection"
 msgstr "Slett valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:705
 msgid "_Delete..."
 msgstr "_Slett …"
 
-#: ../src/connection-editor/nm-connection-list.c:705
+#: ../src/connection-editor/nm-connection-list.c:706
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentiser for å slette valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:942
+#: ../src/connection-editor/nm-connection-list.c:939
 msgid "Error creating connection"
 msgstr "Feil under oppretting av tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:943
+#: ../src/connection-editor/nm-connection-list.c:937
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Vet ikke hvordan tilkoblinger av type «%s» lages"
 
-#: ../src/connection-editor/nm-connection-list.c:998
+#: ../src/connection-editor/nm-connection-list.c:995
 msgid "Error editing connection"
 msgstr "Feil under redigering av tilkobling"
 
@@ -2128,7 +2130,7 @@
 msgid "Don't know how to edit '%s' connections"
 msgstr "Vet ikke hvordan tilkoblinger av type «%s» redigeres"
 
-#: ../src/connection-editor/nm-connection-list.c:999
+#: ../src/connection-editor/nm-connection-list.c:996
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Fant ingen tilkobling med UUID «%s»"
@@ -2146,29 +2148,31 @@
 "\n"
 "Feil: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:241
+#: ../src/connection-editor/page-team.c:94
+#: ../src/connection-editor/page-team-port.c:77
+#: ../src/connection-editor/vpn-helpers.c:234
 msgid "Select file to import"
 msgstr "Velg fil som skal importeres"
 
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:284
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "En fil med navn «%s» eksisterer allerede."
 
-#: ../src/connection-editor/vpn-helpers.c:294
+#: ../src/connection-editor/vpn-helpers.c:286
 msgid "_Replace"
 msgstr "E_rstatt"
 
-#: ../src/connection-editor/vpn-helpers.c:296
+#: ../src/connection-editor/vpn-helpers.c:288
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Vil du erstatte %s med VPN-tilkoblingen du lagrer?"
 
-#: ../src/connection-editor/vpn-helpers.c:332
+#: ../src/connection-editor/vpn-helpers.c:324
 msgid "Cannot export VPN connection"
 msgstr "Kan ikke eksportere VPN-tilkobling"
 
-#: ../src/connection-editor/vpn-helpers.c:334
+#: ../src/connection-editor/vpn-helpers.c:326
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2179,57 +2183,57 @@
 "\n"
 "Feil: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:369
+#: ../src/connection-editor/vpn-helpers.c:361
 msgid "Export VPN connection..."
 msgstr "Eksporter VPN-tilkobling …"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
+#: ../src/gnome-bluetooth/nma-bt-device.c:945
 #, c-format
 msgid "Failed to create PAN connection: %s"
 msgstr "Kunne ikke lage en PAN-tilkobling: %s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:445
-#: ../src/gnome-bluetooth/nma-bt-device.c:959
+#: ../src/gnome-bluetooth/nma-bt-device.c:433
+#: ../src/gnome-bluetooth/nma-bt-device.c:947
 msgid "Your phone is now ready to use!"
 msgstr "Telefonen er klar til bruk!"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:978
+#: ../src/gnome-bluetooth/nma-bt-device.c:966
 #, c-format
 msgid "%s Network"
 msgstr "%s nettverk:"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:336
+#: ../src/gnome-bluetooth/nma-bt-device.c:324
 #, c-format
 msgid "Error: %s"
 msgstr "Feil: %s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:443
+#: ../src/gnome-bluetooth/nma-bt-device.c:431
 #, c-format
 msgid "Failed to create DUN connection: %s"
 msgstr "Kunne ikke lage en DUN-tilkobling: %s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:468
+#: ../src/gnome-bluetooth/nma-bt-device.c:456
 msgid "Mobile wizard was canceled"
 msgstr "Veiviser for mobil ble avbrutt"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:477
+#: ../src/gnome-bluetooth/nma-bt-device.c:465
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "Ukjent enhetstype for telefon (ikke GSM eller CDMA)"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:733
-#: ../src/gnome-bluetooth/nma-bt-device.c:739
+#: ../src/gnome-bluetooth/nma-bt-device.c:721
+#: ../src/gnome-bluetooth/nma-bt-device.c:727
 msgid "failed to connect to the phone."
 msgstr "klarte ikke å koble til telefonen."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:770
+#: ../src/gnome-bluetooth/nma-bt-device.c:758
 msgid "unexpectedly disconnected from the phone."
 msgstr "koblet fra telefonen uventet."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:780
+#: ../src/gnome-bluetooth/nma-bt-device.c:768
 msgid "timed out detecting phone details."
 msgstr "tidsavbrudd under henting av detaljer om telefonen."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:791
+#: ../src/gnome-bluetooth/nma-bt-device.c:779
 msgid "Detecting phone configuration..."
 msgstr "Gjenkjenner telefonkonfigurasjon …"
 
@@ -2237,7 +2241,7 @@
 msgid "could not find the Bluetooth device."
 msgstr "klarte ikke å finne Bluetooth-enhet."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:920
+#: ../src/gnome-bluetooth/nma-bt-device.c:908
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
@@ -2265,36 +2269,36 @@
 "Konfigurasjon av Bluetooth er ikke mulig (klarte ikke å finne "
 "NetworkManager: %s)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:445
+#: ../src/gnome-bluetooth/bt-widget.c:441
 msgid "Use your mobile phone as a network device (PAN/NAP)"
 msgstr "Bruk din mobiltelefon som en nettverksenhet (PAN/NAP)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:454
+#: ../src/gnome-bluetooth/bt-widget.c:450
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "Koble til internett med din mobiltelefon (DUN)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:208
+#: ../src/libnm-gtk/nm-mobile-wizard.c:204
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 "Din mobile bredbåndstilkobling er konfigurert med følgende innstillinger:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:215
+#: ../src/libnm-gtk/nm-mobile-wizard.c:211
 msgid "Your Device:"
 msgstr "Din enhet:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:226
+#: ../src/libnm-gtk/nm-mobile-wizard.c:222
 msgid "Your Provider:"
 msgstr "Din tilbyder:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:237
+#: ../src/libnm-gtk/nm-mobile-wizard.c:233
 msgid "Your Plan:"
 msgstr "Din plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: ../src/libnm-gtk/nm-mobile-wizard.c:254
 msgid ""
 "A connection will now be made to your mobile broadband provider using the "
 "settings you selected.  If the connection fails or you cannot access network "
@@ -2308,23 +2312,23 @@
 "endre dine innstillinger for mobil bredbåndstilkobling kan du velge "
 "«Nettverkstilkoblinger» fra menyen System->Brukervalg."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:274
+#: ../src/libnm-gtk/nm-mobile-wizard.c:266
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Bekreft innstillinger for mobilt bredbånd"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:338
+#: ../src/libnm-gtk/nm-mobile-wizard.c:330
 msgid "Unlisted"
 msgstr "Ikke listet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:493
+#: ../src/libnm-gtk/nm-mobile-wizard.c:461
 msgid "_Select your plan:"
 msgstr "_Velg din plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:517
+#: ../src/libnm-gtk/nm-mobile-wizard.c:485
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "_APN (Navn på aksesspunkt) for valgt plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:541
+#: ../src/libnm-gtk/nm-mobile-wizard.c:505
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -2336,67 +2340,67 @@
 "\n"
 "Spør tilbyder om APN for ditt abonnement hvis du er usikker."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:548
+#: ../src/libnm-gtk/nm-mobile-wizard.c:512
 msgid "Choose your Billing Plan"
 msgstr "Velg din betalingsplan"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:597
+#: ../src/libnm-gtk/nm-mobile-wizard.c:561
 msgid "My plan is not listed..."
 msgstr "Min plan er ikke på listen …"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../src/libnm-gtk/nm-mobile-wizard.c:714
 msgid "Select your provider from a _list:"
 msgstr "Velg din tilbyder fra en _liste:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnm-gtk/nm-mobile-wizard.c:727
 msgid "Provider"
 msgstr "Tilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: ../src/libnm-gtk/nm-mobile-wizard.c:752
 msgid "I can't find my provider and I wish to enter it _manually:"
 msgstr "Jeg kan ikke finne min tilbyder og ønsker å oppgi denne _manuelt:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:803
+#: ../src/libnm-gtk/nm-mobile-wizard.c:765
 msgid "Provider:"
 msgstr "Tilbyder:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:827
+#: ../src/libnm-gtk/nm-mobile-wizard.c:782
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Min tilbyder bruker GSM-teknologi (GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:833
+#: ../src/libnm-gtk/nm-mobile-wizard.c:784
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Min tilbyder bruker CDMA-teknologi (1xRTT, EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:844
+#: ../src/libnm-gtk/nm-mobile-wizard.c:795
 msgid "Choose your Provider"
 msgstr "Velg din tilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1047
 msgid "Country or Region List:"
 msgstr "Liste med land eller regioner:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1060
 msgid "Country or region"
 msgstr "Land eller region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1070
 msgid "My country is not listed"
 msgstr "Landet mitt er ikke på listen"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1120
 msgid "Choose your Provider's Country or Region"
 msgstr "Velg din tilbyders land eller region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1174
 msgid "Installed GSM device"
 msgstr "Installert GSM-enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1177
 msgid "Installed CDMA device"
 msgstr "Installert CDMA-enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1345
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -2404,45 +2408,45 @@
 "Denne assistenten hjelper deg å sette opp en mobil bredbåndstilkobling til "
 "et mobilnettverk (3G)."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1350
 msgid "You will need the following information:"
 msgstr "Du trenger følgende informasjon:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "Your broadband provider's name"
 msgstr "Navnet på din bredbåndstilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1367
 msgid "Your broadband billing plan name"
 msgstr "Navn på betalingsplan for bredbånd"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1373
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(i enkelte tilfeller) APN (navn på aksesspunkt) for din betalingsplan for "
 "bredbånd"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Lag en tilkobling for _denne mobile bredbåndsenheten:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1417
 msgid "Any device"
 msgstr "Enhver enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1430
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Sett opp en mobil bredbåndstilkobling"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1603
 msgid "New Mobile Broadband Connection"
 msgstr "Ny mobil bredbåndstilkobling"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:437
+#: ../src/libnm-gtk/nm-wifi-dialog.c:435
 msgid "New..."
 msgstr "Ny …"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1046
 msgid "C_reate"
 msgstr "_Lag:"
 
@@ -2550,8 +2554,8 @@
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-wimax.c:134
+#: ../src/connection-editor/new-connection.c:120
+#: ../src/connection-editor/page-wimax.c:125
 #: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
 msgid "WiMAX"
 msgstr "WiMAX"
@@ -2603,12 +2607,12 @@
 msgstr "\"Roaming\" nettverk"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:55
 #: ../src/libnm-gtk/nm-mobile-providers.c:808
 msgid "Default"
 msgstr "Forvalg"
 
-#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -2633,11 +2637,11 @@
 msgid "Choose CA Certificate"
 msgstr "Velg CA-sertifikat"
 
-#: ../src/wireless-security/eap-method.c:645
+#: ../src/wireless-security/eap-method.c:440
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr ""
+msgstr "DER, PEM eller PKCS#12 private nøkler (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:648
+#: ../src/wireless-security/eap-method.c:443
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER eller PEM-sertifikater (*.der, *.pem, *.crt, *.cer)"
 
@@ -2664,8 +2668,8 @@
 msgstr "PAC-_fil:"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "_Indre autentisering:"
 
@@ -2674,30 +2678,30 @@
 msgstr "Tillat automatisk PAC-pro_visjonering"
 
 #: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-peap.c:298
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:399
+#: ../src/wireless-security/eap-method-fast.c:400
 msgid "Choose a PAC file..."
 msgstr "Velg en PAC-fil …"
 
-#: ../src/wireless-security/eap-method-fast.c:406
+#: ../src/wireless-security/eap-method-fast.c:407
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:411
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-peap.c:281
+#: ../src/wireless-security/wireless-security.c:417
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:434
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../src/wireless-security/eap-method-peap.c:377
+#: ../src/wireless-security/eap-method-tls.c:464
+#: ../src/wireless-security/eap-method-ttls.c:377
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Velg et Certificate Authority-sertifikat …"
 
@@ -2715,7 +2719,7 @@
 msgid "C_A certificate:"
 msgstr "C_A-sertifikat:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "PEAP-_versjon:"
 
@@ -2723,11 +2727,11 @@
 msgid "As_k for this password every time"
 msgstr "Spør om dette passordet _hver gang"
 
-#: ../src/wireless-security/eap-method-tls.c:260
+#: ../src/wireless-security/eap-method-tls.c:279
 msgid "Unencrypted private keys are insecure"
 msgstr "Private nøkler uten kryptering er ikke sikre"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:282
 msgid ""
 "The selected private key does not appear to be protected by a password.  "
 "This could allow your security credentials to be compromised.  Please select "
@@ -2741,11 +2745,11 @@
 "\n"
 "Du kan passordbeskytte din private nøkkel med openssl"
 
-#: ../src/wireless-security/eap-method-tls.c:428
+#: ../src/wireless-security/eap-method-tls.c:458
 msgid "Choose your personal certificate..."
 msgstr "Velg ditt personlige sertifikat …"
 
-#: ../src/wireless-security/eap-method-tls.c:440
+#: ../src/wireless-security/eap-method-tls.c:470
 msgid "Choose your private key..."
 msgstr "Velg din private nøkkel …"
 
@@ -2757,11 +2761,11 @@
 msgid "_User certificate:"
 msgstr "Br_ukersertifikat:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "Privat nø_kkel:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "Passord for _privat nøkkel:"
 
@@ -2777,19 +2781,19 @@
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../src/wireless-security/wireless-security.c:429
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:465
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:476
 msgid "Tunneled TLS"
 msgstr "Tunnelert TLS (TTLS)"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:487
 msgid "Protected EAP (PEAP)"
 msgstr "Beskyttet EAP (PEAP)"
 
@@ -2799,27 +2803,27 @@
 msgid "Au_thentication:"
 msgstr "Au_tentisering:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: ../src/wireless-security/ws-wep-key.ui.h:5
 msgid "Open System"
 msgstr "Åpent system"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: ../src/wireless-security/ws-wep-key.ui.h:6
 msgid "Shared Key"
 msgstr "Delt nøkkel"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.ui.h:1
 msgid "1 (Default)"
 msgstr "1 (forvalg)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "2"
 msgstr "2"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: ../src/wireless-security/ws-wep-key.ui.h:3
 msgid "3"
 msgstr "3"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:6
+#: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "4"
 msgstr "4"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/notification-daemon.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/notification-daemon.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/notification-daemon.po	2013-01-29 09:33:55.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/notification-daemon.po	2014-01-07 06:37:22.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 13:56+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:23+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../src/daemon.c:188
@@ -38,10 +38,10 @@
 msgid "Notification"
 msgstr "Varsling"
 
-#: ../data/notification-daemon.desktop.in.in.h:1
+#: ../data/notification-daemon.desktop.in.in.h:2
 msgid "Display notifications"
 msgstr "Vis varsler"
 
-#: ../data/notification-daemon.desktop.in.in.h:2
+#: ../data/notification-daemon.desktop.in.in.h:1
 msgid "Notification Daemon"
 msgstr "Varslingstjeneste"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/onboard.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/onboard.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/onboard.po	2013-01-29 09:34:07.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/onboard.po	2014-01-07 06:37:24.000000000 +0000
@@ -14,91 +14,96 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 14:21+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:52+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../Onboard/ConfigUtils.py:61
 msgid "gsettings schema for '{}' is not installed"
-msgstr ""
+msgstr "gsettings-skjemaer for «{}» er ikke installert"
 
 #. assume filename is just a basename instead of a full file path
-#: ../Onboard/ConfigUtils.py:391
+#: ../Onboard/ConfigUtils.py:418
 msgid "{description} '{filename}' not found yet, retrying in default paths"
 msgstr ""
+"{description} «{filename}» ble ikke funnet ennå. Prøver på nytt med "
+"standardbaner."
 
-#: ../Onboard/ConfigUtils.py:406
+#: ../Onboard/ConfigUtils.py:427
 msgid "unable to locate '{filename}', loading default {description} instead"
 msgstr ""
+"klarte ikke å finne «{filename}». Laster inn standard {description} i stedet"
 
-#: ../Onboard/ConfigUtils.py:414
+#: ../Onboard/ConfigUtils.py:436
 msgid "failed to find {description} '{filename}'"
-msgstr ""
+msgstr "fant ikke {description} «{filename}»"
 
-#: ../Onboard/ConfigUtils.py:418
+#: ../Onboard/ConfigUtils.py:440
 msgid "{description} '{filepath}' found."
-msgstr ""
+msgstr "{description} «{filepath}» funnet."
 
-#: ../Onboard/ConfigUtils.py:485
+#: ../Onboard/ConfigUtils.py:525
 msgid "Looking for system defaults in {paths}"
-msgstr ""
+msgstr "Ser etter systemstandarder i {paths}"
 
-#: ../Onboard/ConfigUtils.py:496
+#: ../Onboard/ConfigUtils.py:536
 msgid "Failed to read system defaults. "
-msgstr ""
+msgstr "Klarte ikke å lese systemstandarder. "
 
-#: ../Onboard/ConfigUtils.py:500
+#: ../Onboard/ConfigUtils.py:540
 msgid "No system defaults found."
-msgstr ""
+msgstr "Fant ingen systemstandarder."
 
-#: ../Onboard/ConfigUtils.py:502
+#: ../Onboard/ConfigUtils.py:542
 msgid "Loading system defaults from {filename}"
-msgstr ""
+msgstr "Laster inn systemstandarder fra {filename}"
 
-#: ../Onboard/ConfigUtils.py:526
+#: ../Onboard/ConfigUtils.py:566
 msgid "Found system default '[{}] {}={}'"
-msgstr ""
+msgstr "Fant systemstandard «[{}] {}={}»"
 
-#: ../Onboard/ConfigUtils.py:544
+#: ../Onboard/ConfigUtils.py:584
 msgid "System defaults: Unknown key '{}' in section '{}'"
-msgstr ""
+msgstr "Systemstandarder: Kjenner ikke nøkkelen «{}» i seksjon «{}»"
 
-#: ../Onboard/ConfigUtils.py:564
+#: ../Onboard/ConfigUtils.py:604
 msgid ""
 "System defaults: Invalid value for key '{}' in section '{}'\n"
 "  {}"
 msgstr ""
+"Systemstandarder: Ugyldig verdi for nøkkelen «{}» i seksjon «{}»\n"
+"  {}"
 
-#: ../Onboard/ConfigUtils.py:626
+#: ../Onboard/ConfigUtils.py:667
 msgid "Failed to get gsettings value. "
-msgstr ""
+msgstr "Klarte ikke å hente gsettings-verdi. "
 
-#: ../Onboard/Config.py:252
+#: ../Onboard/Config.py:261
 msgid "Migrating user directory '{}' to '{}'."
-msgstr ""
+msgstr "Flytter brukermappe «{}» til «{}»."
 
 #. python >2.5
-#: ../Onboard/Config.py:257
+#: ../Onboard/Config.py:262
 msgid "Failed to migrate user directory. "
-msgstr ""
+msgstr "Klarte ikke å flytte brukermappe. "
 
-#: ../Onboard/Config.py:513
+#: ../Onboard/Config.py:542
 msgid "layout '{filename}' does not exist"
-msgstr ""
+msgstr "utformingen «{filename}» eksisterer ikke"
 
-#: ../Onboard/Config.py:553
+#: ../Onboard/Config.py:584
 msgid "theme '{filename}' does not exist"
 msgstr "Tema med navn  '{filename}' eksisterer ikke"
 
-#: ../Onboard/Config.py:567
+#: ../Onboard/Config.py:609
 msgid "Loading theme from '{}'"
 msgstr "Laster tema fra '{}'"
 
-#: ../Onboard/Config.py:571
+#: ../Onboard/Config.py:613
 msgid "Unable to read theme '{}'"
-msgstr ""
+msgstr "Klarte ikke å lese temaet «{}»"
 
-#: ../Onboard/Config.py:669
+#: ../Onboard/Config.py:758
 msgid ""
 "Enabling auto-show requires Gnome Accessibility.\n"
 "\n"
@@ -107,10 +112,16 @@
 "\n"
 "Enable accessibility now?"
 msgstr ""
+"Aktivering av autovisning krever Gnome tilgjengelighetsmodus.\n"
+"\n"
+"Onboard kan skru på tigjengelighetsmodus nå, men det anbefales at du logger "
+"ut og inn igjen for å utnytte dette maksimalt.\n"
+"\n"
+"Vil du aktivere tilgjengelighetsmodus nå?"
 
-#: ../Onboard/Config.py:1151
+#: ../Onboard/Config.py:1254
 msgid "color scheme '{filename}' does not exist"
-msgstr ""
+msgstr "fargeoppsettet «{filename}» eksisterer ikke"
 
 #: ../Onboard/LayoutLoaderSVG.py:68
 #: ../debian/onboard/usr/lib/python3/dist-packages/Onboard/LayoutLoaderSVG.py:68
@@ -119,422 +130,442 @@
 "format '{}'"
 msgstr ""
 
-#: ../Onboard/LayoutLoaderSVG.py:288
+#: ../Onboard/LayoutLoaderSVG.py:371
 msgid "Ignoring key '{}'. No svg filename defined."
-msgstr ""
+msgstr "Ignorerer tasten «{}». Ingen svg-filnavn har blitt definert."
 
 #: ../Onboard/LayoutLoaderSVG.py:297
 msgid "Ignoring key '{}'. Not found in '{}'."
-msgstr ""
+msgstr "Ignorerer nøkkel «{}», som ikke ble funnet funnet i  «{}»."
 
-#: ../Onboard/LayoutLoaderSVG.py:467
+#: ../Onboard/LayoutLoaderSVG.py:579
 msgid "Snippet {}"
-msgstr ""
+msgstr "Kodesnutt {}"
 
 #. i18n: full string is "Snippet n, unassigned"
-#: ../Onboard/LayoutLoaderSVG.py:471
+#: ../Onboard/LayoutLoaderSVG.py:583
 msgid ", unassigned"
-msgstr ""
+msgstr ", ikke tildelt"
 
-#: ../Onboard/LayoutLoaderSVG.py:542
+#: ../Onboard/LayoutLoaderSVG.py:656
 msgid "Error loading "
 msgstr "Feil ved lasting "
 
-#: ../Onboard/LayoutLoaderSVG.py:754
+#: ../Onboard/LayoutLoaderSVG.py:874
 msgid "copying layout '{}' to '{}'"
-msgstr ""
+msgstr "kopierer utforming «{}» til «{}»"
 
-#: ../Onboard/LayoutLoaderSVG.py:773
+#: ../Onboard/LayoutLoaderSVG.py:894
 msgid "copy_layouts failed, unsupported layout format '{}'."
-msgstr ""
+msgstr "copy_layouts mislyktes. Utformingsformatet «{}» støttes ikke."
 
-#: ../Onboard/LayoutLoaderSVG.py:814
+#: ../Onboard/LayoutLoaderSVG.py:937
 msgid "copying svg file '{}' to '{}'"
-msgstr ""
+msgstr "kopierer svg-fila «{}» til «{}»"
 
 #: ../data/onboard-settings.desktop.in.h:1
 msgid "Onboard Settings"
-msgstr ""
+msgstr "Onboard-innstillinger"
 
 #: ../data/onboard-settings.desktop.in.h:2
 msgid "Onboard onscreen keyboard settings"
-msgstr ""
+msgstr "Onboard skjermtastatur-innstillinger"
 
 #: ../data/onboard-settings.desktop.in.h:3
 msgid "Change Onboard settings"
-msgstr ""
+msgstr "Endre Onboard-innstillinger"
 
-#: ../Onboard/settings.py:162
+#: ../Onboard/settings.py:169
 msgid "Onboard Preferences"
-msgstr ""
+msgstr "Onboard-brukervalg"
 
-#: ../Onboard/settings.py:523
+#: ../Onboard/settings.py:539
 msgid "No file manager to open layout folder"
 msgstr "Ingen filbehandler til å åpne utseendemappen"
 
-#: ../Onboard/settings.py:530
+#: ../Onboard/settings.py:546
 msgid "Enter name for personalised layout"
 msgstr "Sett navn for nytt selvvalgt oppsett"
 
-#: ../Onboard/settings.py:556
+#: ../Onboard/settings.py:572
 msgid "System settings not found ({}): {}"
-msgstr "Systeminnstillinger ikke funnet ({}): {}"
+msgstr "Fant ikke systeminnstillinger ({}): {}"
 
 #. Frame resize handles: None
-#: ../Onboard/settings.py:569 ../settings.ui.h:17
+#: ../Onboard/settings.py:585
 msgid "None"
-msgstr ""
+msgstr "Ingen"
 
 #. Frame resize handles: Corners only
-#: ../Onboard/settings.py:571
+#: ../Onboard/settings.py:587
 msgid "Corners only"
 msgstr "Kun hjørner"
 
 #. Frame resize handles: All
-#: ../Onboard/settings.py:573
+#: ../Onboard/settings.py:589
 msgid "All corners and edges"
 msgstr "Alle hjørner og kanter"
 
-#: ../Onboard/settings.py:609
+#: ../Onboard/settings.py:625
 msgid "Add Layout"
-msgstr ""
+msgstr "Legg til utforming"
 
-#: ../Onboard/settings.py:619
+#: ../Onboard/settings.py:635
 msgid "Onboard layout files"
-msgstr ""
+msgstr "Onboard-utformingsfiler"
 
-#: ../Onboard/settings.py:624
+#: ../Onboard/settings.py:640
 msgid "All files"
-msgstr ""
+msgstr "Alle filer"
 
-#: ../Onboard/settings.py:721
+#: ../Onboard/settings.py:740
 msgid "Enter a name for the new theme:"
-msgstr ""
+msgstr "Gi et navn til det nye temaet:"
 
-#: ../Onboard/settings.py:729
+#: ../Onboard/settings.py:748
 msgid ""
 "This theme file already exists.\n"
 "'{filename}'\n"
 "\n"
 "Overwrite it?"
 msgstr ""
+"Dette temaet eksisterer allerede.\n"
+"«{filename}»\n"
+"\n"
+"Vil du overskrive det?"
 
-#: ../Onboard/settings.py:746
+#: ../Onboard/settings.py:765
 msgid "Reset selected theme to Onboard defaults?"
-msgstr ""
+msgstr "Tilbakestille valgt tema til Onboard-standardverdier?"
 
-#: ../Onboard/settings.py:748
+#: ../Onboard/settings.py:767
 msgid "Delete selected theme?"
 msgstr "Slett valgt tema?"
 
-#: ../Onboard/settings.py:870
+#: ../Onboard/settings.py:895
 msgid "Reset"
-msgstr ""
+msgstr "Nullstill"
 
 #. Key style with flat fill- and border colors
-#: ../Onboard/settings.py:1057
+#: ../Onboard/settings.py:1125
 msgid "Flat"
-msgstr ""
+msgstr "Flat"
 
 #. Key style with simple gradients
-#: ../Onboard/settings.py:1059 ../settings_theme_dialog.ui.h:4
+#: ../settings_theme_dialog.ui.h:4 ../Onboard/settings.py:1127
 msgid "Gradient"
-msgstr ""
+msgstr "Fargeovergang"
 
 #. Key style for dish-like key caps
-#: ../Onboard/settings.py:1061
+#: ../Onboard/settings.py:1129
 msgid "Dish"
 msgstr ""
 
-#: ../Onboard/settings.py:1110 ../Onboard/settings.py:1167
+#: ../Onboard/settings.py:1178 ../Onboard/settings.py:1235
 msgid "Default"
-msgstr ""
+msgstr "Standard"
 
-#: ../Onboard/settings.py:1151
+#: ../Onboard/settings.py:1219
 msgid "Bold"
-msgstr ""
+msgstr "Fet"
 
-#: ../Onboard/settings.py:1153
+#: ../Onboard/settings.py:1221
 msgid "Italic"
-msgstr ""
+msgstr "Kursiv"
 
-#: ../Onboard/settings.py:1155
+#: ../Onboard/settings.py:1223
 msgid "Condensed"
-msgstr ""
+msgstr "Sammentrykket"
 
-#: ../Onboard/settings.py:1168
+#: ../Onboard/settings.py:1236
 msgid ""
-msgstr ""
+msgstr ""
 
-#: ../Onboard/settings.py:1168
+#: ../Onboard/settings.py:1236
 msgid "Ubuntu Logo"
-msgstr ""
+msgstr "Ubuntu-logo"
 
-#: ../Onboard/settings.py:1302
+#: ../Onboard/settings.py:1370
 msgid "Step"
-msgstr ""
+msgstr "Trinn"
 
-#: ../Onboard/settings.py:1303
+#: ../Onboard/settings.py:1371
 msgid "Left"
-msgstr ""
+msgstr "Venstre"
 
-#: ../Onboard/settings.py:1304
+#: ../Onboard/settings.py:1372
 msgid "Right"
-msgstr ""
+msgstr "Høyre"
 
-#: ../Onboard/settings.py:1305
+#: ../Onboard/settings.py:1373
 msgid "Up"
-msgstr ""
+msgstr "Opp"
 
-#: ../Onboard/settings.py:1306
+#: ../Onboard/settings.py:1374
 msgid "Down"
-msgstr ""
+msgstr "Ned"
 
-#: ../Onboard/settings.py:1307
+#: ../Onboard/settings.py:1375
 msgid "Activate"
-msgstr ""
+msgstr "Aktiver"
 
-#: ../Onboard/settings.py:1472
+#: ../Onboard/settings.py:1544
 msgid "Action:"
-msgstr ""
+msgstr "Handling:"
 
-#: ../Onboard/settings.py:1652
+#: ../Onboard/settings.py:1708
 msgid "Disabled"
-msgstr ""
+msgstr "Deaktivert"
 
-#: ../Onboard/settings.py:1658
+#: ../Onboard/settings.py:1714
 msgid "Button"
-msgstr ""
+msgstr "Knapp"
 
-#: ../Onboard/settings.py:1713 ../Onboard/settings.py:1755
+#: ../Onboard/settings.py:1769 ../Onboard/settings.py:1814
 msgid "Press a button..."
-msgstr ""
+msgstr "Trykk på en knapp..."
 
-#: ../Onboard/settings.py:1757
+#: ../Onboard/settings.py:1816
 msgid "Press a key..."
-msgstr ""
+msgstr "Trykk på en tast..."
 
-#: ../Onboard/utils.py:317
+#: ../Onboard/utils.py:324
 msgid "New Input Device"
-msgstr ""
+msgstr "Ny inndataenhet"
 
-#: ../Onboard/utils.py:318
+#: ../Onboard/utils.py:325
 msgid "Onboard has detected a new input device"
-msgstr ""
+msgstr "Onboard har oppdaget en ny inndataenhet"
 
-#: ../Onboard/utils.py:327
+#: ../Onboard/utils.py:334
 msgid "Do you want to use this device for keyboard scanning?"
-msgstr ""
+msgstr "VIl du bruke denne enheten til tastaturskanning?"
 
-#: ../Onboard/utils.py:331
+#: ../Onboard/utils.py:338
 msgid "Use device"
 msgstr "Bruk enhet"
 
-#: ../Onboard/utils.py:992
+#: ../Onboard/pypredict/tools/train.py:227
+#: ../Onboard/pypredict/tools/filter.py:380 ../Onboard/LanguageSupport.py:164
+#: ../Onboard/utils.py:1022 ../Onboard/SpellChecker.py:608
+#: ../Onboard/SpellChecker.py:644 ../Onboard/SpellChecker.py:683
+#: ../Onboard/SpellChecker.py:697
 msgid "Failed to execute '{}', {}"
-msgstr ""
+msgstr "Klarte ikke å kjøre «{}». {}"
 
-#: ../settings.ui.h:21
+#: ../settings.ui.h:24
 msgid "_Auto-show when editing text"
-msgstr ""
+msgstr "Vis _automatisk når tekst redigeres"
 
-#: ../settings.ui.h:22
+#: ../settings.ui.h:25
 msgid ""
 "Show Onboard when there is a recognized text window in focus. Requires Gnome "
 "Accessibility."
 msgstr ""
+"Vis Onbaord når et gjenkjent tekstvindu er i fokus. Dette krever Gnome "
+"tilgjengelighetsmodus."
 
-#: ../settings.ui.h:23
+#: ../settings.ui.h:26
 msgid "Start Onboard _hidden"
-msgstr ""
+msgstr "Skjul Onboard når det starter."
 
-#: ../settings.ui.h:24
+#: ../settings.ui.h:27
 msgid "Start Onboard hidden."
-msgstr ""
+msgstr "Skjul Onboard når det starter."
 
-#: ../settings.ui.h:25
+#: ../settings.ui.h:31
 msgid "Show floating _icon when Onboard is hidden"
-msgstr ""
+msgstr "Vis flytende _ikon når Onboard skjules"
 
-#: ../settings.ui.h:26
+#: ../settings.ui.h:32
 msgid ""
 "Show a floating icon on the desktop when Onboard is hidden. A click on the "
 "icon makes Onboard reappear."
 msgstr ""
+"Vis et flytende ikon på skrivebordet når Onboard skjules. Onboard vises når "
+"du klikker på ikonet."
 
 #: ../settings.ui.h:27
 msgid "Show/Hide Options"
 msgstr "Vis/skjul valg"
 
-#: ../settings.ui.h:28
+#: ../settings.ui.h:29
 msgid "_Show status icon"
 msgstr "_Vis ikon i statusfelt"
 
-#: ../settings.ui.h:29
+#: ../settings.ui.h:30
 msgid "Show the status item. A click on that icon hides or shows Onboard."
 msgstr ""
+"Vis statusobjektet. Du kan vise eller skjule Onboard ved å trykke på dette "
+"ikonet."
 
-#: ../settings.ui.h:30
+#: ../settings.ui.h:33
 msgid "Show when _unlocking the screen"
-msgstr ""
+msgstr "Vis når skjermen låses _opp"
 
-#: ../settings.ui.h:31
+#: ../settings.ui.h:34
 msgid ""
 "Show Onboard when the dialog to unlock the screen appears; this way Onboard "
 "can be used for example to enter the password to dismiss the screensaver "
 "when it is set to ask for it."
 msgstr ""
+"Vis Onboard når dialogboksen som låser opp skjermen dukker opp. Slik kan "
+"Onboard for eksempel brukes til å skrive inn passordet ditt når "
+"skjermspareren er satt opp til å låse systemet."
 
-#: ../settings.ui.h:32
+#: ../settings.ui.h:35
 msgid "Show _tooltips"
-msgstr ""
+msgstr "Vis _verktøytips"
 
-#: ../settings.ui.h:33
+#: ../settings.ui.h:36
 msgid "Show tooltips for the keyboard&apos;s buttons."
-msgstr ""
+msgstr "Vis verktøytips for tastaturknappene."
 
-#: ../settings.ui.h:34
+#: ../settings.ui.h:37
 msgid "Show tooltips for the keyboard's buttons."
-msgstr ""
+msgstr "Vis verktøytips for tastaturknappene."
 
-#: ../settings.ui.h:35
+#: ../settings.ui.h:38
 msgid "Desktop Integration"
 msgstr "Skrivebordsintegrering"
 
-#: ../settings.ui.h:6
+#: ../settings.ui.h:8
 msgid "General"
 msgstr "Generelt"
 
-#: ../settings.ui.h:36
+#: ../settings.ui.h:43
 msgid "Show window _decoration"
-msgstr ""
+msgstr "Vis _dekorasjon for vinduer."
 
-#: ../settings.ui.h:37
+#: ../settings.ui.h:44
 msgid "Show window caption and frame."
-msgstr ""
+msgstr "Vis bildetekst og ramme for vinduer."
 
-#: ../settings.ui.h:38
+#: ../settings.ui.h:45
 msgid "Show always on visible _workspace"
-msgstr ""
+msgstr "Vis alltid på aktivt arbeidsområde"
 
-#: ../settings.ui.h:39
+#: ../settings.ui.h:46
 msgid "&quot;Sticky&quot; mode for keyboard and floating icon."
-msgstr ""
+msgstr "&quot;Klebrig&quot; modus for tastatur og flyteikon."
 
-#: ../settings.ui.h:40
+#: ../settings.ui.h:47
 msgid "\"Sticky\" mode for keyboard and floating icon."
-msgstr ""
+msgstr "«Klebrig» modus for tastatur og flyteikon."
 
-#: ../settings.ui.h:41
+#: ../settings.ui.h:48
 msgid "_Force window to top"
-msgstr ""
+msgstr "_Tving vinduet til å ligge på toppen"
 
-#: ../settings.ui.h:42
+#: ../settings.ui.h:49
 msgid "Try harder to keep Onboard above anything on-screen."
 msgstr ""
+"Gi en hardere innsats for å holde Onboard foran alt annet på skjermen."
 
-#: ../settings.ui.h:43
+#: ../settings.ui.h:50
 msgid "Keep _aspect ratio"
-msgstr ""
+msgstr "Behold størrelsesforhold"
 
-#: ../settings.ui.h:45
+#: ../settings.ui.h:52
 msgid "Constrain window size to the layout's aspect ratio."
-msgstr ""
+msgstr "Tving vindustørrelsen til å overholde gjeldende størrelsesforhold."
 
 #: ../settings.ui.h:46
 msgid "Window Options"
-msgstr ""
+msgstr "Valg for vinduer"
 
-#: ../settings.ui.h:54
+#: ../settings.ui.h:55
 msgid "Wind_ow:"
-msgstr ""
+msgstr "Vind_u:"
 
-#: ../settings.ui.h:55
+#: ../settings.ui.h:56
 msgid "Transparency of the whole keyboard window. Requires compositing."
-msgstr ""
+msgstr "Gjennomsiktighet for hele tastaturvinduet (krever sammensetting)."
 
-#: ../settings.ui.h:56 ../settings_theme_dialog.ui.h:3
+#: ../settings.ui.h:57 ../settings_theme_dialog.ui.h:3
 msgid "_Background:"
-msgstr ""
+msgstr "_Bakgrunn:"
 
-#: ../settings.ui.h:57
+#: ../settings.ui.h:58
 msgid "Transparency of the keyboard background"
-msgstr ""
+msgstr "Gjennomsiktighet for tastaturbakgrunnen"
 
-#: ../settings.ui.h:58
+#: ../settings.ui.h:59
 msgid "_No background"
 msgstr "_Ingen bakgrunn"
 
-#: ../settings.ui.h:59
+#: ../settings.ui.h:60
 msgid "Show the desktop through the gaps between keys."
-msgstr ""
+msgstr "Vis skrivebordet bak/mellom tastene."
 
-#: ../settings.ui.h:60
+#: ../settings.ui.h:61
 msgid "Transparency"
-msgstr ""
+msgstr "Gjennomsiktighet"
 
-#: ../settings.ui.h:61
+#: ../settings.ui.h:62
 msgid "Set _transparency to"
-msgstr ""
+msgstr "Sett gjennomsik_tighet til"
 
-#: ../settings.ui.h:62
+#: ../settings.ui.h:63
 msgid "Enable inactive transparency. Requires compositing."
-msgstr ""
+msgstr "Aktiver gjennomsiktighet ved inaktivitet (krever sammensetting)"
 
-#: ../settings.ui.h:63
+#: ../settings.ui.h:64
 msgid ""
 "Transparency when the pointer leaves the keyboard. Requires compositing."
 msgstr ""
+"Gjennomsiktighet når musepekeren forlater tastaturet (krever sammensetting)."
 
-#: ../settings.ui.h:64
+#: ../settings.ui.h:65
 msgid "after"
-msgstr ""
+msgstr "etter"
 
-#: ../settings.ui.h:65
+#: ../settings.ui.h:66
 msgid "Delay in seconds until the inactive transparency takes effect."
 msgstr ""
+"Hvor lenge vinduet skal være inaktivt før gjennomsiktigheten trer i kraft."
 
-#: ../settings.ui.h:66
+#: ../settings.ui.h:67
 msgid "seconds"
-msgstr ""
+msgstr "sekunder"
 
-#: ../settings.ui.h:67
+#: ../settings.ui.h:68
 msgid "When Inactive"
 msgstr "Når inaktiv"
 
-#: ../settings.ui.h:7
+#: ../settings.ui.h:9
 msgid "Window"
-msgstr ""
+msgstr "Vindu"
 
-#: ../settings.ui.h:68
+#: ../settings.ui.h:71
 msgid "_Personalize"
-msgstr ""
+msgstr "Tilpass"
 
-#: ../settings.ui.h:69
+#: ../settings.ui.h:72
 msgid "_Open layouts folder"
-msgstr ""
+msgstr "Åpne utformingsmappe"
 
-#: ../settings.ui.h:8
+#: ../settings.ui.h:10
 msgid "Layout"
-msgstr ""
+msgstr "Utforming"
 
-#: ../settings.ui.h:70
+#: ../settings.ui.h:73
 msgid "C_ustomize theme"
-msgstr ""
+msgstr "Tilpass tema"
 
-#: ../settings.ui.h:71
+#: ../settings.ui.h:74
 msgid "Follow _system theme"
-msgstr ""
+msgstr "Følg _systemets tema"
 
-#: ../settings.ui.h:72
+#: ../settings.ui.h:75
 msgid "Remember what Onboard theme was last used for every system theme."
-msgstr ""
+msgstr "Husk hvilket Onboard-tema som blir brukt per systemtema."
 
-#: ../settings.ui.h:9
+#: ../settings.ui.h:11
 msgid "Theme"
-msgstr ""
+msgstr "Tema"
 
-#: ../settings.ui.h:73
+#: ../settings.ui.h:76
 msgid ""
 "Snippets are pieces of text which are entered when the corresponding button "
 "in Onboard is pressed."
@@ -542,27 +573,27 @@
 "Tekstutdrag er biter av tekst som er lagt inn når den tilhørende knappen i "
 "Onboard trykkes."
 
-#: ../data/layoutstrings.py:67 ../settings.ui.h:10
+#: ../settings.ui.h:12 ../data/layoutstrings.py:67
 msgid "Snippets"
 msgstr "Tekstblokker"
 
-#: ../settings.ui.h:83
+#: ../settings.ui.h:124
 msgid "Enable  keyboard _scanning"
-msgstr ""
+msgstr "Aktiver tastatur_skanning"
 
-#: ../settings.ui.h:84
+#: ../settings.ui.h:125
 msgid "Sc_anner Settings"
-msgstr ""
+msgstr "Sk_annerinnstillinger"
 
-#: ../settings.ui.h:85
+#: ../settings.ui.h:126
 msgid "Keyboard Scanning"
-msgstr ""
+msgstr "Tastaturskanning"
 
 #: ../debian/onboard/usr/share/onboard/settings.ui.h:54 ../settings.ui.h:54
 msgid "_Hide Hover Click window"
 msgstr ""
 
-#: ../settings.ui.h:79
+#: ../settings.ui.h:120
 msgid "Hide the system-provided hover click window while Onboard is running."
 msgstr ""
 
@@ -570,7 +601,7 @@
 msgid "Enable Hover Click window on _exit"
 msgstr ""
 
-#: ../settings.ui.h:81
+#: ../settings.ui.h:122
 msgid ""
 "Always enable the system-provided hover click window when exiting Onboard."
 msgstr ""
@@ -579,21 +610,21 @@
 msgid "_Universal Access Panel"
 msgstr ""
 
-#: ../settings.ui.h:82
+#: ../settings.ui.h:123
 msgid "Hover Click"
 msgstr ""
 
-#: ../settings.ui.h:51
+#: ../settings.ui.h:69
 msgid "_Frame resize handles:"
-msgstr ""
+msgstr "Størrelsesbrytere:"
 
-#: ../settings.ui.h:52
+#: ../settings.ui.h:70
 msgid "Resize Protection"
 msgstr ""
 
-#: ../settings.ui.h:11
+#: ../settings.ui.h:15
 msgid "Universal Access"
-msgstr ""
+msgstr "Universell tilgang"
 
 #. ##############
 #: ../Onboard/SnippetView.py:20
@@ -606,15 +637,15 @@
 
 #: ../Onboard/SnippetView.py:33
 msgid "Button Number"
-msgstr ""
+msgstr "Knappnummer"
 
 #: ../Onboard/SnippetView.py:40
 msgid "Button Label"
-msgstr ""
+msgstr "Knappmerke"
 
 #: ../Onboard/SnippetView.py:49
 msgid "Snippet Text"
-msgstr ""
+msgstr "Tekst for kodesnutt"
 
 #: ../Onboard/SnippetView.py:94
 msgid "Must be an integer number"
@@ -623,27 +654,27 @@
 #: ../Onboard/SnippetView.py:103
 #, python-format
 msgid "Snippet %d is already in use."
-msgstr ""
+msgstr "Kodesnutten «%d» er allerede i bruk."
 
-#: ../Onboard/KeyboardWidget.py:1257
+#: ../Onboard/KeyboardWidget.py:1365
 msgid "New snippet"
-msgstr ""
+msgstr "Ny kodesnutt"
 
-#: ../Onboard/KeyboardWidget.py:1261
+#: ../Onboard/KeyboardWidget.py:1369
 msgid "_Save snippet"
-msgstr ""
+msgstr "_Lagre kodesnutt"
 
-#: ../Onboard/KeyboardWidget.py:1274
+#: ../Onboard/KeyboardWidget.py:1382
 msgid "Enter a new snippet for this button:"
-msgstr ""
+msgstr "Skriv inn en ny snutt for denne tasten:"
 
-#: ../Onboard/KeyboardWidget.py:1280
+#: ../Onboard/KeyboardWidget.py:1388
 msgid "_Button label:"
-msgstr ""
+msgstr "Etikett på _knapp:"
 
-#: ../Onboard/KeyboardWidget.py:1284
+#: ../Onboard/KeyboardWidget.py:1392
 msgid "S_nippet:"
-msgstr ""
+msgstr "Kodes_nutt:"
 
 #: ../settings_scanner_dialog.ui.h:1
 msgid "Scanner Settings"
@@ -651,7 +682,7 @@
 
 #: ../settings_scanner_dialog.ui.h:2
 msgid "Select a scanning _profile:"
-msgstr ""
+msgstr "Velg en skanne_profil:"
 
 #: ../settings_scanner_dialog.ui.h:3
 msgid "_Step interval:"
@@ -672,6 +703,7 @@
 "The number of times the scanner cycles through the entire keyboard before it "
 "stops."
 msgstr ""
+"Hvor mange ganger skanneren går gjennom hele tastaturet før den stopper."
 
 #: ../settings_scanner_dialog.ui.h:7
 msgid "Step _only during switch down"
@@ -693,20 +725,23 @@
 msgid ""
 "The time the scanner rests on a key  while progressing forward. (in seconds)"
 msgstr ""
+"Hvor lenge - i sekunder - skanneren forblir på en tast mens den går videre."
 
 #: ../settings_scanner_dialog.ui.h:12
 msgid ""
 "The time the scanner rests on a key  while moving backwards. (in seconds)"
 msgstr ""
+"Hvor lenge - i sekunder - skanneren forblir på en tast mens den går baklengs."
 
 #: ../settings_scanner_dialog.ui.h:13
 msgid "Backtrack _steps:"
-msgstr ""
+msgstr "Tilbakesporing"
 
 #: ../settings_scanner_dialog.ui.h:14
 msgid ""
 "The number of keys the scanner steps back before moving forward again."
 msgstr ""
+"Hvor mange taster skanneren beveger seg tilbake før den går fremover igjen."
 
 #: ../settings_scanner_dialog.ui.h:15
 msgid "_Alternate switch actions"
@@ -720,25 +755,27 @@
 
 #: ../settings_scanner_dialog.ui.h:17
 msgid "Profiles"
-msgstr ""
+msgstr "Profiler"
 
 #: ../settings_scanner_dialog.ui.h:18
 msgid "_Select an input device:"
-msgstr ""
+msgstr "Velg en skriveenhet:"
 
 #: ../settings_scanner_dialog.ui.h:19
 msgid "_Use this device only for scanning"
-msgstr ""
+msgstr "Enheten skal kun brukes til skanning"
 
 #: ../settings_scanner_dialog.ui.h:20
 msgid ""
 "The selected device should not control the system mouse cursor or the "
 "keyboard caret."
 msgstr ""
+"Den valgte skriveenheten skal hverken kontrollere systemets musepekeren "
+"eller tastatursignaler."
 
 #: ../settings_scanner_dialog.ui.h:21
 msgid "Input Device"
-msgstr ""
+msgstr "Skriveenhet"
 
 #: ../settings_scanner_dialog.ui.h:22
 msgid "Automatic scan for 1 switch"
@@ -766,21 +803,21 @@
 
 #: ../Onboard/Indicator.py:113
 msgid "Onboard on-screen keyboard"
-msgstr ""
+msgstr "Onboard skjermtastatur"
 
-#: ../Onboard/KbdWindow.py:70 ../data/onboard.desktop.in.h:1
+#: ../Onboard/KbdWindow.py:75 ../data/onboard.desktop.in.h:1
 msgid "Onboard"
-msgstr ""
+msgstr "Onboard"
 
 #: ../data/onboard.desktop.in.h:2
 msgid "Onboard onscreen keyboard"
-msgstr ""
+msgstr "Onboard skjermtastatur"
 
 #: ../data/onboard.desktop.in.h:3
 msgid "Flexible onscreen keyboard for GNOME"
 msgstr "Fleksibelt skjermtastatur for GNOME"
 
-#: ../Onboard/OnboardGtk.py:313
+#: ../Onboard/OnboardGtk.py:340
 msgid ""
 "Onboard is configured to appear with the dialog to unlock the screen; for "
 "example to dismiss the password-protected screensaver.\n"
@@ -792,8 +829,17 @@
 "Would you like to reconfigure the system to show Onboard when unlocking the "
 "screen?"
 msgstr ""
+"Onboard er satt opp til å dukke opp når du skal låse opp skjermen, for "
+"eksempel fra en passordbeskyttet skjermsparer.\n"
+"\n"
+"Systemet er for øvrig konfigurert til å ikke bruke Onboard for å låse opp "
+"skjermen lenger. En mulig årsak kan være at et annet program har bedt "
+"systemet om å bruke noe annet.\n"
+"\n"
+"Vil du konfigurere systemet på nytt til å vise Onboard når skjermen skal "
+"låses opp?"
 
-#: ../Onboard/OnboardGtk.py:329
+#: ../Onboard/OnboardGtk.py:356
 msgid ""
 "Onboard is configured to appear with the dialog to unlock the screen; for "
 "example to dismiss the password-protected screensaver.\n"
@@ -809,33 +855,37 @@
 "\n"
 "Vil du aktivere denne funksjonen?"
 
-#: ../Onboard/Appearance.py:106
+#: ../Onboard/Appearance.py:112
 msgid "Color scheme for theme '{filename}' not found"
-msgstr ""
+msgstr "Fant ikke fargeoppsett for temaet «{filename}»"
 
-#: ../Onboard/Appearance.py:393
+#: ../Onboard/Appearance.py:406
 msgid "Error saving "
-msgstr ""
+msgstr "Feil ved lagring "
 
-#: ../Onboard/Appearance.py:768
+#: ../Onboard/Appearance.py:828
 msgid ""
 "Loading legacy color scheme format '{old_format}', please consider upgrading "
 "to current format '{new_format}': '{filename}'"
 msgstr ""
+"Laster inn utgått fargeoppsettformat «{}». Vennligst vurder å oppgradere til "
+"gjeldende format «{new_format}»: «{filename}»"
 
-#: ../Onboard/Appearance.py:863 ../Onboard/Appearance.py:995
+#: ../Onboard/Appearance.py:925 ../Onboard/Appearance.py:1057
 msgid ""
 "Duplicate key_id '{}' found in color scheme file. Key_ids must occur only "
 "once."
 msgstr ""
+"Fant en duplisert key_id «{}» i fargeoppsettfilen. En key_id kan kun "
+"forekomme én gang."
 
 #: ../data/layoutstrings.py:15
 msgid "Activate Hover Click"
-msgstr ""
+msgstr "Aktiver sveveklikk"
 
 #: ../data/layoutstrings.py:16
 msgid "Alphanumeric keys"
-msgstr ""
+msgstr "Alfanumeriske taster"
 
 #. translators: very short label of the left Alt key
 #: ../data/layoutstrings.py:18
@@ -864,11 +914,11 @@
 
 #: ../data/layoutstrings.py:27
 msgid "Double click"
-msgstr ""
+msgstr "Dobbeltklikk"
 
 #: ../data/layoutstrings.py:28
 msgid "Drag click"
-msgstr ""
+msgstr "Dra-klikk"
 
 #. translators: very short label of the numpad END key
 #: ../data/layoutstrings.py:30
@@ -883,7 +933,7 @@
 #. translators: very short label of the ESCAPE key
 #: ../data/layoutstrings.py:34
 msgid "Esc"
-msgstr ""
+msgstr "Esc"
 
 #: ../data/layoutstrings.py:35
 msgid "Function keys"
@@ -895,7 +945,7 @@
 
 #: ../data/layoutstrings.py:37
 msgid "Hide Onboard"
-msgstr ""
+msgstr "Skjul Onboard"
 
 #. translators: very short label of the HOME key
 #: ../data/layoutstrings.py:39
@@ -922,16 +972,16 @@
 
 #: ../data/layoutstrings.py:46
 msgid "Move Onboard"
-msgstr ""
+msgstr "Flytt Onboard"
 
 #. translators: very short label of the NUMLOCK key
 #: ../data/layoutstrings.py:48
 msgid "Nm&#10;Lk"
-msgstr ""
+msgstr "Nm&#10;Lk"
 
 #: ../data/layoutstrings.py:49
 msgid "Number block and snippets"
-msgstr ""
+msgstr "Nummergruppe og nyttetaster"
 
 #. translators: very short label of the PAUSE key
 #: ../data/layoutstrings.py:51
@@ -941,17 +991,17 @@
 #. translators: very short label of the PAGE DOWN key
 #: ../data/layoutstrings.py:53
 msgid "Pg&#10;Dn"
-msgstr ""
+msgstr "Pg&#10;Dn"
 
 #. translators: very short label of the PAGE UP key
 #: ../data/layoutstrings.py:55
 msgid "Pg&#10;Up"
-msgstr ""
+msgstr "Pg&#10;Up"
 
 #. translators: very short label of the Preferences button
 #: ../data/layoutstrings.py:57
 msgid "Preferences"
-msgstr ""
+msgstr "Innstillinger"
 
 #. translators: very short label of the PRINT key
 #: ../data/layoutstrings.py:59
@@ -961,7 +1011,7 @@
 #. translators: very short label of the Quit button
 #: ../data/layoutstrings.py:61
 msgid "Quit"
-msgstr ""
+msgstr "Avslutt"
 
 #. translators: very short label of the RETURN key
 #: ../data/layoutstrings.py:63
@@ -970,24 +1020,25 @@
 
 #: ../data/layoutstrings.py:64
 msgid "Right click"
-msgstr ""
+msgstr "Høyreklikk"
 
 #. translators: very short label of the SCROLL key
 #: ../data/layoutstrings.py:66
 msgid "Scroll"
 msgstr "Scroll"
 
+#: ../debian/tmp/usr/share/onboard/settings_docking_dialog.ui.h:10
 #: ../settings_docking_dialog.ui.h:10
 msgid "Settings"
 msgstr "Innstillinger"
 
 #: ../data/layoutstrings.py:68
 msgid "Space"
-msgstr ""
+msgstr "Mellomrom"
 
 #: ../data/layoutstrings.py:69
 msgid "Toggle click helpers"
-msgstr ""
+msgstr "Skru av/på hjelpetekst for klikk"
 
 #. translators: very short label of the TAB key
 #: ../data/layoutstrings.py:71
@@ -1001,15 +1052,15 @@
 
 #: ../settings_theme_dialog.ui.h:1
 msgid "Customize Theme"
-msgstr ""
+msgstr "Tilpass tema"
 
 #: ../settings_theme_dialog.ui.h:2
 msgid "Color Sche_me"
-msgstr ""
+msgstr "Fargeoppsett"
 
 #: ../settings_theme_dialog.ui.h:8
 msgid "_Style:"
-msgstr ""
+msgstr "_Stil:"
 
 #: ../settings_theme_dialog.ui.h:9
 msgid "R_oundness:"
@@ -1017,19 +1068,19 @@
 
 #: ../settings_theme_dialog.ui.h:10
 msgid "S_ize:"
-msgstr ""
+msgstr "Størrelse:"
 
 #: ../settings_theme_dialog.ui.h:12
 msgid "Key Style"
-msgstr ""
+msgstr "Knappestil"
 
 #: ../settings_theme_dialog.ui.h:13
 msgid "_Key:"
-msgstr ""
+msgstr "_Nøkkel:"
 
 #: ../settings_theme_dialog.ui.h:14
 msgid "_Border:"
-msgstr ""
+msgstr "_Kantlinje:"
 
 #: ../settings_theme_dialog.ui.h:9
 msgid "_Direction:"
@@ -1037,7 +1088,7 @@
 
 #: ../settings_theme_dialog.ui.h:15
 msgid "Gradients"
-msgstr ""
+msgstr "Fargeoverganger"
 
 #: ../settings_theme_dialog.ui.h:11
 msgid "Style"
@@ -1045,37 +1096,39 @@
 
 #: ../settings_theme_dialog.ui.h:19
 msgid "_Font:"
-msgstr ""
+msgstr "_Skrift:"
 
 #: ../settings_theme_dialog.ui.h:20
 msgid "_Attributes:"
-msgstr ""
+msgstr "_Egenskaper:"
 
 #: ../settings_theme_dialog.ui.h:21
 msgid "Font"
-msgstr ""
+msgstr "Skrifttype"
 
 #: ../settings_theme_dialog.ui.h:22
 msgid "I_ndependent size"
-msgstr ""
+msgstr "Uavhengig størrelse"
 
 #: ../settings_theme_dialog.ui.h:23
 msgid "_Super key:"
-msgstr ""
+msgstr "_Super-tast:"
 
 #: ../settings_theme_dialog.ui.h:24
 msgid "Label Override"
-msgstr ""
+msgstr "Overstyr etikett"
 
 #: ../settings_theme_dialog.ui.h:25
 msgid "Labels"
-msgstr ""
+msgstr "Etiketter"
 
-#: ../Onboard/AtspiAutoShow.py:21 ../Onboard/KeyboardWidget.py:39
+#: ../Onboard/AtspiStateTracker.py:16
 msgid "Atspi unavailable, auto-hide won't be available"
-msgstr ""
+msgstr "Atspi er utilgjengelig. Automatisk skjuling vil ikke fungere"
 
-#: ../Onboard/KbdWindow.py:158
+#: ../Onboard/KbdWindow.py:163
 msgid ""
 "no window transparency available; screen doesn't support alpha channels"
 msgstr ""
+"gjennomsiktighet for vinduer er ikke tigjengelig. Skjermen støtter ikke "
+"alfakanaler."
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/orca.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/orca.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/orca.po	2013-01-29 09:33:55.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/orca.po	2014-01-07 06:37:24.000000000 +0000
@@ -17,25 +17,25 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 14:17+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:48+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
-#: ../orca.desktop.in.h:1 ../src/orca/app_gui_prefs.py:215
-#: ../src/orca/keybindings.py:106 ../src/orca/orca_gui_prefs.py:1956
-#: ../src/orca/orca_gui_prefs.py:2063
+#: ../orca.desktop.in.h:1 ../src/orca/app_gui_prefs.py:216
+#: ../src/orca/keybindings.py:106 ../src/orca/orca_gui_prefs.py:1960
+#: ../src/orca/orca_gui_prefs.py:2067
 msgid "Orca"
 msgstr "Orca"
 
-#: ../orca.desktop.in.h:2
+#: ../orca.desktop.in.h:1
 msgid "Screen Reader"
 msgstr "Skjermleser"
 
-#: ../orca.desktop.in.h:3
+#: ../orca.desktop.in.h:2
 msgid "Orca Screen Reader"
 msgstr "Orca skjermleser"
 
-#: ../orca.desktop.in.h:4
+#: ../orca.desktop.in.h:3
 msgid ""
 "Provide access to graphical desktop environments via synthesized speech "
 "and/or refreshable braille"
@@ -43,132 +43,134 @@
 "Gir tilgang til grafiske skrivebordsmiljøer via syntetisk tale og/eller "
 "oppdaterbar blindeskrift"
 
-#: ../src/orca/app_gui_prefs.py:135
+#: ../src/orca/app_gui_prefs.py:136
 #, python-format
 msgid "Orca Preferences for %s"
 msgstr "Brukervalg for Orca for %s"
 
-#. Translators: this refers to commands that do not currently have
-#. an associated key binding.
-#. 
-#: ../src/orca/app_gui_prefs.py:220 ../src/orca/orca_gui_prefs.py:2069
+#. Translators: This string is a label for the group of Orca commands which
+#. do not currently have an associated key binding.
+#: ../src/orca/guilabels.py:215
 msgid "Unbound"
 msgstr "Ikke bundet"
 
-#: ../src/orca/app_gui_prefs.py:279
+#. Translators: This message presents the fact that no accessible application has
+#. has keyboard focus.
+#: ../src/orca/messages.py:1089
 msgid "No application has focus."
 msgstr "Ingen programmer har fokus."
 
-#. Translators: Orca Preferences in this case, is a configuration GUI
-#. for allowing users to set application specific settings from within
-#. Orca for the application that currently has focus.
-#. 
-#: ../src/orca/app_gui_prefs.py:294
+#. Translators: Orca Preferences in this case, is a configuration GUI for
+#. allowing users to set application specific settings from within Orca for
+#. the application that currently has focus.
+#: ../src/orca/messages.py:1161
 #, python-format
 msgid "Starting Orca Preferences for %s."
 msgstr "Starter brukervalg for Orca for %s."
 
-#. Translators: this announces that a bookmark has been entered.
-#. Orca allows users to tell it to remember a particular spot in an
-#. application window and provides keystrokes for the user to jump to
-#. those spots.  These spots are known as 'bookmarks'.
-#. 
-#: ../src/orca/bookmarks.py:79
+#. Translators: Orca has a feature in which users can store/save a particular
+#. location in an application window and return to it later by pressing a
+#. keystroke. These stored/saved locations are "bookmarks". This string is
+#. presented to the user when a new bookmark has been entered into the list
+#. of bookmarks.
+#: ../src/orca/messages.py:53
 msgid "bookmark entered"
 msgstr "bokmerke skrevet inn"
 
-#. Translators: this announces that the current object is the same
-#. object pointed to by the bookmark.
-#. 
-#: ../src/orca/bookmarks.py:103
-#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:107
+#. Translators: Orca has a feature in which users can store/save a particular
+#. location in an application window and return to it later by pressing a
+#. keystroke. These stored/saved locations are "bookmarks". This string is
+#. presented to the user to indicate the current object is the same object
+#. pointed to by a given bookmark.
+#: ../src/orca/messages.py:67
 msgid "bookmark is current object"
 msgstr "bokmerke er nåværende objekt"
 
-#: ../src/orca/bookmarks.py:111
-#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:115
+#. Translators: Orca has a feature in which users can store/save a particular
+#. location in an application window and return to it later by pressing a
+#. keystroke. These stored/saved locations are "bookmarks". This string is
+#. presented to the user to indicate the current object's parent and the
+#. bookmarked object's parent are the same.
+#: ../src/orca/messages.py:74
 msgid "bookmark and current object have same parent"
 msgstr "bokmerke og aktivt objekt har samme opphav"
 
-#. Translators: this announces that the bookmark and the current
-#. object share a common ancestor
-#. 
-#: ../src/orca/bookmarks.py:129
-#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:133
+#. Translators: Orca has a feature in which users can store/save a particular
+#. location in an application window and return to it later by pressing a
+#. keystroke. These stored/saved locations are "bookmarks". This string is
+#. presented to the user to indicate the current object and the bookmarked
+#. object share a common ancestor.
+#: ../src/orca/messages.py:81
 #, python-format
 msgid "shared ancestor %s"
 msgstr "delt opphav %s"
 
-#. Translators: This announces that a comparison between the bookmark
-#. and the current object can not be determined.
-#. 
-#: ../src/orca/bookmarks.py:136
-#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:140
+#. Translators: Orca has a feature in which users can store/save a particular
+#. location in an application window and return to it later by pressing a
+#. keystroke. These stored/saved locations are "bookmarks". This string is
+#. presented to the user to indicate the comparative locations of the current
+#. object and the bookmarked object could not be determined.
+#: ../src/orca/messages.py:60
 msgid "comparison unknown"
 msgstr "sammenligning ukjent"
 
-#. Translators: this announces that a bookmark has been saved to
-#. disk
-#. 
-#: ../src/orca/bookmarks.py:145
-#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:155
+#. Translators: Orca has a feature in which users can store/save a particular
+#. location in an application window and return to it later by pressing a
+#. keystroke. These stored/saved locations are "bookmarks". This string is
+#. presented to the user when the active list of bookmarks have been saved to
+#. disk.
+#: ../src/orca/messages.py:88
 msgid "bookmarks saved"
 msgstr "bokmerker lagret"
 
-#. Translators: this announces that a bookmark could not be saved to
-#. disk
-#. 
-#: ../src/orca/bookmarks.py:150
-#: ../src/orca/scripts/toolkits/Gecko/bookmarks.py:160
+#. Translators: Orca has a feature in which users can store/save a particular
+#. location in an application window and return to it later by pressing a
+#. keystroke. These stored/saved locations are "bookmarks". This string is
+#. presented to the user when an error was encountered, preventing the active
+#. list of bookmarks being saved to disk.
+#: ../src/orca/messages.py:95
 msgid "bookmarks could not be saved"
 msgstr "bokmerket kunne ikke bli lagret"
 
-#. Translators: this is a command for a button on a refreshable braille
-#. display (an external hardware device used by people who are blind).
-#. When pressing the button, the display scrolls to the left.
-#. 
-#: ../src/orca/braille.py:119
+#. Translators: this is a command for a button on a refreshable braille display
+#. (an external hardware device used by people who are blind). When pressing the
+#. button, the display scrolls to the left.
+#: ../src/orca/cmdnames.py:540
 msgid "Line Left"
 msgstr "Linje venstre"
 
-#. Translators: this is a command for a button on a refreshable braille
-#. display (an external hardware device used by people who are blind).
-#. When pressing the button, the display scrolls to the right.
-#. 
-#: ../src/orca/braille.py:125
+#. Translators: this is a command for a button on a refreshable braille display
+#. (an external hardware device used by people who are blind). When pressing the
+#. button, the display scrolls to the right.
+#: ../src/orca/cmdnames.py:545
 msgid "Line Right"
 msgstr "Linje høyre"
 
-#. Translators: this is a command for a button on a refreshable braille
-#. display (an external hardware device used by people who are blind).
-#. When pressing the button, the display scrolls up.
-#. 
-#: ../src/orca/braille.py:131
+#. Translators: this is a command for a button on a refreshable braille display
+#. (an external hardware device used by people who are blind). When pressing the
+#. button, the display scrolls up.
+#: ../src/orca/cmdnames.py:550
 msgid "Line Up"
 msgstr "Linje opp"
 
-#. Translators: this is a command for a button on a refreshable braille
-#. display (an external hardware device used by people who are blind).
-#. When pressing the button, the display scrolls down.
-#. 
-#: ../src/orca/braille.py:137
+#. Translators: this is a command for a button on a refreshable braille display
+#. (an external hardware device used by people who are blind). When pressing the
+#. button, the display scrolls down.
+#: ../src/orca/cmdnames.py:555
 msgid "Line Down"
 msgstr "Linje ned"
 
-#. Translators: this is a command for a button on a refreshable braille
-#. display (an external hardware device used by people who are blind).
-#. When pressing the button, it instructs the braille display to freeze.
-#. 
-#: ../src/orca/braille.py:143
+#. Translators: this is a command for a button on a refreshable braille display
+#. (an external hardware device used by people who are blind). When pressing the
+#. button, it instructs the braille display to freeze.
+#: ../src/orca/cmdnames.py:560
 msgid "Freeze"
 msgstr "Frys"
 
-#. Translators: this is a command for a button on a refreshable braille
-#. display (an external hardware device used by people who are blind).
-#. When pressing the button, the display scrolls to the top left of the
-#. window.
-#. 
-#: ../src/orca/braille.py:150
+#. Translators: this is a command for a button on a refreshable braille display
+#. (an external hardware device used by people who are blind). When pressing the
+#. button, the display scrolls to the top left of the window.
+#: ../src/orca/cmdnames.py:565
 msgid "Top Left"
 msgstr "Øverst til venstre"
 
@@ -181,181 +183,225 @@
 msgid "Bottom Right"
 msgstr "Nederst til høyre"
 
-#. Translators: this is a command for a button on a refreshable braille
-#. display (an external hardware device used by people who are blind).
-#. When pressing the button, the display scrolls to position containing
-#. the cursor.
-#. 
-#: ../src/orca/braille.py:164
+#. Translators: this is a command for a button on a refreshable braille display
+#. (an external hardware device used by people who are blind). When pressing the
+#. button, the display scrolls to position containing the cursor.
+#: ../src/orca/cmdnames.py:575
 msgid "Cursor Position"
 msgstr "Markørposisjon"
 
-#. Translators: this is a command for a button on a refreshable braille
-#. display (an external hardware device used by people who are blind).
-#. When pressing the button, the display toggles between contracted and
-#. contracted braille.
-#. 
-#: ../src/orca/braille.py:171
+#. Translators: this is a command for a button on a refreshable braille display
+#. (an external hardware device used by people who are blind). When pressing the
+#. button, the display toggles between six-dot braille and eight-dot braille.
+#: ../src/orca/cmdnames.py:580
 msgid "Six Dots"
 msgstr "Seks punkter"
 
-#. Translators: this is a command for a button on a refreshable braille
-#. display (an external hardware device used by people who are blind).
-#. This command represents a whole set of buttons known as cursor
-#. routings keys and are a way for a user to tell the machine they are
-#. interested in a particular character on the display.
-#. 
-#: ../src/orca/braille.py:179
+#. Translators: this is a command for a button on a refreshable braille display
+#. (an external hardware device used by people who are blind). This command
+#. represents a whole set of buttons known as cursor routing keys and are a way
+#. for a user to move the application's caret to the position indicated on the
+#. display.
+#: ../src/orca/cmdnames.py:587
 msgid "Cursor Routing"
 msgstr "Markørruting"
 
-#. Translators: this is a command for a button on a refreshable braille
-#. display (an external hardware device used by people who are blind).
-#. This command represents the start of a selection operation.  It is
-#. called "Cut Begin" to map to what BrlTTY users are used to:  in
-#. character cell mode operation on virtual consoles, the act of copying
-#. text is erroneously called a "cut" operation.
-#. 
-#: ../src/orca/braille.py:188
+#. Translators: this is a command for a button on a refreshable braille display
+#. (an external hardware device used by people who are blind). This command
+#. represents the start of a selection operation. It is called "Cut Begin" to map
+#. to what BrlTTY users are used to: in character cell mode operation on virtual
+#. consoles, the act of copying text is erroneously called a "cut" operation.
+#: ../src/orca/cmdnames.py:594
 msgid "Cut Begin"
 msgstr "Start klipp ut"
 
-#. Translators: this is a command for a button on a refreshable braille
-#. display (an external hardware device used by people who are blind).
-#. This command represents marking the endpoint of a selection.  It is
-#. called "Cut Line" to map to what BrlTTY users are used to:  in
-#. character cell mode operation on virtual consoles, the act of copying
-#. text is erroneously called a "cut" operation.
-#. 
-#: ../src/orca/braille.py:197
+#. Translators: this is a command for a button on a refreshable braille display
+#. (an external hardware device used by people who are blind). This command
+#. represents marking the endpoint of a selection. It is called "Cut Line" to map
+#. to what BrlTTY users are used to: in character cell mode operation on virtual
+#. consoles, the act of copying text is erroneously called a "cut" operation.
+#: ../src/orca/cmdnames.py:601
 msgid "Cut Line"
 msgstr "Klipp ut linje"
 
-#. Translators: These are the braille translation table names for different
-#. languages. You could read about braille tables at:
-#. http://en.wikipedia.org/wiki/Braille
-#. 
-#: ../src/orca/braille.py:263
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:36
 msgid "Czech Grade 1"
 msgstr "Tsjekkisk grad 1"
 
-#: ../src/orca/braille.py:264
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:40
 msgid "Spanish Grade 1"
 msgstr "Spansk grad 1"
 
-#: ../src/orca/braille.py:265
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:44
 msgid "Canada French Grade 2"
 msgstr "Kanadisk fransk grad 2"
 
-#: ../src/orca/braille.py:266
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:48
 msgid "France French Grade 2"
 msgstr "Fransk grad 2"
 
-#: ../src/orca/braille.py:267
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:52
 msgid "Latvian Grade 1"
 msgstr "Latvisk grad 1"
 
-#: ../src/orca/braille.py:268
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:56
 msgid "Netherlands Dutch Grade 1"
 msgstr "Hollandsk grad 1"
 
-#: ../src/orca/braille.py:269
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:60
 msgid "Norwegian Grade 0"
 msgstr "Norsk grad 0"
 
-#: ../src/orca/braille.py:270
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:64
 msgid "Norwegian Grade 1"
 msgstr "Norsk grad 1"
 
-#: ../src/orca/braille.py:271
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:68
 msgid "Norwegian Grade 2"
 msgstr "Norsk grad 2"
 
-#: ../src/orca/braille.py:272
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:72
 msgid "Norwegian Grade 3"
 msgstr "Norsk grad 3"
 
-#: ../src/orca/braille.py:273
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:76
 msgid "Polish Grade 1"
 msgstr "Polsk grad 1"
 
-#: ../src/orca/braille.py:274
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:80
 msgid "Portuguese Grade 1"
 msgstr "Portugisisk grad 1"
 
-#: ../src/orca/braille.py:275
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:84
 msgid "Swedish Grade 1"
 msgstr "Svensk grad 1"
 
-#: ../src/orca/braille.py:276
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:88
 msgid "Arabic Grade 1"
 msgstr "Arabisk grad 1"
 
-#: ../src/orca/braille.py:277
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:92
 msgid "Welsh Grade 1"
 msgstr "Walisisk grad 1"
 
-#: ../src/orca/braille.py:278
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:96
 msgid "Welsh Grade 2"
 msgstr "Walisisk grad 2"
 
-#: ../src/orca/braille.py:279
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:100
 msgid "German Grade 0"
 msgstr "Tysk grad 0"
 
-#: ../src/orca/braille.py:280
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:104
 msgid "German Grade 1"
 msgstr "Tysk grad 1"
 
-#: ../src/orca/braille.py:281
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:108
 msgid "German Grade 2"
 msgstr "Tysk grad 2"
 
-#: ../src/orca/braille.py:282
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:112
 msgid "U.K. English Grade 2"
 msgstr "Britisk engelsk grad 2"
 
-#: ../src/orca/braille.py:283
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:116
 msgid "U.K. English Grade 1"
 msgstr "Britisk engelsk grad 1"
 
-#: ../src/orca/braille.py:284
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:120
 msgid "U.S. English Grade 1"
 msgstr "Amerikansk engelsk grad 1"
 
-#: ../src/orca/braille.py:285
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:124
 msgid "U.S. English Grade 2"
 msgstr "Amerikansk engelsk grad 2"
 
-#: ../src/orca/braille.py:286
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:128
 msgid "Canada French Grade 1"
 msgstr "Kanadisk fransk grad 1"
 
-#: ../src/orca/braille.py:287
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:132
 msgid "France French Grade 1"
 msgstr "Fransk fransk grad 1"
 
-#: ../src/orca/braille.py:288
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:136
 msgid "Greek Grade 1"
 msgstr "Gresk grad 1"
 
-#: ../src/orca/braille.py:289
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:140
 msgid "Hindi Grade 1"
 msgstr "Hindi grad 1"
 
-#: ../src/orca/braille.py:292
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:152
 msgid "Italian Grade 1"
 msgstr "Italiensk grad 1"
 
-#: ../src/orca/braille.py:293
+#. Translators: These is the name of a braille transation table. To learn more
+#. about braille translation tables, see http://en.wikipedia.org/wiki/Braille.
+#: ../src/orca/brltablenames.py:156
 msgid "Belgium Dutch Grade 1"
 msgstr "Belgisk hollandsk grad 1"
 
-#. Translators: this tells the user how many unfocused
-#. alert and dialog windows plus the total number of
-#. windows that this application has.
-#. 
-#: ../src/orca/braille_generator.py:213
+#. Translators: This message informs the user how many unfocused alert and
+#. dialog windows a newly (re)focused application has. It is added at the
+#. end of a braille message containing the app which just claimed focus.
+#: ../src/orca/messages.py:1631
 #, python-format
 msgid "(%d dialog)"
 msgid_plural "(%d dialogs)"
@@ -757,111 +803,170 @@
 msgid "emb"
 msgstr "inp"
 
-#: ../src/orca/chat.py:345
+#. Translators: In chat applcations, Orca automatically presents incoming
+#. messages in speech and braille. If a user is in multiple conversations or
+#. channels at the same time, it can be confusing to know what room or channel
+#. a given message came from just from hearing/reading it. For this reason, Orca
+#. has an option to present the name of the room first ("#a11y <joanie> hello!"
+#. instead of "<joanie> hello!"). This string to be translated is associated with
+#. the command to toggle room name presentation on or off.
+#: ../src/orca/cmdnames.py:534
 msgid ""
 "Toggle whether we prefix chat room messages with the name of the chat room."
 msgstr ""
 "Om navnet på samtalerom skal legges til begynnelsen av hver meldingstekst."
 
-#: ../src/orca/chat.py:357
+#. Translators: In chat applications, it is often possible to see that a "buddy"
+#. is typing currently (e.g. via a keyboard icon or status text). Some users like
+#. to have this typing status announced by Orca; others find that announcment
+#. unpleasant. Therefore, it is a setting in Orca. This string to be translated
+#. is associated with the command to toggle typing status presentation on or off.
+#: ../src/orca/cmdnames.py:513
 msgid "Toggle whether we announce when our buddies are typing."
 msgstr "Slå av varsling om venner skriver."
 
-#: ../src/orca/chat.py:369
+#. Translators: Orca has a command to review previous chat room messages in
+#. speech and braille. Some users prefer to have this message history combined
+#. (e.g. the last ten messages which came in, no matter what room they came
+#. from). Other users prefer to have specific room history (e.g. the last ten
+#. messages from #a11y). Therefore, this is a setting in Orca. This string to be
+#. translated is associated with the command to toggle specific room history on
+#. or off.
+#: ../src/orca/cmdnames.py:523
 msgid "Toggle whether we provide chat room specific message histories."
 msgstr "Slå av/på hvorvidt hvert praterom skal ha egen meldingshistorikk."
 
-#: ../src/orca/chat.py:379
+#. Translators: Orca has a command to review previous chat room messages in
+#. speech and braille. This string to be translated is associated with the
+#. keyboard commands used to review those previous messages.
+#: ../src/orca/cmdnames.py:505
 msgid "Speak and braille a previous chat room message."
 msgstr "Les opp og braille en tidligere samtaleromsmelding."
 
-#. Translators: If this checkbox is checked, then Orca will speak
-#. the name of the chat room prior to presenting an incoming message.
-#. 
-#: ../src/orca/chat.py:435
+#. Translators: If this checkbox is checked, then Orca will speak the name of the
+#. chat room prior to presenting an incoming message.
+#: ../src/orca/guilabels.py:119
 msgid "_Speak Chat Room name"
 msgstr "Le_s opp navn på samtalerom"
 
-#. Translators: If this checkbox is checked, then Orca will tell
-#. you when one of your buddies is typing a message.
-#. 
-#: ../src/orca/chat.py:444
+#. Translators: If this checkbox is checked, then Orca will tell you when one of
+#. your buddies is typing a message.
+#: ../src/orca/guilabels.py:88
 msgid "Announce when your _buddies are typing"
 msgstr "Si i fra når dine _venner skriver"
 
-#. Translators: If this checkbox is checked, then Orca will provide
-#. the user with chat room specific message histories rather than just
-#. a single history which contains the latest messages from all the
-#. chat rooms that they are currently in.
-#. 
-#: ../src/orca/chat.py:455
+#. Translators: If this checkbox is checked, then Orca will provide the user with
+#. chat room specific message histories rather than just a single history which
+#. contains the latest messages from all the chat rooms that they are in.
+#: ../src/orca/guilabels.py:93
 msgid "Provide chat room specific _message histories"
 msgstr "Tilby prateromsspesifikke _meldingshistorikker"
 
-#. Translators: this is the title of a panel holding options for
-#. how messages in this application's chat rooms should be spoken.
-#. 
-#: ../src/orca/chat.py:468
+#. Translators: This is the label of a panel holding options for how messages in
+#. this application's chat rooms should be spoken. The options are: Speak messages
+#. from all channels (i.e. even if the chat application doesn't have focus); speak
+#. messages from a channel only if it is the active channel; speak messages from
+#. any channel, but only if the chat application has focus.
+#: ../src/orca/guilabels.py:100
 msgid "Speak messages from"
 msgstr "Les meldinger fra"
 
-#. Translators: Orca will speak all new chat messages as they appear
-#. irrespective of whether the chat application currently has focus.
-#. This is the default behaviour.
-#. 
-#: ../src/orca/chat.py:484
+#. Translators: This is the label of a radio button. If it is selected, Orca will
+#. speak all new chat messages as they appear irrespective of whether or not the
+#. chat application currently has focus. This is the default behaviour.
+#: ../src/orca/guilabels.py:105
 msgid "All cha_nnels"
 msgstr "Alle ka_naler"
 
-#. Translators: Orca will speak only new chat messages for the channel
-#. that currently has focus, irrespective of whether the chat
-#. application has focus.
-#. 
-#: ../src/orca/chat.py:494
+#. Translators: This is the label of a radio button. If it is selected, Orca will
+#. only speak new chat messages for the currently active channel, irrespective of
+#. whether the chat application has focus.
+#: ../src/orca/guilabels.py:115
 msgid "A channel only if its _window is active"
 msgstr "En kanal kun hvis _vinduet er aktivt"
 
-#. Translators: Orca will speak new chat messages for all channels
-#. only when the chat application has focus.
-#. 
-#: ../src/orca/chat.py:504
+#. Translators: This is the label of a radio button. If it is selected, Orca will
+#. speak all new chat messages as they appear if and only if the chat application
+#. has focus. The string substituion is for the application name (e.g Pidgin).
+#: ../src/orca/guilabels.py:110
 #, python-format
 msgid "All channels when an_y %s window is active"
 msgstr "Alle kanaler når eth_vert %s-vindu er aktivt"
 
-#: ../src/orca/chat.py:572
+#. Translators: In chat applcations, Orca automatically presents incoming
+#. messages in speech and braille. If a user is in multiple conversations or
+#. channels at the same time, it can be confusing to know what room or channel
+#. a given message came from just from hearing/reading it. For this reason, Orca
+#. has an option to present the name of the room first ("#a11y <joanie> hello!"
+#. instead of "<joanie> hello!"). This string to be translated is presented when
+#. the value of the setting is toggled.
+#: ../src/orca/messages.py:323
 msgid "speak chat room name."
 msgstr "Les opp samtaleromnavn."
 
-#: ../src/orca/chat.py:576
+#. Translators: In chat applcations, Orca automatically presents incoming
+#. messages in speech and braille. If a user is in multiple conversations or
+#. channels at the same time, it can be confusing to know what room or channel
+#. a given message came from just from hearing/reading it. For this reason, Orca
+#. has an option to present the name of the room first ("#a11y <joanie> hello!"
+#. instead of "<joanie> hello!"). This string to be translated is presented when
+#. the value of the setting is toggled.
+#: ../src/orca/messages.py:314
 msgid "Do not speak chat room name."
 msgstr "Ikke les opp samtaleromnavn."
 
-#: ../src/orca/chat.py:589
+#. Translators: In chat applications, it is often possible to see that a "buddy"
+#. is typing currently (e.g. via a keyboard icon or status text). Some users like
+#. to have this typing status announced by Orca; others find that announcment
+#. unpleasant. Therefore, it is a setting in Orca. This string to be translated
+#. is presented when the value of the setting is toggled.
+#: ../src/orca/messages.py:291
 msgid "announce when your buddies are typing."
 msgstr "annonser når dine venner skriver."
 
-#: ../src/orca/chat.py:594
+#. Translators: In chat applications, it is often possible to see that a "buddy"
+#. is typing currently (e.g. via a keyboard icon or status text). Some users like
+#. to have this typing status announced by Orca; others find that announcment
+#. unpleasant. Therefore, it is a setting in Orca. This string to be translated
+#. is presented when the value of the setting is toggled.
+#: ../src/orca/messages.py:284
 msgid "Do not announce when your buddies are typing."
 msgstr "Ikke annonser når dine venner skriver."
 
-#: ../src/orca/chat.py:607
+#. Translators: Orca has a command to review previous chat room messages in
+#. speech and braille. Some users prefer to have this message history combined
+#. (e.g. the last ten messages which came in, no matter what room they came
+#. from). Other users prefer to have specific room history (e.g. the last ten
+#. messages from #a11y). Therefore, this is a setting in Orca. This string to be
+#. translated is presented when the value of the setting is toggled.
+#: ../src/orca/messages.py:340
 msgid "Provide chat room specific message histories."
 msgstr "Vis prateromspesifikk meldingshistorikk."
 
-#: ../src/orca/chat.py:611
+#. Translators: Orca has a command to review previous chat room messages in
+#. speech and braille. Some users prefer to have this message history combined
+#. (e.g. the last ten messages which came in, no matter what room they came
+#. from). Other users prefer to have specific room history (e.g. the last ten
+#. messages from #a11y). Therefore, this is a setting in Orca. This string to be
+#. translated is presented when the value of the setting is toggled.
+#: ../src/orca/messages.py:332
 msgid "Do not provide chat room specific message histories."
 msgstr "Ikke vis prateromspesifikk meldingshistorikk."
 
-#: ../src/orca/chat.py:671
+#. Translators: In chat applcations, Orca automatically presents incoming
+#. messages in speech and braille. If a user is in multiple conversations or
+#. channels at the same time, it can be confusing to know what room or channel
+#. a given message came from just from hearing/reading it. This string to be
+#. translated is presented to the user to clarify where an incoming message
+#. came from. The name of the chat room is the string substitution.
+#: ../src/orca/messages.py:299
 #, python-format
 msgid "Message from chat room %s"
 msgstr "Melding fra samtalerom %s"
 
 #. Translators: this is the spoken word for the space character
 #. 
-#: ../src/orca/chnames.py:39 ../src/orca/keynames.py:146
-#: ../src/orca/script_utilities.py:2693
+#: ../src/orca/chnames.py:39 ../src/orca/keynames.py:138
 msgid "space"
 msgstr "mellomrom"
 
@@ -943,7 +1048,7 @@
 #. 
 #. Translators: this is how someone would speak the name of the plus key
 #. 
-#: ../src/orca/chnames.py:91 ../src/orca/keynames.py:306
+#: ../src/orca/chnames.py:91 ../src/orca/keynames.py:298
 msgid "plus"
 msgstr "pluss"
 
@@ -1048,7 +1153,7 @@
 #. Translators: this is how someone would speak the name of the
 #. non-spacing diacritical key for the grave glyph
 #. 
-#: ../src/orca/chnames.py:159 ../src/orca/keynames.py:263
+#: ../src/orca/chnames.py:159 ../src/orca/keynames.py:255
 msgid "grave"
 msgstr "grave"
 
@@ -1075,7 +1180,7 @@
 #. Translators: this is how someone would speak the name of the
 #. non-spacing diacritical key for the tilde glyph
 #. 
-#: ../src/orca/chnames.py:175 ../src/orca/keynames.py:278
+#: ../src/orca/chnames.py:175 ../src/orca/keynames.py:270
 msgid "tilde"
 msgstr "tilde"
 
@@ -1229,7 +1334,7 @@
 #. Translators: this is how someone would speak the name of the
 #. non-spacing diacritical key for the cedilla glyph
 #. 
-#: ../src/orca/chnames.py:276 ../src/orca/keynames.py:293
+#: ../src/orca/chnames.py:276 ../src/orca/keynames.py:285
 msgid "cedilla"
 msgstr "cedille"
 
@@ -2097,11 +2202,9 @@
 msgid "Emacspeak Speech Services"
 msgstr "Emacspeak opplesningstjenester"
 
-#. Translators: this is intended to be a short phrase to
-#. speak and braille to tell the user that no component
-#. has keyboard focus.
-#. 
-#: ../src/orca/event_manager.py:240
+#. Translators: This is intended to be a short phrase to present the fact that no
+#. no accessible component has keyboard focus.
+#: ../src/orca/messages.py:1085
 msgid "No focus"
 msgstr "Ingen fokus"
 
@@ -2131,78 +2234,58 @@
 msgid "Wrapping to Top"
 msgstr "Går rundt til toppen"
 
-#. Translators: this represents the state of a checkbox.
-#. 
-#: ../src/orca/flat_review.py:355 ../src/orca/settings.py:803
+#. Translators: This is a state which applies to a check box.
+#: ../src/orca/object_properties.py:104
 msgid "partially checked"
 msgstr "delvis merket av"
 
-#. Translators: this represents the state of a checkbox.
-#. 
-#: ../src/orca/flat_review.py:359 ../src/orca/settings.py:802
+#. Translators: This is a state which applies to a check box.
+#: ../src/orca/object_properties.py:98
 msgid "checked"
 msgstr "merket av"
 
-#. Translators: this represents the state of a checkbox.
-#. 
-#. Translators: this represents the state of a checkbox.  It is meant
-#. to be spoken to the user.
-#. 
-#: ../src/orca/flat_review.py:363 ../src/orca/settings.py:801
+#. Translators: This is a state which applies to a check box.
+#: ../src/orca/object_properties.py:101
 msgid "not checked"
 msgstr "ikke merket av"
 
-#. Translators: the state of a toggle button.
-#. 
-#: ../src/orca/flat_review.py:370 ../src/orca/settings.py:814
+#. Translators: This is a state which applies to a toggle button.
+#: ../src/orca/object_properties.py:107
 msgid "pressed"
 msgstr "trykket"
 
-#. Translators: the state of a toggle button.
-#. 
-#. Translators: this represents the state of a toggle button.  It is
-#. meant to be spoken to the user.
-#. 
-#: ../src/orca/flat_review.py:374 ../src/orca/settings.py:814
+#. Translators: This is a state which applies to a toggle button.
+#: ../src/orca/object_properties.py:110
 msgid "not pressed"
 msgstr "ikke trykket"
 
-#. Translators: this is in reference to a radio button being
-#. selected or not.
-#. 
-#: ../src/orca/flat_review.py:382 ../src/orca/settings.py:809
+#. Translators: This is a state which applies to a radio button.
+#: ../src/orca/object_properties.py:113
 msgctxt "radiobutton"
 msgid "selected"
 msgstr "valgt"
 
-#. Translators: this is in reference to a radio button being
-#. selected or not.
-#. 
-#. Translators: this represents the state of a radio button.  It is
-#. meant to be spoken to the user.
-#. 
-#: ../src/orca/flat_review.py:387 ../src/orca/settings.py:808
+#. Translators: This is a state which applies to a radio button.
+#: ../src/orca/object_properties.py:116
 msgctxt "radiobutton"
 msgid "not selected"
 msgstr "ikke valgt"
 
-#. Translators: The component orientation is horizontal.
-#. 
-#: ../src/orca/flat_review.py:425
+#. Translators: This is a state which applies to the orientation of widgets
+#. such as sliders and scroll bars.
+#: ../src/orca/object_properties.py:91
 msgid "horizontal"
 msgstr "horisontal"
 
-#. Translators: The component orientation is vertical.
-#. 
-#: ../src/orca/flat_review.py:429
+#. Translators: This is a state which applies to the orientation of widgets
+#. such as sliders and scroll bars.
+#: ../src/orca/object_properties.py:95
 msgid "vertical"
 msgstr "vertikal"
 
-#. Translators: this is the percentage value of a slider,
-#. progress bar or other component that displays a value as
-#. a percentage.
-#. 
-#: ../src/orca/flat_review.py:453
+#. Translators: This message is presented to inform the user of the value of
+#. a slider, progress bar, or other such component.
+#: ../src/orca/messages.py:1679
 #, python-format
 msgid "%d percent."
 msgid_plural "%d percent."
@@ -2213,99 +2296,105 @@
 #. the 'toggle' action. It must be the same
 #. string used in the *.po file for gail.
 #. 
-#: ../src/orca/flat_review.py:1077 ../src/orca/generator.py:474
-#: ../src/orca/generator.py:723 ../src/orca/generator.py:765
-#: ../src/orca/generator.py:811
-#: ../src/orca/scripts/apps/evolution/speech_generator.py:121
-#: ../src/orca/scripts/apps/packagemanager/script.py:640
+#: ../src/orca/flat_review.py:1050 ../src/orca/generator.py:475
+#: ../src/orca/generator.py:741 ../src/orca/generator.py:783
+#: ../src/orca/generator.py:829
+#: ../src/orca/scripts/apps/evolution/speech_generator.py:122
+#: ../src/orca/scripts/apps/packagemanager/script.py:635
 #: ../src/orca/tutorialgenerator.py:558 ../src/orca/tutorialgenerator.py:598
 msgid "toggle"
 msgstr "bryter"
 
-#. Translators: This string is used to present the state of a
-#. locking key, such as Caps Lock. If Caps Lock is "off", then
-#. letters typed will appear in lowercase; if Caps Lock is "on",
-#. they will instead appear in uppercase. This string is also
-#. applied to Num Lock and potentially will be applied to similar
+#. Translators: This string is used to present the state of a locking key, such
+#. as Caps Lock. If Caps Lock is "off", then letters typed will appear in
+#. lowercase; if Caps Lock is "on", they will instead appear in uppercase. This
+#. string is also applied to Num Lock and potentially will be applied to similar
 #. keys in the future.
-#: ../src/orca/input_event.py:348
+#: ../src/orca/messages.py:1037
 msgctxt "locking key state"
 msgid "off"
 msgstr "av"
 
-#. Translators: This string is used to present the state of a
-#. locking key, such as Caps Lock. If Caps Lock is "off", then
-#. letters typed will appear in lowercase; if Caps Lock is "on",
-#. they will instead appear in uppercase. This string is also
-#. applied to Num Lock and potentially will be applied to similar
+#. Translators: This string is used to present the state of a locking key, such
+#. as Caps Lock. If Caps Lock is "off", then letters typed will appear in
+#. lowercase; if Caps Lock is "on", they will instead appear in uppercase. This
+#. string is also applied to Num Lock and potentially will be applied to similar
 #. keys in the future.
-#: ../src/orca/input_event.py:356
+#: ../src/orca/messages.py:1044
 msgctxt "locking key state"
 msgid "on"
 msgstr "på"
 
 #. Translators: this is presented in a GUI to represent the
 #. "caps lock" modifier.
+#. Translators: this is presented in a GUI to represent the
+#. "caps lock" modifier.
 #. 
-#: ../src/orca/keybindings.py:111
+#: ../src/orca/keybindings.py:113 ../src/orca/keybindings.py:118
 msgid "Caps_Lock"
 msgstr "Caps_lock"
 
 #. Translators: this is presented in a GUI to represent the
 #. "right alt" modifier.
 #. 
-#: ../src/orca/keybindings.py:118
+#: ../src/orca/keybindings.py:125
 msgid "Alt_R"
 msgstr "Alt_R"
 
 #. Translators: this is presented in a GUI to represent the
 #. "super" modifier.
 #. 
-#: ../src/orca/keybindings.py:123
+#: ../src/orca/keybindings.py:130
 msgid "Super"
 msgstr "Super"
 
 #. Translators: this is presented in a GUI to represent the
 #. "meta 2" modifier.
 #. 
-#: ../src/orca/keybindings.py:128
+#: ../src/orca/keybindings.py:135
 msgid "Meta2"
 msgstr "Meta2"
 
 #. Translators: this is presented in a GUI to represent the
 #. "left alt" modifier.
 #. 
-#: ../src/orca/keybindings.py:135
+#: ../src/orca/keybindings.py:142
 msgid "Alt_L"
 msgstr "Alt_L"
 
 #. Translators: this is presented in a GUI to represent the
 #. "control" modifier.
 #. 
-#: ../src/orca/keybindings.py:140
+#: ../src/orca/keybindings.py:147
 msgid "Ctrl"
 msgstr "Ctrl"
 
 #. Translators: this is presented in a GUI to represent the
 #. "shift " modifier.
 #. 
-#: ../src/orca/keybindings.py:145
+#: ../src/orca/keybindings.py:152
 msgid "Shift"
 msgstr "Shift"
 
+#. Translators: Orca's keybindings support double and triple "clicks" or key
+#. presses, similar to using a mouse. This string appears in Orca's preferences
+#. dialog after a keybinding which requires a double click.
 #. Translators: Orca keybindings support double
 #. and triple "clicks" or key presses, similar to
 #. using a mouse.
 #. 
-#: ../src/orca/keybindings.py:157
+#: ../src/orca/guilabels.py:124 ../src/orca/keybindings.py:164
 msgid "double click"
 msgstr "dobbeltklikk"
 
+#. Translators: Orca's keybindings support double and triple "clicks" or key
+#. presses, similar to using a mouse. This string appears in Orca's preferences
+#. dialog after a keybinding which requires a triple click.
 #. Translators: Orca keybindings support double
 #. and triple "clicks" or key presses, similar to
 #. using a mouse.
 #. 
-#: ../src/orca/keybindings.py:163
+#: ../src/orca/guilabels.py:129 ../src/orca/keybindings.py:170
 msgid "triple click"
 msgstr "trippelklikk"
 
@@ -2434,280 +2523,313 @@
 
 #. Translators: this is how someone would speak the name of the backspace key
 #. 
-#: ../src/orca/keynames.py:150
+#: ../src/orca/keynames.py:142
 msgid "backspace"
 msgstr "slett"
 
 #. Translators: this is how someone would speak the name of the return key
 #. 
-#: ../src/orca/keynames.py:154
+#: ../src/orca/keynames.py:146
 msgid "return"
 msgstr "retur"
 
 #. Translators: this is how someone would speak the name of the enter key
 #. 
-#: ../src/orca/keynames.py:158
+#: ../src/orca/keynames.py:150
 msgid "enter"
 msgstr "linjeskift"
 
 #. Translators: this is how someone would speak the name of the up arrow key
 #. 
-#: ../src/orca/keynames.py:162 ../src/orca/keynames.py:166
+#: ../src/orca/keynames.py:154 ../src/orca/keynames.py:158
 msgid "up"
 msgstr "opp"
 
 #. Translators: this is how someone would speak the name of the down arrow key
 #. 
-#: ../src/orca/keynames.py:170 ../src/orca/keynames.py:174
+#: ../src/orca/keynames.py:162 ../src/orca/keynames.py:166
 msgid "down"
 msgstr "ned"
 
 #. Translators: this is how someone would speak the name of the left arrow key
 #. 
-#: ../src/orca/keynames.py:178 ../src/orca/keynames.py:182
+#: ../src/orca/keynames.py:170 ../src/orca/keynames.py:174
 msgid "left"
 msgstr "venstre"
 
 #. Translators: this is how someone would speak the name of the right arrow key
 #. 
-#: ../src/orca/keynames.py:186 ../src/orca/keynames.py:190
+#: ../src/orca/keynames.py:178 ../src/orca/keynames.py:182
 msgid "right"
 msgstr "høyre"
 
 #. Translators: this is how someone would speak the name of the left super key
 #. 
-#: ../src/orca/keynames.py:194
+#: ../src/orca/keynames.py:186
 msgid "left super"
 msgstr "venstre super"
 
 #. Translators: this is how someone would speak the name of the right super key
 #. 
-#: ../src/orca/keynames.py:198
+#: ../src/orca/keynames.py:190
 msgid "right super"
 msgstr "høyre super"
 
 #. Translators: this is how someone would speak the name of the menu key
 #. 
-#: ../src/orca/keynames.py:202
+#: ../src/orca/keynames.py:194
 msgid "menu"
 msgstr "meny"
 
 #. Translators: this is how someone would speak the name of the ISO shift key
 #. 
-#: ../src/orca/keynames.py:206
+#: ../src/orca/keynames.py:198
 msgid "ISO level 3 shift"
 msgstr "ISO nivå 3 shift"
 
 #. Translators: this is how someone would speak the name of the help key
 #. 
-#: ../src/orca/keynames.py:210
+#: ../src/orca/keynames.py:202
 msgid "help"
 msgstr "hjelp"
 
 #. Translators: this is how someone would speak the name of the multi key
 #. 
-#: ../src/orca/keynames.py:214
+#: ../src/orca/keynames.py:206
 msgid "multi"
 msgstr "multi"
 
 #. Translators: this is how someone would speak the name of the mode switch key
 #. 
-#: ../src/orca/keynames.py:218
+#: ../src/orca/keynames.py:210
 msgid "mode switch"
 msgstr "bytte av modus"
 
 #. Translators: this is how someone would speak the name of the escape key
 #. 
-#: ../src/orca/keynames.py:222
+#: ../src/orca/keynames.py:214
 msgid "escape"
 msgstr "escape"
 
 #. Translators: this is how someone would speak the name of the insert key
 #. 
-#: ../src/orca/keynames.py:226 ../src/orca/keynames.py:230
+#: ../src/orca/keynames.py:218 ../src/orca/keynames.py:222
 msgid "insert"
 msgstr "sett inn"
 
 #. Translators: this is how someone would speak the name of the delete key
 #. 
-#: ../src/orca/keynames.py:234 ../src/orca/keynames.py:238
+#: ../src/orca/keynames.py:226 ../src/orca/keynames.py:230
 msgid "delete"
 msgstr "slett"
 
 #. Translators: this is how someone would speak the name of the home key
 #. 
-#: ../src/orca/keynames.py:242 ../src/orca/keynames.py:246
+#: ../src/orca/keynames.py:234 ../src/orca/keynames.py:238
 msgid "home"
 msgstr "hjem"
 
 #. Translators: this is how someone would speak the name of the end key
 #. 
-#: ../src/orca/keynames.py:250 ../src/orca/keynames.py:254
+#: ../src/orca/keynames.py:242 ../src/orca/keynames.py:246
 msgid "end"
 msgstr "slutt"
 
 #. Translators: this is how someone would speak the name of the begin key
 #. 
-#: ../src/orca/keynames.py:258
+#: ../src/orca/keynames.py:250
 msgid "begin"
 msgstr "start"
 
 #. Translators: this is how someone would speak the name of the
 #. non-spacing diacritical key for the acute glyph
 #. 
-#: ../src/orca/keynames.py:268
+#: ../src/orca/keynames.py:260
 msgid "acute"
 msgstr "akutt"
 
 #. Translators: this is how someone would speak the name of the
 #. non-spacing diacritical key for the circumflex glyph
 #. 
-#: ../src/orca/keynames.py:273
+#: ../src/orca/keynames.py:265
 msgid "circumflex"
 msgstr "cirkumfleks"
 
 #. Translators: this is how someone would speak the name of the
 #. non-spacing diacritical key for the diaeresis glyph
 #. 
-#: ../src/orca/keynames.py:283
+#: ../src/orca/keynames.py:275
 msgid "diaeresis"
 msgstr "diaeresis"
 
 #. Translators: this is how someone would speak the name of the
 #. non-spacing diacritical key for the ring glyph
 #. 
-#: ../src/orca/keynames.py:288
+#: ../src/orca/keynames.py:280
 msgid "ring"
 msgstr "ring"
 
 #. Translators: this is how someone would speak the name of the
 #. non-spacing diacritical key for the stroke glyph
 #. 
-#: ../src/orca/keynames.py:298
+#: ../src/orca/keynames.py:290
 msgid "stroke"
 msgstr "skråstrek"
 
-#. Translators:  sets the live region politeness level to polite
-#. 
-#: ../src/orca/liveregions.py:266
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. The "politeness" level is an indication of when the user wishes to be notified
+#. about a change to live region content. Examples include: never ("off"), when
+#. idle ("polite"), and when there is a change ("assertive"). Orca has several
+#. features to facilitate accessing live regions. This message is presented to
+#. inform the user that Orca's live region's "politeness" level has changed for
+#. the current live region.
+#: ../src/orca/messages.py:974
 msgid "setting live region to polite"
 msgstr "setter levende region til høflig"
 
-#. Translators:  sets the live region politeness level to assertive
-#. 
-#: ../src/orca/liveregions.py:271
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. The "politeness" level is an indication of when the user wishes to be notified
+#. about a change to live region content. Examples include: never ("off"), when
+#. idle ("polite"), and when there is a change ("assertive"). Orca has several
+#. features to facilitate accessing live regions. This message is presented to
+#. inform the user that Orca's live region's "politeness" level has changed for
+#. the current live region.
+#: ../src/orca/messages.py:954
 msgid "setting live region to assertive"
 msgstr "setter levende region til påståelig"
 
-#. Translators:  sets the live region politeness level to rude
-#. 
-#: ../src/orca/liveregions.py:276
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. The "politeness" level is an indication of when the user wishes to be notified
+#. about a change to live region content. Examples include: never ("off"), when
+#. idle ("polite"), and when there is a change ("assertive"). Orca has several
+#. features to facilitate accessing live regions. This message is presented to
+#. inform the user that Orca's live region's "politeness" level has changed for
+#. the current live region.
+#: ../src/orca/messages.py:984
 msgid "setting live region to rude"
 msgstr "setter levende region til uhøflig"
 
-#. Translators:  sets the live region politeness level to off
-#. 
-#: ../src/orca/liveregions.py:281
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. The "politeness" level is an indication of when the user wishes to be notified
+#. about a change to live region content. Examples include: never ("off"), when
+#. idle ("polite"), and when there is a change ("assertive"). Orca has several
+#. features to facilitate accessing live regions. This message is presented to
+#. inform the user that Orca's live region's "politeness" level has changed for
+#. the current live region.
+#: ../src/orca/messages.py:964
 msgid "setting live region to off"
 msgstr "setter levende region til av"
 
-#. Tranlators: this tells the user that a cached message
-#. is not available.
-#. 
-#: ../src/orca/liveregions.py:300
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. Orca has several features to facilitate accessing live regions. This message
+#. is presented to inform the user that a cached message is not available for the
+#. the current live region.
+#: ../src/orca/messages.py:1013
 msgid "no live message saved"
 msgstr "ingen levende melding lagret"
 
-#. Translators: This lets the user know that all live regions
-#. have been turned off.
-#: ../src/orca/liveregions.py:317
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. The "politeness" level is an indication of when the user wishes to be notified
+#. about a change to live region content. Examples include: never ("off"), when
+#. idle ("polite"), and when there is a change ("assertive"). Orca has several
+#. features to facilitate accessing live regions. This message is presented to
+#. inform the user that Orca's live region's "politeness" level has changed to
+#. "off" for all of the live regions.
+#: ../src/orca/messages.py:925
 msgid "All live regions set to off"
 msgstr "Alle levende regioner satt til av"
 
-#: ../src/orca/liveregions.py:345
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. The "politeness" level is an indication of when the user wishes to be notified
+#. about a change to live region content. Examples include: never ("off"), when
+#. idle ("polite"), and when there is a change ("assertive"). Orca has several
+#. features to facilitate accessing live regions. This message is presented to
+#. inform the user that Orca's live region's "politeness" level for all live
+#. regions has been restored to their original values.
+#: ../src/orca/messages.py:935
 msgid "live regions politeness levels restored"
 msgstr "nivå for høflighet for levende regioner gjenopprettet"
 
-#. Translators: output the politeness level
-#. 
-#: ../src/orca/liveregions.py:387
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. The "politeness" level is an indication of when the user wishes to be notified
+#. about a change to live region content. Examples include: never ("off"), when
+#. idle ("polite"), and when there is a change ("assertive"). Orca has several
+#. features to facilitate accessing live regions. This message is presented to
+#. inform the user of the "politeness" level for the current live region.
+#: ../src/orca/messages.py:944
 #, python-format
 msgid "politeness level %s"
 msgstr "høflighetsnivå %s"
 
-#. Translators: Orca can present the last notification message
-#. to the user when the user presses a shortcut key.
-#. 
-#: ../src/orca/notification_messages.py:81
+#. Translators: this is a command which causes Orca to present the last received
+#. notification message.
+#: ../src/orca/cmdnames.py:605
 msgid "Present last notification message."
 msgstr "Vis siste varslingsmelding."
 
-#. Translators: Orca can present the previous notification message
-#. to the user when the user presses a shortcut key.
-#. 
-#: ../src/orca/notification_messages.py:89
+#. Translators: this is a command which causes Orca to present the previous
+#. notification message.
+#: ../src/orca/cmdnames.py:613
 msgid "Present previous notification message."
 msgstr "Vis forrige varslingsmelding."
 
-#. Translators: Orca can enable the notification messages
-#. list mode when the user presses a shortcut key.
-#. 
-#: ../src/orca/notification_messages.py:97
+#. Translators: this is a command which causes Orca to present a list of all the
+#. notification messages received.
+#: ../src/orca/cmdnames.py:609
 msgid "Present notification messages list"
 msgstr "Vis liste med varslingsmeldinger"
 
-#. Translators: This is a brief message presented to the user
-#. the list of notifications is empty.
-#. 
-#: ../src/orca/notification_messages.py:125
+#. Translators: This message is presented to the user when the notifications list
+#. is empty.
+#: ../src/orca/messages.py:1230
 msgid "No notification messages"
 msgstr "Ingen varslingsmeldinger"
 
-#. Translators: This is a brief message presented to the user when
-#. when the top of a list of notifications is reached.
-#. 
-#: ../src/orca/notification_messages.py:156
+#. Translators: This is a brief message presented to the user when the top of the
+#. list of notifications is reached.
+#: ../src/orca/messages.py:1215
 msgctxt "notification"
 msgid "Top"
 msgstr "Topp"
 
-#. Translators: This is a brief message presented to the user when
-#. when the bottom of a list of notifications is reached.
-#. 
-#: ../src/orca/notification_messages.py:163
+#. Translators: This is a brief message presented to the user when the bottom of
+#. the list of notifications is reached.
+#: ../src/orca/messages.py:1207
 msgctxt "notification"
 msgid "Bottom"
 msgstr "Bunn"
 
-#. Translators: Orca has a "List notification messages Mode" that allows
-#. the user to list the latest notification messages received.
-#. Escape exits this mode.
-#. This string is the prompt which will be presented to the user
-#. in both speech and braille upon exiting this mode.
-#. 
-#: ../src/orca/notification_messages.py:186
+#. Translators: This message is presented to the user to confirm the list of
+#. notifications mode is being exited.
+#: ../src/orca/messages.py:1211
 msgid "Exiting list notification messages mode."
 msgstr "Går ut av modus for å liste varslingsmeldinger."
 
-#. Translators: This message inform to the user the number of
-#. messages in the list.
-#: ../src/orca/notification_messages.py:240
+#. Translators: This message is presented to inform the user of the number of
+#. messages in a list.
+#: ../src/orca/messages.py:1674
 #, python-format
 msgid "%d message.\n"
 msgid_plural "%d messages.\n"
 msgstr[0] "%d melding.\n"
 msgstr[1] "%d meldinger.\n"
 
-#. Translators: This is a help message.
-#: ../src/orca/notification_messages.py:242
+#. Translators: This is a tutorial message for the notification list mode.
+#: ../src/orca/messages.py:1218
 msgid "Press h for help.\n"
 msgstr "Trykk h for hjelp.\n"
 
-#. Translators: The following string instructs the user how to navigate
-#. amongst the list of commands presented in list notification
-#. messages mode as well as how to exit the list.
-#. 
-#: ../src/orca/notification_messages.py:249
+#. Translators: The following string instructs the user how to navigate within
+#. the list notifications mode.
+#: ../src/orca/messages.py:1223
 msgid ""
 "Use Up, Down, Home or End to navigate in the list.\n"
 "Press Escape to exit.\n"
@@ -2734,20 +2856,31 @@
 #. 
 #. Finally, this expression should match what you've chosen for the
 #. translation of the "Enter y or n:" strings for this file.
-#. 
-#: ../src/orca/orca_console_prefs.py:59
+#: ../src/orca/messages.py:357
 msgid "^[Yy1]"
 msgstr "^[Jj1]"
 
-#: ../src/orca/orca_console_prefs.py:60
+#. Translators: this is a regular expression that is intended to match
+#. a positive 'yes' response from a user at the command line.  The expression
+#. as given means - does it begin with (that's the '^' character) any of
+#. the characters in the '[' ']'?  In this case, we've chosen 'Y', 'y', and
+#. '1' to mean positive answers, so any string beginning with 'Y', 'y', or
+#. '1' will match.  For an example of translation, assume your language has
+#. the words 'posolutely' and 'absitively' as common words that mean the
+#. equivalent of 'yes'.  You might make the expression match the upper and
+#. lower case forms: "^[aApP1]".  If the 'yes' and 'no' words for your
+#. locale begin with the same character, the regular expression should be
+#. modified to use words.  For example: "^(yes|Yes)" (note the change from
+#. using '[' and ']' to '(' and ')').
+#. 
+#. Finally, this expression should match what you've chosen for the
+#. translation of the "Enter y or n:" strings for this file.
+#: ../src/orca/messages.py:374
 msgid "^[Nn0]"
 msgstr "^[Nn0]"
 
-#. Translators: this means speech synthesis (i.e., the machine
-#. speaks to you from its speakers) is not installed or working.
-#. 
-#: ../src/orca/orca_console_prefs.py:131 ../src/orca/orca_console_prefs.py:140
-#: ../src/orca/orca_console_prefs.py:158
+#. Translators: This message means speech synthesis is not installed or working.
+#: ../src/orca/messages.py:1428
 msgid "Speech is unavailable."
 msgstr "Opplesning er utilgjengelig."
 
@@ -2755,152 +2888,131 @@
 msgid "Welcome to Orca setup."
 msgstr "Velkommen til oppsett av Orca."
 
-#. Translators: the speech system represents what general
-#. speech wrapper is going to be used.  Speech-dispatcher
-#. is an example of a speech system. It provides wrappers
-#. around specific speech servers (engines).
-#. 
-#: ../src/orca/orca_console_prefs.py:166
+#. Translators: The speech system represents what general speech wrapper is going
+#. to be used. Speech-dispatcher is an example of a speech system. It provides
+#. wrappers around specific speech servers (engines). This message is part of
+#. Orca's console-based setup.
+#: ../src/orca/messages.py:449
 msgid "Select desired speech system:"
 msgstr "Velg ditt opplesningssystem:"
 
-#. Translators: this is prompting for a numerical choice.
-#. 
-#: ../src/orca/orca_console_prefs.py:179 ../src/orca/orca_console_prefs.py:220
-#: ../src/orca/orca_console_prefs.py:272 ../src/orca/orca_console_prefs.py:460
+#. Translators: This is prompting for a numerical choice to be typed at Orca's
+#. console-based setup.
+#: ../src/orca/messages.py:414
 msgid "Enter choice: "
 msgstr "Skriv inn ditt valg: "
 
-#. Translators: this is letting the user they input an
-#. invalid integer value on the command line and is
-#. also requesting they enter a valid integer value.
-#. 
-#: ../src/orca/orca_console_prefs.py:186 ../src/orca/orca_console_prefs.py:223
-#: ../src/orca/orca_console_prefs.py:278 ../src/orca/orca_console_prefs.py:475
-#: ../src/orca/orca_console_prefs.py:477
+#. Translators: This is letting the user they input an invalid integer value on
+#. the command line and is also requesting they enter a valid integer value.
+#. This message is part of Orca's console-based setup.
+#: ../src/orca/messages.py:419
 msgid "Please enter a valid number."
 msgstr "Vennligst oppgi et gyldig nummer."
 
-#. Translators: this means speech synthesis will not be used.
-#. 
-#: ../src/orca/orca_console_prefs.py:190 ../src/orca/orca_console_prefs.py:201
-#: ../src/orca/orca_console_prefs.py:227 ../src/orca/orca_console_prefs.py:243
-#: ../src/orca/orca_console_prefs.py:282
+#. Translators: This message indicates that speech synthesis will not be used.
+#. It is part of Orca's console-based setup.
+#: ../src/orca/messages.py:467
 msgid "Speech will not be used.\n"
 msgstr "Opplesning vil ikke bli brukt.\n"
 
-#. Translators: this means no working speech servers (speech
-#. synthesis engines) can be found.
-#. 
-#: ../src/orca/orca_console_prefs.py:200
+#. Translators: This message indicates that no working speech servers (speech
+#. synthesis engines) can be found. It is part of Orca's console-based setup.
+#: ../src/orca/messages.py:458
 msgid "No servers available.\n"
 msgstr "Ingen tjenere er tilgjengelige.\n"
 
-#. Translators: this is prompting for a numerical choice from a list
-#. of available speech synthesis engines.
-#. 
-#: ../src/orca/orca_console_prefs.py:207
+#. Translators: This is prompting the user for a numerical choice from a list of
+#. available speech synthesis engines. It is part of Orca's console-based setup.
+#: ../src/orca/messages.py:443
 msgid "Select desired speech server."
 msgstr "Velg den foretrukkede opplesningstjeneren."
 
-#. Translators: this means the speech server (speech synthesis
-#. engine) is not working properly and no voices (e.g., male,
-#. female, child) are available.
-#. 
-#: ../src/orca/orca_console_prefs.py:239
+#. Translators: This message indicates that the speech server (speech synthesis
+#. engine) is not working properly and no voices (e.g., male, female, child) are
+#. available. This message is part of Orca's console-based setup.
+#: ../src/orca/messages.py:463
 msgid "No voices available.\n"
 msgstr "Ingen stemmer er tilgjengelige.\n"
 
-#. Translators: this is prompting for a numerical value from a
-#. list of choices of speech synthesis voices (e.g., male,
-#. female, child).
-#. 
-#: ../src/orca/orca_console_prefs.py:250
+#. Translators: This is prompting for a numerical value from a list of choices of
+#. speech synthesis voices (e.g., male, female, child). This message is part of
+#. Orca's console-based setup.
+#: ../src/orca/messages.py:454
 msgid "Select desired voice:"
 msgstr "Velg ønsket stemme:"
 
-#. Translators: the word echo feature of Orca will speak the
-#. word prior to the caret when the user types a word
-#. delimiter.
-#. 
-#: ../src/orca/orca_console_prefs.py:321
+#. Translators: The word echo feature of Orca will speak the word prior to the
+#. caret when the user types a word delimiter. This message is presented during
+#. Orca's console-based setup.
+#: ../src/orca/messages.py:410
 msgid "Enable echo by word?  Enter y or n: "
 msgstr "Slå på ekko per ord?  Skriv inn j eller n: "
 
-#: ../src/orca/orca_console_prefs.py:331 ../src/orca/orca_console_prefs.py:350
-#: ../src/orca/orca_console_prefs.py:376 ../src/orca/orca_console_prefs.py:393
-#: ../src/orca/orca_console_prefs.py:410 ../src/orca/orca_console_prefs.py:428
-#: ../src/orca/orca_console_prefs.py:509 ../src/orca/orca_console_prefs.py:528
+#. Translators: This is letting the user they input an invalid yes/no value on
+#. the command line and is also requesting they enter a valid one. This message
+#. is part of Orca's console-based setup.
+#: ../src/orca/messages.py:424
 msgid "Please enter y or n."
 msgstr "Skriv inn j eller n."
 
-#. Translators: if key echo is enabled, Orca will speak the
-#. name of a key as the user types on the keyboard.  If the
-#. user wants key echo, they will then be prompted for which
+#. Translators: If key echo is enabled, Orca will speak the name of a key as the
+#. user types on the keyboard. This message is presented during Orca's console-
+#. based setup. If the user wants key echo, they will then be prompted for which
 #. classes of keys they want echoed.
-#. 
-#: ../src/orca/orca_console_prefs.py:340
+#: ../src/orca/messages.py:385
 msgid "Enable key echo?  Enter y or n: "
 msgstr "Slå på tasteekko?  Skriv inn j eller n: "
 
-#. Translators: this is in reference to key echo for
-#. normal text entry keys.
-#. 
-#: ../src/orca/orca_console_prefs.py:366
+#. Translators: This is in reference to key echo for normal text entry keys and
+#. is part of Orca's console-based setup.
+#: ../src/orca/messages.py:390
 msgid "Enable alphanumeric and punctuation keys?  Enter y or n: "
 msgstr "Slå på alfanumeriske og tegnsettingstaster?  Skriv inn j eller n: "
 
-#. Translators: this is in reference to key echo for
-#. CTRL, ALT, Shift, Insert, and "Fn" on laptops.
-#. 
-#: ../src/orca/orca_console_prefs.py:383
+#. Translators: This is in reference to key echo for keys such as CTRL, ALT,
+#. Shift, Insert, etc. It is part of Orca's console-based setup.
+#: ../src/orca/messages.py:395
 msgid "Enable modifier keys?  Enter y or n: "
 msgstr "Slå på modifiseringstaster?  Skriv inn j eller n: "
 
-#. Translators: this is in reference to key echo for
-#. the keys at the top of the keyboard.
-#. 
-#: ../src/orca/orca_console_prefs.py:400
+#. Translators: This is in reference to key echo for function keys (F1-F12).
+#. It is part of Orca's console-based setup.
+#: ../src/orca/messages.py:400
 msgid "Enable function keys?  Enter y or n: "
 msgstr "Slå på funksjonstaster?  Skriv inn j eller n: "
 
-#. Translators: this is in reference to key echo for
-#. space, enter, escape, tab, backspace, delete, arrow
-#. keys, page up, page down, etc.
-#. 
-#: ../src/orca/orca_console_prefs.py:418
+#. Translators: This is in reference to key echo for keys that perform actions
+#. such as enter, escape, tab, backspace, delete, arrow keys, page up/down, etc.
+#. It is part of Orca's console-based setup.
+#: ../src/orca/messages.py:405
 msgid "Enable action keys?  Enter y or n: "
 msgstr "Slå på aksjonstaster?  Skriv inn j eller n: "
 
-#. Translators: we allow the user to choose between the desktop (i.e.,
-#. has a numeric keypad) and laptop (i.e., small and compact) keyboard
-#. layouts for how they might control Orca.
-#. 
-#: ../src/orca/orca_console_prefs.py:434
+#. Translators: Orca has two keyboard layouts which impact what keybindings are
+#. used to perform Orca commands. The two layouts are "Laptop" and "Desktop".
+#. This message is part of Orca's console-based setup.
+#: ../src/orca/messages.py:429
 msgid "Select desired keyboard layout."
 msgstr "Velg ønsket tastaturutforming."
 
-#. Translators: we allow the user to choose between the desktop (i.e.,
-#. has a numeric keypad) and laptop (i.e., small and compact) keyboard
-#. layouts for how they might control Orca.
-#. 
-#: ../src/orca/orca_console_prefs.py:446
+#. Translators: Orca has two keyboard layouts which impact what keybindings are
+#. used to perform Orca commands. The two layouts are "Laptop" and "Desktop".
+#. This message is part of Orca's console-based setup.
+#: ../src/orca/messages.py:434
 msgid "1. Desktop"
 msgstr "1. Skrivebord"
 
-#. Translators: we allow the user to choose between the desktop (i.e.,
-#. has a numeric keypad) and laptop (i.e., small and compact) keyboard
-#. layouts for how they might control Orca.
-#. 
-#: ../src/orca/orca_console_prefs.py:453
+#. Translators: Orca has two keyboard layouts which impact what keybindings are
+#. used to perform Orca commands. The two layouts are "Laptop" and "Desktop".
+#. This message is part of Orca's console-based setup.
+#: ../src/orca/messages.py:439
 msgid "2. Laptop"
 msgstr "2. Bærbar"
 
-#. Translators: this is prompting for whether the user wants to
-#. use a refreshable braille display (an external hardware
-#. device) or not.
-#. 
-#: ../src/orca/orca_console_prefs.py:499
+#. Translators: This is prompting for whether the user wants to use a refreshable
+#. braille display (an external hardware device) or not. It is part of Orca's
+#. console-based setup.
+#: ../src/orca/messages.py:379
 msgid "Enable Braille?  Enter y or n: "
 msgstr "Slå på braille?  Skriv inn j eller n: "
 
@@ -2913,11 +3025,11 @@
 msgid "Enable Braille Monitor?  Enter y or n: "
 msgstr "Slå på brailleskjerm?  Skriv inn j eller n: "
 
-#: ../src/orca/orca_gui_prefs.py:407
+#: ../src/orca/orca_gui_prefs.py:408
 msgid "Accessibility support for GNOME has just been enabled."
 msgstr "Tilgjengelighetsstøtte for GNOME har akkurat blitt slått på."
 
-#: ../src/orca/orca_gui_prefs.py:409
+#: ../src/orca/orca_gui_prefs.py:410
 msgid "You need to log out and log back in for the change to take effect."
 msgstr ""
 "Du er nødt til å logge ut og logge inn igjen for at endringen skal ha effekt."
@@ -2930,7 +3042,9 @@
 msgid "Setup complete. Logging out now."
 msgstr "Oppsett fullført. Logger ut nå."
 
-#: ../src/orca/orca_console_prefs.py:537
+#. Translators: This message is presented at the completion of Orca's console-
+#. based setup.
+#: ../src/orca/messages.py:475
 msgid "Setup complete.  Press Return to continue."
 msgstr "Oppsettet er ferdig.  Trykk linjeskift for å fortsette."
 
@@ -2944,9 +3058,9 @@
 #. is using.  We hate keying off stuff like this, but we're forced
 #. to do so in this case.
 #. 
-#: ../src/orca/orca-find.ui.h:1 ../src/orca/scripts/apps/gedit/script.py:319
-#: ../src/orca/scripts/apps/gedit/script.py:321
-#: ../src/orca/scripts/apps/gnome-search-tool/script.py:163
+#: ../src/orca/orca-find.ui.h:1 ../src/orca/scripts/apps/gedit/script.py:200
+#: ../src/orca/scripts/apps/gedit/script.py:202
+#: ../src/orca/scripts/apps/gnome-search-tool/script.py:160
 msgid "Find"
 msgstr "Finn"
 
@@ -2958,23 +3072,27 @@
 msgid "Close"
 msgstr "Lukk"
 
-#: ../src/orca/orca-find.ui.h:4
+#: ../src/orca/orca-find.ui.h:7
 msgid "_Search for:"
 msgstr "_Søk etter:"
 
-#: ../src/orca/orca-find.ui.h:5
+#: ../src/orca/orca-find.ui.h:8
 msgid "Search for:"
 msgstr "Søk etter:"
 
-#: ../src/orca/orca-find.ui.h:6 ../src/orca/orca_gui_find.py:134
+#. Translators: Orca has a "find" feature which allows the user to search the
+#. active application for on screen text and widgets. This label is associated
+#. with the setting to begin the search from the current location rather than
+#. from the top of the screen.
+#: ../src/orca/guilabels.py:169 ../src/orca/orca-find.ui.h:9
 msgid "C_urrent location"
 msgstr "N_åværende lokasjon"
 
-#: ../src/orca/orca-find.ui.h:7
+#: ../src/orca/orca-find.ui.h:10
 msgid "_Top of window"
 msgstr "_Toppen av vinduet"
 
-#: ../src/orca/orca-find.ui.h:8
+#: ../src/orca/orca-find.ui.h:11
 msgid "Top of window"
 msgstr "Toppen av vinduet"
 
@@ -2982,15 +3100,15 @@
 msgid "<b>Start from:</b>"
 msgstr "<b>Start fra:</b>"
 
-#: ../src/orca/orca-find.ui.h:9
+#: ../src/orca/orca-find.ui.h:12
 msgid "Start from:"
 msgstr "Start fra:"
 
-#: ../src/orca/orca-find.ui.h:10
+#: ../src/orca/orca-find.ui.h:13
 msgid "_Wrap around"
 msgstr "_Bryt"
 
-#: ../src/orca/orca-find.ui.h:11
+#: ../src/orca/orca-find.ui.h:14
 msgid "Search _backwards"
 msgstr "Søk _bakover"
 
@@ -2998,11 +3116,11 @@
 msgid "<b>Search direction:</b>"
 msgstr ""
 
-#: ../src/orca/orca-find.ui.h:13
+#: ../src/orca/orca-find.ui.h:16
 msgid "_Match case"
 msgstr "_Treff på små/store bokstaver"
 
-#: ../src/orca/orca-find.ui.h:14
+#: ../src/orca/orca-find.ui.h:17
 msgid "Match _entire word only"
 msgstr "Treff kun på h_ele ord"
 
@@ -3100,22 +3218,17 @@
 "Orca. Hvis dette ikke er tilfelle, kan du skrive til Free Software "
 "Foundation, Inc. Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#. DESCRIP
-#. 
-#. Translators: Function is a table column header where the
-#. cells in the column are a sentence that briefly describes
-#. what action Orca will take when the user invokes an Orca-specific
-#. keyboard command.
-#. 
-#: ../src/orca/orca_gui_prefs.py:234
+#. Translators: Function is a table column header where the cells in the column
+#. are a sentence that briefly describes what action Orca will take if and when
+#. the user invokes that keyboard command.
+#: ../src/orca/guilabels.py:195
 msgid "Function"
 msgstr "Funksjon"
 
-#. Translators: Key Binding is a table column header where
-#. the cells in the column represent keyboard combinations
-#. the user can press to invoke Orca commands.
-#. 
-#: ../src/orca/orca_gui_prefs.py:312
+#. Translators: Key Binding is a table column header where the cells in the
+#. column represent keyboard combinations the user can press to invoke Orca
+#. commands.
+#: ../src/orca/guilabels.py:200
 msgid "Key Binding"
 msgstr "Tastaturbinding"
 
@@ -3123,202 +3236,164 @@
 #. cells represent whether a key binding has been modified
 #. from the default key binding.
 #. 
-#: ../src/orca/orca_gui_prefs.py:333
+#: ../src/orca/orca_gui_prefs.py:334
 msgid "Modified"
 msgstr "Endret"
 
-#. Translators: This refers to the default/typical voice used
-#. by Orca when presenting the content of the screen and other
-#. messages.
-#. 
-#: ../src/orca/orca_gui_prefs.py:676
+#. Translators: This refers to the voice used by Orca when presenting the content
+#. of the screen and other messages.
+#: ../src/orca/guilabels.py:602
 msgctxt "VoiceType"
 msgid "Default"
 msgstr "Forvalgt"
 
-#. Translators: This refers to the voice used by Orca when
-#. presenting one or more characters which is in uppercase.
-#. 
-#: ../src/orca/orca_gui_prefs.py:680
+#. Translators: This refers to the voice used by Orca when presenting one or more
+#. characters which is written in uppercase.
+#: ../src/orca/guilabels.py:618
 msgctxt "VoiceType"
 msgid "Uppercase"
 msgstr "Store bokstaver"
 
-#. Translators: This refers to the voice used by Orca when
-#. presenting one or more characters which is part of a
-#. hyperlink.
-#. 
-#: ../src/orca/orca_gui_prefs.py:685
+#. Translators: This refers to the voice used by Orca when presenting one or more
+#. characters which is part of a hyperlink.
+#: ../src/orca/guilabels.py:606
 msgctxt "VoiceType"
 msgid "Hyperlink"
 msgstr "Hyperlenke"
 
-#. Translators: This refers to the voice used by Orca when
-#. presenting information which is not displayed on the screen
-#. as text, but is still being communicated by the system in
-#. some visual fashion. For instance, Orca says "misspelled"
-#. to indicate the presence of the red squiggly line found
-#. under a spelling error; Orca might say "3 of 6" when a
-#. user Tabs into a list of six items and the third item is
-#. selected. And so on.
-#. 
-#: ../src/orca/orca_gui_prefs.py:695
+#. Translators: This refers to the voice used by Orca when presenting information
+#. which is not displayed on the screen as text, but is still being communicated
+#. by the system in some visual fashion. For instance, Orca says "misspelled" to
+#. indicate the presence of the red squiggly line found under a spelling error;
+#. Orca might say "3 of 6" when a user Tabs into a list of six items and the
+#. third item is selected. And so on.
+#: ../src/orca/guilabels.py:614
 msgctxt "VoiceType"
 msgid "System"
 msgstr "System"
 
-#. Attribute Name column (NAME).
-#. 
-#. Translators: Attribute here refers to text attributes such
-#. as bold, underline, family-name, etc.
-#. 
-#: ../src/orca/orca_gui_prefs.py:1133
+#. Translators: This is a table column header. "Attribute" here refers to text
+#. attributes such as bold, underline, family-name, etc.
+#: ../src/orca/guilabels.py:657
 msgid "Attribute Name"
 msgstr "Navn på attributt"
 
-#. Attribute Speak column (IS_SPOKEN).
-#. 
-#. Translators: the "Speak" column consists of a single checkbox
-#. for each text attribute.  If the checkbox is checked, Orca
-#. will speak that attribute, if it is present, when the user
-#. presses Orca_Modifier+F.
-#. 
-#: ../src/orca/orca_gui_prefs.py:1148
+#. Translators: This is a table column header. The "Speak" column consists of a
+#. single checkbox. If the checkbox is checked, Orca will speak the associated
+#. item or attribute (e.g. saying "Bold" as part of the information presented
+#. when the user gives the Orca command to obtain the format and font details of
+#. the current text).
+#: ../src/orca/guilabels.py:258
 msgid "Speak"
 msgstr "Snakk"
 
-#. Attribute Mark in Braille column (IS_BRAILLED).
-#. 
-#. Translators: The "Mark in braille" column consists of a single
-#. checkbox for each text attribute.  If the checkbox is checked,
-#. Orca will "underline" that attribute, if it is present, on
-#. the refreshable braille display.
-#. 
-#: ../src/orca/orca_gui_prefs.py:1166
+#. Translators: This is a table column header. This column consists of a single
+#. checkbox. If the checkbox is checked, Orca will indicate the associated item
+#. or attribute by "marking" it in braille. "Marking" is not the same as writing
+#. out the word; instead marking refers to adding some other indicator, e.g.
+#. "underlining" with braille dots 7-8 a word that is bold.
+#: ../src/orca/guilabels.py:239
 msgid "Mark in braille"
 msgstr "Marker i blindeskrift"
 
-#. Attribute Value column (VALUE)
-#. 
-#. Translators: "Present Unless" is a column header of the text
-#. attributes pane of the Orca preferences dialog.  On this pane,
-#. the user can select a set of text attributes that they would like
-#. spoken and/or indicated in braille.  Because the list of attributes
-#. could get quite lengthy, we provide the option to always speak/
-#. braille a text attribute *unless* its value is equal to the value
-#. given by the user in this column of the list.  For example, given
-#. the text attribute "underline" and a present unless value of "none",
-#. the user is stating that he/she would like to have underlined text
-#. announced for all cases (single, double, low, etc.) except when the
-#. value of underline is none (i.e. when it's not underlined).
-#. "Present" here is being used as a verb.
-#. 
-#: ../src/orca/orca_gui_prefs.py:1192
+#. Translators: "Present Unless" is a column header of the text attributes panel
+#. of the Orca preferences dialog. On this panel, the user can select a set of
+#. text attributes that they would like spoken and/or indicated in braille.
+#. Because the list of attributes could get quite lengthy, we provide the option
+#. to always speak/braille a text attribute *unless* its value is equal to the
+#. value given by the user in this column of the list. For example, given the
+#. text attribute "underline" and a present unless value of "none", the user is
+#. stating that he/she would like to have underlined text announced for all cases
+#. (single, double, low, etc.) except when the value of underline is none (i.e.
+#. when it's not underlined). "Present" here is being used as a verb.
+#: ../src/orca/guilabels.py:251
 msgid "Present Unless"
 msgstr "Tilstede med mindre"
 
-#. Pronunciation Dictionary actual string (word) column (ACTUAL).
-#. 
-#. Translators: "Actual String" here refers to a text string as it
-#. actually appears in a text document. This might be an abbreviation
-#. or a particular word that is pronounced differently then the way
-#. that it looks.
-#. 
-#: ../src/orca/orca_gui_prefs.py:1315
+#. Translators: This is a label for a column header in Orca's pronunciation
+#. dictionary. The pronunciation dictionary allows the user to correct words
+#. which the speech synthesizer mispronounces (e.g. a person's name, a technical
+#. word) or doesn't pronounce as the user desires (e.g. an acronym) by providing
+#. an alternative string. The "Actual String" here refers to the word to be
+#. corrected as it would actually appear in text being read. Example: "LOL".
+#: ../src/orca/guilabels.py:143
 msgid "Actual String"
 msgstr "Faktisk streng"
 
-#. Pronunciation Dictionary replacement string column (REPLACEMENT)
-#. 
-#. Translators: "Replacement String" here refers to the text string
-#. that will actually be used to speak it's matching "actual string".
-#. For example: if the actual string was "MHz", then the replacement
-#. (spoken) string would be "megahertz".
-#. 
-#: ../src/orca/orca_gui_prefs.py:1332
+#. Translators: This is a label for a column header in Orca's pronunciation
+#. dictionary. The pronunciation dictionary allows the user to correct words
+#. which the speech synthesizer mispronounces (e.g. a person's name, a technical
+#. word) or doesn't pronounce as the user desires (e.g. an acronym) by providing
+#. an alternative string. The "Replacement String" here refers to how the user
+#. would like the "Actual String" to be pronounced by the speech synthesizer.
+#. Example: "L O L" or "Laughing Out Loud" (for Actual String "LOL").
+#: ../src/orca/guilabels.py:152
 msgid "Replacement String"
 msgstr "Erstatningsstreng"
 
-#. Translators: different speech systems and speech engines work
-#. differently when it comes to handling pauses (e.g., sentence
-#. boundaries). This property allows the user to specify whether
-#. speech should be sent to the speech synthesis system immediately
-#. when a pause directive is enountered or if it should be queued
-#. up and sent to the speech synthesis system once the entire set
-#. of utterances has been calculated.
-#. 
+#. Translators: Different speech systems and speech engines work differently when
+#. it comes to handling pauses (e.g. sentence boundaries). This property allows
+#. the user to specify whether speech should be sent to the speech synthesis
+#. system immediately when a pause directive is enountered or if it should be
+#. queued up and sent to the speech synthesis system once the entire set of
+#. utterances has been calculated.
 #. Translators: different speech systems and speech engines work differently when it comes to handling pauses (e.g., sentence boundaries).  This property allows the user to specify whether speech should be sent to the speech synthesis system immediately when a pause directive is enountered or if it should be queued up and sent to the speech synthesis system once the entire set of utterances has been calculated.
-#: ../src/orca/orca_gui_prefs.py:1411 ../src/orca/orca-setup.ui.h:38
+#: ../src/orca/guilabels.py:590 ../src/orca/orca-setup.ui.h:48
 msgid "Break speech into ch_unks between pauses"
 msgstr "Bryt tale inn i biter mellom pa_user"
 
-#. Translators: If this setting is chosen and the user is reading
-#. over an entire document, Orca will pause at the end of each
-#. line.
-#. 
-#: ../src/orca/orca_gui_prefs.py:1423 ../src/orca/orca_gui_prefs.py:2564
-#: ../src/orca/orca-setup.ui.h:5
+#. Translators: If this setting is chosen and the user is reading over an entire
+#. document, Orca will pause at the end of each line.
+#: ../src/orca/guilabels.py:350 ../src/orca/orca-setup.ui.h:5
 msgid "Line"
 msgstr "Linje"
 
-#. Translators: If this setting is chosen and the user is reading
-#. over an entire document, Orca will pause at the end of each
-#. sentence.
-#. 
-#: ../src/orca/orca_gui_prefs.py:1423 ../src/orca/orca_gui_prefs.py:2570
-#: ../src/orca/orca-setup.ui.h:6
+#. Translators: If this setting is chosen and the user is reading over an entire
+#. document, Orca will pause at the end of each sentence.
+#: ../src/orca/guilabels.py:354 ../src/orca/orca-setup.ui.h:6
 msgid "Sentence"
 msgstr "Setning"
 
-#. Translators: Orca has a setting which determines which progress
-#. bar updates should be announced. Choosing "All" means that Orca
-#. will present progress bar updates regardless of what application
-#. and window they happen to be in.
-#. 
+#. Translators: Orca has a setting which determines which progress bar updates
+#. should be announced. Choosing "All" means that Orca will present progress bar
+#. updates regardless of what application and window they happen to be in.
 #. Translators: Orca has a setting which determines which progress bar updates should be announced. Choosing All means that Orca will present progress bar updates regardless of what application and window they happen to be in.
-#: ../src/orca/orca_gui_prefs.py:1522 ../src/orca/orca_gui_prefs.py:2526
-#: ../src/orca/orca-setup.ui.h:8
+#: ../src/orca/guilabels.py:322 ../src/orca/orca-setup.ui.h:8
 msgctxt "ProgressBar"
 msgid "All"
 msgstr "Alle"
 
-#. Translators: Orca has a setting which determines which progress
-#. bar updates should be announced. Choosing "Application" means
-#. that Orca will present progress bar updates as long as the
-#. progress bar is in the active application (but not necessarily
-#. in the current window).
-#. 
-#: ../src/orca/orca_gui_prefs.py:1529
+#. Translators: Orca has a setting which determines which progress bar updates
+#. should be announced. Choosing "Application" means that Orca will present
+#. progress bar updates as long as the progress bar is in the active application
+#. (but not necessarily in the current window).
+#: ../src/orca/guilabels.py:328
 msgctxt "ProgressBar"
 msgid "Application"
 msgstr "Program"
 
-#. Translators: Orca has a setting which determines which progress
-#. bar updates should be announced. Choosing "Window" means that
-#. Orca will present progress bar updates as long as the progress
-#. bar is in the active window.
-#. 
-#: ../src/orca/orca_gui_prefs.py:1535 ../src/orca/orca_gui_prefs.py:2534
+#. Translators: Orca has a setting which determines which progress bar updates
+#. should be announced. Choosing "Window" means that Orca will present progress
+#. bar updates as long as the progress bar is in the active window.
+#: ../src/orca/guilabels.py:333
 msgctxt "ProgressBar"
 msgid "Window"
 msgstr "Vindu"
 
-#. Translators: When this option is enabled, dead keys will be
-#. announced when pressed.
-#. 
+#. Translators: Orca has an "echo" feature to present text as it is being written
+#. by the user. This string refers to a "key echo" option. When this option is
+#. enabled, dead keys will be announced when pressed.
 #. Translators: When this option is enabled, dead keys will be announced when pressed.
-#: ../src/orca/orca_gui_prefs.py:1640 ../src/orca/orca-setup.ui.h:102
+#: ../src/orca/guilabels.py:163 ../src/orca/orca-setup.ui.h:111
 msgid "Enable non-spacing _diacritical keys"
 msgstr "Slå på _diakritiske tegn uten avstand"
 
-#. TODO - JD: I did the above because GtkBuilder translator notes
-#. (which we have for the above string) are not getting sucked in
-#. to orca.pot. :-(
-#. Translators: When this option is enabled, inserted text of length
-#. 1 is spoken.
-#. 
+#. Translators: Orca has an "echo" feature to present text as it is being written
+#. by the user. While Orca's "key echo" options present the actual keyboard keys
+#. being pressed, "character echo" presents the character/string of length 1 that
+#. is inserted as a result of the keypress.
 #. Translators: When this option is enabled, inserted text of length 1 is spoken.
-#: ../src/orca/orca_gui_prefs.py:1648 ../src/orca/orca-setup.ui.h:104
+#: ../src/orca/guilabels.py:158 ../src/orca/orca-setup.ui.h:113
 msgid "Enable echo by cha_racter"
 msgstr "Slå på ekko per _tegn"
 
@@ -3326,7 +3401,7 @@
 #. and triple "clicks" or key presses, similar to
 #. using a mouse.
 #. 
-#: ../src/orca/orca_gui_prefs.py:1931
+#: ../src/orca/orca_gui_prefs.py:1935
 msgid "(double click)"
 msgstr "(dobbeltklikk)"
 
@@ -3334,142 +3409,125 @@
 #. and triple "clicks" or key presses, similar to
 #. using a mouse.
 #. 
-#: ../src/orca/orca_gui_prefs.py:1937
+#: ../src/orca/orca_gui_prefs.py:1941
 msgid "(triple click)"
 msgstr "(trippelklikk)"
 
-#. Translators: an external braille device has buttons on it that
-#. permit the user to create input gestures from the braille device.
-#. The braille bindings are what determine the actions Orca will
-#. take when the user presses these buttons.
-#. 
-#: ../src/orca/orca_gui_prefs.py:2008 ../src/orca/orca_gui_prefs.py:2100
+#. Translators: An external braille device has buttons on it that permit the
+#. user to create input gestures from the braille device. The braille bindings
+#. are what determine the actions Orca will take when the user presses these
+#. buttons.
+#: ../src/orca/guilabels.py:211
 msgid "Braille Bindings"
 msgstr "Braille-bindinger"
 
-#. Translators: A single braille cell on a refreshable
-#. braille display consists of 8 dots.  If the user
-#. chooses this setting, the dot in the bottom left
-#. corner will be used to 'underline' text of interest.
-#. 
-#: ../src/orca/orca_gui_prefs.py:2355 ../src/orca/orca_gui_prefs.py:2396
-#: ../src/orca/orca_gui_prefs.py:2436 ../src/orca/orca-setup.ui.h:89
+#. Translators: A single braille cell on a refreshable braille display consists
+#. of 8 dots. Dot 7 is the dot in the bottom left corner. If the user selects
+#. this option, Dot 7 will be used to 'underline' text of interest, e.g. when
+#. "marking"/indicating that a given word is bold.
+#: ../src/orca/guilabels.py:46 ../src/orca/orca-setup.ui.h:98
 msgid "Dot _7"
 msgstr "Punkt _7"
 
-#. Translators: If the user chooses this setting, the
-#. dot in the bottom right corner of the braille cell
-#. will be used to 'underline' text of interest.
-#. 
-#: ../src/orca/orca_gui_prefs.py:2362 ../src/orca/orca_gui_prefs.py:2403
-#: ../src/orca/orca_gui_prefs.py:2443 ../src/orca/orca-setup.ui.h:90
+#. Translators: A single braille cell on a refreshable braille display consists
+#. of 8 dots. Dot 8 is the dot in the bottom right corner. If the user selects
+#. this option, Dot 8 will be used to 'underline' text of interest,  e.g. when
+#. "marking"/indicating that a given word is bold.
+#: ../src/orca/guilabels.py:52 ../src/orca/orca-setup.ui.h:99
 msgid "Dot _8"
 msgstr "Punkt _8"
 
-#. Translators: If the user chooses this setting, the
-#. two dots at the bottom of the braille cell will be
-#. used to 'underline' text of interest.
-#. 
-#: ../src/orca/orca_gui_prefs.py:2369 ../src/orca/orca_gui_prefs.py:2410
-#: ../src/orca/orca_gui_prefs.py:2450 ../src/orca/orca-setup.ui.h:91
+#. Translators: A single braille cell on a refreshable braille display consists
+#. of 8 dots. Dots 7-8 are the dots at the bottom. If the user selects this
+#. option, Dots 7-8 will be used to 'underline' text of interest,  e.g. when
+#. "marking"/indicating that a given word is bold.
+#: ../src/orca/guilabels.py:58 ../src/orca/orca-setup.ui.h:100
 msgid "Dots 7 an_d 8"
 msgstr "Punkter 7 o_g 8"
 
-#. Translators: If this setting is chosen, no punctuation
-#. symbols will be spoken as a user reads a document.
-#. 
+#. Translators: If this setting is chosen, no punctuation symbols will be spoken
+#. as a user reads a document.
 #. Translators: this refers to how much punctuation will be spoken by Orca when presenting text on the screen.
-#: ../src/orca/orca_gui_prefs.py:2473 ../src/orca/orca-setup.ui.h:56
+#: ../src/orca/guilabels.py:337 ../src/orca/orca-setup.ui.h:66
 msgctxt "punctuation level"
 msgid "_None"
 msgstr "I_ngen"
 
-#. Translators: If this setting is chosen, common punctuation
-#. symbols (like comma, period, question mark) will not be
-#. spoken as a user reads a document, but less common symbols
-#. (such as #, @, $) will.
-#. 
-#: ../src/orca/orca_gui_prefs.py:2481 ../src/orca/orca-setup.ui.h:57
+#. Translators: If this setting is chosen, common punctuation symbols (like
+#. comma, period, question mark) will not be spoken as a user reads a document,
+#. but less common symbols (such as #, @, $) will.
+#: ../src/orca/guilabels.py:342 ../src/orca/orca-setup.ui.h:67
 msgid "So_me"
 msgstr "_Noen"
 
-#. Translators: If this setting is chosen, the majority of
-#. punctuation symbols will be spoken as a user reads a
-#. document.
-#. 
-#: ../src/orca/orca_gui_prefs.py:2488 ../src/orca/orca-setup.ui.h:58
+#. Translators: If this setting is chosen, the majority of punctuation symbols
+#. will be spoken as a user reads a document.
+#: ../src/orca/guilabels.py:346 ../src/orca/orca-setup.ui.h:68
 msgid "M_ost"
 msgstr "M_est"
 
-#. Translators: This refers to the amount of information
-#. Orca provides about a particular object that receives
-#. focus.
-#. 
-#: ../src/orca/orca_gui_prefs.py:2656 ../src/orca/orca_gui_prefs.py:2744
-#: ../src/orca/orca-setup.ui.h:46
+#. Translators: This refers to the amount of information Orca provides about a
+#. particular object that receives focus.
+#: ../src/orca/guilabels.py:673 ../src/orca/orca-setup.ui.h:56
 msgid "Brie_f"
 msgstr "_Kort"
 
-#. Translators: when users are navigating a table, they
-#. sometimes want the entire row of a table read, or
-#. they just want the current cell to be presented to them.
-#. 
+#. Translators: When users are navigating a table, they sometimes want the entire
+#. row of a table read; other times they want just the current cell presented to
+#. them. This label is associated with the default presentation to be used.
 #. Translators: This is one of two options available in the Preferences dialog for the Table Rows setting. If chosen, Orca will speak just the new cell when the user arrows Up or Down in a table.
-#: ../src/orca/orca_gui_prefs.py:2680 ../src/orca/orca-setup.ui.h:50
+#: ../src/orca/guilabels.py:644 ../src/orca/orca-setup.ui.h:60
 msgid "Speak _cell"
 msgstr "Les _celle"
 
-#. Translators: this is a spoken prompt asking the user to press
-#. a new key combination (e.g., Alt+Ctrl+g) to create a new
-#. key bindings.
-#. 
-#: ../src/orca/orca_gui_prefs.py:2764
+#. Translators: This is a spoken and/or brailled message asking the user to press
+#. a new key combination (e.g., Alt+Ctrl+g) to create a new key binding for an
+#. Orca command.
+#: ../src/orca/messages.py:638
 msgid "enter new key"
 msgstr "oppgi ny tast"
 
-#: ../src/orca/orca_gui_prefs.py:2841
+#. Translators: This is a spoken and/or brailled message letting the user know
+#. Orca is about to delete an existing key combination (e.g. Alt+Ctrl+g) as a
+#. result of their input.
+#: ../src/orca/messages.py:628
 msgid "Key binding deleted. Press enter to confirm."
 msgstr "Tastaturbinding slettet. Trykk linjeskift for å bekrefte."
 
-#. Translators: this is a spoken prompt letting the user know
-#. that the key combination (e.g., Ctrl+Alt+f) they just
-#. entered has already been bound to another command.
-#. 
-#: ../src/orca/orca_gui_prefs.py:2870
+#. Translators: This is a spoken and/or brailled message letting the user know
+#. that the key combination (e.g., Ctrl+Alt+f) they just entered has already been
+#. bound to another command and is thus unavailable. The string substituted in is
+#. the name of the command which already has the binding.
+#: ../src/orca/messages.py:613
 #, python-format
 msgid "The key entered is already bound to %s"
 msgstr "Tasten som ble oppgitt er allerede bundet til %s"
 
-#. Translators: this is a spoken prompt letting the user know Orca
-#. know Orca has recorded a new key combination (e.g., Alt+Ctrl+g)
-#. based upon their input.
-#. 
-#: ../src/orca/orca_gui_prefs.py:2878
+#. Translators: This is a spoken and/or brailled message letting the user know
+#. that Orca has recorded a new key combination (e.g. Alt+Ctrl+g) as a result of
+#. their input. The string substituted in is the new key combination.
+#: ../src/orca/messages.py:618
 #, python-format
 msgid "Key captured: %s. Press enter to confirm."
 msgstr "Tast fanget: %s. Trykk linjeskift for å bekrefte."
 
-#. Translators: this is a spoken prompt confirming the key
-#. combination (e.g., Ctrl+Alt+f) the user just typed when
-#. creating a new key binding.
-#. 
-#: ../src/orca/orca_gui_prefs.py:2926
+#. Translators: This is a spoken and/or brailled message letting the user know
+#. that Orca has assigned a new key combination (e.g. Alt+Ctrl+g) as a result of
+#. their input. The string substituted in is the new key combination.
+#: ../src/orca/messages.py:623
 #, python-format
 msgid "The new key is: %s"
 msgstr "Den nye tasten er: %s"
 
-#. Translators: this is a spoken prompt confirming that an
-#. existing key combination (e.g., Ctrl+Alt+f) that was
-#. associated with a command has been deleted.
-#. 
-#: ../src/orca/orca_gui_prefs.py:2934
+#. Translators: This is a spoken and/or brailled message letting the user know
+#. Orca has deleted an existing key combination (e.g. Alt+Ctrl+g) as a result of
+#. their input.
+#: ../src/orca/messages.py:633
 msgid "The keybinding has been removed."
 msgstr "Tastaturbindingen ble fjernet."
 
-#. Translators: this refers to the keyboard layout (desktop
-#. or laptop).
-#. 
-#: ../src/orca/orca_gui_prefs.py:2972 ../src/orca/orca-setup.ui.h:12
+#. Translators: This label refers to the keyboard layout (desktop or laptop).
+#: ../src/orca/guilabels.py:224 ../src/orca/orca-setup.ui.h:20
 msgid "_Desktop"
 msgstr "_Skrivebord"
 
@@ -3489,23 +3547,22 @@
 msgid "<b>User Profile Conflict!</b>"
 msgstr "<b>Konflikt i brukerprofil!</b>"
 
-#. Translators: This is the title of a message dialog informing
-#. the user that he/she attempted to save a new user profile
-#. under a name which already exists. A "user profile" is a
-#. collection of settings which apply to a given task, such as
-#. a "Spanish" profile which would use Spanish text-to-speech
-#. and Spanish braille and selected when reading Spanish content.
-#: ../src/orca/orca_gui_prefs.py:3364
+#. Translators: This is the title of a message dialog informing the user that
+#. he/she attempted to save a new user profile under a name which already exists.
+#. A "user profile" is a collection of settings which apply to a given task, such
+#. as a "Spanish" profile which would use Spanish text-to-speech and Spanish
+#. braille and selected when reading Spanish content.
+#: ../src/orca/guilabels.py:265
 msgid "Save Profile As Conflict"
 msgstr "Lagre profil som konflikt"
 
-#. Translators: This text is displayed in a message dialog when a user
-#. indicates he/she wants to switch to a new user profile and, in the
-#. process, lose settings which have been altered but not yet saved. A
-#. "user profile" is a collection of settings which apply to a given task
-#. such as a "Spanish" profile which would use Spanish text-to-speech and
-#. Spanish braille and selected when reading Spanish content.
-#: ../src/orca/orca_gui_prefs.py:3386
+#. Translators: This text is displayed in a message dialog when a user indicates
+#. he/she wants to switch to a new user profile which will cause him/her to lose
+#. settings which have been altered but not yet saved. A "user profile" is a
+#. collection of settings which apply to a given task such as a "Spanish" profile
+#. which would use Spanish text-to-speech and Spanish braille and selected when
+#. reading Spanish content.
+#: ../src/orca/guilabels.py:298
 msgid ""
 "You are about to change the active profile. If you\n"
 "have just made changes in your preferences, they will\n"
@@ -3527,7 +3584,10 @@
 msgid "Load User Profile"
 msgstr "Last brukerprofil"
 
-#: ../src/orca/orca_gui_prefs.py:3437
+#. Translators: This message appears in a warning dialog when the user performs
+#. the command to get into Orca's preferences dialog when the preferences dialog
+#. is already open.
+#: ../src/orca/messages.py:1309
 msgid ""
 "You already have an instance of an Orca preferences dialog open.\n"
 "Please close it before opening a new one."
@@ -3536,34 +3596,29 @@
 "\n"
 "Lukk denne før du åpner en ny."
 
-#. Translators: Orca Preferences is the configuration GUI for Orca.
-#. 
-#: ../src/orca/orca_gui_prefs.py:3471
+#. Translators: Orca Preferences is the configuration GUI for Orca. This message
+#. is presented immediately before the GUI is shown.
+#: ../src/orca/messages.py:1156
 msgid "Starting Orca Preferences."
 msgstr "Starter brukervalg for Orca."
 
-#. Translators: Profiles in Orca make it possible for users to
-#. quickly switch amongst a group of pre-defined settings (e.g.
-#. an 'English' profile for reading text written in English using
-#. an English-language speech synthesizer and braille rules, and
-#. a similar 'Spanish' profile for reading Spanish text. The
-#. following string is the title of a dialog in which users can
-#. save a newly-defined profile.
-#. 
-#: ../src/orca/orca_gui_profile.py:55
+#. Translators: Profiles in Orca make it possible for users to quickly switch
+#. amongst a group of pre-defined settings (e.g. an 'English' profile for reading
+#. text written in English using an English-language speech synthesizer and
+#. braille rules, and a similar 'Spanish' profile for reading Spanish text. The
+#. following string is the title of a dialog in which users can save a newly-
+#. defined profile.
+#: ../src/orca/guilabels.py:309
 msgid "Save Profile As"
 msgstr "Lagre profil som"
 
-#. Translators: Profiles in Orca make it possible for users to
-#. quickly switch amongst a group of pre-defined settings (e.g.
-#. an 'English' profile for reading text written in English using
-#. an English-language speech synthesizer and braille rules, and
-#. a similar 'Spanish' profile for reading Spanish text. The
-#. following string is the label for a text entry in which the user
-#. enters the name of a new settings profile being saved via the
-#. 'Save Profile As' dialog.
-#. 
-#: ../src/orca/orca_gui_profile.py:85
+#. Translators: Profiles in Orca make it possible for users to quickly switch
+#. amongst a group of pre-defined settings (e.g. an 'English' profile for reading
+#. text written in English using an English-language speech synthesizer and
+#. braille rules, and a similar 'Spanish' profile for reading Spanish text. The
+#. following string is the label for a text entry in which the user enters the
+#. name of a new settings profile being saved via the 'Save Profile As' dialog.
+#: ../src/orca/guilabels.py:317
 msgid "_Profile Name:"
 msgstr "Navn på _profil:"
 
@@ -3617,30 +3672,27 @@
 msgid "Show this help message"
 msgstr "Vis denne hjelpeteksten"
 
-#. Translators: this is the description of the command line option
-#. '-l, --list-apps' which prints the names of running applications
-#. which can be seen by assistive technologies such as Orca and
-#. Accercser.
-#: ../src/orca/orca_bin.py.in:124
+#. Translators: This is the description of command line option '-l, --list-apps'
+#. which prints the names of running applications which can be seen by assistive
+#. technologies such as Orca and Accerciser.
+#: ../src/orca/messages.py:202
 msgid "Print the known running applications"
 msgstr "Skriv ut kjente kjørende programmer"
 
-#. Translators: this is the description of the command line option
-#. '--debug' which enables debugging output for Orca to be sent to
-#. a file. The YYYY-MM-DD-HH:MM:SS portion of the string indicates
-#. the file name will be formed from the current date and time with
-#. 'debug' in front and '.out' at the end. The 'debug' and '.out'
-#. portions of this string should not be translated (i.e., it will
-#. always start with 'debug' and end with '.out', regardless of the
-#. locale.).
-#: ../src/orca/orca_bin.py.in:191
+#. Translators: This is the description of command line option '--debug' which
+#. causes debugging output for Orca to be sent to a file. The YYYY-MM-DD-HH:MM:SS
+#. portion of the string indicates the file name will be formed from the current
+#. date and time with 'debug' in front and '.out' at the end. The 'debug' and
+#. '.out' portions of this string should not be translated (i.e. it should always
+#. start with 'debug' and end with '.out', regardless of the locale.).
+#: ../src/orca/messages.py:258
 msgid "Send debug output to debug-YYYY-MM-DD-HH:MM:SS.out"
 msgstr "Send feilsøkingsdata til debug-YYY-MM-DD-HH:MM:SS.out"
 
-#. Translators: this is the description of the command line option
-#. '--debug-file' which allows the user to override the default,
-#. date-based name of the debugging output file.
-#: ../src/orca/orca_bin.py.in:176
+#. Translators: This is the description of command line option '--debug-file'
+#. which allows the user to override the default date-based name of the debugging
+#. output file.
+#: ../src/orca/messages.py:263
 msgid "Send debug output to the specified file"
 msgstr "Send feilsøkingsinformasjon til oppgitt fil"
 
@@ -3652,12 +3704,11 @@
 msgid "Set up user preferences"
 msgstr "Sett brukervalg"
 
-#. Translators: this is the description of the command line option
-#. '-t, --text-setup' that will initially display a list of questions
-#. in text form, that the user will need to answer, before Orca will
-#. startup. For this to happen properly, Orca will need to be run
-#. from a terminal window.
-#: ../src/orca/orca_bin.py.in:116
+#. Translators: This is the description of command line option '-t, --text-setup'
+#. that will initially display a list of questions in text form, that the user
+#. will need to answer, before Orca will startup. For this to happen properly,
+#. Orca will need to be run from a terminal window.
+#: ../src/orca/messages.py:273
 msgid "Set up user preferences (text version)"
 msgstr "Sett brukervalg (tekstversjon)"
 
@@ -3669,24 +3720,22 @@
 msgid "Skip set up of user preferences"
 msgstr "Hopp over oppsett av brukervalg"
 
-#. Translators: this is the description of the command line option
-#. '-u, --user-prefs' that allows you to specify an alternate
-#. location from which to loadr the user preferences.
-#: ../src/orca/orca_bin.py.in:166
+#. Translators: This is the description of command line option '-u, --user-prefs'
+#. that allows you to specify an alternate location from which to load the user
+#. preferences.
+#: ../src/orca/messages.py:242
 msgid "Use alternate directory for user preferences"
 msgstr "Bruk alternativ katalog for brukervalg"
 
-#. Translators: this is the description of the command line option
-#. '-e, --enable' which allows the user to specify an option to
-#. enable as Orca is started.
-#: ../src/orca/orca_bin.py.in:131
+#. Translators: this is the description of command line option '-e, --enable'
+#. which allows the user to specify an option to enable as Orca is started.
+#: ../src/orca/messages.py:188
 msgid "Force use of option"
 msgstr "Tvungen bruk av valg"
 
-#. Translators: this is the description of the command line option
-#. '-d, --disable' which allows the user to specify an option to
-#. enable as Orca is started.
-#: ../src/orca/orca_bin.py.in:142
+#. Translators: This is the description of command line option '-d, --disable'
+#. which allows the user to specify an option to disable as Orca is started.
+#: ../src/orca/messages.py:184
 msgid "Prevent use of option"
 msgstr "Hindre bruk av et alternativ"
 
@@ -3723,39 +3772,35 @@
 msgid "Replace a currently running Orca"
 msgstr "Erstatt kjørende Orca"
 
-#. Translators: there is a keystroke to reload the user
-#. preferences.  This is a spoken prompt to let the user
-#. know when the preferences has been reloaded.
-#. 
-#: ../src/orca/orca.py:437
+#. Translators: This message is presented to the user when Orca's preferences
+#. have been reloaded.
+#: ../src/orca/messages.py:1123
 msgid "Orca user settings reloaded."
 msgstr "Orcas brukerinnstillinger ble lastet på nytt."
 
-#. Translators: The following string instructs the user how to navigate
-#. amongst the list of commands presented in 'list shortcuts' mode as
-#. well as how to exit the list when finished.
-#. 
-#: ../src/orca/orca.py:549
+#. Translators: The following string instructs the user how to navigate amongst
+#. the list of commands presented in learn mode, as well as how to exit the list
+#. when finished.
+#: ../src/orca/messages.py:915
 msgid "Use Up and Down Arrow to navigate the list. Press Escape to exit."
 msgstr ""
 "Bruk opp og ned pilene for å navigere i listen. Trykk Escape for å avslutte."
 
-#. Translators: This message is presented when the user is in
-#. 'list of shortcuts mode'. In this messsage, we present the
-#. number of shortcuts found.
-#. 
-#: ../src/orca/orca.py:562
+#. Translators: This message is presented when the user is in a list of
+#. shortcuts associated with Orca commands which are not specific to the
+#. current application. It appears as the title of the dialog containing
+#. the list.
+#: ../src/orca/messages.py:1445
 #, python-format
 msgid "%d Orca default shortcut found."
 msgid_plural "%d Orca default shortcuts found."
 msgstr[0] "%d forvalgt snarvei for Orca funnet."
 msgstr[1] "%d forvalgte snarveier for Orca funnet."
 
-#. Translators: This message is presented when the user is in
-#. 'list of shortcuts mode'. In this message, we present the
-#. number of shortcuts found for the named application.
-#. 
-#: ../src/orca/orca.py:584
+#. Translators: This message is presented when the user is in a list of
+#. shortcuts associated with Orca commands specific to the current
+#. application. It appears as the title of the dialog containing the list.
+#: ../src/orca/messages.py:1453
 #, python-format
 msgid "%(count)d Orca shortcut for %(application)s found."
 msgid_plural "%(count)d Orca shortcuts for %(application)s found."
@@ -3772,49 +3817,19 @@
 msgid "No Orca shortcuts for %s found."
 msgstr "Ingen Orca-snarveier funnet for %s."
 
-#. Translators: when the user is attempting to locate a
-#. particular object and the top of a page or list is
-#. reached without that object being found, we "wrap" to
-#. the bottom and continue looking upwards. We need to
-#. inform the user when this is taking place.
-#. 
-#. Translators: when the user is attempting to locate a
-#. particular object and the top of the page or list is
-#. reached without that object being found, we "wrap" to
-#. the bottom and continue looking upwards. We need to
-#. inform the user when this is taking place.
-#. 
-#. Translators: when the user is attempting to locate a
-#. particular object and the top of a page or list is
-#. reached without that object being found, we "wrap" to
-#. the bottom and continue looking upwards. We need to
-#. inform the user when this is taking place.
-#. 
-#: ../src/orca/orca.py:620 ../src/orca/scripts/toolkits/Gecko/script.py:5108
-#: ../src/orca/structural_navigation.py:850
+#. Translators: when the user is attempting to locate a particular object and the
+#. top of a page or list is reached without that object being found, we "wrap" to
+#. the bottom and continue looking upwards. We need to inform the user when this
+#. is taking place.
+#: ../src/orca/messages.py:1575
 msgid "Wrapping to bottom."
 msgstr "Går rundt til bunnen."
 
-#. Translators: when the user is attempting to locate a
-#. particular object and the bottom of a page or list is
-#. reached without that object being found, we "wrap" to the
-#. top and continue looking downwards. We need to inform the
-#. user when this is taking place.
-#. 
-#. Translators: when the user is attempting to locate a
-#. particular object and the bottom of the page or list is
-#. reached without that object being found, we "wrap" to the
-#. top and continue looking downwards. We need to inform the
-#. user when this is taking place.
-#. 
-#. Translators: when the user is attempting to locate a
-#. particular object and the bottom of a page or list is
-#. reached without that object being found, we "wrap" to the
-#. top and continue looking downwards. We need to inform the
-#. user when this is taking place.
-#. 
-#: ../src/orca/orca.py:641 ../src/orca/scripts/toolkits/Gecko/script.py:5176
-#: ../src/orca/structural_navigation.py:858
+#. Translators: when the user is attempting to locate a particular object and the
+#. bottom of a page or list is reached without that object being found, we "wrap"
+#. to the top and continue looking downwards. We need to inform the user when
+#. this is taking place.
+#: ../src/orca/messages.py:1581
 msgid "Wrapping to top."
 msgstr "Går rundt til toppen."
 
@@ -3834,9 +3849,8 @@
 "Trykk 1 for Orca's forvalgte snarveier. Trykk 2 for Orca's snarveier for "
 "aktivt program. Trykk escape for å avslutte."
 
-#. Translators: this is what Orca speaks and brailles when it quits.
-#. 
-#: ../src/orca/orca.py:825
+#. Translators: This message is presented to the user when Orca is quit.
+#: ../src/orca/messages.py:1164
 msgid "Goodbye."
 msgstr "Ha det bra."
 
@@ -3864,7 +3878,8 @@
 msgid "Import failed due to an unrecognized key: %s"
 msgstr "Import feilet pga en ikke-gjenkjent nøkkel: %s"
 
-#: ../src/orca/orca.py:953
+#. Translators: This message is presented to the user when Orca is launched.
+#: ../src/orca/messages.py:1152
 msgid "Welcome to Orca."
 msgstr "Velkommen til Orca."
 
@@ -3896,7 +3911,7 @@
 msgid "Orca Preferences"
 msgstr "Brukervalg for Orca"
 
-#: ../src/orca/orca-setup.ui.h:13
+#: ../src/orca/orca-setup.ui.h:21
 msgid "_Laptop"
 msgstr "_Bærbar"
 
@@ -3916,16 +3931,16 @@
 msgid "<b>User Interface</b>"
 msgstr ""
 
-#: ../src/orca/orca-setup.ui.h:15
+#: ../src/orca/orca-setup.ui.h:23
 msgid "Active _Profile:"
 msgstr "Aktiv _profil:"
 
-#: ../src/orca/orca-setup.ui.h:16
+#: ../src/orca/orca-setup.ui.h:24
 msgid "Start-up Profile:"
 msgstr "Oppstartsprofil:"
 
 #. This button will load the selected settings profile in the application.
-#: ../src/orca/orca-setup.ui.h:18
+#: ../src/orca/orca-setup.ui.h:26
 msgid "_Load"
 msgstr "_Last"
 
@@ -3933,11 +3948,11 @@
 msgid "<b>Profiles</b>"
 msgstr "<b>Profiler</b>"
 
-#: ../src/orca/orca-setup.ui.h:20
+#: ../src/orca/orca-setup.ui.h:30
 msgid "_Time format:"
 msgstr "_Tidformat:"
 
-#: ../src/orca/orca-setup.ui.h:21
+#: ../src/orca/orca-setup.ui.h:31
 msgid "Dat_e format:"
 msgstr "Dato_format:"
 
@@ -3945,11 +3960,11 @@
 msgid "<b>Time and Date</b>"
 msgstr ""
 
-#: ../src/orca/orca-setup.ui.h:23
+#: ../src/orca/orca-setup.ui.h:33
 msgid "_Present tooltips"
 msgstr "_Vis verktøytips"
 
-#: ../src/orca/orca-setup.ui.h:24
+#: ../src/orca/orca-setup.ui.h:34
 msgid "Speak object under mo_use"
 msgstr "Les objektet under m_usen"
 
@@ -3957,36 +3972,36 @@
 msgid "<b>Mouse</b>"
 msgstr ""
 
-#: ../src/orca/orca-setup.ui.h:26
+#: ../src/orca/orca-setup.ui.h:36
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/orca/orca-setup.ui.h:27
+#: ../src/orca/orca-setup.ui.h:37
 msgid "Vo_lume:"
 msgstr "Vo_lum:"
 
-#: ../src/orca/orca-setup.ui.h:28
+#: ../src/orca/orca-setup.ui.h:38
 msgid "Pi_tch:"
 msgstr "Tone_høyde"
 
-#: ../src/orca/orca-setup.ui.h:29
+#: ../src/orca/orca-setup.ui.h:39
 msgid "_Rate:"
 msgstr "_Rate:"
 
-#: ../src/orca/orca-setup.ui.h:30
+#: ../src/orca/orca-setup.ui.h:40
 msgid "_Person:"
 msgstr "_Person:"
 
-#: ../src/orca/orca-setup.ui.h:31
+#: ../src/orca/orca-setup.ui.h:41
 msgid "Speech synthesi_zer:"
 msgstr "Opplesningssynthesi_zer:"
 
-#: ../src/orca/orca-setup.ui.h:32
+#: ../src/orca/orca-setup.ui.h:42
 msgid "Speech _system:"
 msgstr "Opplesnings_system:"
 
 #. Translators: Having multiple 'voice types' in Orca makes it possible for the user to more quickly identify properties of text non-visually, such as the fact that text is written in capital letters or is a link; or that text is actually visible on the screen as opposed to an Orca-specific message. The available 'voice types' in Orca include 'default', 'uppercase', 'hyperlink', and 'system' -- each of which can be configured by the user to sound the way he/she finds most helpful. This string is displayed in the label for the combo box in which the user selects a voice type to configure.
-#: ../src/orca/orca-setup.ui.h:34
+#: ../src/orca/orca-setup.ui.h:44
 msgid "_Voice type:"
 msgstr "_Stemmetype:"
 
@@ -3996,12 +4011,12 @@
 msgstr ""
 
 #. Translators: multicase strings are StringsWithWordsMashedTogetherLikeThis.
-#: ../src/orca/orca-setup.ui.h:40
+#: ../src/orca/orca-setup.ui.h:50
 msgid "Speak multicase strings as wor_ds"
 msgstr "Uttal strenger med blanding av store og små bokstaver som or_d"
 
 #. Translators: Say all by refers to the way that Orca will say (speak) an amount of text -- in particular, where Orca where insert pauses. There are currently two choices (supplied by a combo box to the right of this label): say all by sentence and  say all by line.  If Orca were speaking a work of fiction, it's probably best to do say all by sentence so it sound more natural. If Orca were speaking something like a page of computer commands, doing a say all by line would work better.
-#: ../src/orca/orca-setup.ui.h:42
+#: ../src/orca/orca-setup.ui.h:52
 msgid "Say All B_y:"
 msgstr "Si alt e_tter:"
 
@@ -4009,15 +4024,15 @@
 msgid "<b>Global Voice Settings</b>"
 msgstr ""
 
-#: ../src/orca/orca-setup.ui.h:44
+#: ../src/orca/orca-setup.ui.h:54
 msgid "Voice"
 msgstr "Stemme"
 
-#: ../src/orca/orca-setup.ui.h:45
+#: ../src/orca/orca-setup.ui.h:55
 msgid "_Enable speech"
 msgstr "_Slå på opplesning"
 
-#: ../src/orca/orca-setup.ui.h:47
+#: ../src/orca/orca-setup.ui.h:57
 msgid "Ver_bose"
 msgstr "_Ekstra informasjon"
 
@@ -4026,7 +4041,7 @@
 msgstr "<b>Detaljgrad</b>"
 
 #. Translators: This is one of two options available in the Preferences dialog for the Table Rows setting. If chosen, Orca will speak the entire row when the user arrows Up or Down in a table.
-#: ../src/orca/orca-setup.ui.h:52
+#: ../src/orca/orca-setup.ui.h:62
 msgid "Speak ro_w"
 msgstr "Les rad"
 
@@ -4035,7 +4050,7 @@
 msgid "<b>Table Rows</b>"
 msgstr "<b>Tabellrader</b>"
 
-#: ../src/orca/orca-setup.ui.h:59
+#: ../src/orca/orca-setup.ui.h:69
 msgid "_All"
 msgstr "_Alle"
 
@@ -4044,28 +4059,28 @@
 msgstr "<b>Tegnsettingsnivå</b>"
 
 #. Translators: If this setting is enabled, Orca will only speak text which is actually displayed on the screen. It will NOT speak things like the role of an item (e.g. 'checkbox') or its state (e.g. 'not checked') or say 'mispelled' to indicate the presence of red squiggly spelling error lines -- things which Orca normally speaks. This setting is primarily intended for low vision users and sighted users with a learning disability.
-#: ../src/orca/orca-setup.ui.h:62
+#: ../src/orca/orca-setup.ui.h:72
 msgid "Only speak displayed text"
 msgstr "Uttal kun vist tekst"
 
-#: ../src/orca/orca-setup.ui.h:63
+#: ../src/orca/orca-setup.ui.h:73
 msgid "Speak blank lines"
 msgstr "Tal tomme linjer"
 
-#: ../src/orca/orca-setup.ui.h:64
+#: ../src/orca/orca-setup.ui.h:74
 msgid "Speak _indentation and justification"
 msgstr "Les opp tekst_indentering og tekstjustering"
 
-#: ../src/orca/orca-setup.ui.h:65
+#: ../src/orca/orca-setup.ui.h:75
 msgid "Spea_k object mnemonics"
 msgstr "Les hurtigtast for obje_kt"
 
 #. Translators: This checkbox toggles whether or not Orca says the child position (e.g., 'item 6 of 7').
-#: ../src/orca/orca-setup.ui.h:67
+#: ../src/orca/orca-setup.ui.h:77
 msgid "Speak child p_osition"
 msgstr "Uttal underp_osisjon"
 
-#: ../src/orca/orca-setup.ui.h:68
+#: ../src/orca/orca-setup.ui.h:78
 msgid "Speak tutorial messages"
 msgstr "Les hjelpmeldinger"
 
@@ -4074,19 +4089,19 @@
 msgstr ""
 
 #. Translators: This is an option in the Preferences dialog box related to the speaking of progress bar information. If checked, Orca will speak progress bar information.
-#: ../src/orca/orca-setup.ui.h:71
+#: ../src/orca/orca-setup.ui.h:81
 msgctxt "ProgressBarUpdates"
 msgid "Enable_d"
 msgstr "Slått _på"
 
 #. Translators: Here this is a label for a spin button through which a user can customize the frequency in seconds an announcement should be made regarding the current value of a progress bar.
-#: ../src/orca/orca-setup.ui.h:73
+#: ../src/orca/orca-setup.ui.h:83
 msgctxt "ProgressBar"
 msgid "Frequency (secs):"
 msgstr "Frekvens (sekunder):"
 
 #. Translators: Orca has a setting which determines which progress bar updates should be announced. The options are all progress bars, only progress bars in the active application, or only progress bars in the current window.
-#: ../src/orca/orca-setup.ui.h:75
+#: ../src/orca/orca-setup.ui.h:85
 msgid "Restrict to:"
 msgstr "Begrens til:"
 
@@ -4095,11 +4110,11 @@
 msgid "<b>Progress Bar Updates</b>"
 msgstr "<b>Oppdateringer for fremdriftsviser</b>"
 
-#: ../src/orca/orca-setup.ui.h:78
+#: ../src/orca/orca-setup.ui.h:88
 msgid "Speech"
 msgstr "Tale"
 
-#: ../src/orca/orca-setup.ui.h:79
+#: ../src/orca/orca-setup.ui.h:89
 msgid "Enable Braille _support"
 msgstr "Slå på braille_støtte"
 
@@ -4107,20 +4122,20 @@
 msgid "Enable Braille _monitor"
 msgstr "Slå på _brailleskjerm"
 
-#: ../src/orca/orca-setup.ui.h:81
+#: ../src/orca/orca-setup.ui.h:90
 msgid "_Abbreviated role names"
 msgstr "_Forkortedde rollenavn"
 
-#: ../src/orca/orca-setup.ui.h:82
+#: ../src/orca/orca-setup.ui.h:91
 msgid "Disable _end of line symbol"
 msgstr "Slå av symbol _for slutt på linjen"
 
-#: ../src/orca/orca-setup.ui.h:83
+#: ../src/orca/orca-setup.ui.h:92
 msgid "_Enable Contracted Braille"
 msgstr "_Slå på sammentrukket Braille"
 
 #. Translators: This string is associated with a combo box which allows the user to select the set of symbols to be used when Orca presents print strings on a refreshable braille display. Braille symbols vary from language to language due in part to what print letters exist for that language. The other reason braille symbols vary is due to which braille 'contractions' get used. Contractions are shorter forms of commonly-used letter combinations and words. For instance in English there is a single braille symbol for 'ing' (dots 3-4-6), and the letter 'e' (dots 1-5) all by itself means 'every'. The list of rules which dictate what contractions should be used and whether or not they can be used in a particular context are stored in liblouis' tables.
-#: ../src/orca/orca-setup.ui.h:85
+#: ../src/orca/orca-setup.ui.h:94
 msgid "Contraction _Table:"
 msgstr "Sammentreknings_tabell:"
 
@@ -4129,7 +4144,7 @@
 msgstr ""
 
 #. Translators: This option refers to the dot or dots in braille which will be used to 'underline' certain characters.
-#: ../src/orca/orca-setup.ui.h:88
+#: ../src/orca/orca-setup.ui.h:97
 msgctxt "braille dots"
 msgid "_None"
 msgstr "I_ngen"
@@ -4142,43 +4157,43 @@
 msgid "<b>Hyperlink Indicator</b>"
 msgstr "<b>Indikator for hyperlenke</b>"
 
-#: ../src/orca/orca-setup.ui.h:94
+#: ../src/orca/orca-setup.ui.h:103
 msgid "Braille"
 msgstr "Braille"
 
-#: ../src/orca/orca-setup.ui.h:95
+#: ../src/orca/orca-setup.ui.h:104
 msgid "Enable _key echo"
 msgstr "Slå på taste_ekko"
 
-#: ../src/orca/orca-setup.ui.h:96
+#: ../src/orca/orca-setup.ui.h:105
 msgid "Enable _alphanumeric and punctuation keys"
 msgstr "Slå på alfanumeriske og tegnsettingstaster"
 
-#: ../src/orca/orca-setup.ui.h:97
+#: ../src/orca/orca-setup.ui.h:106
 msgid "Enable _modifier keys"
 msgstr "Slå på _modifiseringstaster"
 
-#: ../src/orca/orca-setup.ui.h:98
+#: ../src/orca/orca-setup.ui.h:107
 msgid "Enable _function keys"
 msgstr "Slå på _funksjonstaster"
 
-#: ../src/orca/orca-setup.ui.h:99
+#: ../src/orca/orca-setup.ui.h:108
 msgid "Enable ac_tion keys"
 msgstr "Slå på _aksjonstaster"
 
-#: ../src/orca/orca-setup.ui.h:100
+#: ../src/orca/orca-setup.ui.h:109
 msgid "Enable _navigation keys"
 msgstr "Slå på _navigasjonstaster"
 
-#: ../src/orca/orca-setup.ui.h:105
+#: ../src/orca/orca-setup.ui.h:114
 msgid "Enable echo by _word"
 msgstr "Slå på _ordekko"
 
-#: ../src/orca/orca-setup.ui.h:106
+#: ../src/orca/orca-setup.ui.h:115
 msgid "Enable echo by _sentence"
 msgstr "Slå på _setningsekko"
 
-#: ../src/orca/orca-setup.ui.h:107
+#: ../src/orca/orca-setup.ui.h:116
 msgid "Key Echo"
 msgstr "Tasteekko"
 
@@ -4186,7 +4201,7 @@
 msgid "Orca _Modifier Key(s):"
 msgstr "Orca e_ndringstast(er):"
 
-#: ../src/orca/orca-setup.ui.h:109
+#: ../src/orca/orca-setup.ui.h:118
 msgid "Key Bindings"
 msgstr "Tastaturbindinger"
 
@@ -4194,27 +4209,27 @@
 msgid "<b>Pronunciation Dictionary</b>"
 msgstr "<b>Ordbok for uttale</b>"
 
-#: ../src/orca/orca-setup.ui.h:111
+#: ../src/orca/orca-setup.ui.h:120
 msgid "_New entry"
 msgstr "_Ny oppføring"
 
-#: ../src/orca/orca-setup.ui.h:112
+#: ../src/orca/orca-setup.ui.h:121
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../src/orca/orca-setup.ui.h:113
+#: ../src/orca/orca-setup.ui.h:122
 msgid "Pronunciation"
 msgstr "Uttale"
 
-#: ../src/orca/orca-setup.ui.h:114
+#: ../src/orca/orca-setup.ui.h:123
 msgid "_Speak all"
 msgstr "_Si alt"
 
-#: ../src/orca/orca-setup.ui.h:115
+#: ../src/orca/orca-setup.ui.h:124
 msgid "Speak _none"
 msgstr "Ikke s_nakk"
 
-#: ../src/orca/orca-setup.ui.h:116
+#: ../src/orca/orca-setup.ui.h:125
 msgid "_Reset"
 msgstr "_Nullstill"
 
@@ -4223,22 +4238,22 @@
 msgstr "<b>Tekstattributter</b>"
 
 #. Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move to _bottom button, move that attribute to the bottom of the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.
-#: ../src/orca/orca-setup.ui.h:119
+#: ../src/orca/orca-setup.ui.h:128
 msgid "Move to _bottom"
 msgstr "Flytt til _bunn"
 
 #. Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move _down one button, move that attribute down one line in the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.
-#: ../src/orca/orca-setup.ui.h:121
+#: ../src/orca/orca-setup.ui.h:130
 msgid "Move _down one"
 msgstr "Flytt en ne_d"
 
 #. Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move _up one button, move that attribute up one line in the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.
-#: ../src/orca/orca-setup.ui.h:123
+#: ../src/orca/orca-setup.ui.h:132
 msgid "Move _up one"
 msgstr "Flytt en _opp"
 
 #. Translators:  This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move to _top button, move that attribute to the top of the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.
-#: ../src/orca/orca-setup.ui.h:125
+#: ../src/orca/orca-setup.ui.h:134
 msgid "Move to _top"
 msgstr "Flytt til _toppen"
 
@@ -4254,7 +4269,7 @@
 msgid "<b>Braille Indicator</b>"
 msgstr "<b>Indikator for blindeskrift</b>"
 
-#: ../src/orca/orca-setup.ui.h:128
+#: ../src/orca/orca-setup.ui.h:137
 msgid "Text Attributes"
 msgstr "Tekstattributter"
 
@@ -4296,66 +4311,49 @@
 "\"u : uniform, v : victor, w : whiskey, x : xray, y : yankee, z : zulu, æ : "
 "ærlig, ø : østen, å : åse"
 
-#. Translators: Orca will tell you how many characters
-#. are repeated on a line of text.  For example: "22
-#. space characters".  The %d is the number and the %s
-#. is the spoken word for the character.
-#. 
-#: ../src/orca/script_utilities.py:2380
+#. Translators: Orca will tell you how many characters are repeated on a line
+#. of text. For example: "22 space characters". The %d is the number and the
+#. %s is the spoken word for the character.
+#: ../src/orca/messages.py:1693
 #, python-format
 msgid "%(count)d %(repeatChar)s character"
 msgid_plural "%(count)d %(repeatChar)s characters"
 msgstr[0] "%(count)d %(repeatChar)s tegn"
 msgstr[1] "%(count)d %(repeatChar)s tegn"
 
-#. Translators: this indicates that this piece of
-#. text is a hypertext link.
-#. 
-#: ../src/orca/script_utilities.py:2455
-#: ../src/orca/scripts/apps/soffice/script.py:1220
-#: ../src/orca/scripts/default.py:2047 ../src/orca/speech_generator.py:1022
+#. Translators: this indicates that this piece of text is a hypertext link.
+#: ../src/orca/messages.py:889
 msgid "link"
 msgstr "lenke"
 
-#. Translators: This string is part of the presentation of an
-#. item that includes one or several consequtive superscripted
-#. characters, e.g. 'X' followed by 'superscript 2' followed by
-#. 'superscript 3' should be presented as 'X superscript 23'.
-#. 
-#: ../src/orca/script_utilities.py:2545
+#. Translators: This string is part of the presentation of an item that includes
+#. one or several consequtive superscripted characters. For example, 'X' followed
+#. by 'superscript 2' followed by 'superscript 3' should be presented to the user
+#. as 'X superscript 23'.
+#: ../src/orca/messages.py:491
 #, python-format
 msgid " superscript %s"
 msgstr " superskript %s"
 
-#. Translators: This string is part of the presentation of an
-#. item that includes one or several consequtive subscripted
-#. characters, e.g. 'X' followed by 'subscript 2' followed by
-#. 'subscript 3', should be presented as 'X subscript 23.'
-#. 
-#: ../src/orca/script_utilities.py:2555
+#. Translators: This string is part of the presentation of an item that includes
+#. one or several consequtive subscripted characters. For example, 'X' followed
+#. by 'subscript 2' followed by 'subscript 3' should be presented to the user as
+#. 'X subscript 23'.
+#: ../src/orca/messages.py:485
 #, python-format
 msgid " subscript %s"
 msgstr " subskript %s"
 
-#. Translators: the Orca "SayAll" command allows the
-#. user to press a key and have the entire document in
-#. a window be automatically spoken to the user.  If
-#. the user presses any key during a SayAll operation,
-#. the speech will be interrupted and the cursor will
-#. be positioned at the point where the speech was
-#. interrupted.
-#. 
-#: ../src/orca/scripts/apps/evolution/script.py:123
-#: ../src/orca/scripts/default.py:189
-#: ../src/orca/scripts/toolkits/Gecko/script.py:568
-#: ../src/orca/scripts/toolkits/WebKitGtk/script.py:109
+#. Translators: the Orca "SayAll" command allows the user to press a key and have
+#. the entire document in a window be automatically spoken to the user. If the
+#. user presses any key during a SayAll operation, the speech will be interrupted
+#. and the cursor will be positioned at the point where the speech was interrupted.
+#: ../src/orca/cmdnames.py:59
 msgid "Speaks entire document."
 msgstr "Leser opp hele dokumentet."
 
 #. Translators: this represents the number of rows in a table.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:760
-#: ../src/orca/structural_navigation.py:1208
+#: ../src/orca/messages.py:1737
 #, python-format
 msgid "table with %d row"
 msgid_plural "table with %d rows"
@@ -4363,18 +4361,16 @@
 msgstr[1] "tabell med %d rader"
 
 #. Translators: this represents the number of columns in a table.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:765
-#: ../src/orca/structural_navigation.py:1213
+#: ../src/orca/messages.py:1741
 #, python-format
 msgid "%d column"
 msgid_plural "%d columns"
 msgstr[0] "%d kolonne"
 msgstr[1] "%d kolonner"
 
-#. We've left a table.  Announce this fact.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:754
+#. Translators: This message is presented when a user is navigating within a
+#. table and then navigates out of it.
+#: ../src/orca/messages.py:1469
 msgid "leaving table."
 msgstr "forlater tabell."
 
@@ -4386,9 +4382,9 @@
 msgid "row %(row)d, column %(column)d"
 msgstr "rad %(row)d, kolonne %(column)d"
 
-#. Translators: this is in references to a column in a
-#. table.
-#: ../src/orca/speech_generator.py:815
+#. Translators: this is in reference to a column in a table. The substitution
+#. is the index (e.g. the first column is "column 1").
+#: ../src/orca/messages.py:1501
 #, python-format
 msgid "column %d"
 msgstr "kolonne %d"
@@ -4470,43 +4466,15 @@
 msgid "Directories button"
 msgstr "Mappeknapp"
 
-#. Translators: "blank" is a short word to mean the
-#. user has navigated to an empty line.
-#. 
-#. Translators: this indicates an empty (blank) spread
-#. sheet cell.
-#. 
-#. Translators: "blank" is a short word to mean the
-#. user has navigated to an empty line.
-#. 
-#. #######################################################################
-#. #
-#. Strings for speech and braille                                       #
-#. #
-#. #######################################################################
-#. Translators: "blank" is a short word to mean the
-#. user has navigated to an empty line.
-#. 
-#: ../src/orca/scripts/apps/evolution/script.py:331
-#: ../src/orca/scripts/apps/soffice/script.py:1340
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:427
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:541
-#: ../src/orca/scripts/apps/soffice/structural_navigation.py:116
-#: ../src/orca/scripts/default.py:2139 ../src/orca/scripts/default.py:2147
-#: ../src/orca/scripts/default.py:2266 ../src/orca/scripts/default.py:2274
-#: ../src/orca/scripts/default.py:2408 ../src/orca/scripts/default.py:4747
-#: ../src/orca/scripts/default.py:4757
-#: ../src/orca/scripts/toolkits/Gecko/script.py:4396
-#: ../src/orca/settings.py:778 ../src/orca/speech_generator.py:733
-#: ../src/orca/speech_generator.py:1085
-#: ../src/orca/structural_navigation.py:3494
+#. Translators: This is presented when the user has navigated to an empty line.
+#: ../src/orca/messages.py:43
 msgid "blank"
 msgstr "blank"
 
 #. Translators: this in reference to an e-mail message
 #. status of having been read or unread.
 #. 
-#: ../src/orca/scripts/apps/evolution/speech_generator.py:135
+#: ../src/orca/scripts/apps/evolution/speech_generator.py:136
 msgid "Read"
 msgstr "Lest"
 
@@ -4518,11 +4486,9 @@
 msgid "%s screen"
 msgstr "%s-skjerm"
 
-#. Translators: this is an indication that Orca is unable to
-#. obtain the display of the gcalctool calculator, which is
-#. the area where calculation results are presented.
-#. 
-#: ../src/orca/scripts/apps/gcalctool/script.py:86
+#. Translators: this is an indication that Orca is unable to obtain the display/
+#. results area of the calculator being used (e.g. gcalctool).
+#: ../src/orca/messages.py:105
 msgid "Unable to get calculator display"
 msgstr "Kan ikke hente kalkulatorvisning"
 
@@ -4531,11 +4497,11 @@
 #. keying off stuff like this, but we're forced to do so in
 #. in this case.
 #. 
-#: ../src/orca/scripts/apps/gedit/script.py:228
+#: ../src/orca/scripts/apps/gedit/script.py:109
 msgid "Change to:"
 msgstr "Endre til:"
 
-#: ../src/orca/scripts/apps/gedit/script.py:229
+#: ../src/orca/scripts/apps/gedit/script.py:110
 msgid "Misspelled word:"
 msgstr "Feilstavet ord:"
 
@@ -4547,15 +4513,15 @@
 #. gedit.  We hate keying off stuff like this, but we're
 #. forced to do so in this case.
 #. 
-#: ../src/orca/scripts/apps/gedit/script.py:263
+#: ../src/orca/scripts/apps/gedit/script.py:144
 msgid "Completed spell checking"
 msgstr "Stavekontroll fullført"
 
-#: ../src/orca/scripts/apps/gedit/script.py:264
+#: ../src/orca/scripts/apps/gedit/script.py:145
 msgid "Spell checking is complete."
 msgstr "Stavekontrollen er ferdig."
 
-#: ../src/orca/scripts/apps/gedit/script.py:266
+#: ../src/orca/scripts/apps/gedit/script.py:147
 msgid "Press Tab and Return to terminate."
 msgstr "Trykk Tab og Linjeskift for å avslutte."
 
@@ -4569,11 +4535,11 @@
 #. has to match what Thunderbird is using.  We hate keying
 #. off stuff like this, but we're forced to do so in this case.
 #. 
-#: ../src/orca/scripts/apps/gedit/script.py:390
-#: ../src/orca/scripts/apps/gedit/script.py:465
+#: ../src/orca/scripts/apps/gedit/script.py:271
+#: ../src/orca/scripts/apps/gedit/script.py:346
 #: ../src/orca/scripts/apps/Thunderbird/script.py:176
 #: ../src/orca/scripts/apps/Thunderbird/script.py:325
-#: ../src/orca/scripts/apps/Thunderbird/script.py:569
+#: ../src/orca/scripts/apps/Thunderbird/script.py:599
 #: ../src/orca/scripts/apps/Thunderbird/speech_generator.py:100
 msgid "Check Spelling"
 msgstr "Stavekontroll"
@@ -4583,14 +4549,14 @@
 #. keying off stuff like this, but we're forced to do so in this
 #. case.
 #. 
-#: ../src/orca/scripts/apps/gedit/script.py:494
+#: ../src/orca/scripts/apps/gedit/script.py:375
 msgid "Phrase not found"
 msgstr "Frase ikke funnet"
 
 #. Translators: this indicates a find command succeeded in
 #. finding something.
 #. 
-#: ../src/orca/scripts/apps/gedit/script.py:556
+#: ../src/orca/scripts/apps/gedit/script.py:437
 msgid "Phrase found."
 msgstr "Frase funnet."
 
@@ -4598,7 +4564,9 @@
 msgid "Read the latest n messages in the incoming messages text area."
 msgstr "Les de siste n meldingene i tekstområde for innkommende meldinger."
 
-#: ../src/orca/scripts/apps/gnome-search-tool/script.py:100
+#. Translators: This message is presented to indicate that a search has begun
+#. or is still taking place.
+#: ../src/orca/messages.py:1385
 msgid "Searching."
 msgstr "Søker."
 
@@ -4612,31 +4580,35 @@
 #. is using.  We hate keying off stuff like this, but we're forced
 #. to do so in this case.
 #. 
-#: ../src/orca/scripts/apps/gnome-search-tool/script.py:134
+#: ../src/orca/scripts/apps/gnome-search-tool/script.py:131
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../src/orca/scripts/apps/gnome-search-tool/script.py:169
+#. Translators: This message is presented to indicate a search executed by the
+#. user has been completed.
+#: ../src/orca/messages.py:1389
 msgid "Search complete."
 msgstr "Søk fullført."
 
-#: ../src/orca/scripts/apps/gnome-search-tool/script.py:177
+#. Translators: This message informs the user who many files were found as
+#. a result of a search.
+#: ../src/orca/messages.py:1646
 #, python-format
 msgid "%d file found"
 msgid_plural "%d files found"
 msgstr[0] "%d fil funnet"
 msgstr[1] "%d filer funnet"
 
-#: ../src/orca/scripts/apps/gnome-search-tool/script.py:182
+#. Translators: This message is presented to the user after performing a file
+#. search to indicate there were no matches.
+#: ../src/orca/messages.py:558
 msgid "No files found."
 msgstr "Ingen filer funnet."
 
-#. Translators: inaccessible means that the application cannot
-#. be read by Orca.  This usually means the application is not
-#. friendly to the assistive technology infrastructure.
-#. 
-#: ../src/orca/scripts/apps/gtk-window-decorator/script.py:89
-#: ../src/orca/scripts/apps/metacity/script.py:120
+#. Translators: Inaccessible means that the application cannot be read by Orca.
+#. This usually means the application is not friendly to the assistive technology
+#. infrastructure.
+#: ../src/orca/messages.py:799
 msgid "inaccessible"
 msgstr "utilgjengelig"
 
@@ -4650,19 +4622,17 @@
 #. between workspaces.  The goal here is to find a match
 #. with that prefix.
 #. 
-#: ../src/orca/scripts/apps/metacity/script.py:113
+#: ../src/orca/scripts/apps/metacity/script.py:114
 msgid "Workspace "
 msgstr "Skrivebord "
 
-#: ../src/orca/scripts/apps/metacity/script.py:113
+#: ../src/orca/scripts/apps/metacity/script.py:114
 msgid "Desk "
 msgstr "Desk "
 
-#. Translators: this is the number of items in a layered
-#. pane or table.
-#. 
-#: ../src/orca/scripts/apps/nautilus/script.py:139
-#: ../src/orca/speech_generator.py:1401
+#. Translators: This message presents the number of items in a layered pane
+#. or table.
+#: ../src/orca/messages.py:1659
 #, python-format
 msgid "%d item"
 msgid_plural "%d items"
@@ -4676,9 +4646,9 @@
 msgid "Notification %s"
 msgstr "Varsling %s"
 
-#. Translators: This denotes a notification to the user of some sort.
-#. 
-#: ../src/orca/scripts/apps/notify-osd/script.py:85
+#. Translators: This message alerts the user to the fact that what will be
+#. presented next came from a notification.
+#: ../src/orca/messages.py:1203
 msgid "Notification"
 msgstr "Varsling"
 
@@ -4689,25 +4659,19 @@
 #. checkbox. If it is checked, Orca will inform the user when
 #. the notification icon has appeared.
 #. 
-#: ../src/orca/scripts/apps/packagemanager/script.py:114
+#: ../src/orca/scripts/apps/packagemanager/script.py:115
 msgid "Notify me when errors have been logged."
 msgstr "Varsle meg når feil er logget."
 
-#. Translators: this is in reference to loading a web page
-#. or some other content.
-#. 
-#: ../src/orca/scripts/apps/packagemanager/script.py:224
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1739
-#: ../src/orca/scripts/toolkits/WebKitGtk/script.py:344
+#. Translators: This message is presented to the user when a web page or similar
+#. item has started loading.
+#: ../src/orca/messages.py:1244
 msgid "Loading.  Please wait."
 msgstr "Laster. Vennligst vent."
 
-#. Translators: this is in reference to loading a web page
-#. or some other content.
-#. 
-#: ../src/orca/scripts/apps/packagemanager/script.py:233
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1752
-#: ../src/orca/scripts/toolkits/WebKitGtk/script.py:354
+#. Translators: This message is presented to the user when a web page or similar
+#. item has finished loading.
+#: ../src/orca/messages.py:1248
 msgid "Finished loading."
 msgstr "Fullført lasting."
 
@@ -4717,7 +4681,7 @@
 #. the error in a dialog box. This is the message Orca will
 #. present to inform the user that this has occurred.
 #. 
-#: ../src/orca/scripts/apps/packagemanager/script.py:255
+#: ../src/orca/scripts/apps/packagemanager/script.py:250
 msgid "An error occurred. View the error log for details."
 msgstr "En feil oppsto. Vis feilloggen for å se detaljer."
 
@@ -4730,7 +4694,11 @@
 msgid "Use Ctrl+L to move focus to the results."
 msgstr "Bruk Ctrl+L for å flytte fokus til resultatene."
 
-#: ../src/orca/scripts/apps/pidgin/script.py:144
+#. Translators: This message is presented to inform the user that a new chat
+#. conversation has been added to the existing conversations. The "tab" here
+#. refers to the tab which contains the label for a GtkNotebook page. The
+#. label on the tab is the string substitution.
+#: ../src/orca/messages.py:305
 #, python-format
 msgid "New chat tab %s"
 msgstr "Ny pratefane %s"
@@ -4740,10 +4708,9 @@
 msgid "Display more options"
 msgstr "Vis flere alternativer"
 
-#. Translators: this is the input line of a spreadsheet
-#. (i.e., the place where enter formulas)
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:229
+#. Translators: This string refers to an Orca command. The "input line" refers
+#. to the place where one enters formulas for a spreadsheet.
+#: ../src/orca/cmdnames.py:730
 msgid "Presents the contents of the input line."
 msgstr "Presenterer innholdet av innskrivingsfeltet."
 
@@ -4757,10 +4724,11 @@
 "Set rad som skal brukes som dynamiske kolonneoverskrifter når innhold i "
 "regnearkceller uttales."
 
-#. Translators: Orca allows you to dynamically define which
-#. row of a spreadsheet or table counts as column headers.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:246
+#. Translators: Orca allows you to dynamically define which row of a spreadsheet
+#. or table should be treated as containing column headers. This string refers to
+#. the command to unset the row so it is no longer treated as if it contained
+#. column headers.
+#: ../src/orca/cmdnames.py:715
 msgid "Clears the dynamic column headers."
 msgstr "Tømmer dynamiske kolonneoverskrifter."
 
@@ -4774,96 +4742,88 @@
 "Sett kolonnen som brukes som dynamiske radtopptekster når innhold i "
 "regnearkceller uttales."
 
-#. Translators: Orca allows you to dynamically define which
-#. column of a spreadsheet or table counts as row headers.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:263
+#. Translators: Orca allows you to dynamically define which column of a
+#. spreadsheet or table should be treated as containing column headers. This
+#. string refers to the command to unset the column so it is no longer treated
+#. as if it contained row headers.
+#: ../src/orca/cmdnames.py:726
 msgid "Clears the dynamic row headers"
 msgstr "Tømmer dynamiske radoverskrifter"
 
-#. Translators: If checked, then Orca will speak the coordinates
-#. of the current spread sheet cell. Coordinates are the row and
-#. column position within the spread sheet (i.e. A1, B1, C2 ...)
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:356
+#. Translators: This is a label for an option to tell Orca whether or not it
+#. should speak the coordinates of the current spread sheet cell. Coordinates are
+#. the row and column position within the spread sheet (i.e. A1, B1, C2 ...)
+#: ../src/orca/guilabels.py:627
 msgid "Speak spread sheet cell coordinates"
 msgstr "Uttal cellekoordinater i regneark"
 
-#. Translators: this is the title of a panel containing options
-#. for specifying how to navigate tables in document content.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:369
-#: ../src/orca/scripts/toolkits/Gecko/script.py:769
+#. Translators: This is the title of a panel containing options for specifying
+#. how to navigate tables in document content.
+#: ../src/orca/guilabels.py:635
 msgid "Table Navigation"
 msgstr "Tabellnavigasjon"
 
-#. Translators: this is an option to tell Orca whether or not it
+#. Translators: This is a label for an option to tell Orca whether or not it
 #. should speak table cell coordinates in document content.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:382
-#: ../src/orca/scripts/toolkits/Gecko/script.py:782
+#: ../src/orca/guilabels.py:648
 msgid "Speak _cell coordinates"
 msgstr "Tal _cellekoordinater"
 
-#. Translators: this is an option to tell Orca whether or not it
-#. should speak the span size of a table cell (e.g., how many
-#. rows and columns a particular table cell spans in a table).
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:393
-#: ../src/orca/scripts/toolkits/Gecko/script.py:793
+#. Translators: This is a label for an option to tell Orca whether or not it
+#. should speak the span size of a table cell (e.g., how many rows and columns
+#. a particular table cell spans in a table).
+#: ../src/orca/guilabels.py:653
 msgid "Speak _multiple cell spans"
 msgstr "Uttal _flere celleområder"
 
-#. Translators: this is an option for whether or not to speak
-#. the header of a table cell in document content.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:403
-#: ../src/orca/scripts/toolkits/Gecko/script.py:803
+#. Translators: This is a label for an option for whether or not to speak the
+#. header of a table cell in document content.
+#: ../src/orca/guilabels.py:631
 msgid "Announce cell _header"
 msgstr "Annonser celle_topptekst"
 
-#. Translators: this is an option to allow users to skip over
-#. empty/blank cells when navigating tables in document content.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:413
-#: ../src/orca/scripts/toolkits/Gecko/script.py:813
+#. Translators: This is a label for an option to tell Orca to skip over empty/
+#. blank cells when navigating tables in document content.
+#: ../src/orca/guilabels.py:639
 msgid "Skip _blank cells"
 msgstr "Hopp over tomme ce_ller"
 
-#. Translators: this is used to announce that the
-#. current input line in a spreadsheet is blank/empty.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:882
+#. Translators: this is used to announce that the current input line in a
+#. spreadsheet is blank/empty.
+#: ../src/orca/messages.py:548
 msgid "empty"
 msgstr "tom"
 
-#. Translators: Orca allows you to dynamically define which
-#. row of a spreadsheet or table counts as column headers.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:962
+#. Translators: Orca allows you to dynamically define which row of a spreadsheet
+#. or table should be treated as containing column headers. This message is
+#. presented when the user sets the row to a particular row number.
+#: ../src/orca/messages.py:526
 #, python-format
 msgid "Dynamic column header set for row %d"
 msgstr "Dynamisk kolonneoverskrift satt for rad %d"
 
-#. Translators: Orca allows you to dynamically define which
-#. row of a spreadsheet or table counts as column headers.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:984
+#. Translators: Orca allows you to dynamically define which row of a spreadsheet
+#. or table should be treated as containing column headers. This message is
+#. presented when the user unsets the row so it is no longer treated as if it
+#. contained column headers.
+#: ../src/orca/messages.py:532
 msgid "Dynamic column header cleared."
 msgstr "Dynamisk kolonneoverskrift tømt."
 
-#. Translators: Orca allows you to dynamically define which
-#. column of a spreadsheet or table counts as row headers.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:1036
+#. Translators: Orca allows you to dynamically define which column of a
+#. spreadsheet or table should be treated as containing column headers. This
+#. message is presented when the user sets the column to a particular column
+#. number.
+#: ../src/orca/messages.py:538
 #, python-format
 msgid "Dynamic row header set for column %s"
 msgstr "Dynamisk radoverskrift satt for kolonne %s"
 
-#. Translators: Orca allows you to dynamically define which
-#. column of a spreadsheet or table counts as row headers.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:1059
+#. Translators: Orca allows you to dynamically define which column of a
+#. spreadsheet or table should be treated as containing column headers. This
+#. message is presented when the user unsets the column so it is no longer
+#. treated as if it contained row headers.
+#: ../src/orca/messages.py:544
 msgid "Dynamic row header cleared."
 msgstr "Dynamisk radoverskrift tømt."
 
@@ -4873,7 +4833,7 @@
 #. using.  We hate keying off stuff like this, but
 #. we're forced to do so in this case.
 #. 
-#: ../src/orca/scripts/apps/soffice/script.py:1244
+#: ../src/orca/scripts/apps/soffice/script.py:1243
 msgid "Welcome to StarOffice"
 msgstr "Velkommen til StarOffice"
 
@@ -4884,15 +4844,15 @@
 #. We really try to avoid doing this kind of thing, but
 #. sometimes it is necessary and we apologize.
 #. 
-#: ../src/orca/scripts/apps/soffice/script.py:1292
+#: ../src/orca/scripts/apps/soffice/script.py:1291
 msgid "Available fields"
 msgstr "Tilgjengelige felt"
 
-#: ../src/orca/scripts/apps/soffice/script.py:1450
+#: ../src/orca/scripts/apps/soffice/script.py:1449
 msgid "Note that the Scroll Down button has to be pressed numerous times."
 msgstr "Merk at rull ned-knappen har bliltt trykket mange ganger."
 
-#: ../src/orca/scripts/apps/soffice/script.py:1466
+#: ../src/orca/scripts/apps/soffice/script.py:1465
 msgid "License Agreement Accept button now has focus."
 msgstr "Knappen som aksepterer lisensen har fokus."
 
@@ -4902,7 +4862,7 @@
 #. is using.  We hate keying off stuff like this, but we're
 #. forced to in this case.
 #. 
-#: ../src/orca/scripts/apps/soffice/script.py:1495
+#: ../src/orca/scripts/apps/soffice/script.py:1494
 msgid "First name"
 msgstr "Fornavn"
 
@@ -4910,46 +4870,39 @@
 #. in StarOffice/OpenOffice calc that allows you to type in a
 #. cell coordinate (e.g., A4) and then move to it.
 #. 
-#: ../src/orca/scripts/apps/soffice/script.py:1570
+#: ../src/orca/scripts/apps/soffice/script.py:1569
 msgid "Move to cell"
 msgstr "Flytt til celle"
 
-#. Translators: this is an indication of the position of the
-#. focused Impress slide and the total number of slides in the
-#. presentation.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:1759
+#. Translators: This message is an indication of the position of the focused
+#. slide and the total number of slides in the presentation.
+#: ../src/orca/messages.py:1314
 #, python-format
 msgid "slide %(position)d of %(count)d"
 msgstr "lysbilde %(position)d av %(count)d"
 
-#. Translators: This message is to inform the user that
-#. the last row of a table in a document was just deleted.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:1945
+#. Translators: This message is presented to the user to confirm that he/she just
+#. deleted the last row of a table.
+#: ../src/orca/messages.py:1541
 msgid "Last row deleted."
 msgstr "Siste rad slettet."
 
-#. Translators: This message is to inform the user that
-#. a row in a table was just deleted.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:1949
+#. Translators: This message is presented to the user to confirm that he/she just
+#. deleted a table row.
+#: ../src/orca/messages.py:1537
 msgid "Row deleted."
 msgstr "Rad slettet."
 
-#. Translators: This message is to inform the user that a
-#. new table row was inserted at the end of the existing
-#. table. This typically happens when the user presses Tab
-#. from within the last cell of the table.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:1956
+#. Translators: This message is presented to the user to confirm that he/she just
+#. inserted a table row at the end of the table. This typically happens when the
+#. user presses Tab from within the last cell of the table.
+#: ../src/orca/messages.py:1550
 msgid "Row inserted at the end of the table."
 msgstr "Rad satt inn ved slutten av tabellen."
 
-#. Translators: This message is to inform the user that
-#. a row in a table was just inserted.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:1960
+#. Translators: This message is presented to the user to confirm that he/she just
+#. inserted a table row.
+#: ../src/orca/messages.py:1545
 msgid "Row inserted."
 msgstr "Rad satt inn."
 
@@ -4960,163 +4913,133 @@
 #. stuff like this, but we're forced to do so in this
 #. case.
 #. 
-#: ../src/orca/scripts/apps/soffice/script.py:2005
+#: ../src/orca/scripts/apps/soffice/script.py:2004
 msgid "Presentation Wizard"
 msgstr "Presentasjonsassistent"
 
-#. Translators: this means a
-#. particular cell in a spreadsheet
-#. has a formula
+#. Translators: this means a particular cell in a spreadsheet has a formula
 #. (e.g., "=sum(a1:d1)")
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:2137
+#: ../src/orca/messages.py:600
 msgid "has formula"
 msgstr "har formel"
 
 #. Translators: this is the name of a cell in a spreadsheet.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:2160
+#: ../src/orca/messages.py:180
 #, python-format
 msgid "Cell %s"
 msgstr "Celle %s"
 
-#. Translators: this represents the state of a check box
-#. 
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:214
+#. Translators: This brief message is presented to indicate the state of widgets
+#. (checkboxes, push buttons, toggle buttons) on a toolbar which are associated
+#. with text formatting (bold, italics, underlining, justification, etc.).
+#: ../src/orca/messages.py:1240
 msgid "on"
 msgstr "på"
 
-#. Translators: this represents the state of a check box
-#. 
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:218
+#. Translators: This brief message is presented to indicate the state of widgets
+#. (checkboxes, push buttons, toggle buttons) on a toolbar which are associated
+#. with text formatting (bold, italics, underlining, justification, etc.).
+#: ../src/orca/messages.py:1235
 msgid "off"
 msgstr "av"
 
-#. Translators: people can enter a string of text that is
-#. too wide for a spreadsheet cell.  This string will be
-#. spoken if such a cell is encountered.
-#. 
-#: ../src/orca/scripts/apps/soffice/speech_generator.py:405
+#. Translators: People can enter a string of text that is too wide to be
+#. fully displayed in a spreadsheet cell. This message will be spoken if
+#. such a cell is encountered.
+#: ../src/orca/messages.py:1623
 #, python-format
 msgid "%d character too long"
 msgid_plural "%d characters too long"
 msgstr[0] "%d tegn for lang"
 msgstr[1] "%d tegn for lang"
 
-#. Translators: this represents the (row, col) position of
-#. a cell in a table.
-#. 
-#: ../src/orca/scripts/apps/soffice/structural_navigation.py:123
-#: ../src/orca/structural_navigation.py:3501
+#. Translators: This message describes the (row, col) position of a table cell.
+#: ../src/orca/messages.py:1461
 #, python-format
 msgid "Row %(row)d, column %(column)d."
 msgstr "Rad %(row)d, kolonne %(column)d."
 
 #. Translators: this is the name of a panel in Thunderbird.
 #. 
-#: ../src/orca/scripts/apps/Thunderbird/script.py:607
-#: ../src/orca/scripts/apps/Thunderbird/script.py:624
+#: ../src/orca/scripts/apps/Thunderbird/script.py:637
+#: ../src/orca/scripts/apps/Thunderbird/script.py:654
 #, python-format
 msgid "%s panel"
 msgstr "%s panel"
 
-#. Translators: this command will move the mouse pointer
-#. to the current item without clicking on it.
-#. 
-#: ../src/orca/scripts/default.py:146
+#. Translators: this command will move the mouse pointer to the current item
+#. without clicking on it.
+#: ../src/orca/cmdnames.py:37
 msgid "Routes the pointer to the current item."
 msgstr "Ruter pekeren til aktiv oppføring."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  A left click means to generate
-#. a left mouse button click on the current item.
-#. 
-#: ../src/orca/scripts/default.py:161
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. Left click means to generate a left mouse button click on the current item.
+#: ../src/orca/cmdnames.py:45
 msgid "Performs left click on current flat review item."
 msgstr "Utfører venstreklikk på gjeldende oppføring i flat visning."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  A right click means to generate
-#. a right mouse button click on the current item.
-#. 
-#: ../src/orca/scripts/default.py:176
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. Right click means to generate a right mouse button click on the current item.
+#: ../src/orca/cmdnames.py:53
 msgid "Performs right click on current flat review item."
 msgstr "Utfører høyreklikk på gjeldene oppføring i flat visning."
 
-#. Translators: the "Where am I" feature of Orca allows
-#. a user to press a key and then have information
-#. about their current context spoken and brailled to
-#. them.  For example, the information may include the
-#. name of the current pushbutton with focus as well as
-#. its mnemonic.
-#. 
-#: ../src/orca/scripts/default.py:201
+#. Translators: the "Where am I" feature of Orca allows a user to press a key and
+#. then have information about their current context spoken and brailled to them.
+#. For example, the information may include the name of the current pushbutton
+#. with focus as well as its mnemonic.
+#: ../src/orca/cmdnames.py:65
 msgid "Performs the basic where am I operation."
 msgstr "Kjører grunnleggende versjon av «hvor er jeg»-operasjonen."
 
-#. Translators: the "Where am I" feature of Orca allows
-#. a user to press a key and then have information
-#. about their current context spoken and brailled to
-#. them.  For example, the information may include the
-#. name of the current pushbutton with focus as well as
-#. its mnemonic.
-#. 
-#: ../src/orca/scripts/default.py:213
+#. Translators: the "Where am I" feature of Orca allows a user to press a key and
+#. then have information about their current context spoken and brailled to them.
+#. For example, the information may include the name of the current pushbutton
+#. with focus as well as its mnemonic.
+#: ../src/orca/cmdnames.py:71
 msgid "Performs the detailed where am I operation."
 msgstr "Kjører detaljert versjon av «hvor er jeg»-operasjonen."
 
-#. Translators: This command will cause the window's
-#. title to be spoken.
-#. 
-#: ../src/orca/scripts/default.py:226
+#. Translators: This command will cause the window's title to be spoken.
+#: ../src/orca/cmdnames.py:78
 msgid "Speaks the title bar."
 msgstr "Uttaler teksten i tittelfeltet."
 
-#. Translators: This command will cause the window's
-#. status bar contents to be spoken.
-#. 
-#: ../src/orca/scripts/default.py:239
+#. Translators: This command will cause the window's status bar contents to be
+#. spoken.
+#: ../src/orca/cmdnames.py:75
 msgid "Speaks the status bar."
 msgstr "Uttaler teksten i statuslinjen."
 
-#. Translators: the Orca "Find" dialog allows a user to
-#. search for text in a window and then move focus to
-#. that text.  For example, they may want to find the
-#. "OK" button.
-#. 
-#: ../src/orca/scripts/default.py:249
+#. Translators: the Orca "Find" dialog allows a user to search for text in a
+#. window and then move focus to that text. For example, they may want to find
+#. the "OK" button.
+#: ../src/orca/cmdnames.py:83
 msgid "Opens the Orca Find dialog."
 msgstr "Åpner dialog for søk i Orca."
 
-#. Translators: the Orca "Find" dialog allows a user to
-#. search for text in a window and then move focus to
-#. that text.  For example, they may want to find the
-#. "OK" button.  This string is used for finding the
-#. next occurence of a string.
-#. 
-#: ../src/orca/scripts/default.py:260
+#. Translators: the Orca "Find" dialog allows a user to search for text in a
+#. window and then move focus to that text. For example, they may want to find
+#. the "OK" button. This string is used for finding the next occurence of a
+#. string.
+#: ../src/orca/cmdnames.py:89
 msgid "Searches for the next instance of a string."
 msgstr "Søker etter neste instans av en streng."
 
-#. Translators: the Orca "Find" dialog allows a user to
-#. search for text in a window and then move focus to
-#. that text.  For example, they may want to find the
-#. "OK" button.  This string is used for finding the
-#. previous occurence of a string.
-#. 
-#: ../src/orca/scripts/default.py:271
+#. Translators: the Orca "Find" dialog allows a user to search for text in a
+#. window and then move focus to that text. For example, they may want to find
+#. the "OK" button. This string is used for finding the previous occurence of a
+#. string.
+#: ../src/orca/cmdnames.py:95
 msgid "Searches for the previous instance of a string."
 msgstr "Søker etter forrige instans av en streng."
 
@@ -5130,346 +5053,250 @@
 msgid "Paints and prints the visible zones in the active window."
 msgstr "Tegner opp og skriver ut synlige soner i det aktive vinduet."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.
-#. 
-#: ../src/orca/scripts/default.py:285
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#: ../src/orca/cmdnames.py:102
 msgid "Enters and exits flat review mode."
 msgstr "Går inn i og ut av flat visningsmodus."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.
-#. 
-#: ../src/orca/scripts/default.py:299
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#: ../src/orca/cmdnames.py:126
 msgid "Moves flat review to the beginning of the previous line."
 msgstr "Flytter flat visning til begynnelsen av forrige linje."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  The home position is the
-#. beginning of the content in the window.
-#. 
-#: ../src/orca/scripts/default.py:314
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. The home position is the beginning of the content in the window.
+#: ../src/orca/cmdnames.py:110
 msgid "Moves flat review to the home position."
 msgstr "Flytter flat visning til hjemposisjonen."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  This particular command will
-#. cause Orca to speak the current line.
-#. 
-#: ../src/orca/scripts/default.py:329
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#: ../src/orca/cmdnames.py:133
 msgid "Speaks the current flat review line."
 msgstr "Leser opp den gjeldende linjen i flat visning."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}. This particular command will
-#. cause Orca to spell the current line.
-#. 
-#: ../src/orca/scripts/default.py:344
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. This particular command will cause Orca to spell the current line character
+#. by character.
+#: ../src/orca/cmdnames.py:142
 msgid "Spells the current flat review line."
 msgstr "Staver den gjeldende linjen i flat visning."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}. This particular command will
-#. cause Orca to "phonetically spell" the current line,
-#. saying "Alpha" for "a", "Bravo" for "b" and so on.
-#. 
-#: ../src/orca/scripts/default.py:360
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. This particular command will cause Orca to spell the current line character
+#. by character phonetically, saying "Alpha" for "a", "Bravo" for "b" and so on.
+#: ../src/orca/cmdnames.py:152
 msgid "Phonetically spells the current flat review line."
 msgstr "Staver fonetisk aktiv linje i flat visning."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.
-#. 
-#: ../src/orca/scripts/default.py:374
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#: ../src/orca/cmdnames.py:159
 msgid "Moves flat review to the beginning of the next line."
 msgstr "Flytter flat visning til begynnelsen av neste linje."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  The end position is the last
-#. bit of information in the window.
-#. 
-#: ../src/orca/scripts/default.py:389
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. The home position is the last bit of information in the window.
+#: ../src/orca/cmdnames.py:118
 msgid "Moves flat review to the end position."
 msgstr "Flytter flat visning til sluttposisjonen."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  Previous will go backwards
-#. in the window until you reach the top (i.e., it will
-#. wrap across lines if necessary).
-#. 
-#: ../src/orca/scripts/default.py:405
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. Previous will go backwards in the window until you reach the top (i.e., it
+#. will wrap across lines if necessary).
+#: ../src/orca/cmdnames.py:168
 msgid "Moves flat review to the previous item or word."
 msgstr "Flytter flat visning til forrige oppføring eller ord."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  Above in this case means
-#. geographically above, as if you drew a vertical line
-#. in the window.
-#. 
-#: ../src/orca/scripts/default.py:421
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. Above in this case means geographically above, as if you drew a vertical
+#. line upward on the screen.
+#: ../src/orca/cmdnames.py:214
 msgid "Moves flat review to the word above the current word."
 msgstr "Flytter flat visning til oret over gjeldende ord."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  This command will speak the
-#. current word or item.
-#. 
-#: ../src/orca/scripts/default.py:436
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. This command will speak the current word or item.
+#: ../src/orca/cmdnames.py:176
 msgid "Speaks the current flat review item or word."
 msgstr ""
 "Leser opp den gjeldende oppføringen eller det gjeldende ordet i flat visning."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  This command will spell out
-#. the current word or item letter by letter.
-#. 
-#: ../src/orca/scripts/default.py:451
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. This particular command will cause Orca to spell the current word or item
+#. character by character.
+#: ../src/orca/cmdnames.py:185
 msgid "Spells the current flat review item or word."
 msgstr ""
 "Leser opp den gjeldende oppføringen eller det gjeldende ordet i flat visning."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  This command will spell out
-#. the current word or item phonetically, saying "Alpha"
-#. for "a", "Bravo" for "b" and so on.
-#. 
-#: ../src/orca/scripts/default.py:467
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. This particular command will cause Orca to spell the current word or item
+#. character by character phonetically, saying "Alpha" for "a", "Bravo" for "b"
+#. and so on.
+#: ../src/orca/cmdnames.py:196
 msgid "Phonetically spells the current flat review item or word."
 msgstr "Staver fonetisk gjeldende oppføring eller ord i flat visning."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  The flat review object is
-#. typically something like a pushbutton, a label, or
-#. some other GUI widget.  The 'speaks' means it will
-#. speak the text associated with the object.
-#. 
-#: ../src/orca/scripts/default.py:484
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. With respect to this command, the flat review object is typically something
+#. like a pushbutton, a label, or some other GUI widget. The 'speaks' means it
+#. will speak the text associated with the object.
+#: ../src/orca/cmdnames.py:224
 msgid "Speaks the current flat review object."
 msgstr "Leser opp det gjeldende flatvisningsobjektet."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  Next will go forwards
-#. in the window until you reach the end (i.e., it will
-#. wrap across lines if necessary).
-#. 
-#: ../src/orca/scripts/default.py:500
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. Next will go forwards in the window until you reach the end (i.e., it
+#. will wrap across lines if necessary).
+#: ../src/orca/cmdnames.py:205
 msgid "Moves flat review to the next item or word."
 msgstr ""
 "Flytter flat visning til den neste oppføringen eller det neste ordet."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  Below in this case means
-#. geographically below, as if you drew a vertical line
-#. downward on the screen.
-#. 
-#: ../src/orca/scripts/default.py:516
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. Below in this case means geographically below, as if you drew a vertical
+#. line downward on the screen.
+#: ../src/orca/cmdnames.py:233
 msgid "Moves flat review to the word below the current word."
 msgstr "Flytter flat visning til ordet under det gjeldende ordet."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  Previous will go backwards
-#. in the window until you reach the top (i.e., it will
-#. wrap across lines if necessary).
-#. 
-#: ../src/orca/scripts/default.py:532
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. Previous will go backwards in the window until you reach the top (i.e., it
+#. will wrap across lines if necessary).
+#: ../src/orca/cmdnames.py:242
 msgid "Moves flat review to the previous character."
 msgstr "Flytter flat visning til forrige tegn."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.
-#. 
-#: ../src/orca/scripts/default.py:546
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. This command will move to and present the end of the line.
+#: ../src/orca/cmdnames.py:287
 msgid "Moves flat review to the end of the line."
 msgstr "Flytter flat visning til enden av linjen."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  Previous will go backwards
-#. in the window until you reach the top (i.e., it will
-#. wrap across lines if necessary).  The 'speaks' in
-#. this case will be the spoken language form of the
-#. character currently being reviewed.
-#. 
-#: ../src/orca/scripts/default.py:564
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. This command will speak the current character
+#: ../src/orca/cmdnames.py:250
 msgid "Speaks the current flat review character."
 msgstr "Leser opp det gjeldende tegnet fra flat visning."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  Previous will go backwards
-#. in the window until you reach the top (i.e., it will
-#. wrap across lines if necessary).  This command will
-#. cause Orca to speak a phonetic representation of the
-#. character currently being reviewed, saying "Alpha"
-#. for "a", "Bravo" for "b" and so on.
-#. 
-#: ../src/orca/scripts/default.py:583
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. This particular command will cause Orca to present the character phonetically,
+#. saying "Alpha" for "a", "Bravo" for "b" and so on.
+#: ../src/orca/cmdnames.py:260
 msgid "Phonetically speaks the current flat review character."
 msgstr "Leser fonetisk det gjeldende tegnet fra flat visning."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  Previous will go backwards
-#. in the window until you reach the top (i.e., it will
-#. wrap across lines if necessary).  This command will
-#. cause Orca to speak information about the current character
-#. Like its unicode value and other relevant information
-#. 
-#: ../src/orca/scripts/default.py:601
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. This particular command will cause Orca to present the character's unicode
+#. value.
+#: ../src/orca/cmdnames.py:270
 msgid "Speaks unicode value of the current flat review character."
 msgstr "Leser opp unicode-verdien for det gjeldende tegnet fra flat visning."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  Next will go forwards
-#. in the window until you reach the end (i.e., it will
-#. wrap across lines if necessary).
-#. 
-#: ../src/orca/scripts/default.py:617
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. Previous will go forwards in the window until you reach the end (i.e., it
+#. will wrap across lines if necessary).
+#: ../src/orca/cmdnames.py:279
 msgid "Moves flat review to the next character."
 msgstr "Flytter flat visning til neste tegn."
 
-#. Translators: when users are navigating a table, they
-#. sometimes want the entire row of a table read, or
-#. they just want the current cell to be presented to them.
-#. 
-#: ../src/orca/scripts/default.py:658
+#. Translators: when users are navigating a table, they sometimes want the
+#. entire row of a table read; other times they just want the current cell
+#. to be presented to them.
+#: ../src/orca/cmdnames.py:320
 msgid "Toggles whether to read just the current table cell or the whole row."
 msgstr "Les bare gjeldende tabellcelle eller hele raden."
 
-#. Translators: the attributes being presented are the
-#. text attributes, such as bold, italic, font name,
-#. font size, etc.
-#. 
-#: ../src/orca/scripts/default.py:668
+#. Translators: the attributes being presented are the text attributes, such as
+#. bold, italic, font name, font size, etc.
+#: ../src/orca/cmdnames.py:325
 msgid "Reads the attributes associated with the current text character."
 msgstr "Leser attributtene tilordnet det gjeldende tekstlige tegnet."
 
@@ -5483,111 +5310,77 @@
 msgid "Reports information on current script."
 msgstr "Rapporterer informasjon om aktivt skript."
 
-#. Translators: a refreshable braille display is an
-#. external hardware device that presents braille
-#. character to the user.  There are a limited number
-#. of cells on the display (typically 40 cells).  Orca
-#. provides the feature to build up a longer logical
-#. line and allow the user to press buttons on the
-#. braille display so they can pan left and right over
-#. this line.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:277
-#: ../src/orca/scripts/default.py:683
-#: ../src/orca/scripts/toolkits/Gecko/script.py:582
-#: ../src/orca/scripts/toolkits/WebKitGtk/script.py:123
+#. Translators: a refreshable braille display is an external hardware device that
+#. presents braille characters to the user. There are a limited number of cells
+#. on the display (typically 40 cells).  Orca provides the feature to build up a
+#. longer logical line and allow the user to press buttons on the braille display
+#. so they can pan left and right over this line.
+#: ../src/orca/cmdnames.py:332
 msgid "Pans the braille display to the left."
 msgstr "Forskyver braillevisningen til venstre."
 
-#. Translators: a refreshable braille display is an
-#. external hardware device that presents braille
-#. character to the user.  There are a limited number
-#. of cells on the display (typically 40 cells).  Orca
-#. provides the feature to build up a longer logical
-#. line and allow the user to press buttons on the
-#. braille display so they can pan left and right over
-#. this line.
-#. 
-#: ../src/orca/scripts/apps/soffice/script.py:292
-#: ../src/orca/scripts/default.py:698
-#: ../src/orca/scripts/toolkits/Gecko/script.py:597
-#: ../src/orca/scripts/toolkits/WebKitGtk/script.py:138
+#. Translators: a refreshable braille display is an external hardware device that
+#. presents braille characters to the user. There are a limited number of cells
+#. on the display (typically 40 cells).  Orca provides the feature to build up a
+#. longer logical line and allow the user to press buttons on the braille display
+#. so they can pan left and right over this line.
+#: ../src/orca/cmdnames.py:339
 msgid "Pans the braille display to the right."
 msgstr "Forskyver braillevisningen til høyre."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  The bottom left is the bottom
-#. left of the window currently being reviewed.
-#. 
-#: ../src/orca/scripts/default.py:714
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. The bottom left is the bottom left of the window currently being reviewed.
+#: ../src/orca/cmdnames.py:295
 msgid "Moves flat review to the bottom left."
 msgstr "Flytter flat visning nederst til venstre."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  Flat review is modal, and
-#. the user can be exploring the window without changing
-#. which object in the window which has focus.  The
-#. feature used here will return the flat review to the
-#. object with focus.
-#. 
-#: ../src/orca/scripts/default.py:732
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  The flat review feature allows
+#. the user to explore this text by the {previous,next} {line,word,character}.
+#. Flat review is modal, and the user can be exploring the window without
+#. changing which object in the window which has focus. The feature used here
+#. will return the flat review to the object with focus.
+#: ../src/orca/cmdnames.py:349
 msgid "Returns to object with keyboard focus."
 msgstr "Returnerer til objektet med tastaturfokus."
 
-#. Translators: braille can be displayed in many ways.
-#. Contracted braille provides a more efficient means
-#. to represent text, especially long documents.  The
-#. feature used here is an option to toggle between
-#. contracted and uncontracted.
-#. 
-#: ../src/orca/scripts/default.py:743
+#. Translators: braille can be displayed in many ways. Contracted braille
+#. provides a more efficient means to represent text, especially long
+#. documents. The feature used here is an option to toggle between contracted
+#. and uncontracted.
+#: ../src/orca/cmdnames.py:355
 msgid "Turns contracted braille on and off."
 msgstr "Slår av/på sammentrukket blindeskrift."
 
-#. Translators: hardware braille displays often have
-#. buttons near each braille cell.  These are called
-#. cursor routing keys and are a way for a user to
-#. tell the machine they are interested in a particular
-#. character on the display.
-#. 
-#: ../src/orca/scripts/default.py:754
+#. Translators: hardware braille displays often have buttons near each braille
+#. cell. These are called cursor routing keys and are a way for a user to tell
+#. the machine they are interested in a particular character on the display.
+#: ../src/orca/cmdnames.py:360
 msgid "Processes a cursor routing key."
 msgstr "Prosesserer en tast for markørrute."
 
-#. Translators: this is used to indicate the start point
-#. of a text selection.
-#. 
-#: ../src/orca/scripts/default.py:762
+#. Translators: this is used to indicate the start point of a text selection.
+#: ../src/orca/cmdnames.py:363
 msgid "Marks the beginning of a text selection."
 msgstr "Markerer starten av en tekstmarkering."
 
-#. Translators: this is used to indicate the end point
-#. of a text selection.
-#. 
-#: ../src/orca/scripts/default.py:770
+#. Translators: this is used to indicate the end point of a text selection.
+#: ../src/orca/cmdnames.py:366
 msgid "Marks the end of a text selection."
 msgstr "Markerer slutten på en tekstmarkering."
 
-#. Translators: Orca has a "Learn Mode" that will allow
-#. the user to type any key on the keyboard and hear what
-#. the effects of that key would be.  The effects might
-#. be what Orca would do if it had a handler for the
-#. particular key combination, or they might just be to
-#. echo the name of the key if Orca doesn't have a handler.
-#. 
-#: ../src/orca/scripts/default.py:782
+#. Translators: Orca has a "Learn Mode" that will allow the user to type any key
+#. on the keyboard and hear what the effects of that key would be. The effects
+#. might be what Orca would do if it had a handler for the particular key
+#. combination, or they might just be to echo the name of the key if Orca doesn't
+#. have a handler.
+#: ../src/orca/cmdnames.py:373
 msgid "Enters learn mode.  Press escape to exit learn mode."
 msgstr "Går inn i læringsmodus. Trykk escape for å gå ut av det igjen."
 
@@ -5606,92 +5399,77 @@
 "Går inn i modus for å liste snarveier. Trykk escape for å gå ut av modus for "
 "å liste snarveier."
 
-#. Translators: the speech rate is how fast the speech
-#. synthesis engine will generate speech.
-#. 
-#: ../src/orca/scripts/default.py:805
+#. Translators: the speech rate is how fast the speech synthesis engine will
+#. generate speech.
+#: ../src/orca/cmdnames.py:377
 msgid "Decreases the speech rate."
 msgstr "Begrenser lesehastigheten."
 
-#. Translators: the speech rate is how fast the speech
-#. synthesis engine will generate speech.
-#. 
-#: ../src/orca/scripts/default.py:813
+#. Translators: the speech rate is how fast the speech synthesis engine will
+#. generate speech.
+#: ../src/orca/cmdnames.py:381
 msgid "Increases the speech rate."
 msgstr "Øker lesehastigheten."
 
-#. Translators: the speech pitch is how high or low in
-#. pitch/frequency the speech synthesis engine will
-#. generate speech.
-#. 
-#: ../src/orca/scripts/default.py:822
+#. Translators: the speech pitch is how high or low in pitch/frequency the
+#. speech synthesis engine will generate speech.
+#: ../src/orca/cmdnames.py:385
 msgid "Decreases the speech pitch."
 msgstr "Begrenser stemmens tonehøyde."
 
-#. Translators: the speech pitch is how high or low in
-#. pitch/frequency the speech synthesis engine will
-#. generate speech.
-#. 
-#: ../src/orca/scripts/default.py:831
+#. Translators: the speech pitch is how high or low in pitch/frequency the
+#. speech synthesis engine will generate speech.
+#: ../src/orca/cmdnames.py:389
 msgid "Increases the speech pitch."
 msgstr "Øker stemmens tonehøyde."
 
-#: ../src/orca/scripts/default.py:836
+#. Translators: this string is associated with the keyboard shortcut to quit
+#. Orca.
+#: ../src/orca/cmdnames.py:397
 msgid "Quits Orca"
 msgstr "Avslutter Orca"
 
-#. Translators: the preferences configuration dialog is
-#. the dialog that allows users to set their preferences
-#. for Orca.
-#. 
-#: ../src/orca/scripts/default.py:845
+#. Translators: the preferences configuration dialog is the dialog that allows
+#. users to set their preferences for Orca.
+#: ../src/orca/cmdnames.py:401
 msgid "Displays the preferences configuration dialog."
 msgstr "Viser innstillingsvinduet."
 
-#. Translators: the application preferences configuration
-#. dialog is the dialog that allows users to set their
-#. preferences for a specific application within Orca.
-#. 
-#: ../src/orca/scripts/default.py:854
+#. Translators: the preferences configuration dialog is the dialog that allows
+#. users to set their preferences for a specific application within Orca.
+#: ../src/orca/cmdnames.py:406
 msgid "Displays the application preferences configuration dialog."
 msgstr "Viser brukervalgdialogen for programmet."
 
-#. Translators: Orca allows the user to turn speech synthesis
-#. on or off.  We call it 'silencing'.
-#. 
-#: ../src/orca/scripts/default.py:862
+#. Translators: Orca allows the user to turn speech synthesis on or off.
+#. We call it 'silencing'.
+#: ../src/orca/cmdnames.py:393
 msgid "Toggles the silencing of speech."
 msgstr "Slår av og på lyd for opplesning."
 
-#. Translators: Orca allows the user to enable/disable
-#. the speaking of indentation and justification.
-#. 
-#: ../src/orca/scripts/default.py:871
+#. Translators: Orca allows the user to enable/disable speaking of indentation
+#. and justification.
+#: ../src/orca/cmdnames.py:411
 msgid "Toggles the speaking of indentation and justification."
 msgstr "Slår av/på opplesing av tekst_indentering og tekstjustering."
 
-#. Translators: Orca allows users to cycle through
-#. punctuation levels.
-#. None, some, most, or all, punctuation will be spoken.
-#. 
-#: ../src/orca/scripts/default.py:880
+#. Translators: Orca allows users to cycle through punctuation levels. None,
+#. some, most, or all, punctuation will be spoken.
+#: ../src/orca/cmdnames.py:415
 msgid "Cycles to the next speaking of punctuation level."
 msgstr "Bytter til neste uttale av tegnsettingsnivå."
 
-#. Translators: Orca has an "echo" setting which allows
-#. the user to configure what is spoken in response to a
-#. key press. Given a user who typed "Hello world.":
+#. Translators: Orca has an "echo" setting which allows the user to configure
+#. what is spoken in response to a key press. Given a user who typed "Hello
+#. world.":
 #. - key echo: "H e l l o space w o r l d period"
-#. - word echo: "Hello" spoken when the space is pressed;
-#. "world" spoken when the period is pressed.
-#. - sentence echo: "Hello world" spoken when the period
-#. is pressed.
-#. A user can choose to have no echo, one type of echo, or
-#. multiple types of echo.
-#. The following string refers to a command that allows the
-#. user to quickly choose which type of echo is being used.
-#. 
-#: ../src/orca/scripts/default.py:926
+#. - word echo: "Hello" spoken when the space is pressed; "world" spoken when
+#. the period is pressed.
+#. - sentence echo: "Hello world" spoken when the period is pressed.
+#. A user can choose to have no echo, one type of echo, or multiple types of
+#. echo. The following string refers to a command that allows the user to quickly
+#. choose which type of echo is being used.
+#: ../src/orca/cmdnames.py:444
 msgid "Cycles to the next key echo level."
 msgstr "Bytter til neste nivå for tasteekko."
 
@@ -5708,14 +5486,12 @@
 "Skriver ut feilsøkingsinformasjon som viser alle kjente programmer på "
 "konsollet hvor Orca kjører."
 
-#. Translators: this is a debug message that Orca users
-#. will not normally see. It describes a debug routine
-#. that allows the user to adjust the level of debug
+#. Translators: this is a debug message that Orca users will not normally see. It
+#. describes a debug routine that allows the user to adjust the level of debug
 #. information that Orca generates at run time.
-#. 
-#: ../src/orca/scripts/default.py:936
+#: ../src/orca/cmdnames.py:449
 msgid "Cycles the debug level at run time."
-msgstr ""
+msgstr "Endrer feilsøkingsnivå ved kjøring."
 
 #. Translators: this is a debug message that Orca users
 #. will not normally see. It describes a debug routine
@@ -5748,92 +5524,80 @@
 msgid "Prints memory usage information."
 msgstr "Skriver ut informasjon om minnebruk."
 
-#. Translators: this command announces information regarding
-#. the relationship of the given bookmark to the current
-#. position
-#. 
-#: ../src/orca/scripts/default.py:945
+#. Translators: this command announces information regarding the relationship of
+#. the given bookmark to the current position. Note that in this context, the
+#. "bookmark" is storing the location of an accessible object, typically on a web
+#. page.
+#: ../src/orca/cmdnames.py:456
 msgid "Bookmark where am I with respect to current position."
 msgstr "Lag bokmerke for plassering i forhold til nåværende posisjon."
 
-#. Translators: this command moves the current position to the
-#. location stored at the bookmark.
-#. 
-#: ../src/orca/scripts/default.py:953
+#. Translators: this command moves the user to the location stored at the bookmark.
+#. Note that in this context, the "bookmark" is storing the location of an
+#. accessible object, typically on a web page.
+#: ../src/orca/cmdnames.py:467
 msgid "Go to bookmark."
 msgstr "Gå til bokmerke."
 
-#. Translators: this event handler binds an in-page accessible
-#. object location to the given input key command.
-#. 
-#: ../src/orca/scripts/default.py:961
+#. Translators: this event handler binds an in-page accessible object location to
+#. the given input key command.
+#: ../src/orca/cmdnames.py:477
 msgid "Add bookmark."
 msgstr "Legg til bokmerke."
 
-#. Translators: this event handler saves all bookmarks for the
-#. current application to disk.
-#. 
-#: ../src/orca/scripts/default.py:969
+#. Translators: this event handler saves all bookmarks for the current application
+#. to disk.
+#: ../src/orca/cmdnames.py:481
 msgid "Save bookmarks."
 msgstr "Lagre bokmerke."
 
-#. Translators: this event handler cycles through the registered
-#. bookmarks and takes the user to the next bookmark location.
-#. 
-#: ../src/orca/scripts/default.py:977
+#. Translators: this event handler cycles through the registered bookmarks and
+#. takes the user to the next bookmark location. Note that in this context, the
+#. "bookmark" is storing the location of an accessible object, typically on a web
+#. page.
+#: ../src/orca/cmdnames.py:473
 msgid "Go to next bookmark location."
 msgstr "Gå til neste bokmerkelokasjon."
 
-#. Translators: this event handler cycles through the
-#. registered bookmarks and takes the user to the previous
-#. bookmark location.
-#. 
-#: ../src/orca/scripts/default.py:986
+#. Translators: this event handler cycles through the registered bookmarks and
+#. takes the user to the previous bookmark location. Note that in this context,
+#. the "bookmark" is storing the location of an accessible object, typically on
+#. a web page.
+#: ../src/orca/cmdnames.py:462
 msgid "Go to previous bookmark location."
 msgstr "Gå til forrige bokmerkelokasjon."
 
-#. Translators: Orca allows the item under the pointer to
-#. be spoken. This toggles the feature.
-#. 
-#: ../src/orca/scripts/default.py:994
+#. Translators: Orca allows the item under the pointer to be spoken. This toggles
+#. the feature without the need to get into a GUI.
+#: ../src/orca/cmdnames.py:485
 msgid "Toggle mouse review mode."
 msgstr "Slår av/på forbedringsmodus for mus."
 
-#. Translators: Orca can present the current time to the
-#. user when the user presses
-#. a shortcut key.
-#. 
-#: ../src/orca/scripts/default.py:1003
+#. Translators: Orca has a command to present the current time in speech and in
+#. braille.
+#: ../src/orca/cmdnames.py:489
 msgid "Present current time."
 msgstr "Vis klokkeslett."
 
-#. Translators: Orca can present the current date to the
-#. user when the user presses
-#. a shortcut key.
-#. 
-#: ../src/orca/scripts/default.py:1012
+#. Translators: Orca has a command to present the current date in speech and in
+#. braille.
+#: ../src/orca/cmdnames.py:493
 msgid "Present current date."
 msgstr "Vis dato."
 
-#. Translators: Orca normally intercepts all keyboard
-#. commands and only passes them along to the current
-#. application when they are not Orca commands.  This
-#. command causes the next command issued to be passed
-#. along to the current application, bypassing Orca's
-#. interception of it.
-#. 
-#: ../src/orca/scripts/default.py:1024
+#. Translators: Orca normally intercepts all keyboard commands and only passes
+#. them along to the current application when they are not Orca commands. This
+#. command causes the next command issued to be passed along to the current
+#. application, bypassing Orca's interception of it.
+#: ../src/orca/cmdnames.py:500
 msgid "Passes the next command on to the current application."
 msgstr "Sender neste kommando videre til aktivt program."
 
-#. Translators: Orca normally intercepts all keyboard
-#. commands and only passes them along to the current
-#. application when they are not Orca commands.  This
-#. command causes the next command issued to be passed
-#. along to the current application, bypassing Orca's
-#. interception of it.
-#. 
-#: ../src/orca/scripts/default.py:1528
+#. Translators: Orca normally intercepts all keyboard commands and only passes
+#. them along to the current application when they are not Orca commands. This
+#. command causes the next command issued to be passed along to the current
+#. application, bypassing Orca's interception of it.
+#: ../src/orca/messages.py:101
 msgid "Bypass mode enabled."
 msgstr "Send tastaturkommandoer til applikasjon."
 
@@ -5853,29 +5617,23 @@
 "Går inn i læringsmodus.  Trykk en knapp for å høre hva det brukes til. Trykk "
 "esc for å avslutte læremodus."
 
-#. Translators: Orca has a "Learn Mode" that will allow
-#. the user to type any key on the keyboard and hear what
-#. the effects of that key would be.  The effects might
-#. be what Orca would do if it had a handler for the
-#. particular key combination, or they might just be to
-#. echo the name of the key if Orca doesn't have a handler.
-#. This text here is what is to be presented on the braille
-#. display.
-#. 
-#: ../src/orca/scripts/default.py:1565
+#. Translators: Orca has a "Learn Mode" that will allow the user to type any key
+#. on the keyboard and hear what the effects of that key would be.  The effects
+#. might be what Orca would do if it had a handler for the particular key
+#. combination, or they might just be to echo the name of the key if Orca doesn't
+#. have a handler. This message is what is presented on the braille display when
+#. entering Learn Mode.
+#: ../src/orca/messages.py:827
 msgid "Learn mode.  Press escape to exit."
 msgstr "Læringsmodus.  Trykk escape for å gå ut av det."
 
-#. Translators: Orca has a "Learn Mode" that will allow
-#. the user to type any key on the keyboard and hear what
-#. the effects of that key would be.  The effects might
-#. be what Orca would do if it had a handler for the
-#. particular key combination, or they might just be to
-#. echo the name of the key if Orca doesn't have a handler.
-#. Exiting learn mode puts the user back in normal operating
-#. mode.
-#. 
-#: ../src/orca/scripts/default.py:1591
+#. Translators: Orca has a "Learn Mode" that will allow the user to type any key
+#. on the keyboard and hear what the effects of that key would be.  The effects
+#. might be what Orca would do if it had a handler for the particular key
+#. combination, or they might just be to echo the name of the key if Orca doesn't
+#. have a handler. This message is what is presented in speech and braille when
+#. exiting Learn Mode.
+#: ../src/orca/messages.py:874
 msgid "Exiting learn mode."
 msgstr "Går ut av læringsmodus."
 
@@ -5900,469 +5658,381 @@
 msgid "Exiting list shortcuts mode."
 msgstr "Går ut av snarveimodus."
 
-#. Translators: Orca has a command that allows the user to
-#. move the mouse pointer to the current object. This is a
-#. detailed message which will be presented if for some
-#. reason Orca cannot identify/find the current location.
-#. 
-#. Translators: Orca has a command that allows the user
-#. to move the mouse pointer to the current object. If
-#. for some reason Orca cannot identify the current
-#. location, it will speak this message.
-#. 
-#. Translators: Orca has a command that allows the user to
-#. move the mouse pointer to the current object. This is a
-#. detailed message which will be presented if for some
-#. reason Orca cannot identify/find the current location.
-#. 
-#: ../src/orca/scripts/default.py:1932 ../src/orca/scripts/default.py:2068
-#: ../src/orca/scripts/default.py:2088
+#. Translators: Orca has a command that allows the user to move the mouse pointer
+#. to the current object. This is a detailed message which will be presented if
+#. for some reason Orca cannot identify/find the current location.
+#: ../src/orca/messages.py:1030
 msgid "Could not find current location."
 msgstr "Kunne ikke finne nåværende lokasjon."
 
-#. Translators: Orca has a command that allows the user to
-#. move the mouse pointer to the current object. This is a
-#. brief message which will be presented if for some reason
-#. Orca cannot identify/find the current location.
-#. 
-#: ../src/orca/scripts/default.py:1938 ../src/orca/scripts/default.py:2094
+#. Translators: Orca has a command that allows the user to move the mouse pointer
+#. to the current object. This is a brief message which will be presented if for
+#. some reason Orca cannot identify/find the current location.
+#: ../src/orca/messages.py:1025
 msgctxt "location"
 msgid "Not found"
 msgstr "Ikke funnet"
 
-#. Translators: "white space" is a short phrase to mean the
-#. user has navigated to a line with only whitespace on it.
-#. 
-#: ../src/orca/scripts/default.py:2152 ../src/orca/scripts/default.py:2413
+#. Translators: This is presented when the user has navigated to a line with only
+#. whitespace characters (space, tab, etc.) on it.
+#: ../src/orca/messages.py:1569
 msgid "white space"
 msgstr "mellomrom"
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  This message lets the user know
-#. they have left the flat review feature.
-#. 
-#: ../src/orca/scripts/default.py:2660
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  This message is presented to
+#. let the user know he/she just entered flat review.
+#: ../src/orca/messages.py:596
 msgid "Leaving flat review."
 msgstr "Forlater flat visningsmodus."
 
-#. Translators: the 'flat review' feature of Orca
-#. allows the blind user to explore the text in a
-#. window in a 2D fashion.  That is, Orca treats all
-#. the text from all objects in a window (e.g.,
-#. buttons, labels, etc.) as a sequence of words in a
-#. sequence of lines.  The flat review feature allows
-#. the user to explore this text by the {previous,next}
-#. {line,word,character}.  This message lets the user know
-#. they have entered the flat review feature.
-#. 
-#: ../src/orca/scripts/default.py:2676
+#. Translators: the 'flat review' feature of Orca allows the blind user to
+#. explore the text in a window in a 2D fashion.  That is, Orca treats all
+#. the text from all objects in a window (e.g., buttons, labels, etc.) as a
+#. sequence of words in a sequence of lines.  This message is presented to
+#. let the user know he/she just entered flat review.
+#: ../src/orca/messages.py:589
 msgid "Entering flat review."
 msgstr "Går inn i flat visningsmodus."
 
-#. Translators: this is a spoken prompt letting the user know
-#. that speech synthesis has been turned back on.
-#. 
-#: ../src/orca/scripts/default.py:2696
+#. Translators: This message is presented to the user when speech synthesis
+#. has been turned back on.
+#: ../src/orca/messages.py:1401
 msgid "Speech enabled."
 msgstr "Opplesning slått på."
 
-#. Translators: this is a spoken prompt letting the user know
-#. that speech synthesis has been temporarily turned off.
-#. 
-#: ../src/orca/scripts/default.py:2701
+#. Translators: This message is presented to the user when speech synthesis
+#. has been temporarily turned off.
+#: ../src/orca/messages.py:1397
 msgid "Speech disabled."
 msgstr "Opplesning slått av."
 
-#. Translators: This is a detailed message indicating that
-#. indentation and justification will be spoken.
-#. 
-#: ../src/orca/scripts/default.py:2714
+#. Translators: This detailed message indicates that indentation and
+#. justification will be spoken.
+#: ../src/orca/messages.py:819
 msgid "Speaking of indentation and justification enabled."
 msgstr "Les opp tekstindentering og tekstjustering."
 
-#. Translators: This is a brief message that will be presented
-#. to the user who has just enabled/disabled the speaking of
-#. indentation and justification information.
-#. 
-#: ../src/orca/scripts/default.py:2719
+#. Translators: This brief message indicates that indentation and
+#. justification will be spoken.
+#: ../src/orca/messages.py:814
 msgctxt "indentation and justification"
 msgid "Enabled"
 msgstr "Slått på"
 
-#. Translators: This is a detailed message indicating that
-#. indentation and justification will not be spoken.
-#. 
-#: ../src/orca/scripts/default.py:2724
+#. Translators: This detailed message indicates that indentation and
+#. justification will not be spoken.
+#: ../src/orca/messages.py:809
 msgid "Speaking of indentation and justification disabled."
 msgstr "Leser ikke opp tekstindentering og tekstjustering."
 
-#. Translators: This is a brief message that will be presented
-#. to the user who has just enabled/disabled the speaking of
-#. indentation and justification information.
-#. 
-#: ../src/orca/scripts/default.py:2729
+#. Translators: This brief message indicates that indentation and
+#. justification will be spoken.
+#: ../src/orca/messages.py:804
 msgctxt "indentation and justification"
 msgid "Disabled"
 msgstr "Slått av"
 
-#. Translators: This detailed message will be presented as the
-#. user cycles through the different levels of spoken punctuation.
-#. The options are: All puntuation marks will be spoken, None
-#. will be spoken, Most will be spoken, or Some will be spoken.
-#. 
-#: ../src/orca/scripts/default.py:2746
+#. Translators: This detailed message will be presented as the user cycles
+#. through the different levels of spoken punctuation. The options are:
+#. All puntuation marks will be spoken, None will be spoken, Most will be
+#. spoken, or Some will be spoken.
+#: ../src/orca/messages.py:1381
 msgid "Punctuation level set to some."
 msgstr "Tegnsettingsnivå satt til litt."
 
-#. Translators: This brief message will be presented as the user
-#. cycles through the different levels of spoken punctuation.
-#. The options are: All puntuation marks will be spoken, None
-#. will be spoken, Most will be spoken, or Some will be spoken.
-#. 
-#: ../src/orca/scripts/default.py:2752
+#. Translators: This brief message will be presented as the user cycles
+#. through the different levels of spoken punctuation. The options are:
+#. All puntuation marks will be spoken, None will be spoken, Most will be
+#. spoken, or Some will be spoken.
+#: ../src/orca/messages.py:1375
 msgctxt "spoken punctuation"
 msgid "Some"
 msgstr "Noe"
 
-#. Translators: This detailed message will be presented as the
-#. user cycles through the different levels of spoken punctuation.
-#. The options are: All puntuation marks will be spoken, None
-#. will be spoken, Most will be spoken, or Some will be spoken.
-#. 
-#: ../src/orca/scripts/default.py:2760
+#. Translators: This detailed message will be presented as the user cycles
+#. through the different levels of spoken punctuation. The options are:
+#. All puntuation marks will be spoken, None will be spoken, Most will be
+#. spoken, or Some will be spoken.
+#: ../src/orca/messages.py:1357
 msgid "Punctuation level set to most."
 msgstr "Tegnsettingsnivå satt til mesteparten."
 
-#. Translators: This brief message will be presented as the user
-#. cycles through the different levels of spoken punctuation.
-#. The options are: All puntuation marks will be spoken, None
-#. will be spoken, Most will be spoken, or Some will be spoken.
-#. 
-#: ../src/orca/scripts/default.py:2766
+#. Translators: This brief message will be presented as the user cycles
+#. through the different levels of spoken punctuation. The options are:
+#. All puntuation marks will be spoken, None will be spoken, Most will be
+#. spoken, or Some will be spoken.
+#: ../src/orca/messages.py:1351
 msgctxt "spoken punctuation"
 msgid "Most"
 msgstr "De fleste"
 
-#. Translators: This detailed message will be presented as the
-#. user cycles through the different levels of spoken punctuation.
-#. The options are: All puntuation marks will be spoken, None
-#. will be spoken, Most will be spoken, or Some will be spoken.
-#. 
-#: ../src/orca/scripts/default.py:2774
+#. Translators: This detailed message will be presented as the user cycles
+#. through the different levels of spoken punctuation. The options are:
+#. All puntuation marks will be spoken, None will be spoken, Most will be
+#. spoken, or Some will be spoken.
+#: ../src/orca/messages.py:1345
 msgid "Punctuation level set to all."
 msgstr "Tegnsettingsnivå satt til alle."
 
-#. Translators: This brief message will be presented as the user
-#. cycles through the different levels of spoken punctuation.
-#. The options are: All puntuation marks will be spoken, None
-#. will be spoken, Most will be spoken, or Some will be spoken.
-#. 
-#: ../src/orca/scripts/default.py:2780
+#. Translators: This brief message will be presented as the user cycles
+#. through the different levels of spoken punctuation. The options are:
+#. All puntuation marks will be spoken, None will be spoken, Most will be
+#. spoken, or Some will be spoken.
+#: ../src/orca/messages.py:1339
 msgctxt "spoken punctuation"
 msgid "All"
 msgstr "Alle"
 
-#. Translators: This detailed message will be presented as the
-#. user cycles through the different levels of spoken punctuation.
-#. The options are: All puntuation marks will be spoken, None
-#. will be spoken, Most will be spoken, or Some will be spoken.
-#. 
-#: ../src/orca/scripts/default.py:2789
+#. Translators: This detailed message will be presented as the user cycles
+#. through the different levels of spoken punctuation. The options are:
+#. All puntuation marks will be spoken, None will be spoken, Most will be
+#. spoken, or Some will be spoken.
+#: ../src/orca/messages.py:1369
 msgid "Punctuation level set to none."
 msgstr "Tegnsettingsnivå satt til ingen."
 
-#. Translators: This brief message will be presented as the user
-#. cycles through the different levels of spoken punctuation.
-#. The options are: All puntuation marks will be spoken, None
-#. will be spoken, Most will be spoken, or Some will be spoken.
-#. 
-#: ../src/orca/scripts/default.py:2795
+#. Translators: This brief message will be presented as the user cycles
+#. through the different levels of spoken punctuation. The options are:
+#. All puntuation marks will be spoken, None will be spoken, Most will be
+#. spoken, or Some will be spoken.
+#: ../src/orca/messages.py:1363
 msgctxt "spoken punctuation"
 msgid "None"
 msgstr "Ingen"
 
-#. Translators: Orca has an "echo" setting which allows
-#. the user to configure what is spoken in response to a
-#. key press. Given a user who typed "Hello world.":
+#. Translators: Orca has an "echo" setting which allows the user to configure
+#. what is spoken in response to a key press. Given a user who typed "Hello
+#. world.":
 #. - key echo: "H e l l o space w o r l d period"
 #. - word echo: "Hello" spoken when the space is pressed;
 #. "world" spoken when the period is pressed.
 #. - sentence echo: "Hello world" spoken when the period
 #. is pressed.
-#. A user can choose to have no echo, one type of echo, or
-#. multiple types of echo and can cycle through the various
-#. levels quickly via a command.
-#. 
-#: ../src/orca/scripts/default.py:2945
+#. A user can choose to have no echo, one type of echo, or multiple types of
+#. echo and can cycle through the various levels quickly via a command.
+#: ../src/orca/messages.py:664
 msgid "Key echo set to key."
 msgstr "Tasteekko satt til tast."
 
-#. Translators: Orca has an "echo" setting which allows
-#. the user to configure what is spoken in response to a
-#. key press. Given a user who typed "Hello world.":
+#. Translators: Orca has an "echo" setting which allows the user to configure
+#. what is spoken in response to a key press. Given a user who typed "Hello
+#. world.":
 #. - key echo: "H e l l o space w o r l d period"
 #. - word echo: "Hello" spoken when the space is pressed;
 #. "world" spoken when the period is pressed.
 #. - sentence echo: "Hello world" spoken when the period
 #. is pressed.
-#. A user can choose to have no echo, one type of echo, or
-#. multiple types of echo and can cycle through the various
-#. levels quickly via a command. The following string is a
-#. brief message which will be presented to the user who is
-#. cycling amongst the various echo options.
-#. 
-#: ../src/orca/scripts/default.py:2960
+#. A user can choose to have no echo, one type of echo, or multiple types of
+#. echo and can cycle through the various levels quickly via a command. The
+#. following string is a brief message which will be presented to the user who
+#. is cycling amongst the various echo options.
+#: ../src/orca/messages.py:652
 msgctxt "key echo"
 msgid "key"
 msgstr "tast"
 
-#. Translators: Orca has an "echo" setting which allows
-#. the user to configure what is spoken in response to a
-#. key press. Given a user who typed "Hello world.":
+#. Translators: Orca has an "echo" setting which allows the user to configure
+#. what is spoken in response to a key press. Given a user who typed "Hello
+#. world.":
 #. - key echo: "H e l l o space w o r l d period"
 #. - word echo: "Hello" spoken when the space is pressed;
 #. "world" spoken when the period is pressed.
 #. - sentence echo: "Hello world" spoken when the period
 #. is pressed.
-#. A user can choose to have no echo, one type of echo, or
-#. multiple types of echo and can cycle through the various
-#. levels quickly via a command.
-#. 
-#: ../src/orca/scripts/default.py:2978
+#. A user can choose to have no echo, one type of echo, or multiple types of
+#. echo and can cycle through the various levels quickly via a command.
+#: ../src/orca/messages.py:768
 msgid "Key echo set to word."
 msgstr "Tasteekko satt til ord."
 
-#. Translators: Orca has an "echo" setting which allows
-#. the user to configure what is spoken in response to a
-#. key press. Given a user who typed "Hello world.":
+#. Translators: Orca has an "echo" setting which allows the user to configure
+#. what is spoken in response to a key press. Given a user who typed "Hello
+#. world.":
 #. - key echo: "H e l l o space w o r l d period"
 #. - word echo: "Hello" spoken when the space is pressed;
 #. "world" spoken when the period is pressed.
 #. - sentence echo: "Hello world" spoken when the period
 #. is pressed.
-#. A user can choose to have no echo, one type of echo, or
-#. multiple types of echo and can cycle through the various
-#. levels quickly via a command. The following string is a
-#. brief message which will be presented to the user who is
-#. cycling amongst the various echo options.
-#. 
-#: ../src/orca/scripts/default.py:2993
+#. A user can choose to have no echo, one type of echo, or multiple types of
+#. echo and can cycle through the various levels quickly via a command. The
+#. following string is a brief message which will be presented to the user who
+#. is cycling amongst the various echo options.
+#: ../src/orca/messages.py:756
 msgctxt "key echo"
 msgid "word"
 msgstr "ord"
 
-#. Translators: Orca has an "echo" setting which allows
-#. the user to configure what is spoken in response to a
-#. key press. Given a user who typed "Hello world.":
+#. Translators: Orca has an "echo" setting which allows the user to configure
+#. what is spoken in response to a key press. Given a user who typed "Hello
+#. world.":
 #. - key echo: "H e l l o space w o r l d period"
 #. - word echo: "Hello" spoken when the space is pressed;
 #. "world" spoken when the period is pressed.
 #. - sentence echo: "Hello world" spoken when the period
 #. is pressed.
-#. A user can choose to have no echo, one type of echo, or
-#. multiple types of echo and can cycle through the various
-#. levels quickly via a command.
-#. 
-#: ../src/orca/scripts/default.py:3011
+#. A user can choose to have no echo, one type of echo, or multiple types of
+#. echo and can cycle through the various levels quickly via a command.
+#: ../src/orca/messages.py:742
 msgid "Key echo set to sentence."
 msgstr "Tasteekko satt til setning."
 
-#. Translators: Orca has an "echo" setting which allows
-#. the user to configure what is spoken in response to a
-#. key press. Given a user who typed "Hello world.":
+#. Translators: Orca has an "echo" setting which allows the user to configure
+#. what is spoken in response to a key press. Given a user who typed "Hello
+#. world.":
 #. - key echo: "H e l l o space w o r l d period"
 #. - word echo: "Hello" spoken when the space is pressed;
 #. "world" spoken when the period is pressed.
 #. - sentence echo: "Hello world" spoken when the period
 #. is pressed.
-#. A user can choose to have no echo, one type of echo, or
-#. multiple types of echo and can cycle through the various
-#. levels quickly via a command. The following string is a
-#. brief message which will be presented to the user who is
-#. cycling amongst the various echo options.
-#. 
-#: ../src/orca/scripts/default.py:3026
+#. A user can choose to have no echo, one type of echo, or multiple types of
+#. echo and can cycle through the various levels quickly via a command. The
+#. following string is a brief message which will be presented to the user who
+#. is cycling amongst the various echo options.
+#: ../src/orca/messages.py:730
 msgctxt "key echo"
 msgid "sentence"
 msgstr "setning"
 
-#. Translators: Orca has an "echo" setting which allows
-#. the user to configure what is spoken in response to a
-#. key press. Given a user who typed "Hello world.":
+#. Translators: Orca has an "echo" setting which allows the user to configure
+#. what is spoken in response to a key press. Given a user who typed "Hello
+#. world.":
 #. - key echo: "H e l l o space w o r l d period"
 #. - word echo: "Hello" spoken when the space is pressed;
 #. "world" spoken when the period is pressed.
 #. - sentence echo: "Hello world" spoken when the period
 #. is pressed.
-#. A user can choose to have no echo, one type of echo, or
-#. multiple types of echo and can cycle through the various
-#. levels quickly via a command.
-#. 
-#: ../src/orca/scripts/default.py:3044
+#. A user can choose to have no echo, one type of echo, or multiple types of
+#. echo and can cycle through the various levels quickly via a command.
+#: ../src/orca/messages.py:716
 msgid "Key echo set to key and word."
 msgstr "Tasteekko satt til tast og ord."
 
-#. Translators: Orca has an "echo" setting which allows
-#. the user to configure what is spoken in response to a
-#. key press. Given a user who typed "Hello world.":
+#. Translators: Orca has an "echo" setting which allows the user to configure
+#. what is spoken in response to a key press. Given a user who typed "Hello
+#. world.":
 #. - key echo: "H e l l o space w o r l d period"
 #. - word echo: "Hello" spoken when the space is pressed;
 #. "world" spoken when the period is pressed.
 #. - sentence echo: "Hello world" spoken when the period
 #. is pressed.
-#. A user can choose to have no echo, one type of echo, or
-#. multiple types of echo and can cycle through the various
-#. levels quickly via a command. The following string is a
-#. brief message which will be presented to the user who is
-#. cycling amongst the various echo options.
-#. 
-#: ../src/orca/scripts/default.py:3059
+#. A user can choose to have no echo, one type of echo, or multiple types of
+#. echo and can cycle through the various levels quickly via a command. The
+#. following string is a brief message which will be presented to the user who
+#. is cycling amongst the various echo options.
+#: ../src/orca/messages.py:704
 msgctxt "key echo"
 msgid "key and word"
 msgstr "tast og ord"
 
-#. Translators: Orca has an "echo" setting which allows
-#. the user to configure what is spoken in response to a
-#. key press. Given a user who typed "Hello world.":
+#. Translators: Orca has an "echo" setting which allows the user to configure
+#. what is spoken in response to a key press. Given a user who typed "Hello
+#. world.":
 #. - key echo: "H e l l o space w o r l d period"
 #. - word echo: "Hello" spoken when the space is pressed;
 #. "world" spoken when the period is pressed.
 #. - sentence echo: "Hello world" spoken when the period
 #. is pressed.
-#. A user can choose to have no echo, one type of echo, or
-#. multiple types of echo and can cycle through the various
-#. levels quickly via a command.
-#. 
-#: ../src/orca/scripts/default.py:3077
+#. A user can choose to have no echo, one type of echo, or multiple types of
+#. echo and can cycle through the various levels quickly via a command.
+#: ../src/orca/messages.py:794
 msgid "Key echo set to word and sentence."
 msgstr "Tasteekko satt til ord og setning."
 
-#. Translators: Orca has an "echo" setting which allows
-#. the user to configure what is spoken in response to a
-#. key press. Given a user who typed "Hello world.":
+#. Translators: Orca has an "echo" setting which allows the user to configure
+#. what is spoken in response to a key press. Given a user who typed "Hello
+#. world.":
 #. - key echo: "H e l l o space w o r l d period"
 #. - word echo: "Hello" spoken when the space is pressed;
 #. "world" spoken when the period is pressed.
 #. - sentence echo: "Hello world" spoken when the period
 #. is pressed.
-#. A user can choose to have no echo, one type of echo, or
-#. multiple types of echo and can cycle through the various
-#. levels quickly via a command. The following string is a
-#. brief message which will be presented to the user who is
-#. cycling amongst the various echo options.
-#. 
-#: ../src/orca/scripts/default.py:3092
+#. A user can choose to have no echo, one type of echo, or multiple types of
+#. echo and can cycle through the various levels quickly via a command. The
+#. following string is a brief message which will be presented to the user who
+#. is cycling amongst the various echo options.
+#: ../src/orca/messages.py:782
 msgctxt "key echo"
 msgid "word and sentence"
 msgstr "ord og setning"
 
-#. Translators: Orca has an "echo" setting which allows
-#. the user to configure what is spoken in response to a
-#. key press. Given a user who typed "Hello world.":
+#. Translators: Orca has an "echo" setting which allows the user to configure
+#. what is spoken in response to a key press. Given a user who typed "Hello
+#. world.":
 #. - key echo: "H e l l o space w o r l d period"
 #. - word echo: "Hello" spoken when the space is pressed;
 #. "world" spoken when the period is pressed.
 #. - sentence echo: "Hello world" spoken when the period
 #. is pressed.
-#. A user can choose to have no echo, one type of echo, or
-#. multiple types of echo and can cycle through the various
-#. levels quickly via a command.
-#. 
-#: ../src/orca/scripts/default.py:3110
+#. A user can choose to have no echo, one type of echo, or multiple types of
+#. echo and can cycle through the various levels quickly via a command.
+#: ../src/orca/messages.py:690
 msgid "Key echo set to None."
 msgstr "Tasteekko satt til ingen."
 
-#. Translators: Orca has an "echo" setting which allows
-#. the user to configure what is spoken in response to a
-#. key press. Given a user who typed "Hello world.":
+#. Translators: Orca has an "echo" setting which allows the user to configure
+#. what is spoken in response to a key press. Given a user who typed "Hello
+#. world.":
 #. - key echo: "H e l l o space w o r l d period"
 #. - word echo: "Hello" spoken when the space is pressed;
 #. "world" spoken when the period is pressed.
 #. - sentence echo: "Hello world" spoken when the period
 #. is pressed.
-#. A user can choose to have no echo, one type of echo, or
-#. multiple types of echo and can cycle through the various
-#. levels quickly via a command. The following string is a
-#. brief message which will be presented to the user who is
-#. cycling amongst the various echo options.
-#. 
-#: ../src/orca/scripts/default.py:3125
+#. A user can choose to have no echo, one type of echo, or multiple types of
+#. echo and can cycle through the various levels quickly via a command. The
+#. following string is a brief message which will be presented to the user who
+#. is cycling amongst the various echo options.
+#: ../src/orca/messages.py:678
 msgctxt "key echo"
 msgid "None"
 msgstr "Ingen"
 
-#. Translators: when users are navigating a table, they
-#. sometimes want the entire row of a table read, or
-#. they just want the current cell to be presented to them.
-#. 
-#: ../src/orca/scripts/default.py:3145
+#. Translators: When users are navigating a table, they sometimes want the entire
+#. row of a table read; other times they want just the current cell presented.
+#. This string is a message presented to the user when this setting is toggled.
+#: ../src/orca/messages.py:1479
 msgid "Speak row"
 msgstr "Les rad"
 
-#. Translators: when users are navigating a table, they
-#. sometimes want the entire row of a table read, or
-#. they just want the current cell to be presented to them.
-#. 
-#: ../src/orca/scripts/default.py:3151
+#. Translators: When users are navigating a table, they sometimes want the entire
+#. row of a table read; other times they want just the current cell presented.
+#. This string is a message presented to the user when this setting is toggled.
+#: ../src/orca/messages.py:1474
 msgid "Speak cell"
 msgstr "Les celle"
 
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca lets them know this.
-#. 
-#. Translators: this object is now selected.
-#. Let the user know this.
-#. 
-#. 
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca lets them know this.
-#. 
-#: ../src/orca/scripts/default.py:3426 ../src/orca/scripts/default.py:3561
-#: ../src/orca/scripts/default.py:5589 ../src/orca/speech_generator.py:1181
-#: ../src/orca/speech_generator.py:1210
+#. Translators: when the user selects (highlights) text in a document, Orca lets
+#. them know.
+#: ../src/orca/messages.py:1554
 msgctxt "text"
 msgid "selected"
 msgstr "valgt"
 
-#. Translators: this object is now unselected.
-#. Let the user know this.
-#. 
-#. 
-#. Translators: when the user unselects
-#. (unhighlights) text in a document, Orca lets
-#. them know this.
-#. 
-#: ../src/orca/scripts/default.py:3567 ../src/orca/scripts/default.py:5595
+#. Translators: when the user unselects (un-highlights) text in a document, Orca
+#. lets them know.
+#: ../src/orca/messages.py:1558
 msgctxt "text"
 msgid "unselected"
 msgstr "ikke valgt"
 
-#. Translators: this is to inform the user of the presence
-#. of the red squiggly line which indicates that a given
-#. word is not spelled correctly.
-#. 
-#: ../src/orca/scripts/default.py:3665 ../src/orca/scripts/default.py:5650
+#. Translators: This is to inform the user of the presence of the red squiggly
+#. line which indicates that a given word is not spelled correctly.
+#: ../src/orca/messages.py:1048
 msgid "misspelled"
 msgstr "feilstavet"
 
-#. Translators: this is an index value
-#. so that we can tell which progress bar
-#. we are referring to.
-#. 
-#: ../src/orca/scripts/default.py:4592
+#. Translators: this is an index value so that we can present value changes
+#. regarding a specific progress bar in environments where there are multiple
+#. progress bars (e.g. in the Firefox downloads dialog).
+#: ../src/orca/messages.py:1333
 #, python-format
 msgid "Progress bar %d."
 msgstr "Fremdriftsviser %d."
 
-#. Translators: bold as in the font sense.
-#. 
-#: ../src/orca/scripts/default.py:4628 ../src/orca/speech_generator.py:1002
+#. Translators: This refers to font weight.
+#: ../src/orca/messages.py:46
 msgid "bold"
 msgstr "uthevet"
 
@@ -6373,146 +6043,162 @@
 #. application, so we leave things in plural form
 #. here.
 #. 
-#: ../src/orca/scripts/default.py:4645 ../src/orca/scripts/default.py:4657
+#: ../src/orca/scripts/default.py:3637 ../src/orca/scripts/default.py:3649
 #, python-format
 msgid "%(key)s %(value)s pixel"
 msgid_plural "%(key)s %(value)s pixels"
 msgstr[0] "%(key)s %(value)s piksel"
 msgstr[1] "%(key)s %(value)s piksler"
 
-#. Translators: the Orca "Find" dialog allows a user to
-#. search for text in a window and then move focus to
-#. that text.  For example, they may want to find the
-#. "OK" button.  This message lets them know a string
-#. they were searching for was not found.
-#. 
-#: ../src/orca/scripts/default.py:5057
+#. Translators: the Orca "Find" dialog allows a user to search for text in a
+#. window and then move focus to that text.  For example, they may want to find
+#. the "OK" button.  This message lets them know a string they were searching
+#. for was not found.
+#: ../src/orca/messages.py:1434 ../src/orca/scripts/default.py:4019
 msgid "string not found"
 msgstr "streng ikke funnet"
 
-#. Translators: Orca will provide more compelling output of
-#. the spell checking dialog in some applications.  The first
-#. thing it does is let them know what the misspelled word
-#. is.
-#. 
-#: ../src/orca/scripts/default.py:5129
+#. Translators: Orca tries to provide more compelling output of the spell check
+#. dialog in some applications. The first thing it does is let the user know
+#. what the misspelled word is.
+#: ../src/orca/messages.py:1053
 #, python-format
 msgid "Misspelled word: %s"
 msgstr "Feilstavet ord: %s"
 
-#: ../src/orca/scripts/default.py:5137
+#. Translators: Orca tries to provide more compelling output of the spell check
+#. dialog in some applications. The second thing it does is give the phrase
+#. containing the misspelled word in the document. This is known as the context.
+#: ../src/orca/messages.py:1058
 #, python-format
 msgid "Context is %s"
 msgstr "Sammenhengen er %s"
 
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca will speak information about what they
-#. have selected.
-#. 
-#: ../src/orca/scripts/default.py:5389
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user selects from the
+#. current location to the end of the paragraph by pressing Ctrl+Shift+Down.
+#: ../src/orca/messages.py:1283
 msgid "paragraph selected down from cursor position"
 msgstr "avsnitt valgt ned fra markørposisjon"
 
-#: ../src/orca/scripts/default.py:5390
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user unselects previously
+#. selected text from the current location to the end of the paragraph by
+#. pressing Ctrl+Shift+Down.
+#: ../src/orca/messages.py:1296
 msgid "paragraph unselected down from cursor position"
 msgstr "avsnitt valgt bort ned fra markørposisjon"
 
-#: ../src/orca/scripts/default.py:5391
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user selects from the
+#. current location to the start of the paragraph by pressing Ctrl+Shift+UP.
+#: ../src/orca/messages.py:1289
 msgid "paragraph selected up from cursor position"
 msgstr "avsnitt valgt opp fra markørposisjon"
 
-#: ../src/orca/scripts/default.py:5392
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user unselects previously
+#. selected text from the current location to the start of the paragraph by
+#. pressing Ctrl+Shift+UP.
+#: ../src/orca/messages.py:1303
 msgid "paragraph unselected up from cursor position"
 msgstr "avsnitt valgt bort opp fra markørposisjon"
 
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca will speak information about what they
-#. have selected.
-#. 
-#: ../src/orca/scripts/default.py:5446
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user selects from the
+#. current location to the end of the line by pressing Ctrl+Shift+Page_Down.
+#: ../src/orca/messages.py:886
 msgid "line selected to end from previous cursor position"
 msgstr "linje valgt til slutt fra forrige markørposisjon"
 
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca will speak information about what they
-#. have selected.
-#. 
-#: ../src/orca/scripts/default.py:5454
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user selects from the
+#. current location to the start of the line by pressing Ctrl+Shift+Page_Up.
+#: ../src/orca/messages.py:880
 msgid "line selected from start to previous cursor position"
 msgstr "linje valgt fra start til forrige markørposisjon"
 
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca will speak information about what they
-#. have selected.
-#. 
-#: ../src/orca/scripts/default.py:5463
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user selects from the
+#. current location to the end of the page by pressing Shift+Page_Down.
+#: ../src/orca/messages.py:1259
 msgid "page selected from cursor position"
 msgstr "side valgt fra markørposisjon"
 
-#. Translators: when the user unselects text in a document,
-#. Orca will speak information about what they have unselected.
-#. 
-#: ../src/orca/scripts/default.py:5468
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user unselects a previously
+#. selected page by pressing Shift+Page_Down.
+#: ../src/orca/messages.py:1271
 msgid "page unselected from cursor position"
 msgstr "side valgt bort fra markørposisjon"
 
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca will speak information about what they
-#. have selected.
-#. 
-#: ../src/orca/scripts/default.py:5477
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user selects from the
+#. current location to the start of the page by pressing Shift+Page_Up.
+#: ../src/orca/messages.py:1265
 msgid "page selected to cursor position"
 msgstr "side valgt til markørposisjon"
 
-#. Translators: when the user unselects text in a document,
-#. Orca will speak information about what they have unselected.
-#. 
-#: ../src/orca/scripts/default.py:5482
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user unselects a previously
+#. selected page by pressing Shift+Page_Up.
+#: ../src/orca/messages.py:1277
 msgid "page unselected to cursor position"
 msgstr "side valgt bort til markørposisjon"
 
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca will speak information about what they
-#. have selected.
-#. 
-#: ../src/orca/scripts/default.py:5507
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user selects from the
+#. current location to the start of the document by pressing Ctrl+Shift+Home.
+#: ../src/orca/messages.py:515
 msgid "document selected to cursor position"
 msgstr "dokument valgt til markørposisjon"
 
-#. Translators: when the user unselects text in a document,
-#. Orca will speak information about what they have unselected.
-#. 
-#: ../src/orca/scripts/default.py:5512
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user unselects previously
+#. selected text by pressing Ctrl+Shift+Home.
+#: ../src/orca/messages.py:521
 msgid "document unselected to cursor position"
 msgstr "dokument valgt bort til markørposisjon"
 
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca will speak information about what they
-#. have selected.
-#. 
-#: ../src/orca/scripts/default.py:5521
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user selects from the
+#. current location to the end of the document by pressing Ctrl+Shift+End.
+#: ../src/orca/messages.py:503
 msgid "document selected from cursor position"
 msgstr "dokument valgt fra markørposisjon"
 
-#. Translators: when the user unselects text in a document,
-#. Orca will speak information about what they have unselected.
-#. 
-#: ../src/orca/scripts/default.py:5526
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user unselects previously
+#. selected text by pressing Ctrl+Shift+End.
+#: ../src/orca/messages.py:509
 msgid "document unselected from cursor position"
 msgstr "dokument valgt bort fra markørposisjon"
 
-#. Translators: this means the user has selected
-#. all the text in a document (e.g., Ctrl+a in gedit).
-#. 
-#: ../src/orca/scripts/default.py:5543
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user selects the entire
+#. document by pressing Ctrl+A.
+#: ../src/orca/messages.py:497
 msgid "entire document selected"
 msgstr "hele dokumentet valgt"
 
-#. Translators: this is information about a unicode character
-#. reported to the user.  The value is the unicode number value
-#. of this character in hex.
-#. 
-#: ../src/orca/scripts/default.py:6113
+#. Translators: this is information about a unicode character reported to the
+#. user.  The value is the unicode number value of this character in hex.
+#: ../src/orca/messages.py:1562
 #, python-format
 msgid "Unicode %s"
 msgstr "Unicode %s"
@@ -6523,6 +6209,11 @@
 msgid "entered bookmark"
 msgstr "oppgitt bokmerke"
 
+#. Translators: The following string is spoken to let the user know that he/she
+#. is on a link within an image map. An image map is an image/graphic which has
+#. been divided into regions. Each region can be clicked on and has an associated
+#. link. Please see http://en.wikipedia.org/wiki/Imagemap for more information
+#. and examples.
 #. Translators: The following string is spoken to let the user
 #. know that he/she is on a link within an image map. An image
 #. map is an image/graphic which has been divided into regions.
@@ -6530,584 +6221,503 @@
 #. Please see http://en.wikipedia.org/wiki/Imagemap for more
 #. information and examples.
 #. 
+#: ../src/orca/messages.py:607
 #: ../src/orca/scripts/toolkits/Gecko/braille_generator.py:149
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:136
 msgid "image map link"
 msgstr "bildekartlenke"
 
-#. Translators: this is for navigating HTML content one
-#. character at a time.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:383
+#. Translators: this is a command related to navigating within a document.
+#: ../src/orca/cmdnames.py:616
 msgid "Goes to next character."
 msgstr "Flytter til neste tegn."
 
-#. Translators: this is for navigating HTML content one
-#. character at a time.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:391
+#. Translators: this is a command related to navigating within a document.
+#: ../src/orca/cmdnames.py:619
 msgid "Goes to previous character."
 msgstr "Flytter til forrige tegn."
 
-#. Translators: this is for navigating HTML content one
-#. word at a time.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:399
+#. Translators: this is a command related to navigating within a document.
+#: ../src/orca/cmdnames.py:622
 msgid "Goes to next word."
 msgstr "Flytter til neste ord."
 
-#. Translators: this is for navigating HTML content one
-#. word at a time.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:407
+#. Translators: this is a command related to navigating within a document.
+#: ../src/orca/cmdnames.py:625
 msgid "Goes to previous word."
 msgstr "Flytter til forrige ord."
 
-#. Translators: this is for navigating HTML content one
-#. line at a time.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:415
+#. Translators: this is a command related to navigating within a document.
+#: ../src/orca/cmdnames.py:628
 msgid "Goes to next line."
 msgstr "Flytter til neste linje."
 
-#. Translators: this is for navigating HTML content one
-#. line at a time.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:423
+#. Translators: this is a command related to navigating within a document.
+#: ../src/orca/cmdnames.py:631
 msgid "Goes to previous line."
 msgstr "Flytter til forrige linje."
 
-#. Translators: this command will move the user to the
-#. beginning of an HTML document.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:431
+#. Translators: this is a command related to navigating within a document.
+#: ../src/orca/cmdnames.py:634
 msgid "Goes to the top of the file."
 msgstr "Går til starten av filen."
 
-#. Translators: this command will move the user to the
-#. end of an HTML document.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:439
+#. Translators: this is a command related to navigating within a document.
+#: ../src/orca/cmdnames.py:637
 msgid "Goes to the bottom of the file."
 msgstr "Går til slutten av filen."
 
-#. Translators: this command will move the user to the
-#. beginning of the line in an HTML document.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:447
+#. Translators: this is a command related to navigating within a document.
+#: ../src/orca/cmdnames.py:640
 msgid "Goes to the beginning of the line."
 msgstr "Går til begynnelsen av linjen."
 
-#. Translators: this command will move the user to the
-#. end of the line in an HTML document.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:455
+#. Translators: this is a command related to navigating within a document.
+#: ../src/orca/cmdnames.py:643
 msgid "Goes to the end of the line."
 msgstr "Går til slutten av linjen."
 
-#. Translators: this is for causing a collapsed combo box
-#. which was reached by Orca's caret navigation to be expanded.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:463
+#. Translators: this is for causing a collapsed combo box which was reached
+#. by Orca's caret navigation to be expanded.
+#: ../src/orca/cmdnames.py:654
 msgid "Causes the current combo box to be expanded."
 msgstr "Utvider aktiv kombinasjonsboks."
 
-#. Translators: this string refers to an Orca command which
-#. advances the live region "politeness" setting from one
-#. level to the next.
-#. 
-#. The term "live region" refers to dynamically updated
-#. content, typically on a web page, about which a user
-#. likely wants to be notified. For instance, a stock
-#. ticker on a financial site or a table of updated scores
-#. on a sports site. In contast, a countdown timer or clock
-#. on a web site is NOT a live region.
-#. 
-#. The "politeness" level is an indication of when the user
-#. wishes to be notified about a change to live region content,
-#. e.g. never ("off"), when idle ("polite"), or when there is
-#. a change ("assertive").
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:484
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. The "politeness" level is an indication of when the user wishes to be notified
+#. about a change to live region content. Examples include: never ("off"), when
+#. idle ("polite"), and when there is a change ("assertive"). Orca has several
+#. features to facilitate accessing live regions. This string refers to a command
+#. to cycle through the different "politeness" levels.
+#: ../src/orca/cmdnames.py:670
 msgid "Advance live region politeness setting."
 msgstr "Avansert innstilling for høflighet for levende region."
 
-#. Translators: this string refers to an Orca command which
-#. turns changes the live region "politness" level to "off."
-#. 
-#. The term "live region" refers to dynamically updated
-#. content, typically on a web page, about which a user
-#. likely wants to be notified. For instance, a stock
-#. ticker on a financial site or a table of updated scores
-#. on a sports site. In contast, a countdown timer or clock
-#. on a web site is NOT a live region.
-#. 
-#. The "politeness" level is an indication of when the user
-#. wishes to be notified about a change to live region content,
-#. e.g. never ("off"), when idle ("polite"), or when there is
-#. a change ("assertive").
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:504
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. The "politeness" level is an indication of when the user wishes to be notified
+#. about a change to live region content. Examples include: never ("off"), when
+#. idle ("polite"), and when there is a change ("assertive"). Orca has several
+#. features to facilitate accessing live regions. This string refers to a command
+#. to turn off live regions by default.
+#: ../src/orca/cmdnames.py:680
 msgid "Set default live region politeness level to off."
 msgstr "Sett forvalgt høflighetsnivå for levende region til av."
 
-#. Translators: this string refers to an Orca command which
-#. allows the user to toggle whether or not Orca pays attention
-#. to changes in live regions. Note that turning off monitoring
-#. of live events is NOT the same as turning the politeness level
-#. to "off". The user can opt to have no notifications presented
-#. (politeness level of "off") and still manually review recent
-#. updates to live regions via Orca commands for doing so -- as
-#. long as the monitoring of live regions is enabled.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:518
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. This string refers to an Orca command which allows the user to toggle whether
+#. or not Orca pays attention to changes in live regions. Note that turning off
+#. monitoring of live events is NOT the same as turning the politeness level
+#. to "off". The user can opt to have no notifications presented (politeness
+#. level of "off") and still manually review recent updates to live regions via
+#. Orca commands for doing so -- as long as the monitoring of live regions is
+#. enabled.
+#: ../src/orca/cmdnames.py:697
 msgid "Monitor live regions."
 msgstr "Overvåk levende regioner."
 
-#. Translators: this is for reviewing up to nine stored
-#. previous live messages. Please see previous translator
-#. notes for more information on live regions.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:527
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. This string refers to a command for reviewing up to nine stored previous live
+#. messages.
+#: ../src/orca/cmdnames.py:686
 msgid "Review live region announcement."
 msgstr "Gjennomgå annonsering fra levende region."
 
-#. Translators: this is for navigating between objects
-#. (regardless of type) in HTML
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:535
+#. Translators: this is a command related to navigating within a document.
+#: ../src/orca/cmdnames.py:649
 msgid "Goes to the previous object."
 msgstr "Går til forrige objekt."
 
-#. Translators: this is for navigating between objects
-#. (regardless of type) in HTML
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:543
+#. Translators: this is a command related to navigating within a document.
+#: ../src/orca/cmdnames.py:646
 msgid "Goes to the next object."
 msgstr "Går til neste objekt."
 
-#. Translators: Gecko native caret navigation is where
-#. Firefox itself controls how the arrow keys move the caret
-#. around HTML content.  It's often broken, so Orca needs
-#. to provide its own support.  As such, Orca offers the user
-#. the ability to switch between the Firefox mode and the
-#. Orca mode.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:555
+#. Translators: Gecko native caret navigation is where Firefox (or Thunderbird)
+#. itself controls how the arrow keys move the caret around HTML content. It's
+#. often broken, so Orca needs to provide its own support. As such, Orca offers
+#. the user the ability to toggle which application is controlling the caret.
+#: ../src/orca/cmdnames.py:661
 msgid "Switches between Gecko native and Orca caret navigation."
 msgstr "Bytter mellom markørnavigering i Gecko og Orca."
 
-#. Translators: hovering the mouse over certain objects
-#. on a web page causes a new object to appear such as
-#. a pop-up menu. This command will move the user to the
-#. object which just appeared as a result of the user
-#. hovering the mouse. If the user is already in the
-#. mouse over object, this command will hide the mouse
-#. over and return the user to the object he/she was in.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:611
+#. Translators: hovering the mouse over certain objects on a web page causes a
+#. new object to appear such as a pop-up menu. This command will move the user
+#. to the object which just appeared as a result of the user hovering the mouse.
+#. If the user is already in the mouse over object, this command will hide the
+#. mouse over and return the user to the object he/she was in.
+#: ../src/orca/cmdnames.py:704
 msgid "Moves focus into and away from the current mouse over."
 msgstr "Flytter fokus inn i og bort fra aktiv musposisjon."
 
-#. Translators: this is the title of a panel holding options for
-#. how to navigate HTML content (e.g., Orca caret navigation,
-#. positioning of caret, etc.).
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:687
+#. Translators: This is the title of a panel holding options for how to navigate
+#. HTML content (e.g., Orca caret navigation, positioning of caret, structural
+#. navigation, etc.).
+#: ../src/orca/guilabels.py:576
 msgid "Page Navigation"
 msgstr "Sidenavigering"
 
-#. Translators: Gecko native caret navigation is where
-#. Firefox itself controls how the arrow keys move the caret
-#. around HTML content.  It's often broken, so Orca needs
-#. to provide its own support.  As such, Orca offers the user
-#. the ability to switch between the Firefox mode and the
-#. Orca mode.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:704
+#. Translators: Gecko native caret navigation is where Firefox itself controls
+#. how the arrow keys move the caret around HTML content. It's often broken, so
+#. Orca needs to provide its own support. As such, Orca offers the user the
+#. ability to switch between the Firefox mode and the Orca mode. This is the
+#. label of a checkbox in which users can indicate their default preference.
+#: ../src/orca/guilabels.py:394
 msgid "Use _Orca Caret Navigation"
 msgstr "Bruk markørnavigering i _Orca"
 
-#. Translators: Orca provides keystrokes to navigate HTML content
-#. in a structural manner: go to previous/next header, list item,
-#. table, etc.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:715
+#. Translators: Orca provides keystrokes to navigate HTML content in a structural
+#. manner: go to previous/next header, list item, table, etc. This is the label
+#. of a checkbox in which users can indicate their default preference.
+#: ../src/orca/guilabels.py:399
 msgid "Use Orca _Structural Navigation"
 msgstr "Bruk _strukturnavigering i Orca"
 
-#. Translators: Orca has had to implement its own caret navigation
-#. model to work around issues in Gecko/Firefox. In certain versions
-#. of Firefox, we must perform a focus grab on each object being
-#. navigated in order for things to work as expected; in other
-#. versions of Firefox, we must avoid doing so in order for things
-#. to work as expected. We cannot identify with certainty which
-#. situation the user is in, so we must provide this as an option
-#. within Orca.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:731
+#. Translators: Orca has had to implement its own caret navigation model to work
+#. around issues in Gecko/Firefox. In some versions of Firefox, we must perform
+#. a focus grab on each object being navigated in order for things to work as
+#. expected; in other versions of Firefox, we must avoid doing so in order for
+#. things# to work as expected. We cannot identify with certainty which situation
+#. the user is in, so we must provide this as an option within Orca.
+#: ../src/orca/guilabels.py:75
 msgid "_Grab focus on objects when navigating"
 msgstr "_Fest fokus på objekter ved navigering"
 
-#. Translators: when the user arrows up and down in HTML content,
-#. it is some times beneficial to always position the cursor at the
-#. beginning of the line rather than guessing the position directly
-#. above the current cursor position.  This option allows the user
-#. to decide the behavior they want.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:745
+#. Translators: When the user arrows up and down in HTML content, and Orca is
+#. controlling the caret, the user might want Orca to always position the
+#. cursor at the beginning of the line (as opposed to the position directly
+#. above/below the current cursor position). Different users have different
+#. preferences. This string is the label for a checkbox which allows users
+#. to set the line-positioning behavior they want.
+#: ../src/orca/guilabels.py:84
 msgid "_Position cursor at start of line when navigating vertically"
 msgstr "_Plasser markøren ved starten av linjen ved vertikal navigering"
 
-#. Translators: when the user loads a new page in Firefox, they
-#. can optionally tell Orca to automatically start reading a
-#. page from beginning to end.
-#. 
-#. Translators: when the user loads a new page in WebKit, they
-#. can optionally tell Orca to automatically start reading a
-#. page from beginning to end.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:757
-#: ../src/orca/scripts/toolkits/WebKitGtk/script.py:160
+#. Translators: When the user loads a new web page, they can optionally have Orca
+#. automatically start reading the page from beginning to end. This is the label
+#. of a checkbox in which users can indicate their preference.
+#: ../src/orca/guilabels.py:582
 msgid "Automatically start speaking a page when it is first _loaded"
 msgstr "Start uttale av en side automatisk når den _lastes første gang"
 
-#. Translators: this is the title of a panel containing options
-#. for using Firefox's Find toolbar.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:826
+#. Translators: This is the label of a panel containing options for what Orca
+#. presents when the user is in the Find toolbar of an application, e.g. Firefox.
+#: ../src/orca/guilabels.py:178
 msgid "Find Options"
 msgstr "Alternativer for søk"
 
-#. Translators: this is an option to allow users to have Orca
-#. automatically speak the line that contains the match while
-#. the user is still in Firefox's Find toolbar.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:840
+#. Translators: This is the label for a checkbox. This option controls whether or
+#. not Orca will automatically speak the line that contains the match while the
+#. user is performing a search from the Find toolbar of an application, e.g.
+#. Firefox.
+#: ../src/orca/guilabels.py:190
 msgid "Speak results during _find"
 msgstr "Uttal resultater under _søk"
 
-#. Translators: this is an option which dictates whether the line
-#. that contains the match from the Find toolbar should always
-#. be spoken, or only spoken if it is a different line than the
-#. line which contained the last match.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:852
+#. Translators: This is the label for a checkbox. This option controls whether
+#. the line that contains the match from an application's Find toolbar should
+#. always be spoken, or only spoken if it is a different line than the line
+#. which contained the last match.
+#: ../src/orca/guilabels.py:184
 msgid "Onl_y speak changed lines during find"
 msgstr "Uttal k_un endrede linjer under søk"
 
-#. Translators: this option allows the user to specify the number
-#. of matched characters that must be present before Orca speaks
-#. the line that contains the results from the Find toolbar.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:867
+#. Translators: This is the label for a spinbutton. This option allows the user
+#. to specify the number of matched characters that must be present before Orca
+#. speaks the line that contains the results from an application's Find toolbar.
+#: ../src/orca/guilabels.py:174
 msgid "Minimum length of matched text:"
 msgstr "Minste lengde på tekst med treff:"
 
-#. Translators: when the user selects (highlights) text in
-#. a document, Orca will speak information about what they
-#. have selected.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1383
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user selects from the
+#. current location to the end of the line by pressing Shift+Down.
+#: ../src/orca/messages.py:846
 msgid "line selected down from cursor position"
 msgstr "linje valgt ned fra markørposisjon"
 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1384
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user unselects previously
+#. selected text from the current location to the end of the paragraph by
+#. pressing Shift+Down.
+#: ../src/orca/messages.py:859
 msgid "line unselected down from cursor position"
 msgstr "linje valgt bort ned fra markørposisjon"
 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1385
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user selects from the
+#. current location to the start of the line by pressing Shift+Up.
+#: ../src/orca/messages.py:852
 msgid "line selected up from cursor position"
 msgstr "linje valgt opp fra markørposisjon"
 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1386
+#. Translators: when the user selects (highlights) or unselects text in a
+#. document, Orca will speak information about what they have selected or
+#. unselected. This message is presented when the user unselects previously
+#. selected text from the current location to the start of the paragraph by
+#. pressing Shift+Up.
+#: ../src/orca/messages.py:866
 msgid "line unselected up from cursor position"
 msgstr "linje valgt bort opp fra markørposisjon"
 
-#. Translators: Orca has a command that moves the mouse
-#. pointer to the current location on a web page. If
-#. moving the mouse pointer caused an item to appear
+#. Translators: Orca has a command that moves the mouse pointer to the current
+#. location on a web page. If moving the mouse pointer caused an item to appear
 #. such as a pop-up menu, we want to present that fact.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1449
+#: ../src/orca/messages.py:1081
 msgid "New item has been added"
 msgstr "Ny oppføring er lagt til"
 
-#. Translators: this is in reference to loading a web page
-#. or some other content.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:1745
-#: ../src/orca/scripts/toolkits/WebKitGtk/script.py:349
+#. Translators: This message is presented to the user when a web page or similar
+#. item has finished loading. The string substitution is for the name of the
+#. object which has just finished loading (most likely the page's title).
+#: ../src/orca/messages.py:1253
 #, python-format
 msgid "Finished loading %s."
 msgstr "Fullført lasting av %s."
 
-#. Translators: the 'h' below represents a heading level
-#. attribute for content that you might find in something
-#. such as HTML content (e.g., <h1>). The translated form
-#. is meant to be a single character followed by a numeric
-#. heading level, where the single character is to indicate
-#. 'heading'.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:2203
-#: ../src/orca/scripts/toolkits/WebKitGtk/braille_generator.py:58
+#. Translators: The 'h' in this string represents a heading level attribute for
+#. content that you might find in something such as HTML content (e.g., <h1>).
+#. The translated form is meant to be a single character followed by a numeric
+#. heading level, where the single character is to indicate 'heading'.
+#: ../src/orca/object_properties.py:68
 #, python-format
 msgid "h%d"
 msgstr "h%d"
 
-#. Translators: hovering the mouse over certain objects on a
-#. web page causes a new object to appear such as a pop-up
-#. menu. Orca has a command will move the user to the object
-#. which just appeared as a result of the user hovering the
+#. Translators: Hovering the mouse over certain objects on a web page causes a
+#. new object to appear such as a pop-up menu. Orca has a command will move the
+#. user to the object which just appeared as a result of the user hovering the
 #. mouse. If this command fails, Orca will present this message.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:4562
+#: ../src/orca/messages.py:1064
 msgid "Mouse over object not found."
 msgstr "Mus over objekt ikke funnet."
 
 #. Translators: this is the action name for the 'open' action.
 #. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5035
+#: ../src/orca/scripts/toolkits/Gecko/script.py:4743
 msgid "open"
 msgstr "åpen"
 
-#. Translators: this announces to the user that live region
-#. support has been turned off.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5202
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5226
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5236
-#: ../src/orca/structural_navigation.py:395
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. Orca has several features to facilitate accessing live regions. This message
+#. is presented to inform the user that Orca's live region features have been
+#. turned off.
+#: ../src/orca/messages.py:1020
 msgid "Live region support is off"
 msgstr "Støtte for levende regioner er slått av"
 
-#. Translators: this announces to the user that live region
-#. are being monitored.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5210
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. Orca has several features to facilitate accessing live regions. This message
+#. is presented in response to a command that toggles whether or not Orca pays
+#. attention to changes in live regions. Note that turning off monitoring of live
+#. events is NOT the same as turning the politeness level to "off". The user can
+#. opt to have no notifications presented (politeness level of "off") and still
+#. manually review recent updates to live regions via Orca commands for doing so
+#. -- as long as the monitoring of live regions is enabled.
+#: ../src/orca/messages.py:1006
 msgid "Live regions monitoring on"
 msgstr "Overvåking av levende regioner slått på"
 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5217
+#. Translators: A live region is an area of a web page that is periodically
+#. updated, e.g. stock ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#. Orca has several features to facilitate accessing live regions. This message
+#. is presented in response to a command that toggles whether or not Orca pays
+#. attention to changes in live regions. Note that turning off monitoring of live
+#. events is NOT the same as turning the politeness level to "off". The user can
+#. opt to have no notifications presented (politeness level of "off") and still
+#. manually review recent updates to live regions via Orca commands for doing so
+#. -- as long as the monitoring of live regions is enabled.
+#: ../src/orca/messages.py:995
 msgid "Live regions monitoring off"
 msgstr "Overvåking av levende regioner slått av"
 
-#. Translators: Gecko native caret navigation is where
-#. Firefox itself controls how the arrow keys move the caret
-#. around HTML content.  It's often broken, so Orca needs
-#. to provide its own support.  As such, Orca offers the user
-#. the ability to switch between the Firefox mode and the
-#. Orca mode.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5252
+#. Translators: Gecko native caret navigation is where Firefox (or Thunderbird)
+#. itself controls how the arrow keys move the caret around HTML content. It's
+#. often broken, so Orca needs to provide its own support. As such, Orca offers
+#. the user the ability to toggle which application is controlling the caret.
+#: ../src/orca/messages.py:171
 msgid "Gecko is controlling the caret."
 msgstr "Gecko styrer markøren."
 
-#. Translators: Gecko native caret navigation is where
-#. Firefox itself controls how the arrow keys move the caret
-#. around HTML content.  It's often broken, so Orca needs
-#. to provide its own support.  As such, Orca offers the user
-#. the ability to switch between the Firefox mode and the
-#. Orca mode.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/script.py:5264
+#. Translators: Gecko native caret navigation is where Firefox (or Thunderbird)
+#. itself controls how the arrow keys move the caret around HTML content. It's
+#. often broken, so Orca needs to provide its own support. As such, Orca offers
+#. the user the ability to toggle which application is controlling the caret.
+#: ../src/orca/messages.py:177
 msgid "Orca is controlling the caret."
 msgstr "Orca styrer markøren."
 
-#. Translators: the %(level)d is in reference to a heading
-#. level in HTML (e.g., For <h3>, the level is 3)
-#. and the %(role)s is in reference to a previously
+#. Translators: The %(level)d is in reference to a heading level in HTML (e.g.,
+#. For <h3>, the level is 3) and the %(role)s is in reference to a previously
 #. translated rolename for the heading.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:261
-#: ../src/orca/scripts/toolkits/WebKitGtk/speech_generator.py:92
+#: ../src/orca/object_properties.py:73
 #, python-format
 msgid "%(role)s level %(level)d"
 msgstr "%(role)s nivå %(level)d"
 
-#. Translators: this represents a list in HTML.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:301
-#: ../src/orca/structural_navigation.py:2816
+#. Translators: This message describes a bulleted or numbered list.
+#: ../src/orca/messages.py:1669
 #, python-format
 msgid "List with %d item"
 msgid_plural "List with %d items"
 msgstr[0] "Liste med %d oppføring"
 msgstr[1] "Liste med %d oppføringer"
 
-#. Translators: Announces the number of headings in the
-#. web page that is currently being displayed.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:474
+#. Translators: This message presents the number of headings in a document.
+#: ../src/orca/messages.py:1654
 #, python-format
 msgid "%d heading"
 msgid_plural "%d headings"
 msgstr[0] "%d overskrift"
 msgstr[1] "%d overskrifter"
 
-#. Translators: Announces the number of forms in the
-#. web page that is currently being displayed.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:479
+#. Translators: This message presents the number of forms in a document.
+#: ../src/orca/messages.py:1650
 #, python-format
 msgid "%d form"
 msgid_plural "%d forms"
 msgstr[0] "%d skjema"
 msgstr[1] "%d skjema"
 
-#. Translators: Announces the number of non-layout tables in the
-#. web page that is currently being displayed.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:484
+#. Translators: This message presents the number of tables in a document.
+#: ../src/orca/messages.py:1733
 #, python-format
 msgid "%d table"
 msgid_plural "%d tables"
 msgstr[0] "%d tabell"
 msgstr[1] "%d tabeller"
 
-#. Translators: Announces the number of visited links in the
-#. web page that is currently being displayed.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:490
+#. Translators: This message presents the number of visited links in a
+#. document.
+#: ../src/orca/messages.py:1755
 #, python-format
 msgid "%d visited link"
 msgid_plural "%d visited links"
 msgstr[0] "%d besøkt lenke"
 msgstr[1] "%d besøkte lenker"
 
-#. Translators: Announces the number of unvisited links in the
-#. web page that is currently being displayed.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:496
+#. Translators: This message presents the number of unvisited links in a
+#. document.
+#: ../src/orca/messages.py:1750
 #, python-format
 msgid "%d unvisited link"
 msgid_plural "%d unvisited links"
 msgstr[0] "%d lenke som ikke er besøkt"
 msgstr[1] "%d lenker som ikke er besøkt"
 
-#. Translators: Announces the percentage of the document that has
-#. been read.  This is calculated by knowing the index of the
-#. current position divided by the total number of objects on the
-#. page.
-#. 
-#: ../src/orca/scripts/toolkits/Gecko/speech_generator.py:504
+#. Translators: This message announces the percentage of the document that
+#. has been read. The value is calculated by knowing the index of the current
+#. position divided by the total number of objects on the page.
+#: ../src/orca/messages.py:1685
 #, python-format
 msgid "%d percent of document read"
 msgid_plural "%d percent of document read"
 msgstr[0] "%d prosent av dokumentet er lest"
 msgstr[1] "%d prosent av dokumentet er lest"
 
-#. Translators: Certain objects (such as form controls on web pages)
-#. can have STATE_REQUIRED set on them to inform the user that this
-#. field must be filled out. This string is the default string which
-#. will be spoken and displayed in braille to indicate this state is
-#. present.
-#. 
-#: ../src/orca/settings.py:786 ../src/orca/settings.py:863
+#. Translators: Certain objects (such as form controls on web pages) can have
+#. STATE_REQUIRED set to inform the user that this field must be filled out.
+#: ../src/orca/object_properties.py:151 ../src/orca/object_properties.py:155
 msgid "required"
 msgstr "krevet"
 
-#. Translators: this is used to indicate the user is in a text
-#. area that is not editable.  It is meant to be spoken to the user.
-#. 
-#: ../src/orca/settings.py:791
+#. Translators: Certain objects (such as form controls on web pages) can have
+#. STATE_EDITABLE set to inform the user that this field can be filled out.
+#. It is assumed that form fields will be editable; if they lack this state,
+#. we need to present that information to the user. This string is the spoken
+#. version.
+#: ../src/orca/object_properties.py:140
 msgctxt "text"
 msgid "read only"
 msgstr "skrivebeskyttet"
 
-#. Translators: this represents an item on the screen that has
-#. been set insensitive (or grayed out).
-#. 
-#: ../src/orca/settings.py:796 ../src/orca/settings.py:874
+#. Translators: This state represents an item on the screen that has been set
+#. insensitive (or grayed out).
+#: ../src/orca/object_properties.py:129 ../src/orca/object_properties.py:133
 msgid "grayed"
 msgstr "grået ut"
 
-#. Translators: this represents the state of a node in a tree.
-#. 'expanded' means the children are showing.  'collapsed' means the
-#. children are not showing.
-#. 
-#: ../src/orca/settings.py:820 ../src/orca/settings.py:886
+#. Translators: This is a state which applies to items which can be expanded
+#. or collapsed such as combo boxes and nodes/groups in a treeview. Collapsed
+#. means the item's children are not showing; expanded means they are.
+#: ../src/orca/object_properties.py:82
 msgid "collapsed"
 msgstr "sammenslått"
 
-#: ../src/orca/settings.py:820 ../src/orca/settings.py:886
+#. Translators: This is a state which applies to items which can be expanded
+#. or collapsed such as combo boxes and nodes/groups in a treeview. Collapsed
+#. means the item's children are not showing; expanded means they are.
+#: ../src/orca/object_properties.py:87
 msgid "expanded"
 msgstr "utvidet"
 
-#. Translators: "multi-select" refers to a web form list
-#. in which more than one item can be selected at a time.
-#. 
-#: ../src/orca/settings.py:825
+#. Translators: "multi-select" refers to a web form list in which more than
+#. one item can be selected at a time.
+#: ../src/orca/object_properties.py:159
 msgid "multi-select"
 msgstr "flervalg"
 
-#. Translators: this represents the depth of a node in a tree
-#. view (i.e., how many ancestors a node has).  It is meant to be
-#. spoken.
-#. 
-#: ../src/orca/settings.py:831
+#. Translators: This represents the depth of a node in a TreeView (i.e. how many
+#. ancestors the node has). This is the spoken version.
+#: ../src/orca/object_properties.py:58
 #, python-format
 msgid "tree level %d"
 msgstr "trenivå %d"
 
-#. Translators: this represents a list item in a document.
-#. The nesting level is how 'deep' the item is (e.g., a
-#. level of 2 represents a list item inside a list that's
-#. inside another list). This is meant to be spoken.
-#. 
-#. Translators: this represents a list item in a document.
-#. The nesting level is how 'deep' the item is (e.g., a
-#. level of 2 represents a list item inside a list that's
-#. inside another list).
-#. 
-#: ../src/orca/settings.py:838 ../src/orca/structural_navigation.py:2831
+#. Translators: This message describes a list item in a document. Nesting level
+#. is how "deep" the item is (e.g., a level of 2 represents a list item inside a
+#. list that's inside another list).
+#: ../src/orca/messages.py:1076 ../src/orca/object_properties.py:47
 #, python-format
 msgid "Nesting level %d"
 msgstr "Nøstenivå %d"
 
-#. Translators: this is a indication of the focused icon and the
-#. count of the total number of icons within an icon panel. An
-#. example of an icon panel is the Nautilus folder view.
-#. 
-#: ../src/orca/settings.py:844
+#. Translators: this is a indication of the focused icon and the count of the
+#. total number of icons within an icon panel. An example of an icon panel is
+#. the Nautilus folder view.
+#: ../src/orca/object_properties.py:37
 #, python-format
 msgid "on %(index)d of %(total)d"
 msgstr "ved %(index)d av %(total)d"
 
-#. Translators: this refers to the position of an item in a list
-#. or group of objects, such as menu items in a menu, radio buttons
-#. in a radio button group, combobox item in a combobox, etc.
-#. 
-#: ../src/orca/settings.py:850
+#. Translators: this refers to the position of an item in a list or group of
+#. objects, such as menu items in a menu, radio buttons in a radio button group,
+#. combobox item in a combobox, etc.
+#: ../src/orca/object_properties.py:42
 #, python-format
 msgid "%(index)d of %(total)d"
 msgstr "%(index)d av %(total)d"
 
-#. Translators: this is used to indicate the user is in a text
-#. area that is not editable.  It is meant to be a short abbreviation
-#. to be presented on the braille display.
-#. 
-#: ../src/orca/settings.py:869
+#. Translators: Certain objects (such as form controls on web pages) can have
+#. STATE_EDITABLE set to inform the user that this field can be filled out.
+#. It is assumed that form fields will be editable; if they lack this state,
+#. we need to present that information to the user. This string is the braille
+#. version. (Because braille displays have limited real estate, we abbreviate.)
+#: ../src/orca/object_properties.py:147
 msgctxt "text"
 msgid "rdonly"
 msgstr "skrivebeskyttet"
 
-#. Translators: this represents the depth of a node in a tree
-#. view (i.e., how many ancestors a node has).  It is meant to
-#. be presented on a braille display.
-#. 
-#: ../src/orca/settings.py:892
+#. Translators: This represents the depth of a node in a TreeView (i.e. how many
+#. ancestors the node has). This is the braille version.
+#: ../src/orca/object_properties.py:62
 #, python-format
 msgid "TREE LEVEL %d"
 msgstr "TRENIVÅ %d"
 
-#. Translators: this represents a list item in a document.
-#. The nesting level is how 'deep' the item is (e.g., a
-#. level of 2 represents a list item inside a list that's
-#. inside another list).  It is meant to be presented on
-#. the braille display.
-#. 
-#: ../src/orca/settings.py:900
+#. Translators: This message describes a list item in a document. Nesting level
+#. is how "deep" the item is (e.g., a level of 2 represents a list item inside a
+#. list that's inside another list). This string is specifically for braille.
+#. Because braille displays lack real estate, we're using a shorter string than
+#. we use for speech.
+#: ../src/orca/object_properties.py:54
 #, python-format
 msgid "LEVEL %d"
 msgstr "NIVÅ %d"
@@ -7117,7 +6727,7 @@
 #. This is one of the alternative formats that the
 #. user may wish to be presented with.
 #. 
-#: ../src/orca/settings.py:933
+#: ../src/orca/settings.py:783
 msgid "%H hours, %M minutes and %S seconds."
 msgstr "%H timer, %M minutter og %S sekunder."
 
@@ -7126,116 +6736,97 @@
 #. This is one of the alternative formats that the
 #. user may wish to be presented with.
 #. 
-#: ../src/orca/settings.py:940
+#: ../src/orca/settings.py:790
 msgid "%H hours and %M minutes."
 msgstr "%H timer og %M minutter."
 
-#. Translators: "Default Synthesizer" will appear in the list of available
-#. speech engines as a special item.  It refers to the default engine
-#. configured within the speech subsystem.  Apart from this item, the user
-#. will have a chance to select a particular speech engine by its real
-#. name, such as Festival, IBMTTS, etc.
-#. 
-#: ../src/orca/speechdispatcherfactory.py:82
+#. Translators: This is a label which will appear in the list of available speech
+#. engines as a special item. It refers to the default engine configured within
+#. the speech subsystem. Apart from this item, the user will have a chance to
+#. select a particular speech engine by its real name (Festival, IBMTTS, etc.)
+#: ../src/orca/guilabels.py:135
 msgid "Default Synthesizer"
 msgstr "Forvalgt synthesizer"
 
-#. Translators: this is the name of a speech synthesis system
-#. called "Speech Dispatcher".
-#. 
-#: ../src/orca/speechdispatcherfactory.py:96
+#. Translators this label refers to the name of particular speech synthesis
+#. system. (http://devel.freebsoft.org/speechd)
+#: ../src/orca/guilabels.py:622
 msgid "Speech Dispatcher"
 msgstr "Taleutsender"
 
-#. Translators: This string will appear in the list of
-#. available voices for the current speech engine.  %s will be
-#. replaced by the name of the current speech engine, such as
-#. "Festival default voice" or "IBMTTS default voice".  It
-#. refers to the default voice configured for given speech
-#. engine within the speech subsystem.  Apart from this item,
-#. the list will contain the names of all available "real"
-#. voices provided by the speech engine.
-#. 
-#: ../src/orca/speechdispatcherfactory.py:180
+#. Translators: This string will appear in the list of available voices for the
+#. current speech engine. "%s" will be replaced by the name of the current speech
+#. engine, such as "Festival default voice" or "IBMTTS default voice". It refers
+#. to the default voice configured for given speech engine within the speech
+#. subsystem. Apart from this item, the list will contain the names of all
+#. available "real" voices provided by the speech engine.
+#: ../src/orca/guilabels.py:598
 #, python-format
 msgid "%s default voice"
 msgstr "%s forvalgt stemme"
 
-#. Translators: we replace the ellipses (both manual and UTF-8)
-#. with a spoken string.  The extra space you see at the beginning
-#. is because we need the speech synthesis engine to speak the
-#. new string well.  For example, "Open..." turns into
-#. "Open dot dot dot".
-#. 
-#: ../src/orca/speechdispatcherfactory.py:294
+#. Translators: We replace the ellipses (both manual and UTF-8) with a spoken
+#. string. The extra space you see at the beginning is because we need the
+#. speech synthesis engine to speak the new string well. For example, "Open..."
+#. turns into "Open dot dot dot".
+#: ../src/orca/messages.py:1419
 msgid " dot dot dot"
 msgstr " prikk prikk prikk"
 
 #. Translators: This string announces speech rate change.
-#: ../src/orca/speechdispatcherfactory.py:383
+#: ../src/orca/messages.py:1407
 msgid "slower."
 msgstr "saktere."
 
-#: ../src/orca/speechdispatcherfactory.py:383
+#. Translators: This string announces speech rate change.
+#: ../src/orca/messages.py:1404
 msgid "faster."
 msgstr "raskere."
 
 #. Translators: This string announces speech pitch change.
-#: ../src/orca/speechdispatcherfactory.py:396
+#: ../src/orca/messages.py:1413
 msgid "lower."
 msgstr "lavere."
 
-#: ../src/orca/speechdispatcherfactory.py:396
+#. Translators: This string announces speech pitch change.
+#: ../src/orca/messages.py:1410
 msgid "higher."
 msgstr "høyere."
 
-#. Translators: this refers to a link to a file, where
-#. the first item is the protocol (ftp, ftps, or file)
-#. and the second item the name of the file being linked
-#. to.
-#. 
-#: ../src/orca/speech_generator.py:479
+#. Translators: this refers to a link to a file, where the first item is the
+#. protocol (ftp, ftps, or file) and the second item the name of the file being
+#. linked to.
+#: ../src/orca/messages.py:906
 #, python-format
 msgid "%(uri)s link to %(file)s"
 msgstr "%(uri)s lenker til %(file)s"
 
-#. Translators: this is the protocol of a link eg. http, mailto.
-#. 
-#: ../src/orca/speech_generator.py:485
+#. Translators: this message conveys the protocol of a link eg. http, mailto.
+#: ../src/orca/messages.py:909
 #, python-format
 msgid "%s link"
 msgstr "%s-lenke"
 
-#. Translators: this is an indication that a given
-#. link points to an object that is on the same page.
-#. 
-#: ../src/orca/speech_generator.py:521
+#. Translators: this is an indication that a given link points to an object
+#. that is on the same page.
+#: ../src/orca/messages.py:893
 msgid "same page"
 msgstr "samme side"
 
-#. Translators: this is an indication that a given
-#. link points to an object that is at the same site
-#. (but not on the same page as the link).
-#. 
-#. Translators: this is an indication that a given
-#. link points to an object that is at the same site
-#. (but not on the same page) as the link.
-#. 
-#: ../src/orca/speech_generator.py:527 ../src/orca/speech_generator.py:540
+#. Translators: this is an indication that a given link points to an object
+#. that is at the same site (but not on the same page as the link).
+#: ../src/orca/messages.py:897
 msgid "same site"
 msgstr "samme nettsted"
 
-#. Translators: this is an indication that a given
-#. link points to an object that is at a different
-#. site than that of the link.
-#. 
-#: ../src/orca/speech_generator.py:546
+#. Translators: this is an indication that a given link points to an object
+#. that is at a different site than that of the link.
+#: ../src/orca/messages.py:901
 msgid "different site"
 msgstr "annet nettsted"
 
 #. Translators: This is the size of a file in bytes
-#. 
-#: ../src/orca/speech_generator.py:576
+#: ../src/orca/messages.py:1641
 #, python-format
 msgid "%d byte"
 msgid_plural "%d bytes"
@@ -7243,69 +6834,62 @@
 msgstr[1] "%d bytes"
 
 #. Translators: This is the size of a file in kilobytes
-#. 
-#: ../src/orca/speech_generator.py:580
+#: ../src/orca/messages.py:551
 #, python-format
 msgid "%.2f kilobytes"
 msgstr "%.2f kilobytes"
 
 #. Translators: This is the size of a file in megabytes
-#. 
-#: ../src/orca/speech_generator.py:584
+#: ../src/orca/messages.py:554
 #, python-format
 msgid "%.2f megabytes"
 msgstr "%.2f megabytes"
 
-#. Translators: this is in reference to a table cell being
-#. selected or not.
-#. 
-#: ../src/orca/speech_generator.py:786
+#. Translators: This is a state which applies to a table cell.
+#: ../src/orca/object_properties.py:119
 msgctxt "tablecell"
 msgid "not selected"
 msgstr "ikke valgt"
 
-#. Translators: this is in references to a row in a table.
-#. 
-#: ../src/orca/speech_generator.py:844
+#. Translators: this is in reference to a row in a table. The substitution is
+#. the index (e.g. the first row is "row 1").
+#: ../src/orca/messages.py:1519
 #, python-format
 msgid "row %d"
 msgstr "rad %d"
 
-#. Translators: this is in references to a column in a
-#. table.
-#: ../src/orca/speech_generator.py:873
+#. Translators: this is in reference to a column in a table. If the user is in
+#. the first column of a table with five columns, the position is "column 1 of 5"
+#: ../src/orca/messages.py:1505
 #, python-format
 msgid "column %(index)d of %(total)d"
 msgstr "kolonne %(index)d av %(total)d"
 
-#. Translators: this is in reference to a row in a table.
-#. 
-#: ../src/orca/speech_generator.py:878
+#. Translators: this is in reference to a row in a table. If the user is in the
+#. the first row of a table with five rows, the position is "row 1 of 5"
+#: ../src/orca/messages.py:1523
 #, python-format
 msgid "row %(index)d of %(total)d"
 msgstr "rad %(index)d av %(total)d"
 
-#. Translators: This is to indicate to the user that
-#. he/she is in the last cell of a table in a document.
-#. 
-#: ../src/orca/speech_generator.py:914
+#. Translators: This message is presented to indicate the user is in the last
+#. cell of a table in a document.
+#: ../src/orca/messages.py:1465
 msgid "End of table"
 msgstr "Slutt på tabell"
 
-#. Translators: this is the number of space characters on a line
-#. of text.
-#. 
-#: ../src/orca/speech_generator.py:1251
+#. Translators: This message is presented to inform the user of the number of
+#. space characters in a string.
+#: ../src/orca/messages.py:1724
 #, python-format
 msgid "%d space"
 msgid_plural "%d spaces"
 msgstr[0] "%d mellomrom"
 msgstr[1] "%d mellomrom"
 
-#. Translators: this is the number of tab characters on a line
-#. of text.
-#. 
-#: ../src/orca/speech_generator.py:1262
+#. Translators: This message is presented to inform the user of the number of
+#. tab characters in a string.
+#: ../src/orca/messages.py:1729
 #, python-format
 msgid "%d tab"
 msgid_plural "%d tabs"
@@ -7314,160 +6898,127 @@
 
 #. Translators: this is the percentage value of a progress bar.
 #. 
-#: ../src/orca/speech_generator.py:1330
+#: ../src/orca/speech_generator.py:1335
 #, python-format
 msgid "%d percent"
 msgid_plural "%d percent"
 msgstr[0] "%d prosent"
 msgstr[1] "%d prosent"
 
-#. Translators: this is the number of items in a layered pane
-#. or table.
-#. 
-#: ../src/orca/speech_generator.py:1429 ../src/orca/speech_generator.py:1450
+#. Translators, normally layered panes and tables have items in them. Thus it is
+#. noteworthy when this is not the case. This message is presented to the user to
+#. indicate the current layered pane or table contains zero items.
+#: ../src/orca/messages.py:1586
 msgid "0 items"
 msgstr "0 oppføringer"
 
-#. Translators: this is a count of the number of selected icons
-#. and the count of the total number of icons within an icon panel.
-#. An example of an icon panel is the Nautilus folder view.
-#. 
-#: ../src/orca/speech_generator.py:1509
+#. Translators: This message is presented to indicate the number of selected
+#. objects (e.g. icons) and the total number of those objects.
+#: ../src/orca/messages.py:1700
 #, python-format
 msgid "%(index)d of %(total)d item selected"
 msgid_plural "%(index)d of %(total)d items selected"
 msgstr[0] "%(index)d av %(total)d oppføring valgt"
 msgstr[1] "%(index)d av %(total)d oppføringer valgt"
 
-#. Translators: this tells the user how many unfocused
-#. alert and dialog windows that this application has.
-#. 
-#: ../src/orca/speech_generator.py:1565 ../src/orca/speech_generator.py:1866
+#. Translators: This message informs the user how many unfocused alert and
+#. dialog windows a newly (re)focused application has. It is added at the
+#. end of a spoken message containing the app which just claimed focus.
+#: ../src/orca/messages.py:1637
 #, python-format
 msgid "%d unfocused dialog"
 msgid_plural "%d unfocused dialogs"
 msgstr[0] "%d dialog uten fokus"
 msgstr[1] "%d dialoger uten fokus"
 
-#. Translators: this is an alternative name for the
-#. parent object of a series of icons.
-#. 
-#: ../src/orca/speech_generator.py:1654
+#. Translators: This is an alternative name for the parent object of a series
+#. of icons.
+#: ../src/orca/object_properties.py:77
 msgid "Icon panel"
 msgstr "Ikonpanel"
 
-#. Translators: The "default" button in a dialog box is the
-#. button that gets activated when Enter is pressed anywhere
-#. within that dialog box.
-#. 
-#: ../src/orca/speech_generator.py:1813
+#. Translators: The "default" button in a dialog box is the button that gets
+#. activated when Enter is pressed anywhere within that dialog box.
+#: ../src/orca/messages.py:479
 #, python-format
 msgid "Default button is %s"
 msgstr "Forvalgt knapp er %s"
 
-#. Translators: the structural navigation keys are designed
-#. to move the caret around the document content by object
-#. type. Thus H moves you to the next heading, Shift H to
-#. the previous heading, T to the next table, and so on.
-#. This feature needs to be toggle-able so that it does not
-#. interfere with normal writing functions.
-#. 
-#: ../src/orca/structural_navigation.py:573
+#. Translators: the structural navigation keys are designed to move the caret
+#. around the document content by object type. Thus H moves you to the next
+#. heading, Shift H to the previous heading, T to the next table, and so on.
+#. This feature needs to be toggle-able so that it does not interfere with normal
+#. writing functions.
+#: ../src/orca/cmdnames.py:737
 msgid "Toggles structural navigation keys."
 msgstr "Slår av/på navigasjonstaster for struktur."
 
-#. Translators: the structural navigation keys are designed
-#. to move the caret around document content by object type.
-#. Thus H moves you to the next heading, Shift H to the
-#. previous heading, T to the next table, and so on. Some
-#. users prefer to turn this off to use Firefox's search
-#. when typing feature.  This message is sent to both the
-#. braille display and the speech synthesizer when the user
-#. toggles the structural navigation feature of Orca.
-#. It should be a brief informative message.
-#. 
-#: ../src/orca/structural_navigation.py:627
+#. Translators: The structural navigation keys are designed to move the caret
+#. around document content by object type. H moves you to the next heading,
+#. Shift H to the previous heading, T to the next table, and so on. Some users
+#. prefer to turn this off to use Firefox's search when typing feature. This
+#. message is presented when the user toggles the structural navigation feature
+#. of Orca. It should be a brief informative message.
+#: ../src/orca/messages.py:1450
 msgid "Structural navigation keys on."
 msgstr "Strukturelle navigasjonstaster er slått på."
 
-#. Translators: the structural navigation keys are designed
-#. to move the caret around document content by object type.
-#. Thus H moves you to the next heading, Shift H to the
-#. previous heading, T to the next table, and so on. Some
-#. users prefer to turn this off to use Firefox's search
-#. when typing feature.  This message is sent to both the
-#. braille display and the speech synthesizer when the user
-#. toggles the structural navigation feature of Orca.
-#. It should be a brief informative message.
-#. 
-#: ../src/orca/structural_navigation.py:639
+#. Translators: The structural navigation keys are designed to move the caret
+#. around document content by object type. H moves you to the next heading,
+#. Shift H to the previous heading, T to the next table, and so on. Some users
+#. prefer to turn this off to use Firefox's search when typing feature. This
+#. message is presented when the user toggles the structural navigation feature
+#. of Orca. It should be a brief informative message.
+#: ../src/orca/messages.py:1442
 msgid "Structural navigation keys off."
 msgstr "Strukturelle navigasjonstaster er slått av."
 
-#. Translators: this is for navigating document content by
-#. moving from table cell to table cell. If the user gives a
-#. table navigation command but is not in a table, Orca speaks
-#. this message.
-#. 
-#: ../src/orca/structural_navigation.py:678
+#. Translators: This is for navigating document content by moving from table cell
+#. to table cell. If the user gives a table navigation command but is not in a
+#. table, presents this message.
+#: ../src/orca/messages.py:1489
 msgid "Not in a table."
 msgstr "Ikke i en tabell."
 
-#. Translators: this is for navigating document
-#. content by moving from table cell to table cell.
-#. This is the message spoken when the user attempts
-#. to move to the left of the current cell and is
-#. already in the first column.
-#. 
-#: ../src/orca/structural_navigation.py:698
+#. Translators: This is for navigating document content by moving from table cell
+#. to table cell. This is the message presented when the user attempts to move to
+#. the left of the current cell and is already in the first column.
+#: ../src/orca/messages.py:1528
 msgid "Beginning of row."
 msgstr "Begynnelse av rad."
 
-#. Translators: this is for navigating document
-#. content by moving from table cell to table cell.
-#. This is the message spoken when the user attempts
-#. to move to the right of the current cell and is
-#. already in the last column.
-#. 
-#: ../src/orca/structural_navigation.py:707
+#. Translators: This is for navigating document content by moving from table cell
+#. to table cell. This is the message presented when the user attempts to move to
+#. the right of the current cell and is already in the last column.
+#: ../src/orca/messages.py:1533
 msgid "End of row."
 msgstr "Slutten av rad."
 
-#. Translators: this is for navigating document
-#. content by moving from table cell to table cell.
-#. This is the message spoken when the user attempts
-#. to move to the cell above the current cell and is
-#. already in the first row.
-#. 
-#: ../src/orca/structural_navigation.py:716
+#. Translators: This is for navigating document content by moving from table cell
+#. to table cell. This is the message presented when the user attempts to move to
+#. the cell above the current cell and is already in the first row.
+#: ../src/orca/messages.py:1515
 msgid "Top of column."
 msgstr "Toppen på kolonnen."
 
-#. Translators: this is for navigating document
-#. content by moving from table cell to table cell.
-#. This is the message spoken when the user attempts
-#. to move to the cell below the current cell and is
-#. already in the last row.
-#. 
-#: ../src/orca/structural_navigation.py:725
+#. Translators: This is for navigating document content by moving from table cell
+#. to table cell. This is the message presented when the user attempts to move to
+#. the cell below the current cell and is already in the last row.
+#: ../src/orca/messages.py:1510
 msgid "Bottom of column."
 msgstr "Bunnen på kolonnen."
 
-#. Translators: a uniform table is one in which each table
-#. cell occupies one row and one column (i.e. a perfect grid)
-#. In contrast, a non-uniform table is one in which at least
-#. one table cell occupies more than one row and/or column.
-#. 
-#: ../src/orca/structural_navigation.py:1201
+#. Translators: a uniform table is one in which each table cell occupies one row
+#. and one column (i.e. a perfect grid). In contrast, a non-uniform table is one
+#. in which at least one table cell occupies more than one row and/or column.
+#: ../src/orca/messages.py:1484
 msgid "Non-uniform"
 msgstr "Ikke-uniform"
 
-#. Translators: The cell here refers to a cell within a table
-#. within a document.  We need to announce when the cell occupies
-#. or "spans" more than a single row and/or column.
-#. 
-#: ../src/orca/structural_navigation.py:1368
-#: ../src/orca/structural_navigation.py:1390
+#. Translators: The cell here refers to a cell within a table within a
+#. document. We need to announce when the cell occupies or "spans" more
+#. than a single row and/or column.
+#: ../src/orca/messages.py:1594 ../src/orca/messages.py:1613
 #, python-format
 msgid "Cell spans %d row"
 msgid_plural "Cell spans %d rows"
@@ -7475,561 +7026,434 @@
 msgstr[1] "Cellen går over %d rader"
 
 #. Translators: this represents the number of columns in a table.
-#. 
-#: ../src/orca/structural_navigation.py:1374
+#: ../src/orca/messages.py:1599
 #, python-format
 msgid " %d column"
 msgid_plural " %d columns"
 msgstr[0] " %d kolonne"
 msgstr[1] " %d kolonner"
 
-#. Translators: The cell here refers to a cell within a table
-#. within a document.  We need to announce when the cell occupies
-#. or "spans" more than a single row and/or column.
-#. 
-#: ../src/orca/structural_navigation.py:1382
+#. Translators: The cell here refers to a cell within a table within a
+#. document. We need to announce when the cell occupies or "spans" more
+#. than a single row and/or column.
+#: ../src/orca/messages.py:1606
 #, python-format
 msgid "Cell spans %d column"
 msgid_plural "Cell spans %d columns"
 msgstr[0] "Cellen går over %d kolonne"
 msgstr[1] "Cellen går over %d kolonner"
 
-#. Translators: this is for navigating among anchors in a document.
-#. An anchor is a named spot that one can jump to.
-#. 
-#: ../src/orca/structural_navigation.py:1744
+#. Translators: this is for navigating among anchors in a document. An anchor is
+#. a named spot that one can jump to.
+#: ../src/orca/cmdnames.py:741
 msgid "Goes to previous anchor."
 msgstr "Går til forrige anker."
 
-#. Translators: this is for navigating among anchors in a document.
-#. An anchor is a named spot that one can jump to.
-#. 
-#: ../src/orca/structural_navigation.py:1749
+#. Translators: this is for navigating among anchors in a document. An anchor is
+#. a named spot that one can jump to.
+#: ../src/orca/cmdnames.py:745
 msgid "Goes to next anchor."
 msgstr "Går til neste anker."
 
-#. Translators: this is for navigating document content by
-#. moving from anchor to anchor. (An anchor is a named spot
-#. that one can jump to.) This is a detailed message which
-#. will be presented to the user if no more anchors can be found.
-#. 
-#: ../src/orca/structural_navigation.py:1806
+#. Translators: This is for navigating document content by moving from anchor to
+#. anchor. (An anchor is a named spot that one can jump to.) This is a detailed
+#. message which will be presented to the user if no more anchors can be found.
+#: ../src/orca/messages.py:1094
 msgid "No more anchors."
 msgstr "Ingen flere anker."
 
-#. Translators: Orca has a command that allows the user to move
-#. to the next structural navigation object. In Orca, "structural
-#. navigation" refers to quickly moving through a document by
-#. jumping amongst objects of a given type, such as from link to
-#. link, or from heading to heading, or from form field to form
-#. field. This is a brief message which will be presented to the
-#. user if the desired structural navigation object could not be
-#. found.
-#. 
-#: ../src/orca/structural_navigation.py:1816
-#: ../src/orca/structural_navigation.py:1910
-#: ../src/orca/structural_navigation.py:2000
-#: ../src/orca/structural_navigation.py:2090
-#: ../src/orca/structural_navigation.py:2195
-#: ../src/orca/structural_navigation.py:2285
-#: ../src/orca/structural_navigation.py:2387
-#: ../src/orca/structural_navigation.py:2484
-#: ../src/orca/structural_navigation.py:2606
-#: ../src/orca/structural_navigation.py:2624
-#: ../src/orca/structural_navigation.py:2734
-#: ../src/orca/structural_navigation.py:2852
-#: ../src/orca/structural_navigation.py:2948
-#: ../src/orca/structural_navigation.py:3049
-#: ../src/orca/structural_navigation.py:3140
-#: ../src/orca/structural_navigation.py:3230
-#: ../src/orca/structural_navigation.py:3311
-#: ../src/orca/structural_navigation.py:3401
-#: ../src/orca/structural_navigation.py:3601
-#: ../src/orca/structural_navigation.py:3690
+#. Translators: Orca has a command that allows the user to move to the next
+#. structural navigation object. In Orca, "structural navigation" refers to
+#. quickly moving through a document by jumping amongst objects of a given
+#. type, such as from link to link, or from heading to heading, or from form
+#. field to form field. This is a brief message which will be presented to the
+#. user if the desired structural navigation object could not be found.
+#: ../src/orca/messages.py:1458
 msgctxt "structural navigation"
 msgid "Not found"
 msgstr "Ikke funnet"
 
-#. Translators: this is for navigating among blockquotes in a
-#. document.
-#. 
-#: ../src/orca/structural_navigation.py:1834
+#. Translators: this is for navigating among blockquotes in a document.
+#: ../src/orca/cmdnames.py:748
 msgid "Goes to previous blockquote."
 msgstr "Går til forrige blokksitat."
 
-#. Translators: this is for navigating among blockquotes in a
-#. document.
-#. 
-#: ../src/orca/structural_navigation.py:1839
+#. Translators: this is for navigating among blockquotes in a document.
+#: ../src/orca/cmdnames.py:751
 msgid "Goes to next blockquote."
 msgstr "Går til neste blokksitat."
 
-#. Translators: this is for navigating document content by
-#. moving from blockquote to blockquote. This is a detailed
-#. message which will be presented to the user if no more
-#. blockquotes can be found.
-#. 
-#: ../src/orca/structural_navigation.py:1900
+#. Translators: This is for navigating document content by moving from blockquote
+#. to blockquote. This is a detailed message which will be presented to the user
+#. if no more blockquotes can be found.
+#: ../src/orca/messages.py:1099
 msgid "No more blockquotes."
 msgstr "Det finnes ikke flere blokksitater."
 
-#. Translators: this is for navigating among buttons in a form
-#. within a document.
-#. 
-#: ../src/orca/structural_navigation.py:1928
+#. Translators: this is for navigating among buttons in a document.
+#: ../src/orca/cmdnames.py:757
 msgid "Goes to previous button."
 msgstr "Går til forrige knapp."
 
-#. Translators: this is for navigating among buttons in a form
-#. within a document.
-#. 
-#: ../src/orca/structural_navigation.py:1933
+#. Translators: this is for navigating among buttons in a document.
+#: ../src/orca/cmdnames.py:760
 msgid "Goes to next button."
 msgstr "Går til neste knapp."
 
-#. Translators: this is for navigating document content by
-#. moving from push button to push button in a form. This is
-#. a detailed message which will be presented to the user if
-#. no more push buttons can be found.
-#. 
-#: ../src/orca/structural_navigation.py:1990
+#. Translators: This is for navigating document content by moving from button
+#. to button. This is a detailed message which will be presented to the user
+#. if no more buttons can be found.
+#: ../src/orca/messages.py:1104
 msgid "No more buttons."
 msgstr "Ingen flere knapper."
 
-#. Translators: this is for navigating among check boxes in a form
-#. within a document.
-#. 
-#: ../src/orca/structural_navigation.py:2018
+#. Translators: this is for navigating among check boxes in a document.
+#: ../src/orca/cmdnames.py:766
 msgid "Goes to previous check box."
 msgstr "Går til forrige avkrysningsboks."
 
-#. Translators: this is for navigating among check boxes in a form
-#. within a document.
-#. 
-#: ../src/orca/structural_navigation.py:2023
+#. Translators: this is for navigating among check boxes in a document.
+#: ../src/orca/cmdnames.py:769
 msgid "Goes to next check box."
 msgstr "Går til neste avkrysningsboks."
 
-#. Translators: this is for navigating document content by
-#. moving from checkbox to checkbox in a form. This is a
-#. detailed message which will be presented to the user if
-#. no more checkboxes can be found.
-#. 
-#: ../src/orca/structural_navigation.py:2080
+#. Translators: This is for navigating document content by moving from check
+#. box to check box. This is a detailed message which will be presented to the
+#. user if no more check boxes can be found.
+#: ../src/orca/messages.py:1109
 msgid "No more check boxes."
 msgstr "Ingen flere avkrysningsbokser."
 
-#. Translators: this is for navigating a document in a
-#. structural manner, where a 'large object' is a logical
-#. chunk of text, such as a paragraph, a list, a table, etc.
-#. 
-#: ../src/orca/structural_navigation.py:2109
+#. Translators: this is for navigating among large objects in a document.
+#. A 'large object' is a logical chunk of text, such as a paragraph, a list,
+#. a table, etc.
+#: ../src/orca/cmdnames.py:835
 msgid "Goes to previous large object."
 msgstr "Går til forrige store objekt."
 
-#. Translators: this is for navigating a document in a
-#. structural manner, where a 'large object' is a logical
-#. chunk of text, such as a paragraph, a list, a table, etc.
-#. 
-#: ../src/orca/structural_navigation.py:2115
+#. Translators: this is for navigating among large objects in a document.
+#. A 'large object' is a logical chunk of text, such as a paragraph, a list,
+#. a table, etc.
+#: ../src/orca/cmdnames.py:840
 msgid "Goes to next large object."
 msgstr "Går til neste store objekt."
 
-#. Translators: this is for navigating document content by
-#. moving from 'large object' to 'large object'. A 'large
-#. object' is a logical chunk of text, such as a paragraph,
-#. a list, a table, etc. This is a detailed message which
-#. will be presented to the user if no more large objects
-#. can be found.
-#. 
-#: ../src/orca/structural_navigation.py:2185
+#. Translators: This is for navigating document content by moving from 'large
+#. object' to 'large object'. A 'large object' is a logical chunk of text,
+#. such as a paragraph, a list, a table, etc. This is a detailed message which
+#. will be presented to the user if no more check boxes can be found.
+#: ../src/orca/messages.py:1115
 msgid "No more large objects."
 msgstr "Ingen flere store objekter."
 
-#. Translators: this is for navigating among combo boxes in a form
-#. within a document.
-#. 
-#: ../src/orca/structural_navigation.py:2213
+#. Translators: this is for navigating among combo boxes in a document.
+#: ../src/orca/cmdnames.py:775
 msgid "Goes to previous combo box."
 msgstr "Går til forrige komboboks."
 
-#. Translators: this is for navigating among combo boxes in a form
-#. within a document.
-#. 
-#: ../src/orca/structural_navigation.py:2218
+#. Translators: this is for navigating among combo boxes in a document.
+#: ../src/orca/cmdnames.py:778
 msgid "Goes to next combo box."
 msgstr "Går til neste komboboks."
 
-#. Translators: this is for navigating document content by
-#. moving from combo box to combo box in a form. This is a
-#. detailed message which will be presented to the user if
-#. no more checkboxes can be found.
-#. 
-#: ../src/orca/structural_navigation.py:2275
+#. Translators: This is for navigating document content by moving from combo
+#. box to combo box. This is a detailed message which will be presented to the
+#. user if no more combo boxes can be found.
+#: ../src/orca/messages.py:1120
 msgid "No more combo boxes."
 msgstr "Ingen flere kombobokser."
 
-#. Translators: this is for navigating among text entries in a form
-#. within a document.
-#. 
-#: ../src/orca/structural_navigation.py:2303
+#. Translators: this is for navigating among entries in a document.
+#: ../src/orca/cmdnames.py:784
 msgid "Goes to previous entry."
 msgstr "Går til forrige oppføring."
 
-#. Translators: this is for navigating among text entries
-#. in a form.
-#. 
-#: ../src/orca/structural_navigation.py:2308
+#. Translators: this is for navigating among entries in a document.
+#: ../src/orca/cmdnames.py:787
 msgid "Goes to next entry."
 msgstr "Går til neste oppføring."
 
-#. Translators: this is for navigating document content by
-#. moving from text entry to text entry in a form. This is
-#. a detailed message which will be presented to the user if
-#. no more text entries can be found.
-#. 
-#: ../src/orca/structural_navigation.py:2377
+#. Translators: This is for navigating document content by moving from entry
+#. to entry. This is a detailed message which will be presented to the user
+#. if no more entries can be found.
+#: ../src/orca/messages.py:1125
 msgid "No more entries."
 msgstr "Ingen flere oppføringer."
 
-#. Translators: this is for navigating among fields in a form within
-#. a document.
-#. 
-#: ../src/orca/structural_navigation.py:2405
+#. Translators: this is for navigating among form fields in a document.
+#: ../src/orca/cmdnames.py:793
 msgid "Goes to previous form field."
 msgstr "Går til forrige felt i skjema."
 
-#. Translators: this is for navigating among fields in a form within
-#. a document.
-#. 
-#: ../src/orca/structural_navigation.py:2412
+#. Translators: this is for navigating among form fields in a document.
+#: ../src/orca/cmdnames.py:796
 msgid "Goes to next form field."
 msgstr "Går til neste felt i skjema."
 
-#. Translators: this is for navigating document content by
-#. moving from form field to form filed. This is a detailed
-#. message which will be presented to the user if no more form
-#. field can be found.
-#. 
-#: ../src/orca/structural_navigation.py:2474
+#. Translators: This is for navigating document content by moving from form
+#. field to form field. This is a detailed message which will be presented to
+#. the user if no more form fields can be found.
+#: ../src/orca/messages.py:1130
 msgid "No more form fields."
 msgstr "Det finnes ikke flere felt i skjema."
 
-#. Translators: this is for navigating in a document by heading.
-#. (e.g. <h1>)
-#. 
-#: ../src/orca/structural_navigation.py:2502
+#. Translators: this is for navigating among headings (e.g. <h1>) in a document.
+#: ../src/orca/cmdnames.py:802
 msgid "Goes to previous heading."
 msgstr "Går til forrige overskrift."
 
-#. Translators: this is for navigating in a document by heading.
-#. (e.g., <h1>)
-#. 
-#: ../src/orca/structural_navigation.py:2507
+#. Translators: this is for navigating among headings (e.g. <h1>) in a document.
+#: ../src/orca/cmdnames.py:805
 msgid "Goes to next heading."
 msgstr "Går til neste overskrift."
 
-#. Translators: this is for navigating in a document by heading.
-#. (e.g. <h1> is a heading at level 1).
-#. 
-#: ../src/orca/structural_navigation.py:2517
+#. Translators: this is for navigating among headings (e.g. <h1>) in a document.
+#. <h1> is a heading at level 1, <h2> is a heading at level 2, etc.
+#: ../src/orca/cmdnames.py:812
 #, python-format
 msgid "Goes to previous heading at level %d."
 msgstr "Går til forrige overskrift med nivå %d."
 
-#. Translators: this is for navigating in a document by heading.
-#. (e.g. <h1> is a heading at level 1).
-#. 
-#: ../src/orca/structural_navigation.py:2524
+#. Translators: this is for navigating among headings (e.g. <h1>) in a document.
+#. <h1> is a heading at level 1, <h2> is a heading at level 2, etc.
+#: ../src/orca/cmdnames.py:816
 #, python-format
 msgid "Goes to next heading at level %d."
 msgstr "Går til neste overskrift med nivå %d."
 
-#. Translators: this is for navigating HTML content by moving from
-#. heading to heading (e.g. <h1>, <h2>, etc). This string is the
-#. detailed message which Orca will present if there are no more
-#. headings found.
-#. 
-#: ../src/orca/structural_navigation.py:2596
+#. Translators: This is for navigating document content by moving from heading
+#. to heading. This is a detailed message which will be presented to the user
+#. if no more headings can be found.
+#: ../src/orca/messages.py:1135
 msgid "No more headings."
 msgstr "Ingen flere topptekster."
 
-#. Translators: this is for navigating HTML content by moving from
-#. heading to heading at a particular level (i.e. only <h1> or only
-#. <h2>, etc.) This string is the detailed message which Orca will
-#. present if there are no more headings found at the desired level.
-#. 
-#: ../src/orca/structural_navigation.py:2614
+#. Translators: This is for navigating document content by moving from heading
+#. to heading at a particular level (i.e. only <h1> or only <h2>, etc.). This
+#. is a detailed message which will be presented to the user if no more headings
+#. at the desired level can be found.
+#: ../src/orca/messages.py:1141
 #, python-format
 msgid "No more headings at level %d."
 msgstr "Ingen flere overskrifter på nivå %d."
 
-#. Translators: this is for navigating to the previous ARIA
-#. role landmark.  ARIA role landmarks are the W3C defined
-#. HTML tag attribute 'role' used to identify important part
-#. of webpage like banners, main context, search etc.
-#. 
-#: ../src/orca/structural_navigation.py:2644
+#. Translators: this is for navigating among ARIA landmarks in a document. ARIA
+#. role landmarks are the W3C defined HTML tag attribute 'role' used to identify
+#. important part of webpage like banners, main context, search etc.
+#: ../src/orca/cmdnames.py:825
 msgid "Goes to previous landmark."
 msgstr "Går til forrige landemerke."
 
-#. Translators: this is for navigating to the next ARIA
-#. role landmark.  ARIA role landmarks are the W3C defined
-#. HTML tag attribute 'role' used to identify important part
-#. of webpage like banners, main context, search etc.
-#. 
-#: ../src/orca/structural_navigation.py:2651
+#. Translators: this is for navigating among ARIA landmarks in a document. ARIA
+#. role landmarks are the W3C defined HTML tag attribute 'role' used to identify
+#. important part of webpage like banners, main context, search etc.
+#: ../src/orca/cmdnames.py:830
 msgid "Goes to next landmark."
 msgstr "Går til neste landemerke."
 
-#. Translators: this is for navigating to the previous ARIA
-#. role landmark.  ARIA role landmarks are the W3C defined
-#. HTML tag attribute 'role' used to identify important part
-#. of webpage like banners, main context, search etc.  This
-#. is an indication that one was not found.
-#. 
-#: ../src/orca/structural_navigation.py:2724
+#. Translators: this is for navigating to the previous ARIA role landmark.
+#. ARIA role landmarks are the W3C defined HTML tag attribute 'role' used to
+#. identify important part of webpage like banners, main context, search etc.
+#. This is an indication that one was not found.
+#: ../src/orca/messages.py:1147
 msgid "No landmark found."
 msgstr "Ingen landemerker funnet."
 
-#. Translators: this is for navigating among bulleted/numbered
-#. lists in a document.
-#. 
-#: ../src/orca/structural_navigation.py:2752
+#. Translators: this is for navigating among lists in a document.
+#: ../src/orca/cmdnames.py:851
 msgid "Goes to previous list."
 msgstr "Går til forrige liste."
 
-#. Translators: this is for navigating among bulleted/numbered
-#. lists in a document.
-#. 
-#: ../src/orca/structural_navigation.py:2757
+#. Translators: this is for navigating among lists in a document.
+#: ../src/orca/cmdnames.py:854
 msgid "Goes to next list."
-msgstr "Går til forrige liste."
+msgstr "Går til neste liste."
 
-#. Translators: this is for navigating document content by moving
-#. from bulleted/numbered list to bulleted/numbered list. This
-#. string is the detailed message which Orca will present if there
-#. are no more lists found.
-#. 
-#: ../src/orca/structural_navigation.py:2842
+#. Translators: This is for navigating document content by moving from bulleted/
+#. numbered list to bulleted/numbered list. This is a detailed message which will
+#. be presented to the user if no more lists can be found.
+#: ../src/orca/messages.py:1157
 msgid "No more lists."
 msgstr "Det finnes ingen flere lister."
 
-#. Translators: this is for navigating among bulleted/numbered list
-#. items in a document.
-#. 
-#: ../src/orca/structural_navigation.py:2870
+#. Translators: this is for navigating among list items in a document.
+#: ../src/orca/cmdnames.py:860
 msgid "Goes to previous list item."
 msgstr "Går til forrige listeoppføring."
 
-#. Translators: this is for navigating among bulleted/numbered list
-#. items in a document.
-#. 
-#: ../src/orca/structural_navigation.py:2875
+#. Translators: this is for navigating among list items in a document.
+#: ../src/orca/cmdnames.py:863
 msgid "Goes to next list item."
 msgstr "Går til neste lenkeoppføring."
 
-#. Translators: this is for navigating document content by
-#. moving from bulleted/numbered list item to  bulleted/
-#. numbered list item.  This string is the detailed message
-#. which Orca will present if there are no more list items found.
-#. 
-#: ../src/orca/structural_navigation.py:2938
+#. Translators: This is for navigating document content by moving from bulleted/
+#. numbered list item to bulleted/numbered list item. This is a detailed message
+#. which will be presented to the user if no more list items can be found.
+#: ../src/orca/messages.py:1162
 msgid "No more list items."
 msgstr "Det finnes ingen flere oppføringer i listen."
 
-#. Translators: this is for navigating between live regions
-#. 
-#: ../src/orca/structural_navigation.py:2965
+#. Translators: this is for navigating among live regions in a document. A live
+#. region is an area of a web page that is periodically updated, e.g. a stock
+#. ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#: ../src/orca/cmdnames.py:871
 msgid "Goes to previous live region."
 msgstr "Går til forrige levende region."
 
-#. Translators: this is for navigating between live regions
-#. 
-#: ../src/orca/structural_navigation.py:2969
+#. Translators: this is for navigating among live regions in a document. A live
+#. region is an area of a web page that is periodically updated, e.g. a stock
+#. ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#: ../src/orca/cmdnames.py:876
 msgid "Goes to next live region."
 msgstr "Går til neste levende region."
 
-#. Translators: this is for navigating to the last live region
-#. which made an announcement.
-#. 
-#: ../src/orca/structural_navigation.py:2974
+#. Translators: this is for navigating among live regions in a document. A live
+#. region is an area of a web page that is periodically updated, e.g. a stock
+#. ticker. http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#: ../src/orca/cmdnames.py:881
 msgid "Goes to the last live region which made an announcement."
 msgstr "Går til siste levende region som gjorde en annonsering."
 
-#. Translators: this is for navigating HTML in a structural
-#. manner, where a 'live region' is a location in a web page
-#. that are updated without having to refresh the entire page.
-#. 
-#: ../src/orca/structural_navigation.py:3039
+#. Translators: This is for navigating document content by moving from live
+#. region to live region. A live region is an area of a web page that is
+#. periodically updated, e.g. stock ticker. This is a detailed message which
+#. will be presented to the user if no more live regions can be found. For
+#. more info, see http://www.w3.org/TR/wai-aria/terms#def_liveregion
+#: ../src/orca/messages.py:1169
 msgid "No more live regions."
 msgstr "Det finnes ikke flere levende regioner."
 
 #. Translators: this is for navigating among paragraphs in a document.
-#. 
-#: ../src/orca/structural_navigation.py:3066
+#: ../src/orca/cmdnames.py:884
 msgid "Goes to previous paragraph."
 msgstr "Går til forrige avsnitt."
 
 #. Translators: this is for navigating among paragraphs in a document.
-#. 
-#: ../src/orca/structural_navigation.py:3070
+#: ../src/orca/cmdnames.py:887
 msgid "Goes to next paragraph."
 msgstr "Går til neste avsnitt."
 
-#. Translators: this is for navigating document content by moving
-#. from paragraph to paragraph. This string is the detailed message
-#. which Orca will present if there are no more paragraphs found.
-#. 
-#: ../src/orca/structural_navigation.py:3130
+#. Translators: This is for navigating document content by moving from paragraph
+#. to paragraph. This is a detailed message which will be presented to the user
+#. if no more paragraphs can be found.
+#: ../src/orca/messages.py:1174
 msgid "No more paragraphs."
 msgstr "Ingen flere avsnitt."
 
-#. Translators: this is for navigating among radio buttons in a
-#. form within a document.
-#. 
-#: ../src/orca/structural_navigation.py:3158
+#. Translators: this is for navigating among radio buttons in a document.
+#: ../src/orca/cmdnames.py:893
 msgid "Goes to previous radio button."
 msgstr "Går til forrige radioknapp."
 
-#. Translators: this is for navigating among radio buttons in a
-#. form within a document.
-#. 
-#: ../src/orca/structural_navigation.py:3163
+#. Translators: this is for navigating among radio buttons in a document.
+#: ../src/orca/cmdnames.py:896
 msgid "Goes to next radio button."
 msgstr "Går til neste radioknapp."
 
-#. Translators: this is for navigating in document content by moving
-#. from radio button to radio button in a form. This string is the
-#. detailed message which Orca will present if there are no more
-#. radio buttons found.
-#. 
-#: ../src/orca/structural_navigation.py:3220
+#. Translators: This is for navigating document content by moving from radio
+#. button to radio button. This is a detailed message which will be presented to
+#. the user if no more radio buttons can be found.
+#: ../src/orca/messages.py:1179
 msgid "No more radio buttons."
 msgstr "Ingen flere radioknapper."
 
-#. Translators: this is for navigating among separators, such as the
-#. <hr> tag, in a document.
-#. 
-#: ../src/orca/structural_navigation.py:3248
+#. Translators: this is for navigating among separators (e.g. <hr>) in a
+#. document.
+#: ../src/orca/cmdnames.py:903
 msgid "Goes to previous separator."
 msgstr "Går til forrige skilletegn."
 
-#. Translators: this is for navigating among separators, such as the
-#. <hr> tag, in a document.
-#. 
-#: ../src/orca/structural_navigation.py:3253
+#. Translators: this is for navigating among separators (e.g. <hr>) in a
+#. document.
+#: ../src/orca/cmdnames.py:907
 msgid "Goes to next separator."
 msgstr "Går til neste skilletegn."
 
-#. Translators: this is for navigating document content by moving
-#. amongst separators (e.g. <hr> tags). This string is the detailed
-#. message which Orca will present if there are no more separators
-#. found.
-#. 
-#: ../src/orca/structural_navigation.py:3301
+#. Translators: This is for navigating document content by moving from separator
+#. to separator (e.g. <hr> tags). This is a detailed message which will be
+#. presented to the user if no more separators can be found.
+#: ../src/orca/messages.py:1184
 msgid "No more separators."
 msgstr "Ingen flere skilletegn."
 
 #. Translators: this is for navigating among tables in a document.
-#. 
-#: ../src/orca/structural_navigation.py:3328
+#: ../src/orca/cmdnames.py:910
 msgid "Goes to previous table."
 msgstr "Går til forrige tabell."
 
 #. Translators: this is for navigating among tables in a document.
-#. 
-#: ../src/orca/structural_navigation.py:3332
+#: ../src/orca/cmdnames.py:913
 msgid "Goes to next table."
 msgstr "Går til neste tabell."
 
-#. Translators: this is for navigating document content by moving
-#. from table to table.  This string is the detailed message which
-#. Orca will present if there are no more tables found.
-#. 
-#: ../src/orca/structural_navigation.py:3391
+#. Translators: This is for navigating document content by moving from table to
+#. to table. This is a detailed message which will be presented to the user if
+#. no more tables can be found.
+#: ../src/orca/messages.py:1189
 msgid "No more tables."
 msgstr "Ingen flere tabeller."
 
 #. Translators: this is for navigating among table cells in a document.
-#. 
-#: ../src/orca/structural_navigation.py:3418
+#: ../src/orca/cmdnames.py:928
 msgid "Goes left one cell."
 msgstr "Går en celle til venstre."
 
 #. Translators: this is for navigating among table cells in a document.
-#. 
-#: ../src/orca/structural_navigation.py:3422
+#: ../src/orca/cmdnames.py:931
 msgid "Goes right one cell."
 msgstr "Går en celle til høyre."
 
 #. Translators: this is for navigating among table cells in a document.
-#. 
-#: ../src/orca/structural_navigation.py:3426
+#: ../src/orca/cmdnames.py:934
 msgid "Goes up one cell."
 msgstr "Går en celle opp."
 
 #. Translators: this is for navigating among table cells in a document.
-#. 
-#: ../src/orca/structural_navigation.py:3430
+#: ../src/orca/cmdnames.py:919
 msgid "Goes down one cell."
 msgstr "Går ned en celle."
 
 #. Translators: this is for navigating among table cells in a document.
-#. 
-#: ../src/orca/structural_navigation.py:3434
+#: ../src/orca/cmdnames.py:922
 msgid "Goes to the first cell in a table."
 msgstr "Går til den første cellen i en tabell."
 
 #. Translators: this is for navigating among table cells in a document.
-#. 
-#: ../src/orca/structural_navigation.py:3438
+#: ../src/orca/cmdnames.py:925
 msgid "Goes to the last cell in a table."
 msgstr "Går til den siste cellen i en tabell."
 
-#. Translators: this is for navigating among unvisited links in a
-#. document.
-#. 
-#: ../src/orca/structural_navigation.py:3523
+#. Translators: this is for navigating among unvisited links in a document.
+#: ../src/orca/cmdnames.py:937
 msgid "Goes to previous unvisited link."
 msgstr "Går til forrige ubesøkte lenke."
 
-#. Translators: this is for navigating among unvisited links in a
-#. document.
-#. 
-#: ../src/orca/structural_navigation.py:3528
+#. Translators: this is for navigating among unvisited links in a document.
+#: ../src/orca/cmdnames.py:940
 msgid "Goes to next unvisited link."
 msgstr "Går til neste ubesøkte lenke."
 
-#. Translators: this is for navigating document content by moving
-#. from unvisited link to unvisited link. This string is the
-#. detailed message which Orca will present if there are no more
-#. unvisited links found.
-#. 
-#: ../src/orca/structural_navigation.py:3591
+#. Translators: This is for navigating document content by moving from unvisited
+#. link to unvisited link. This is a detailed message which will be presented to
+#. the user if no more unvisited links can be found.
+#: ../src/orca/messages.py:1194
 msgid "No more unvisited links."
 msgstr "Det finnes ingen flere ubesøkte lenker."
 
-#. Translators: this is for navigating among visited links in a
-#. document.
-#. 
-#: ../src/orca/structural_navigation.py:3619
+#. Translators: this is for navigating among visited links in a document.
+#: ../src/orca/cmdnames.py:946
 msgid "Goes to previous visited link."
 msgstr "Går til forrige besøkte lenke."
 
-#. Translators: this is for navigating among visited links in a
-#. document.
-#. 
-#: ../src/orca/structural_navigation.py:3624
+#. Translators: this is for navigating among visited links in a document.
+#: ../src/orca/cmdnames.py:949
 msgid "Goes to next visited link."
 msgstr "Går til neste besøkte lenke."
 
-#. Translators: this is for navigating document content by moving
-#. from visited link to visited link. This string is the detailed
-#. message which Orca will present if there are no more visited
-#. links found.
-#. 
-#: ../src/orca/structural_navigation.py:3680
+#. Translators: This is for navigating document content by moving from visited
+#. link to visited link. This is a detailed message which will be presented to
+#. the user if no more visited links can be found.
+#: ../src/orca/messages.py:1199
 msgid "No more visited links."
 msgstr "Det finnes ingen flere besøkte lenker."
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/pitivi.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/pitivi.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/pitivi.po	2013-01-29 09:34:08.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/pitivi.po	2014-01-07 06:37:24.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 14:14+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:44+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../data/pitivi.desktop.in.in.h:1
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/polkit-gnome-1.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/polkit-gnome-1.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/polkit-gnome-1.po	2013-01-29 09:34:01.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/polkit-gnome-1.po	2014-01-07 06:37:34.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:58+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:48+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../src/polkitgnomeauthenticationdialog.c:255
@@ -100,4 +100,4 @@
 
 #: ../src/polkitgnomelistener.c:164
 msgid "Authentication dialog was dismissed by the user"
-msgstr ""
+msgstr "Autentiseringsspørsmål ble avvist av brukeren"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/rhythmbox-ubuntuone.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/rhythmbox-ubuntuone.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/rhythmbox-ubuntuone.po	2013-01-29 09:34:06.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/rhythmbox-ubuntuone.po	2014-01-07 06:37:52.000000000 +0000
@@ -7,24 +7,16 @@
 msgstr ""
 "Project-Id-Version: rhythmbox-ubuntuone\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-11 20:24+0000\n"
+"POT-Creation-Date: 2013-06-11 18:23+0000\n"
 "PO-Revision-Date: 2012-02-24 10:17+0000\n"
 "Last-Translator: Rune Hammersland <rune@hammersland.net>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:38+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
-
-#: ../rhythmbox-ubuntuone.desktop.in.h:1
-msgid "Purchase music on Ubuntu One in Rhythmbox"
-msgstr "Kjøp musikk på Ubuntu One i Rhythmbox"
-
-#: ../ubuntuone/MusicStoreWidget.py:182
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+"X-Launchpad-Export-Date: 2014-01-06 21:09+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../ubuntuone/ubuntuone.plugin.in.h:1
 msgid "Integration of Ubuntu One for Rhythmbox."
-msgstr ""
+msgstr "Ubuntu One-integrering for Rhythmbox."
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/rhythmbox.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/rhythmbox.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/rhythmbox.po	2013-01-29 09:33:54.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/rhythmbox.po	2014-01-07 06:37:08.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: rhythmbox 2.95.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-29 00:38+0000\n"
+"POT-Creation-Date: 2013-06-20 22:30+0000\n"
 "PO-Revision-Date: 2012-03-09 10:23+0000\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -17,23 +17,23 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:09+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:23+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
-#: ../backends/gstreamer/rb-encoder-gst.c:505
+#: ../backends/gstreamer/rb-encoder-gst.c:508
 #, c-format
 msgid "Could not create a GStreamer sink element to write to %s"
 msgstr "Kunne ikke opprette GStreamer-element for å skrive til %s"
 
 #. ?
 #: ../backends/gstreamer/rb-player-gst.c:493
-#: ../backends/gstreamer/rb-player-gst-xfade.c:2833
+#: ../backends/gstreamer/rb-player-gst-xfade.c:2850
 #, c-format
 msgid "Failed to open output device: %s"
 msgstr "Klarte ikke å åpne utdataenhet: %s"
 
-#: ../backends/gstreamer/rb-player-gst.c:638
+#: ../backends/gstreamer/rb-player-gst.c:633
 #, c-format
 msgid "Failed to create playbin2 element; check your GStreamer installation"
 msgstr ""
@@ -51,32 +51,32 @@
 msgstr "Kunne ikke starte ny strøm"
 
 #. ?
-#: ../backends/gstreamer/rb-player-gst-xfade.c:2760
+#: ../backends/gstreamer/rb-player-gst-xfade.c:2777
 #, c-format
 msgid "Failed to open output device"
 msgstr "Klarte ikke å åpne utdataenhet"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3114
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3188
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3131
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3205
 #, c-format
 msgid "Failed to create GStreamer element; check your installation"
 msgstr "Feil under oppretting av GStreamer-element; sjekk installasjonen din"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3128
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3145
 #, c-format
 msgid "Failed to create audio output element; check your installation"
 msgstr "Feil under oppretting av utdataelement; sjekk installasjonen"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3162
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3205
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3232
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3242
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3252
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3179
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3222
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3249
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3259
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3269
 #, c-format
 msgid "Failed to link GStreamer pipeline; check your installation"
 msgstr "Klarte ikke å koble GStreamer-rør; sjekk installasjonen"
 
-#: ../backends/gstreamer/rb-player-gst-xfade.c:3347
+#: ../backends/gstreamer/rb-player-gst-xfade.c:3364
 #, c-format
 msgid "Failed to create GStreamer pipeline to play %s"
 msgstr "Feil under oppretting av GStreamer-rør for å spille %s"
@@ -94,8 +94,8 @@
 msgstr "Mine mest populære"
 
 #: ../data/rhythmbox.desktop.in.in.h:1
-#: ../data/rhythmbox-device.desktop.in.in.h:1 ../shell/rb-shell.c:611
-#: ../shell/rb-shell.c:2614
+#: ../data/rhythmbox-device.desktop.in.in.h:1 ../shell/rb-shell.c:493
+#: ../shell/rb-shell.c:2431
 msgid "Rhythmbox"
 msgstr "RhythmBox"
 
@@ -114,23 +114,27 @@
 msgid "Play and organize your music collection"
 msgstr "Spill av og organiser din musikksamling"
 
-#: ../data/rhythmbox.desktop.in.in.h:5
+#: ../data/rhythmbox.desktop.in.in.h:6
 msgid "Mp3;Audio;CD;MTP;Podcast;DAAP;Playlist;Ipod;"
 msgstr ""
 
-#: ../plugins/notification/rb-notification-plugin.c:216
+#: ../data/rhythmbox.desktop.in.in.h:6
+#: ../plugins/notification/rb-notification-plugin.c:230
 msgid "Play"
 msgstr "Spill av"
 
-#: ../plugins/notification/rb-notification-plugin.c:216
+#: ../data/rhythmbox.desktop.in.in.h:7
+#: ../plugins/notification/rb-notification-plugin.c:230
 msgid "Pause"
 msgstr "Pause"
 
-#: ../plugins/notification/rb-notification-plugin.c:225
+#: ../data/rhythmbox.desktop.in.in.h:8
+#: ../plugins/notification/rb-notification-plugin.c:239
 msgid "Next"
 msgstr "Neste"
 
-#: ../plugins/notification/rb-notification-plugin.c:210
+#: ../data/rhythmbox.desktop.in.in.h:9
+#: ../plugins/notification/rb-notification-plugin.c:224
 msgid "Previous"
 msgstr "Forrige"
 
@@ -214,52 +218,51 @@
 msgid "_Artist"
 msgstr "_Artist"
 
-#: ../data/ui/general-prefs.ui.h:8
+#: ../data/ui/general-prefs.ui.h:9
 msgid "A_lbum"
 msgstr "A_lbum"
 
-#: ../data/ui/general-prefs.ui.h:9
+#: ../data/ui/general-prefs.ui.h:10
 msgid "_Year"
 msgstr "_År"
 
-#: ../data/ui/general-prefs.ui.h:10
+#: ../data/ui/general-prefs.ui.h:11
 msgid "_Last played"
 msgstr "S_ist spilt"
 
-#: ../data/ui/general-prefs.ui.h:11
+#: ../data/ui/general-prefs.ui.h:12
 msgid "_Genre"
 msgstr "S_janger"
 
-#: ../data/ui/general-prefs.ui.h:12
+#: ../data/ui/general-prefs.ui.h:13
 msgid "Da_te added"
 msgstr "Da_to lagt til"
 
-#: ../data/ui/general-prefs.ui.h:13
+#: ../data/ui/general-prefs.ui.h:14
 msgid "_Play count"
 msgstr "_Ganger spilt"
 
-#: ../data/ui/general-prefs.ui.h:14
+#: ../data/ui/general-prefs.ui.h:15
 msgid "C_omment"
 msgstr "K_ommentar"
 
-#: ../data/ui/general-prefs.ui.h:15 ../widgets/rb-entry-view.c:1593
+#: ../data/ui/general-prefs.ui.h:16 ../widgets/rb-entry-view.c:1616
 msgid "BPM"
 msgstr "BPM"
 
-#: ../data/ui/general-prefs.ui.h:16
+#: ../data/ui/general-prefs.ui.h:17
 msgid "_Rating"
 msgstr "_Poeng"
 
-#: ../data/ui/general-prefs.ui.h:17
+#: ../data/ui/general-prefs.ui.h:18
 msgid "Ti_me"
 msgstr "Ti_d"
 
-#: ../data/ui/general-prefs.ui.h:18
+#: ../data/ui/general-prefs.ui.h:19
 msgid "Lo_cation"
 msgstr "Lo_kasjon"
 
-#: ../data/ui/general-prefs.ui.h:19
-#: ../plugins/visualizer/rb-visualizer-menu.c:138
+#: ../data/ui/general-prefs.ui.h:20
 msgid "_Quality"
 msgstr "_Kvalitet"
 
@@ -326,8 +329,8 @@
 
 #: ../data/ui/media-player-properties.ui.h:5
 #: ../data/ui/podcast-feed-properties.ui.h:6
-#: ../data/ui/podcast-properties.ui.h:5 ../data/ui/song-info-multiple.ui.h:8
-#: ../data/ui/song-info.ui.h:12 ../plugins/iradio/station-properties.ui.h:4
+#: ../data/ui/podcast-properties.ui.h:5 ../data/ui/song-info-multiple.ui.h:9
+#: ../data/ui/song-info.ui.h:13 ../plugins/iradio/station-properties.ui.h:4
 msgid "Basic"
 msgstr "Grunnleggende"
 
@@ -340,6 +343,8 @@
 msgstr "<b>Forhåndsvisning av synkronisering</b>"
 
 #: ../data/ui/media-player-properties.ui.h:8
+#: ../plugins/generic-player/generic-player-toolbar.ui.h:6
+#: ../plugins/ipod/ipod-toolbar.ui.h:6 ../plugins/mtpdevice/mtp-toolbar.ui.h:6
 msgid "Sync"
 msgstr "Synkronisering"
 
@@ -407,7 +412,7 @@
 msgstr "Opphavsrett:"
 
 #: ../data/ui/podcast-feed-properties.ui.h:10
-#: ../data/ui/podcast-properties.ui.h:13 ../data/ui/song-info.ui.h:26
+#: ../data/ui/podcast-properties.ui.h:13 ../data/ui/song-info.ui.h:28
 #: ../plugins/iradio/station-properties.ui.h:10
 msgid "Details"
 msgstr "Detaljer"
@@ -453,26 +458,26 @@
 msgstr "Dato:"
 
 #: ../data/ui/podcast-properties.ui.h:7 ../data/ui/song-info-multiple.ui.h:4
-#: ../data/ui/song-info.ui.h:22 ../plugins/iradio/station-properties.ui.h:9
+#: ../data/ui/song-info.ui.h:24 ../plugins/iradio/station-properties.ui.h:9
 msgid "_Rating:"
 msgstr "_Poeng:"
 
-#: ../data/ui/podcast-properties.ui.h:8 ../data/ui/song-info.ui.h:21
+#: ../data/ui/podcast-properties.ui.h:8 ../data/ui/song-info.ui.h:23
 #: ../plugins/iradio/station-properties.ui.h:8
 msgid "Play count:"
 msgstr "Ganger spilt:"
 
-#: ../data/ui/podcast-properties.ui.h:9 ../data/ui/song-info.ui.h:20
+#: ../data/ui/podcast-properties.ui.h:9 ../data/ui/song-info.ui.h:22
 #: ../plugins/iradio/station-properties.ui.h:7
 msgid "Last played:"
 msgstr "Sist spilt:"
 
-#: ../data/ui/podcast-properties.ui.h:10 ../data/ui/song-info.ui.h:18
+#: ../data/ui/podcast-properties.ui.h:10 ../data/ui/song-info.ui.h:20
 #: ../plugins/iradio/station-properties.ui.h:6
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: ../data/ui/podcast-properties.ui.h:11 ../data/ui/song-info.ui.h:23
+#: ../data/ui/podcast-properties.ui.h:11 ../data/ui/song-info.ui.h:25
 msgid "Duration:"
 msgstr "Varighet:"
 
@@ -508,19 +513,19 @@
 msgid "Album a_rtist:"
 msgstr "Albuma_rtist:"
 
-#: ../data/ui/song-info-multiple.ui.h:9 ../data/ui/song-info.ui.h:13
+#: ../data/ui/song-info-multiple.ui.h:10 ../data/ui/song-info.ui.h:14
 msgid "Albu_m sort order:"
 msgstr "S_orteringsrekkefølge for album:"
 
-#: ../data/ui/song-info-multiple.ui.h:10 ../data/ui/song-info.ui.h:14
+#: ../data/ui/song-info-multiple.ui.h:11 ../data/ui/song-info.ui.h:15
 msgid "_Artist sort order:"
 msgstr "Sorteringsrekkefølge for _artist:"
 
-#: ../data/ui/song-info-multiple.ui.h:11 ../data/ui/song-info.ui.h:15
+#: ../data/ui/song-info-multiple.ui.h:12 ../data/ui/song-info.ui.h:16
 msgid "Album a_rtist sort order:"
 msgstr "Sorteringsrekkefølge for albuma_rtist:"
 
-#: ../data/ui/song-info-multiple.ui.h:12 ../data/ui/song-info.ui.h:16
+#: ../data/ui/song-info-multiple.ui.h:14 ../data/ui/song-info.ui.h:18
 msgid "Sorting"
 msgstr "Sorterer"
 
@@ -540,23 +545,23 @@
 msgid "_Comment:"
 msgstr "_Kommentar:"
 
-#: ../data/ui/song-info.ui.h:11 ../plugins/iradio/station-properties.ui.h:3
+#: ../data/ui/song-info.ui.h:12 ../plugins/iradio/station-properties.ui.h:3
 msgid "Error message"
 msgstr "Feilmelding"
 
-#: ../data/ui/song-info.ui.h:17
+#: ../data/ui/song-info.ui.h:19
 msgid "File name:"
 msgstr "Filnavn:"
 
-#: ../data/ui/song-info.ui.h:19
+#: ../data/ui/song-info.ui.h:21
 msgid "Location:"
 msgstr "Lokasjon:"
 
-#: ../data/ui/song-info.ui.h:24
+#: ../data/ui/song-info.ui.h:26
 msgid "File size:"
 msgstr "Filstørrelse:"
 
-#: ../data/ui/song-info.ui.h:25
+#: ../data/ui/song-info.ui.h:27
 msgid "Date added:"
 msgstr "Dato lagt til:"
 
@@ -643,9 +648,9 @@
 #: ../lib/rb-cut-and-paste-code.c:94
 #: ../plugins/audioscrobbler/audioscrobbler-profile.ui.h:8
 #: ../plugins/iradio/rb-station-properties-dialog.c:500
-#: ../rhythmdb/rhythmdb.c:3599 ../widgets/rb-entry-view.c:933
-#: ../widgets/rb-entry-view.c:1541 ../widgets/rb-entry-view.c:1554
-#: ../widgets/rb-song-info.c:1462
+#: ../rhythmdb/rhythmdb.c:3632 ../widgets/rb-entry-view.c:940
+#: ../widgets/rb-entry-view.c:1564 ../widgets/rb-entry-view.c:1577
+#: ../widgets/rb-song-info.c:1504
 msgid "Never"
 msgstr "Aldri"
 
@@ -688,42 +693,42 @@
 #. 
 #. don't search for 'unknown' when we don't have the artist or title information
 #. Translators: unknown track title
-#: ../lib/rb-cut-and-paste-code.c:158 ../lib/rb-util.c:710
+#: ../lib/rb-cut-and-paste-code.c:158 ../lib/rb-util.c:688
 #: ../plugins/artsearch/lastfm.py:163 ../plugins/artsearch/lastfm.py:164
-#: ../plugins/audiocd/rb-audiocd-source.c:551
+#: ../plugins/audiocd/rb-audiocd-source.c:526
 #: ../plugins/audioscrobbler/rb-audioscrobbler.c:589
 #: ../plugins/audioscrobbler/rb-audioscrobbler.c:593
 #: ../plugins/audioscrobbler/rb-audioscrobbler-entry.c:95
 #: ../plugins/audioscrobbler/rb-audioscrobbler-entry.c:102
 #: ../plugins/daap/rb-rhythmdb-dmap-db-adapter.c:123
-#: ../plugins/generic-player/rb-generic-player-source.c:1096
-#: ../plugins/ipod/rb-ipod-source.c:569
-#: ../plugins/iradio/rb-iradio-source.c:564
-#: ../plugins/iradio/rb-iradio-source.c:1070
+#: ../plugins/generic-player/rb-generic-player-source.c:1160
+#: ../plugins/ipod/rb-ipod-source.c:657
+#: ../plugins/iradio/rb-iradio-source.c:539
+#: ../plugins/iradio/rb-iradio-source.c:1062
 #: ../plugins/iradio/rb-station-properties-dialog.c:489
-#: ../plugins/lyrics/lyrics.py:78 ../plugins/lyrics/lyrics.py:80
-#: ../plugins/mtpdevice/rb-mtp-source.c:654
-#: ../plugins/mtpdevice/rb-mtp-source.c:1144
-#: ../plugins/mtpdevice/rb-mtp-source.c:1530
-#: ../plugins/notification/rb-notification-plugin.c:475
+#: ../plugins/lyrics/lyrics.py:69 ../plugins/lyrics/lyrics.py:71
+#: ../plugins/mtpdevice/rb-mtp-source.c:649
+#: ../plugins/mtpdevice/rb-mtp-source.c:1132
+#: ../plugins/mtpdevice/rb-mtp-source.c:1518
+#: ../plugins/notification/rb-notification-plugin.c:496
 #: ../podcast/rb-feed-podcast-properties-dialog.c:339
-#: ../podcast/rb-podcast-add-dialog.c:570 ../podcast/rb-podcast-manager.c:1911
-#: ../podcast/rb-podcast-manager.c:2010
+#: ../podcast/rb-podcast-add-dialog.c:571 ../podcast/rb-podcast-manager.c:1921
+#: ../podcast/rb-podcast-manager.c:2020
 #: ../podcast/rb-podcast-properties-dialog.c:622
 #: ../podcast/rb-podcast-properties-dialog.c:717
-#: ../podcast/rb-podcast-source.c:828 ../remote/dbus/rb-client.c:154
-#: ../rhythmdb/rhythmdb.c:2010 ../rhythmdb/rhythmdb.c:2016
-#: ../rhythmdb/rhythmdb.c:2031 ../rhythmdb/rhythmdb.c:5392
-#: ../rhythmdb/rhythmdb.c:5397 ../rhythmdb/rhythmdb-tree.c:1338
-#: ../rhythmdb/rhythmdb-tree.c:1342 ../rhythmdb/rhythmdb-tree.c:1346
-#: ../rhythmdb/rhythmdb-tree.c:1350 ../shell/rb-shell-player.c:1790
-#: ../shell/rb-shell-player.c:3763 ../shell/rb-shell-player.c:3765
-#: ../widgets/rb-entry-view.c:985 ../widgets/rb-entry-view.c:1007
-#: ../widgets/rb-entry-view.c:1482 ../widgets/rb-entry-view.c:1494
-#: ../widgets/rb-entry-view.c:1506 ../widgets/rb-header.c:1148
-#: ../widgets/rb-header.c:1174 ../widgets/rb-song-info.c:917
-#: ../widgets/rb-song-info.c:929 ../widgets/rb-song-info.c:1150
-#: ../widgets/rb-song-info.c:1489
+#: ../podcast/rb-podcast-source.c:797 ../remote/dbus/rb-client.c:154
+#: ../rhythmdb/rhythmdb.c:2023 ../rhythmdb/rhythmdb.c:2029
+#: ../rhythmdb/rhythmdb.c:2044 ../rhythmdb/rhythmdb.c:2078
+#: ../rhythmdb/rhythmdb.c:5396 ../rhythmdb/rhythmdb.c:5401
+#: ../rhythmdb/rhythmdb-tree.c:1351 ../rhythmdb/rhythmdb-tree.c:1355
+#: ../rhythmdb/rhythmdb-tree.c:1359 ../rhythmdb/rhythmdb-tree.c:1363
+#: ../shell/rb-shell-player.c:875 ../shell/rb-shell-player.c:2691
+#: ../shell/rb-shell-player.c:2693 ../widgets/rb-entry-view.c:992
+#: ../widgets/rb-entry-view.c:1014 ../widgets/rb-entry-view.c:1505
+#: ../widgets/rb-entry-view.c:1517 ../widgets/rb-entry-view.c:1529
+#: ../widgets/rb-header.c:1229 ../widgets/rb-header.c:1255
+#: ../widgets/rb-song-info.c:933 ../widgets/rb-song-info.c:945
+#: ../widgets/rb-song-info.c:1192 ../widgets/rb-song-info.c:1531
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -737,45 +742,45 @@
 msgid "Cannot get free space at %s: %s"
 msgstr "Kan ikke finne ledig plass ved %s: %s"
 
-#: ../lib/rb-util.c:691 ../plugins/context/tmpl/album-tmpl.html:21
+#: ../lib/rb-util.c:669 ../plugins/context/tmpl/album-tmpl.html:21
 #: ../remote/dbus/rb-client.c:156
 #, c-format
 msgid "%d:%02d"
 msgstr "%d:%02d"
 
-#: ../lib/rb-util.c:693 ../plugins/context/tmpl/album-tmpl.html:19
+#: ../lib/rb-util.c:671 ../plugins/context/tmpl/album-tmpl.html:19
 #: ../remote/dbus/rb-client.c:158
 #, c-format
 msgid "%d:%02d:%02d"
 msgstr "%d:%02d:%02d"
 
-#: ../lib/rb-util.c:757
+#: ../lib/rb-util.c:735
 #, c-format
 msgid "%d:%02d of %d:%02d remaining"
 msgstr "%d:%02d av %d:%02d"
 
-#: ../lib/rb-util.c:761
+#: ../lib/rb-util.c:739
 #, c-format
 msgid "%d:%02d:%02d of %d:%02d:%02d remaining"
 msgstr "%d:%02d:%02d av %d:%02d:%02d gjenstår"
 
-#: ../lib/rb-util.c:766
+#: ../lib/rb-util.c:744
 #, c-format
 msgid "%d:%02d of %d:%02d"
 msgstr "%d:%02d av %d:%02d"
 
-#: ../lib/rb-util.c:770
+#: ../lib/rb-util.c:748
 #, c-format
 msgid "%d:%02d:%02d of %d:%02d:%02d"
 msgstr "%d:%02d:%02d av %d:%02d:%02d"
 
-#: ../metadata/rb-metadata-gst.c:493
+#: ../metadata/rb-metadata-gst.c:499
 #, c-format
 msgid "Unable to write tags to this file as it contains multiple streams"
 msgstr ""
 "Kan ikke skrive merker til denne filen da den inneholder flere strømmer"
 
-#: ../metadata/rb-metadata-gst.c:533
+#: ../metadata/rb-metadata-gst.c:539
 #, c-format
 msgid ""
 "Unable to write tags to this file as it is not encoded in a supported format"
@@ -783,12 +788,12 @@
 "Kan ikke skrive merker til denne filen da den ikke er kodet i et støttet "
 "format"
 
-#: ../metadata/rb-metadata-gst.c:665
+#: ../metadata/rb-metadata-gst.c:671
 #, c-format
 msgid "Failed to create a source element; check your installation"
 msgstr "Feil under oppretting av kildeelement; sjekk installasjonen"
 
-#: ../metadata/rb-metadata-gst.c:702
+#: ../metadata/rb-metadata-gst.c:701
 #, c-format
 msgid ""
 "Failed to create the 'decodebin2' element; check your GStreamer installation"
@@ -796,7 +801,7 @@
 "Feil under oppretting av «decodebin2»-element; sjekk installasjonen av "
 "GStreamer"
 
-#: ../metadata/rb-metadata-gst.c:684
+#: ../metadata/rb-metadata-gst.c:690
 #, c-format
 msgid ""
 "Failed to create the 'giostreamsink' element; check your GStreamer "
@@ -805,7 +810,7 @@
 "Feil under oppretting av «giostreamsink»-element; sjekk installasjonen av "
 "GStreamer"
 
-#: ../metadata/rb-metadata-gst.c:767
+#: ../metadata/rb-metadata-gst.c:773
 #, c-format
 msgid "File corrupted during write"
 msgstr "Filen ble korrupt under skriving"
@@ -862,33 +867,31 @@
 msgid "_Continue"
 msgstr "_Fortsett"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:143
+#: ../plugins/audiocd/rb-audiocd-source.c:169
 msgid "_Extract to Library"
 msgstr "_Hent ut til bibliotek"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:144
+#: ../plugins/audiocd/rb-audiocd-source.c:170
 msgid "Copy tracks to the library"
 msgstr "Kopier spor til biblioteket"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:146
+#: ../plugins/audiocd/audiocd-toolbar.ui.h:4
 msgid "Reload"
 msgstr "Last på nytt"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:147
+#: ../plugins/audiocd/rb-audiocd-source.c:173
 msgid "Reload Album Information"
 msgstr "Last albuminformasjon på nytt"
 
-#. Translators: this is the toolbar button label
-#. for Copy to Library action.
-#: ../plugins/audiocd/rb-audiocd-source.c:346
+#: ../plugins/audiocd/audiocd-toolbar.ui.h:2
 msgid "Extract"
 msgstr "Hent ut"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:414
+#: ../plugins/audiocd/rb-audiocd-source.c:386
 msgid "Select tracks to be extracted"
 msgstr "Velg spor som skal hentes ut"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:620
+#: ../plugins/audiocd/rb-audiocd-source.c:595
 msgid "S_ubmit Album"
 msgstr "S_end inn album"
 
@@ -896,96 +899,94 @@
 msgid "Hide"
 msgstr "Skjul"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:624
+#: ../plugins/audiocd/rb-audiocd-source.c:599
 msgid "Could not find this album on MusicBrainz."
 msgstr "Kunne ikke finne dette albumet på MusicBrainz."
 
-#: ../plugins/audiocd/rb-audiocd-source.c:625
+#: ../plugins/audiocd/rb-audiocd-source.c:600
 msgid "You can improve the MusicBrainz database by adding this album."
 msgstr "Du kan forbedre MusicBrainz-databasen ved å legge til dette albumet."
 
-#: ../plugins/audiocd/rb-audiocd-source.c:557
+#: ../plugins/audiocd/rb-audiocd-source.c:532
 msgid "<Invalid unicode>"
 msgstr "<Ugyldig Unicode>"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:1113
+#: ../plugins/audiocd/rb-audiocd-source.c:1087
 #, c-format
 msgid "Track %u"
 msgstr "Spor %u"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:716
-#: ../plugins/audiocd/rb-audiocd-source.c:724
-#: ../plugins/audiocd/rb-audiocd-source.c:1146
+#: ../plugins/audiocd/rb-audiocd-source.c:714
+#: ../plugins/audiocd/rb-audiocd-source.c:722
+#: ../plugins/audiocd/rb-audiocd-source.c:1136
 msgid "Couldn't load Audio CD"
 msgstr "Kunne ikke laste lyd-CD"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:717
+#: ../plugins/audiocd/rb-audiocd-source.c:715
 msgid "Rhythmbox couldn't access the CD."
 msgstr "Rhythmbox kunne ikke aksessere CDen."
 
-#: ../plugins/audiocd/rb-audiocd-source.c:725
+#: ../plugins/audiocd/rb-audiocd-source.c:723
 msgid "Rhythmbox couldn't read the CD information."
 msgstr "Rhythmbox kunne ikke lese informasjon for CDen."
 
-#: ../podcast/rb-podcast-add-dialog.c:705 ../sources/rb-library-source.c:138
-#: ../widgets/rb-entry-view.c:1428
+#: ../podcast/rb-podcast-add-dialog.c:706 ../sources/rb-library-source.c:142
+#: ../widgets/rb-entry-view.c:1441
 msgid "Title"
 msgstr "Tittel"
 
-#: ../plugins/context/ArtistTab.py:58 ../sources/rb-library-source.c:129
-#: ../widgets/rb-entry-view.c:1438 ../widgets/rb-library-browser.c:135
+#: ../plugins/context/ArtistTab.py:59
+#: ../plugins/magnatune/magnatune-toolbar.ui.h:4
+#: ../sources/rb-library-source.c:133 ../widgets/rb-entry-view.c:1451
+#: ../widgets/rb-library-browser.c:135
 msgid "Artist"
 msgstr "Artist"
 
-#: ../plugins/audiocd/rb-audiocd-source.c:1147
+#: ../plugins/audiocd/rb-audiocd-source.c:1137
 msgid "Rhythmbox could not get access to the CD device."
 msgstr "Rhythmbox kunne ikke aksessere CD-enheten."
 
-#: ../plugins/audiocd/sj-metadata.c:199
+#: ../plugins/audiocd/sj-metadata.c:190
 #, c-format
 msgid "Device '%s' does not contain any media"
 msgstr "Enhet «%s» inneholder ingen media"
 
-#: ../plugins/audiocd/sj-metadata.c:202
+#: ../plugins/audiocd/sj-metadata.c:193
 #, c-format
 msgid ""
 "Device '%s' could not be opened. Check the access permissions on the device."
 msgstr "Enhet «%s» kunne ikke åpnes. Sjekk tilgangsrettigheter på enheten."
 
-#. FIXME: would be nicer to only check if "cdrom" is being probed,
-#. * but libbrasero doesn't seem to have an API for that
-#. 
-#: ../plugins/audiocd/sj-metadata.c:182 ../plugins/audiocd/sj-metadata.c:205
-#: ../plugins/audiocd/sj-metadata.c:216
+#: ../plugins/audiocd/sj-metadata.c:196 ../plugins/audiocd/sj-metadata.c:207
 #, c-format
 msgid "Cannot read CD: %s"
 msgstr "Kan ikke lese CD: %s"
 
-#: ../plugins/audiocd/sj-metadata-getter.c:259
+#: ../plugins/audiocd/sj-metadata-getter.c:247
 #, c-format
 msgid "Could not create CD lookup thread"
 msgstr "Kunne ikke lage tråd for oppslag av CD"
 
-#: ../plugins/audiocd/sj-metadata-gvfs.c:90
+#: ../plugins/audiocd/sj-metadata-gvfs.c:86
 #, c-format
 msgid "Cannot access CD"
 msgstr "Kan ikke lese CD"
 
-#: ../plugins/audiocd/sj-metadata-gvfs.c:109
+#: ../plugins/audiocd/sj-metadata-gvfs.c:105
 msgid "Unknown Title"
 msgstr "Ukjent tittel"
 
-#: ../plugins/audiocd/sj-metadata-gvfs.c:113
-#: ../plugins/audiocd/sj-metadata-gvfs.c:139
+#: ../plugins/audiocd/sj-metadata-gvfs.c:109
+#: ../plugins/audiocd/sj-metadata-gvfs.c:135
 msgid "Unknown Artist"
 msgstr "Ukjent artist"
 
-#: ../plugins/audiocd/sj-metadata-gvfs.c:135
+#: ../plugins/audiocd/sj-metadata-gvfs.c:131
 #, c-format
 msgid "Track %d"
 msgstr "Spor %d"
 
-#: ../plugins/audiocd/sj-metadata-gvfs.c:160
+#: ../plugins/audiocd/sj-metadata-gvfs.c:156
 #, c-format
 msgid "Cannot access CD: %s"
 msgstr "Kan ikke lese CD: %s"
@@ -1038,7 +1039,7 @@
 msgstr "Tid for siste innsending:"
 
 #: ../plugins/audioscrobbler/audioscrobbler-profile.ui.h:9
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:889
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:874
 msgid "Disabled"
 msgstr "Deaktivert"
 
@@ -1106,77 +1107,78 @@
 msgid "Track submission failed too many times"
 msgstr "Innsending av spor har mislyktes for mange ganger"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:246
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:244
 msgid "Refresh Profile"
 msgstr "Oppdater profil"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:247
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:245
 msgid "Refresh your Profile"
 msgstr "Oppdater din profil"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:676
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:685
 msgid "Love"
 msgstr "Liker"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:677
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:672
 msgid "Mark this song as loved"
 msgstr "Merk denne sangen som likt"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:679
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:689
 msgid "Ban"
 msgstr "Bannlys"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:680
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:675
 msgid "Ban the current track from being played again"
 msgstr "Bannlys dette sporet fra å bli spilt igjen"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:682
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:693
+#: ../plugins/magnatune/magnatune-toolbar.ui.h:3
 msgid "Download"
 msgstr "Last ned"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:683
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:678
 msgid "Download the currently playing track"
 msgstr "Last ned sporet som spilles av nå"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:806
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:791
 msgid "You are not currently logged in."
 msgstr "Du er ikke logget inn."
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:807
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:825
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:832
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:792
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:810
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:817
 msgid "Log in"
 msgstr "Logg inn"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:813
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:798
 msgid "Waiting for authentication..."
 msgstr "Venter på autentisering …"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:814
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:799
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:824
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:809
 msgid "Authentication error. Please try logging in again."
 msgstr "Autentiseringsfeil. Vennligst prøv å logge inn på nytt."
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:831
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:816
 msgid "Connection error. Please try logging in again."
 msgstr "Tilkoblingsfeil. Vennligst prøv å logge inn på nytt."
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:1249
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:1226
 msgid "My Library"
 msgstr "Mitt bibliotek"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:1257
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:1234
 msgid "My Recommendations"
 msgstr "Mine anbefalinger"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:1265
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:1242
 msgid "My Neighbourhood"
 msgstr "Mitt nabolag"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:1432
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:1409
 #, c-format
 msgid "%s plays"
 msgstr "%s avspillinger"
@@ -1184,58 +1186,58 @@
 #. Translators: %s is the name of the audioscrobbler service, for example "Last.fm".
 #. * This is the label for menu item which when activated will take the user to the
 #. * artist/track's page on the service's website.
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:1689
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:1666
 #, c-format
 msgid "_View on %s"
 msgstr "_Vis på %s"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:1706
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:1683
 msgid "Listen to _Similar Artists Radio"
 msgstr "Lytt til radio med _lignende artister"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:1720
+#: ../plugins/audioscrobbler/rb-audioscrobbler-profile-page.c:1697
 msgid "Listen to _Top Fans Radio"
 msgstr "Lytt til radio for _største fan"
 
 #. Translators: describes a radio stream playing tracks similar to those by an artist.
 #. * Followed by a text entry box for the artist name.
 #. 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:60
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:56
 msgid "Similar to Artist:"
 msgstr "Som ligner på artist:"
 
 #. Translators: describes a radio stream playing tracks listened to by the top fans of
 #. * a particular artist.  Followed by a text entry box for the artist name.
 #. 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:64
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:60
 msgid "Top Fans of Artist:"
 msgstr "Største tilhengere av artist:"
 
 #. Translators: describes a radio stream playing tracks from the library of a particular
 #. * user.  Followed by a text entry box for the user name.
 #. 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:68
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:64
 msgid "Library of User:"
 msgstr "Bibliotek for bruker:"
 
 #. Translators: describes a radio stream playing tracks played by users similar to a
 #. * particular user.  Followed by a text entry box for the user name.
 #. 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:72
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:68
 msgid "Neighbourhood of User:"
 msgstr "Nabolaget til bruker:"
 
 #. Translators: describes a radio stream playing tracks that a particular user has marked
 #. * as loved.  Followed by a text entry box for the user name.
 #. 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:76
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:72
 msgid "Tracks Loved by User:"
 msgstr "Spor som er elsket av bruker:"
 
 #. Translators: describes a radio stream playing tracks recommended to a particular user.
 #. * Followed by a text entry box for the user name.
 #. 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:80
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:76
 msgid "Recommendations for User:"
 msgstr "Anbefalinger for bruker:"
 
@@ -1243,64 +1245,64 @@
 #. * See http://blog.last.fm/2010/10/29/mix-radio-a-new-radio-station for a description of it.
 #. * Followed by a text entry box for the user name.
 #. 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:85
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:81
 msgid "Mix Radio for User:"
 msgstr "Radiomiks for bruker:"
 
 #. Translators: describes a radio stream playing tracks tagged with a particular tag.
 #. * Followed by a text entry box for the tag.
 #. 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:89
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:85
 msgid "Tracks Tagged with:"
 msgstr "Spor tagget med:"
 
 #. Translators: describes a radio stream playing tracks often listened to by members of
 #. * a particular group. Followed by a text entry box for the group name.
 #. 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:93
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:89
 msgid "Listened by Group:"
 msgstr "Lyttet til av gruppe:"
 
 #. Translators: station is built from artists similar to the artist %s
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:128
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:124
 #, c-format
 msgid "%s Radio"
 msgstr "%s-radio"
 
 #. Translators: station is built from the artist %s's top fans
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:130
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:126
 #, c-format
 msgid "%s Fan Radio"
 msgstr "tilhengerradio for %s"
 
 #. Translators: station is built from the library of the user %s
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:132
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:128
 #, c-format
 msgid "%s's Library"
 msgstr "Biblioteket til %s"
 
 #. Translators: station is built from the "neighbourhood" of the user %s.
 #. * Last.fm uses "neighbourhood" to mean other users with similar music tastes
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:135
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:131
 #, c-format
 msgid "%s's Neighbourhood"
 msgstr "Nabolaget til %s"
 
 #. Translators: station is built from the tracks which have been "loved" by the user %s
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:137
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:133
 #, c-format
 msgid "%s's Loved Tracks"
 msgstr "Sanger %s liker"
 
 #. Translators: station is built from the tracks which are recommended to the user %s
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:139
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:135
 #, c-format
 msgid "%s's Recommended Radio"
 msgstr "Anbefalt radio for %s"
 
 #. Translators: station is the "Mix Radio" for the user %s.
 #. * See http://blog.last.fm/2010/10/29/mix-radio-a-new-radio-station for description.
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:142
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:138
 #, c-format
 msgid "%s's Mix Radio"
 msgstr "%s-radiomiks"
@@ -1308,13 +1310,13 @@
 #. Translators: station is built from the tracks which have been "tagged" with %s.
 #. * Last.fm lets users "tag" songs with any string they wish. Tags are usually genres,
 #. * but nationalities, record labels, decades and very random words are also commmon
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:146
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:142
 #, c-format
 msgid "%s Tag Radio"
 msgstr "Tag-radio for %s"
 
 #. Translators: station is built from the library of the group %s
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:148
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:144
 #, c-format
 msgid "%s Group Radio"
 msgstr "%s grupperadio"
@@ -1339,14 +1341,12 @@
 msgid "You must enter your password to listen to this station"
 msgstr "Du må oppgi passordet ditt for å lytte til denne stasjonen"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:787
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:1136
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:1266
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:696
 msgid "Error tuning station: no response"
 msgstr "Feil under innstilling av stasjon: ingen svar"
 
 #. Invalid station url
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:824
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:728
 msgid "Invalid station URL"
 msgstr "Ugyldig URL til stasjon"
 
@@ -1354,35 +1354,35 @@
 #. Translators: %s is the name of the audioscrobbler service, for example "Last.fm".
 #. * This message indicates that to listen to this radio station the user needs to be
 #. * a paying subscriber to the service.
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:830
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:734
 #, c-format
 msgid "This station is only available to %s subscribers"
 msgstr "Denne stasjonen er kun tilgjengelig for %s-abonnenter."
 
 #. Not enough content
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:834
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:738
 msgid "Not enough content to play station"
 msgstr "Ikke nok innhold til å spille denne stasjonen."
 
 #. Deprecated station
 #. Translators: %s is the name of the audioscrobbler service, for example "Last.fm".
 #. * This message indicates that the service has deprecated this type of station.
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:839
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:743
 #, c-format
 msgid "%s no longer supports this type of station"
 msgstr "%s støtter ikke denne type stasjon lenger"
 
 #. Other error
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:843
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:747
 #, c-format
 msgid "Error tuning station: %i - %s"
 msgstr "Feil under innstilling av stasjon: %i - %s"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:854
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:757
 msgid "Error tuning station: unexpected response"
 msgstr "Feil under innstilling av stasjon: uventet svar"
 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:859
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:762
 msgid "Error tuning station: invalid response"
 msgstr "Feil ved innstilling av stasjon: ugyldig svar"
 
@@ -1399,7 +1399,7 @@
 #. We could be calling either radio.tune or radio.getPlaylist methods.
 #. * "Tuning station" seems like a user friendly message to display for both cases.
 #. 
-#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:1395
+#: ../plugins/audioscrobbler/rb-audioscrobbler-radio-source.c:1025
 msgid "Tuning station"
 msgstr "Stiller inn stasjon"
 
@@ -1419,7 +1419,7 @@
 msgid "Create an audio CD from playlist"
 msgstr "Lag en lyd-CD fra spillelisten"
 
-#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:98
+#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:660
 msgid "Duplicate Audio CD..."
 msgstr "Kopier lyd-CD …"
 
@@ -1427,32 +1427,32 @@
 msgid "Create a copy of this audio CD"
 msgstr "Lag en kopi av denne lyd-CDen"
 
-#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:173
+#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:165
 msgid "Rhythmbox could not duplicate the disc"
 msgstr "Rhythmbox kunne ikke kopiere platen"
 
-#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:178
+#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:170
 msgid "Rhythmbox could not record the audio disc"
 msgstr "Rhythmbox kunne ikke ta opp lyd-platen"
 
-#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:209
+#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:201
 #, c-format
 msgid "Unable to build an audio track list"
 msgstr "Kan ikke bygge en liste med lydspor"
 
-#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:220
-#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:412
+#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:212
+#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:404
 #, c-format
 msgid "Unable to write audio project file %s: %s"
 msgstr "Kan ikke skrive prosjektfil %s for lydprosjekt: %s"
 
-#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:238
-#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:419
+#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:230
+#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:411
 #, c-format
 msgid "Unable to write audio project"
 msgstr "Kan ikke skrive lydprosjekt"
 
-#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:459
+#: ../plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c:451
 msgid "Unable to create audio CD project"
 msgstr "Kunne ikke lage lyd-CD-prosjekt"
 
@@ -1479,12 +1479,13 @@
 msgid "Loading top albums for %s"
 msgstr "Laster mest populære album for %s"
 
-#: ../plugins/context/ArtistTab.py:118
+#: ../plugins/context/ArtistTab.py:119
 #, python-format
 msgid "Loading biography for %s"
 msgstr "Laster biografi for %s"
 
 #: ../plugins/context/context.plugin.in.h:1
+#: ../plugins/context/ContextView.py:90
 msgid "Context Pane"
 msgstr "Kontekstområde"
 
@@ -1502,12 +1503,12 @@
 msgstr "Endre synlighet for kontekstområdet"
 
 #. Translators: 'top' here means 'most popular'.  %s is replaced by the artist name.
-#: ../plugins/context/ContextView.py:214
+#: ../plugins/context/ContextView.py:204
 #, python-format
 msgid "Top songs by %s"
 msgstr "Mest populære sanger av %s"
 
-#: ../plugins/context/ContextView.py:247
+#: ../plugins/context/ContextView.py:237
 msgid "Nothing Playing"
 msgstr "Ingenting spilles av"
 
@@ -1527,8 +1528,8 @@
 msgid "No artist specified."
 msgstr "Ingen artist oppgitt."
 
-#: ../plugins/context/LyricsTab.py:53 ../plugins/lyrics/lyrics.py:247
-#: ../plugins/lyrics/lyrics.py:332
+#: ../plugins/context/LyricsTab.py:53 ../plugins/lyrics/lyrics.py:240
+#: ../plugins/lyrics/lyrics.py:325
 msgid "Lyrics"
 msgstr "Tekster"
 
@@ -1546,7 +1547,7 @@
 msgstr "Skjul alle spor"
 
 #: ../plugins/context/tmpl/album-tmpl.html:47
-#: ../plugins/context/tmpl/album-tmpl.html:82
+#: ../plugins/context/tmpl/album-tmpl.html:80
 msgid "Show all tracks"
 msgstr "Vis alle spor"
 
@@ -1555,18 +1556,18 @@
 msgid "Top albums by %s"
 msgstr "Mest populære album av %s"
 
-#: ../plugins/context/tmpl/album-tmpl.html:76
+#: ../plugins/context/tmpl/album-tmpl.html:74
 #, c-format
 msgid "%s (%d track)"
 msgid_plural "%s (%d tracks)"
 msgstr[0] "%s (%d spor)"
 msgstr[1] "%s (%d spor)"
 
-#: ../plugins/context/tmpl/album-tmpl.html:95
+#: ../plugins/context/tmpl/album-tmpl.html:93
 msgid "Track list not available"
 msgstr "Sporliste er ikke tilgjengelig"
 
-#: ../plugins/context/tmpl/album-tmpl.html:101
+#: ../plugins/context/tmpl/album-tmpl.html:99
 msgid "Unable to retrieve album information:"
 msgstr "Kan ikke hente informasjon om album:"
 
@@ -1583,7 +1584,7 @@
 msgid "Read less"
 msgstr "Les mindre"
 
-#: ../plugins/context/tmpl/artist-tmpl.html:48
+#: ../plugins/context/tmpl/artist-tmpl.html:29
 msgid "Unable to retrieve artist information:"
 msgstr "Kan ikke hente informasjon om artist:"
 
@@ -1651,11 +1652,11 @@
 msgid "Disconnect from DAAP share"
 msgstr "Koble fra DAAP-ressurs"
 
-#: ../plugins/daap/rb-daap-plugin.c:681
+#: ../plugins/daap/rb-daap-plugin.c:531
 msgid "New DAAP share"
 msgstr "Ny DAAP-ressurs"
 
-#: ../plugins/daap/rb-daap-plugin.c:681
+#: ../plugins/daap/rb-daap-plugin.c:531
 msgid "Host:port of DAAP share:"
 msgstr "Vert:port for DAAP-ressurs:"
 
@@ -1664,32 +1665,32 @@
 msgid "%s's Music"
 msgstr "%ss musikk"
 
-#: ../plugins/daap/rb-daap-source.c:448
+#: ../plugins/daap/rb-daap-source.c:476
 #, c-format
 msgid "The music share '%s' requires a password to connect"
 msgstr "Delt musikkressurs «%s» krever et passord for tilkobling"
 
-#: ../plugins/daap/rb-daap-source.c:519
+#: ../plugins/daap/rb-daap-source.c:692
 msgid "Connecting to music share"
 msgstr "Kobler til delt musikk"
 
-#: ../plugins/daap/rb-daap-source.c:527
+#: ../plugins/daap/rb-daap-source.c:542
 msgid "Retrieving songs from music share"
 msgstr "Henter sanger fra delt ressurs"
 
-#: ../plugins/daap/rb-daap-source.c:614
+#: ../plugins/daap/rb-daap-source.c:625
 msgid "Could not connect to shared music"
 msgstr "Kunne ikke koble til delt ressurs med musikk"
 
-#: ../plugins/daap/rb-dacp-pairing-page.c:408
+#: ../plugins/daap/rb-dacp-pairing-page.c:397
 msgid "Connecting..."
 msgstr "Kobler til …"
 
-#: ../plugins/daap/rb-dacp-pairing-page.c:410
+#: ../plugins/daap/rb-dacp-pairing-page.c:399
 msgid "Could not pair with this Remote."
 msgstr "Kunne ikke koble til denne fjernkontrollen."
 
-#: ../plugins/daap/rb-dacp-pairing-page.c:630
+#: ../plugins/daap/rb-dacp-pairing-page.c:619
 msgid "Remotes"
 msgstr "Fjernkontroller"
 
@@ -1717,12 +1718,12 @@
 msgstr "Sjangere"
 
 #: ../plugins/dbus-media-server/rb-dbus-media-server-plugin.c:2409
-#: ../shell/rb-playlist-manager.c:1106 ../sources/rb-display-page-group.c:92
+#: ../shell/rb-playlist-manager.c:1081 ../sources/rb-display-page-group.c:92
 msgid "Playlists"
 msgstr "Spillelister"
 
 #: ../plugins/fmradio/fmradio.plugin.in.h:1
-#: ../plugins/fmradio/rb-fm-radio-source.c:245
+#: ../plugins/fmradio/rb-fm-radio-source.c:243
 msgid "FM Radio"
 msgstr "FM-radio"
 
@@ -1738,11 +1739,11 @@
 msgid "Create a new FM Radio station"
 msgstr "Opprett en ny FM-radiostasjon"
 
-#: ../plugins/fmradio/rb-fm-radio-source.c:389
+#: ../plugins/fmradio/rb-fm-radio-source.c:403
 msgid "New FM Radio Station"
 msgstr "Ny FM-radiostasjon"
 
-#: ../plugins/fmradio/rb-fm-radio-source.c:390
+#: ../plugins/fmradio/rb-fm-radio-source.c:404
 msgid "Frequency of radio station"
 msgstr "Frekvens for radiostasjon"
 
@@ -1794,8 +1795,7 @@
 msgid "Support for generic audio player devices (plus PSP and Nokia 770)"
 msgstr "Støtte for generiske lydavspillingsenheter (plus PSP og Nokia 770)"
 
-#: ../plugins/generic-player/rb-generic-player-plugin.c:90
-#: ../shell/rb-playlist-manager.c:839 ../shell/rb-playlist-manager.c:882
+#: ../shell/rb-playlist-manager.c:817 ../shell/rb-playlist-manager.c:860
 msgid "New Playlist"
 msgstr "Ny spilleliste"
 
@@ -1811,21 +1811,18 @@
 msgid "Delete this playlist"
 msgstr "Slett denne spillelisten"
 
-#: ../plugins/generic-player/rb-generic-player-plugin.c:96
-#: ../plugins/ipod/rb-ipod-plugin.c:102
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:123 ../podcast/rb-podcast-source.c:126
-#: ../shell/rb-shell-clipboard.c:190
+#: ../data/ui/missing-files-popup.ui.h:2
 msgid "_Properties"
 msgstr "_Egenskaper"
 
 #: ../plugins/generic-player/rb-generic-player-plugin.c:97
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:124
+#: ../plugins/mtpdevice/rb-mtp-plugin.c:123
 msgid "Display device properties"
 msgstr "Vis egenskaper for enhet"
 
-#: ../plugins/generic-player/rb-generic-player-source.c:1385
-#: ../plugins/ipod/rb-ipod-source.c:2008
-#: ../plugins/mtpdevice/rb-mtp-source.c:1624
+#: ../plugins/generic-player/rb-generic-player-source.c:1449
+#: ../plugins/ipod/rb-ipod-source.c:2073
+#: ../plugins/mtpdevice/rb-mtp-source.c:1612
 msgid "Advanced"
 msgstr "Avansert"
 
@@ -1837,7 +1834,13 @@
 msgid "Browse various local and Internet media sources"
 msgstr "Bla gjennom kilder lokalt og på internett"
 
-#: ../plugins/grilo/rb-grilo-source.c:342
+#: ../data/ui/library-toolbar.ui.h:2 ../data/ui/playlist-toolbar.ui.h:2
+#: ../data/ui/podcast-toolbar.ui.h:2 ../plugins/daap/daap-toolbar.ui.h:2
+#: ../plugins/generic-player/generic-player-toolbar.ui.h:2
+#: ../plugins/grilo/rb-grilo-source.c:342 ../plugins/ipod/ipod-toolbar.ui.h:2
+#: ../plugins/iradio/iradio-toolbar.ui.h:2
+#: ../plugins/magnatune/magnatune-toolbar.ui.h:2
+#: ../plugins/mtpdevice/mtp-toolbar.ui.h:2
 msgid "Browse"
 msgstr "Bla gjennom"
 
@@ -1845,7 +1848,7 @@
 msgid "Fetch more tracks"
 msgstr "Hent flere spor"
 
-#: ../plugins/grilo/rb-grilo-source.c:859
+#: ../plugins/grilo/rb-grilo-source.c:860
 #, c-format
 msgid "Only showing %d result"
 msgid_plural "Only showing %d results"
@@ -1968,8 +1971,7 @@
 msgid "Support for Apple iPod devices (show the content, play from device)"
 msgstr "Støtte for Apple iPo-enheter (vis innhold, spill av fra enhet)"
 
-#: ../plugins/ipod/rb-ipod-plugin.c:99 ../plugins/ipod/rb-ipod-plugin.c:108
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:120 ../shell/rb-playlist-manager.c:203
+#: ../data/ui/playlist-menu.ui.h:2
 msgid "_Rename"
 msgstr "_Gi nytt navn"
 
@@ -1981,7 +1983,7 @@
 msgid "Display iPod properties"
 msgstr "Vis egenskaper for iPod"
 
-#: ../plugins/ipod/rb-ipod-plugin.c:105 ../shell/rb-shell-clipboard.c:177
+#: ../data/ui/display-page-add-menu.ui.h:1
 msgid "_New Playlist"
 msgstr "_Ny spilleliste"
 
@@ -2002,19 +2004,19 @@
 msgid "Delete playlist"
 msgstr "Slett spilleliste"
 
-#: ../plugins/ipod/rb-ipod-source.c:384
+#: ../plugins/ipod/rb-ipod-source.c:460
 msgid "Unable to initialize new iPod"
 msgstr "Kan ikke initiere ny iPod"
 
-#: ../plugins/ipod/rb-ipod-source.c:1424
-#: ../podcast/rb-podcast-main-source.c:70
+#: ../plugins/ipod/rb-ipod-source.c:1506
+#: ../podcast/rb-podcast-main-source.c:76
 #: ../sources/sync/rb-sync-settings-ui.c:262
 #: ../sources/sync/rb-sync-settings-ui.c:263
 #: ../sources/sync/rb-sync-state-ui.c:78
 msgid "Podcasts"
 msgstr "Podcaster"
 
-#: ../plugins/ipod/rb-ipod-source.c:1885
+#: ../plugins/ipod/rb-ipod-source.c:317
 msgid "New playlist"
 msgstr "Ny spilleliste"
 
@@ -2026,35 +2028,35 @@
 msgid "Support for broadcasting services transmitted via the Internet"
 msgstr "Støtte for kringkastingstjenester over internett"
 
-#: ../plugins/iradio/rb-iradio-source.c:159
+#: ../plugins/iradio/rb-iradio-source.c:157
 msgid "New Internet _Radio Station..."
 msgstr "Ny _radiostasjon på internett …"
 
-#: ../plugins/iradio/rb-iradio-source.c:160
+#: ../plugins/iradio/rb-iradio-source.c:158
 msgid "Create a new Internet Radio station"
 msgstr "Opprett en ny internett-radiostasjon"
 
 #. Translators: this is the toolbar button label for
 #. New Internet Radio Station action.
-#: ../plugins/iradio/rb-iradio-source.c:344
+#: ../plugins/iradio/rb-iradio-source.c:343
 msgctxt "Radio"
 msgid "Add"
 msgstr "Legg til"
 
-#: ../plugins/iradio/rb-iradio-source.c:381 ../widgets/rb-entry-view.c:1458
+#: ../plugins/iradio/rb-iradio-source.c:346 ../widgets/rb-entry-view.c:1481
 #: ../widgets/rb-library-browser.c:134
 msgid "Genre"
 msgstr "Sjanger"
 
-#: ../plugins/iradio/rb-iradio-source.c:401
+#: ../plugins/iradio/rb-iradio-source.c:366
 msgid "Search your internet radio stations"
 msgstr "Søk i dine radiostasjoner på internett:"
 
-#: ../plugins/iradio/rb-iradio-source.c:488
+#: ../plugins/iradio/rb-iradio-source.c:462
 msgid "Radio"
 msgstr "Radio"
 
-#: ../plugins/iradio/rb-iradio-source.c:628
+#: ../plugins/iradio/rb-iradio-source.c:603
 #, c-format
 msgid "%d station"
 msgid_plural "%d stations"
@@ -2062,26 +2064,26 @@
 msgstr[1] "%d stasjoner"
 
 #. should prevent multiple dialogs?  going to kill this nonsense anyway soon..
-#: ../plugins/iradio/rb-iradio-source.c:983
+#: ../plugins/iradio/rb-iradio-source.c:974
 #: ../plugins/iradio/rb-station-properties-dialog.c:403
 msgid "New Internet Radio Station"
 msgstr "Ny radiostasjon på internett"
 
-#: ../plugins/iradio/rb-iradio-source.c:983
+#: ../plugins/iradio/rb-iradio-source.c:974
 msgid "URL of internet radio station:"
 msgstr "URL for radiostasjon på internett:"
 
 #: ../plugins/iradio/rb-station-properties-dialog.c:399
 #: ../podcast/rb-feed-podcast-properties-dialog.c:215
 #: ../podcast/rb-podcast-properties-dialog.c:507
-#: ../sources/rb-media-player-source.c:426 ../widgets/rb-song-info.c:1075
+#: ../sources/rb-media-player-source.c:420 ../widgets/rb-song-info.c:1113
 #, c-format
 msgid "%s Properties"
 msgstr "Egenskaper for %s"
 
 #: ../plugins/iradio/rb-station-properties-dialog.c:491
 #: ../podcast/rb-podcast-properties-dialog.c:620
-#: ../widgets/rb-entry-view.c:1011 ../widgets/rb-song-info.c:1152
+#: ../widgets/rb-entry-view.c:1018 ../widgets/rb-song-info.c:1194
 #, c-format
 msgid "%lu kbps"
 msgstr "%lu kbps"
@@ -2112,7 +2114,7 @@
 msgid "Choose lyrics folder..."
 msgstr "Velg mappe for tekster …"
 
-#: ../plugins/lyrics/lyrics.plugin.in.h:1
+#: ../plugins/lyrics/lyrics.plugin.in.h:1 ../plugins/lyrics/lyrics.py:348
 msgid "Song Lyrics"
 msgstr "Sangtekster"
 
@@ -2132,25 +2134,24 @@
 msgid "<b>Lyrics Folder</b>"
 msgstr "<b>Tekstmappe</b>"
 
-#: ../plugins/lyrics/lyrics.py:164 ../plugins/lyrics/lyrics.py:166
-#: ../plugins/lyrics/lyrics.py:175
+#: ../plugins/lyrics/lyrics.py:157 ../plugins/lyrics/lyrics.py:159
+#: ../plugins/lyrics/lyrics.py:168
 msgid "No lyrics found"
 msgstr "Ingen tekster funnet"
 
-#: ../plugins/lyrics/lyrics.py:209
+#: ../plugins/lyrics/lyrics.py:202
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../plugins/lyrics/lyrics.py:214 ../plugins/lyrics/lyrics.py:227
-#: ../shell/rb-shell.c:337
+#: ../plugins/lyrics/lyrics.py:207 ../plugins/lyrics/lyrics.py:220
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../plugins/lyrics/lyrics.py:229
+#: ../plugins/lyrics/lyrics.py:222
 msgid "_Search again"
 msgstr "_Søk igjen"
 
-#: ../plugins/lyrics/lyrics.py:287
+#: ../plugins/lyrics/lyrics.py:280
 msgid "Searching for lyrics..."
 msgstr "Søker etter tekster …"
 
@@ -2408,11 +2409,11 @@
 msgid "128K MP3"
 msgstr "128K MP3"
 
-#: ../plugins/magnatune/magnatune.py:129
+#: ../plugins/magnatune/magnatune.py:120
 msgid "Magnatune"
 msgstr "Magnatune"
 
-#: ../plugins/magnatune/magnatune.py:139
+#: ../plugins/magnatune/magnatune-popup.ui.h:2
 msgid "Download Album"
 msgstr "Last ned album"
 
@@ -2436,38 +2437,39 @@
 msgid "Stop album downloads"
 msgstr "Stopp nedlastinger av album"
 
-#: ../plugins/magnatune/MagnatuneSource.py:108
+#: ../plugins/magnatune/MagnatuneSource.py:277
+#: ../plugins/magnatune/MagnatuneSource.py:334
 msgid "Loading Magnatune catalog"
 msgstr "Laster katalog for Magnatune"
 
-#: ../plugins/magnatune/MagnatuneSource.py:115
+#: ../plugins/magnatune/MagnatuneSource.py:124
 msgid "Downloading Magnatune Album(s)"
 msgstr "Laster ned Magnatune-album"
 
-#: ../plugins/magnatune/MagnatuneSource.py:208
+#: ../plugins/magnatune/MagnatuneSource.py:192
 msgid "Couldn't download album"
 msgstr "Kunne ikke laste ned album"
 
-#: ../plugins/magnatune/MagnatuneSource.py:209
+#: ../plugins/magnatune/MagnatuneSource.py:193
 msgid "You must have a library location set to download an album."
 msgstr ""
 "Du må ha satt en lokasjon for biblioteket for å kunne kjøpe en plate."
 
-#: ../plugins/magnatune/MagnatuneSource.py:272
+#: ../plugins/magnatune/MagnatuneSource.py:255
 msgid "Unable to load catalog"
 msgstr "Kan ikke laste katalog"
 
-#: ../plugins/magnatune/MagnatuneSource.py:273
+#: ../plugins/magnatune/MagnatuneSource.py:256
 msgid ""
 "Rhythmbox could not understand the Magnatune catalog, please file a bug."
 msgstr ""
 "Rhythmbox forsto ikke Magnatune-katalogen. Vennligst rapporter feilen."
 
-#: ../plugins/magnatune/MagnatuneSource.py:425
+#: ../plugins/magnatune/MagnatuneSource.py:406
 msgid "Download Error"
 msgstr "Feil ved nedlasting"
 
-#: ../plugins/magnatune/MagnatuneSource.py:426
+#: ../plugins/magnatune/MagnatuneSource.py:407
 #, python-format
 msgid ""
 "An error occurred while trying to authorize the download.\n"
@@ -2478,11 +2480,11 @@
 "Magnatune-tjeneren returnerte:\n"
 "%s"
 
-#: ../plugins/magnatune/MagnatuneSource.py:429 ../widgets/rb-entry-view.c:1602
+#: ../plugins/magnatune/MagnatuneSource.py:410 ../widgets/rb-entry-view.c:1625
 msgid "Error"
 msgstr "Feil"
 
-#: ../plugins/magnatune/MagnatuneSource.py:430
+#: ../plugins/magnatune/MagnatuneSource.py:411
 #, python-format
 msgid ""
 "An error occurred while trying to download the album.\n"
@@ -2493,11 +2495,11 @@
 "Feilmeldingen var:\n"
 "%s"
 
-#: ../plugins/magnatune/MagnatuneSource.py:466
+#: ../plugins/magnatune/MagnatuneSource.py:475
 msgid "Finished Downloading"
 msgstr "Nedlasting fullført"
 
-#: ../plugins/magnatune/MagnatuneSource.py:466
+#: ../plugins/magnatune/MagnatuneSource.py:475
 msgid "All Magnatune downloads have been completed."
 msgstr "Alle Magnatune-nedlastinger er fullført."
 
@@ -2524,15 +2526,15 @@
 msgid "Unable to open temporary file: %s"
 msgstr "Kan ikke åpne midlertidig fil: %s"
 
-#: ../plugins/mtpdevice/rb-mtp-plugin.c:121
+#: ../plugins/mtpdevice/rb-mtp-plugin.c:120
 msgid "Rename MTP-device"
 msgstr "Gi nytt navn til MTP-enhet"
 
-#: ../plugins/mtpdevice/rb-mtp-source.c:609
+#: ../plugins/mtpdevice/rb-mtp-source.c:603
 msgid "Media Player"
-msgstr "Medieasvpiller"
+msgstr "Medieavspiller"
 
-#: ../plugins/mtpdevice/rb-mtp-source.c:888
+#: ../plugins/mtpdevice/rb-mtp-source.c:883
 #: ../plugins/mtpdevice/rb-mtp-thread.c:799
 msgid "Media player device error"
 msgstr "Enhetsfeil på mediesavspiller"
@@ -2540,12 +2542,12 @@
 #. Translators: first %s is the device manufacturer,
 #. * second is the product name.
 #. 
-#: ../plugins/mtpdevice/rb-mtp-source.c:892
+#: ../plugins/mtpdevice/rb-mtp-source.c:887
 #, c-format
 msgid "Unable to open the %s %s device"
 msgstr "Kan ikke åpne %s %s-enhet"
 
-#: ../plugins/mtpdevice/rb-mtp-source.c:936
+#: ../plugins/mtpdevice/rb-mtp-source.c:931
 msgid "Digital Audio Player"
 msgstr "Digital lydspiller"
 
@@ -2580,23 +2582,23 @@
 msgstr "Varslingsdialoger"
 
 #. Translators: by Artist
-#: ../plugins/notification/rb-notification-plugin.c:310
+#: ../plugins/notification/rb-notification-plugin.c:331
 #: ../plugins/visualizer/rb-visualizer-fullscreen.c:148
 #, c-format
 msgid "by <i>%s</i>"
 msgstr "av <i>%s</i>"
 
 #. Translators: from Album
-#: ../plugins/notification/rb-notification-plugin.c:312
+#: ../plugins/notification/rb-notification-plugin.c:333
 #: ../plugins/visualizer/rb-visualizer-fullscreen.c:150
 #: ../plugins/visualizer/rb-visualizer-fullscreen.c:213
 #, c-format
 msgid "from <i>%s</i>"
 msgstr "fra <i>%s</i>"
 
-#: ../plugins/notification/rb-notification-plugin.c:390
+#: ../plugins/notification/rb-notification-plugin.c:411
 #: ../plugins/visualizer/rb-visualizer-fullscreen.c:207
-#: ../widgets/rb-header.c:835
+#: ../widgets/rb-header.c:913
 msgid "Not Playing"
 msgstr "Spiller ikke"
 
@@ -2608,11 +2610,12 @@
 msgid "Inhibit Power Manager from suspending the machine while playing"
 msgstr "Stopp strømstyring fra å gå i hvilemodus under avspilling"
 
-#: ../plugins/power-manager/rb-power-manager-plugin.c:170
+#: ../plugins/power-manager/rb-power-manager-plugin.c:97
 msgid "Playing"
 msgstr "Spiller"
 
 #: ../plugins/pythonconsole/pythonconsole.plugin.in.h:1
+#: ../plugins/pythonconsole/pythonconsole.py:71
 msgid "Python Console"
 msgstr "Python-konsoll"
 
@@ -2628,7 +2631,7 @@
 msgid "Show Rhythmbox's python console"
 msgstr "Vis Rhythmbox's python-konsoll"
 
-#: ../plugins/pythonconsole/pythonconsole.py:90
+#: ../plugins/pythonconsole/pythonconsole.py:81
 msgid "Python Debugger"
 msgstr "Python-feilsøker"
 
@@ -2636,11 +2639,11 @@
 msgid "Enable remote python debugging with rpdb2"
 msgstr "Slå på ekstern feilsøking i python med rpdb2"
 
-#: ../plugins/pythonconsole/pythonconsole.py:128
+#: ../plugins/pythonconsole/pythonconsole.py:106
 msgid "You can access the main window through the 'shell' variable :"
 msgstr "Du kan aksessere hovedvinduet via «shell» miljøvariabelen :"
 
-#: ../plugins/pythonconsole/pythonconsole.py:143
+#: ../plugins/pythonconsole/pythonconsole.py:121
 #, python-format
 msgid ""
 "After you press OK, Rhythmbox will wait until you connect to it with winpdb "
@@ -2759,7 +2762,7 @@
 msgid "Send selected tracks by email or instant message"
 msgstr "Send valgte spor via e-post eller lynmelding"
 
-#: ../plugins/sendto/sendto.py:58
+#: ../plugins/sendto/sendto.py:50
 msgid "Send to..."
 msgstr "Send til …"
 
@@ -2783,11 +2786,11 @@
 msgid "_Visual Effect"
 msgstr "_Visuell effekt"
 
-#: ../plugins/visualizer/rb-visualizer-page.c:78
+#: ../plugins/visualizer/rb-visualizer-page.c:69
 msgid "Visual Effects"
 msgstr "Visuelle effekter"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:369
+#: ../plugins/visualizer/rb-visualizer-menu.c:78
 msgid "Fullscreen"
 msgstr "Fullskjerm"
 
@@ -2795,7 +2798,7 @@
 msgid "Toggle fullscreen visual effects"
 msgstr "Slå av/på visuelle effekter for full skjerm"
 
-#: ../plugins/visualizer/rb-visualizer-plugin.c:395
+#: ../plugins/visualizer/rb-visualizer-plugin.c:392
 msgid "Display"
 msgstr "Vis"
 
@@ -2807,59 +2810,59 @@
 msgid "Displays visualizations"
 msgstr "Viser visualisering"
 
-#: ../podcast/rb-podcast-main-source.c:118
+#: ../podcast/rb-podcast-main-source.c:125
 msgid "New Episodes"
 msgstr "Nye episoder"
 
-#: ../podcast/rb-podcast-main-source.c:136
+#: ../podcast/rb-podcast-main-source.c:143
 msgid "New Downloads"
 msgstr "Nye nedlastinger"
 
-#: ../podcast/rb-podcast-main-source.c:157
+#: ../podcast/rb-podcast-main-source.c:164
 msgid "Downloading podcast"
 msgstr "Laster ned podcast"
 
-#: ../podcast/rb-podcast-main-source.c:174
+#: ../podcast/rb-podcast-main-source.c:181
 msgid "Finished downloading podcast"
 msgstr "Nedlasting av podcast er fullført"
 
-#: ../podcast/rb-podcast-main-source.c:191
+#: ../podcast/rb-podcast-main-source.c:198
 msgid "New updates available from"
 msgstr "Nye oppdateringer tilgjengelig fra"
 
-#: ../podcast/rb-podcast-main-source.c:230
+#: ../podcast/rb-podcast-main-source.c:237
 msgid "Error in podcast"
 msgstr "Feil i podcast"
 
-#: ../podcast/rb-podcast-main-source.c:237
+#: ../podcast/rb-podcast-main-source.c:244
 #, c-format
 msgid "%s. Would you like to add the podcast feed anyway?"
 msgstr "%s. Vil du legge til podcast-strømmen likevel?"
 
-#: ../podcast/rb-podcast-manager.c:904
+#: ../podcast/rb-podcast-manager.c:914
 msgid "Error creating podcast download directory"
 msgstr "Feil under oppretting av nedlastingskatalog for podcast"
 
-#: ../podcast/rb-podcast-manager.c:905
+#: ../podcast/rb-podcast-manager.c:915
 #, c-format
 msgid "Unable to create the download directory for %s: %s"
 msgstr "Kan ikke opprette nedlastingskatalog for %s: %s"
 
-#: ../podcast/rb-podcast-manager.c:1026
+#: ../podcast/rb-podcast-manager.c:1036
 msgid "Invalid URL"
 msgstr "Ugyldig URL"
 
-#: ../podcast/rb-podcast-manager.c:1027
+#: ../podcast/rb-podcast-manager.c:1037
 #, c-format
 msgid "The URL \"%s\" is not valid, please check it."
 msgstr "URL «%s» er ikke gyldig. Vennligst sjekk den."
 
 #. added as something else, probably iradio
-#: ../podcast/rb-podcast-manager.c:1038
+#: ../podcast/rb-podcast-manager.c:1048
 msgid "URL already added"
 msgstr "URL allerede lagt til"
 
-#: ../podcast/rb-podcast-manager.c:1039
+#: ../podcast/rb-podcast-manager.c:1049
 #, c-format
 msgid ""
 "The URL \"%s\" has already been added as a radio station. If this is a "
@@ -2868,7 +2871,7 @@
 "URL «%s» er allerede lagt til som en radiostasjon. Hvis dette er en podcast-"
 "strøm må du fjerne radiostasjonen."
 
-#: ../podcast/rb-podcast-manager.c:1122
+#: ../podcast/rb-podcast-manager.c:1132
 #, c-format
 msgid ""
 "The URL '%s' does not appear to be a podcast feed. It may be the wrong URL, "
@@ -2879,11 +2882,11 @@
 "URLen eller strømmen kan være ødelagt. Vil du at Rhythmbox skal prøve å "
 "bruke den likevel?"
 
-#: ../podcast/rb-podcast-manager.c:1253
+#: ../podcast/rb-podcast-manager.c:1263
 msgid "Podcast"
 msgstr "Podcast"
 
-#: ../podcast/rb-podcast-manager.c:2225
+#: ../podcast/rb-podcast-manager.c:2235
 #, c-format
 msgid ""
 "There was a problem adding this podcast: %s.  Please verify the URL: %s"
@@ -2919,7 +2922,7 @@
 msgid "Not Downloaded"
 msgstr "Ikke lastet ned"
 
-#: ../podcast/rb-podcast-source.c:117
+#: ../podcast/rb-podcast-source.c:110
 msgid "_New Podcast Feed..."
 msgstr "_Ny podcast-strøm …"
 
@@ -2927,61 +2930,63 @@
 msgid "Subscribe to a new Podcast Feed"
 msgstr "Abonner på en ny podcast-strøm"
 
-#: ../podcast/rb-podcast-source.c:120
+#: ../podcast/rb-podcast-source.c:113
 msgid "Download _Episode"
 msgstr "Last ned _episode"
 
-#: ../podcast/rb-podcast-source.c:121
+#: ../podcast/rb-podcast-source.c:114
 msgid "Download Podcast Episode"
 msgstr "Last ned podcast-episode"
 
-#: ../podcast/rb-podcast-source.c:123
+#: ../podcast/rb-podcast-source.c:116
 msgid "_Cancel Download"
 msgstr "_Avbryt nedlasting"
 
-#: ../podcast/rb-podcast-source.c:124
+#: ../podcast/rb-podcast-source.c:117
 msgid "Cancel Episode Download"
 msgstr "Avbryt nedlasting av episode"
 
-#: ../podcast/rb-podcast-source.c:127
+#: ../podcast/rb-podcast-source.c:120
 msgid "Episode Properties"
 msgstr "Egenskaper for episode"
 
-#: ../podcast/rb-podcast-source.c:129
+#: ../podcast/rb-podcast-source.c:122
 msgid "_Update Podcast Feed"
 msgstr "_Oppdater podcast-strøm"
 
-#: ../podcast/rb-podcast-source.c:130
+#: ../podcast/rb-podcast-source.c:123
 msgid "Update Feed"
 msgstr "Oppdater strøm"
 
-#: ../podcast/rb-podcast-source.c:132
+#: ../podcast/rb-podcast-source.c:125
 msgid "_Delete Podcast Feed"
 msgstr "Slett _podcast-strøm"
 
-#: ../podcast/rb-podcast-source.c:133
+#: ../podcast/rb-podcast-source.c:126
 msgid "Delete Feed"
 msgstr "Slett strøm"
 
-#: ../podcast/rb-podcast-source.c:135
+#: ../podcast/rb-podcast-source.c:128
 msgid "_Update All Feeds"
 msgstr "_Oppdater alle strømmer"
 
-#: ../podcast/rb-podcast-source.c:136
+#: ../podcast/rb-podcast-source.c:129
 msgid "Update all feeds"
 msgstr "Oppdater alle stømmer"
 
-#: ../podcast/rb-podcast-source.c:142 ../sources/rb-auto-playlist-source.c:103
-#: ../sources/rb-browser-source.c:148
-#: ../sources/rb-static-playlist-source.c:123
+#. ensure search instances exist
+#: ../podcast/rb-podcast-source.c:1569
+#: ../sources/rb-auto-playlist-source.c:253 ../sources/rb-browser-source.c:314
+#: ../sources/rb-browser-source.c:330
+#: ../sources/rb-static-playlist-source.c:295
 msgid "Search all fields"
 msgstr "Søk i alle felt"
 
-#: ../podcast/rb-podcast-source.c:143
+#: ../podcast/rb-podcast-source.c:1570
 msgid "Search podcast feeds"
 msgstr "Søk i podcast-strømmer"
 
-#: ../podcast/rb-podcast-source.c:144
+#: ../podcast/rb-podcast-source.c:1571
 msgid "Search podcast episodes"
 msgstr "Søk i podcast-episoder"
 
@@ -2993,11 +2998,11 @@
 msgid "URL of podcast feed:"
 msgstr "URL for podcast-strøm:"
 
-#: ../podcast/rb-podcast-source.c:558
+#: ../podcast/rb-podcast-source.c:524
 msgid "Delete the podcast feed and downloaded files?"
 msgstr "Slett podcast-strøm og nedlastede filer?"
 
-#: ../podcast/rb-podcast-source.c:561
+#: ../podcast/rb-podcast-source.c:527
 msgid ""
 "If you choose to delete the feed and files, they will be permanently lost.  "
 "Please note that you can delete the feed but keep the downloaded files by "
@@ -3006,42 +3011,42 @@
 "Hvis du velger å slette strømmen og filene vil begge deler gå tapt. Du kan "
 "slette strømmen, men beholde de nedlastede filene ved å kun slette strømmen."
 
-#: ../podcast/rb-podcast-source.c:569
+#: ../podcast/rb-podcast-source.c:535
 msgid "Delete _Feed Only"
 msgstr "Slett kun _strøm"
 
-#: ../podcast/rb-podcast-source.c:576
+#: ../podcast/rb-podcast-source.c:542
 msgid "_Delete Feed And Files"
 msgstr "_Slett strøm og filer"
 
-#: ../podcast/rb-podcast-source.c:654 ../podcast/rb-podcast-source.c:1514
+#: ../podcast/rb-podcast-source.c:623 ../podcast/rb-podcast-source.c:1451
 msgid "Downloaded"
 msgstr "Lastet ned"
 
-#: ../podcast/rb-podcast-source.c:658 ../podcast/rb-podcast-source.c:1516
+#: ../podcast/rb-podcast-source.c:627 ../podcast/rb-podcast-source.c:1453
 msgid "Failed"
 msgstr "Mislyktes"
 
-#: ../podcast/rb-podcast-source.c:662 ../podcast/rb-podcast-source.c:1515
+#: ../podcast/rb-podcast-source.c:631 ../podcast/rb-podcast-source.c:1452
 msgid "Waiting"
 msgstr "Venter"
 
-#: ../podcast/rb-podcast-source.c:769
+#: ../podcast/rb-podcast-source.c:738
 #, c-format
 msgid "%d feed"
 msgid_plural "All %d feeds"
 msgstr[0] "%d strøm"
 msgstr[1] "Alle %d strømmene"
 
-#: ../podcast/rb-podcast-source.c:1013
+#: ../podcast/rb-podcast-source.c:981
 msgid "Podcast Error"
 msgstr "Feil med Podcast"
 
-#: ../podcast/rb-podcast-source.c:1183
+#: ../podcast/rb-podcast-source.c:1143
 msgid "Delete the podcast episode and downloaded file?"
 msgstr "Slett podcast-episoden og tilhørende fil?"
 
-#: ../podcast/rb-podcast-source.c:1186
+#: ../podcast/rb-podcast-source.c:1146
 msgid ""
 "If you choose to delete the episode and file, they will be permanently lost. "
 " Please note that you can delete the episode but keep the downloaded file by "
@@ -3051,15 +3056,15 @@
 "episoden samtidig som du beholder den nedlastede filen ved å velge å bare "
 "slette episoden."
 
-#: ../podcast/rb-podcast-source.c:1194
+#: ../podcast/rb-podcast-source.c:1154
 msgid "Delete _Episode Only"
 msgstr "Slett kun _episode"
 
-#: ../podcast/rb-podcast-source.c:1200
+#: ../podcast/rb-podcast-source.c:1160
 msgid "_Delete Episode And File"
 msgstr "_Slett episode og fil"
 
-#: ../podcast/rb-podcast-source.c:1303
+#: ../podcast/rb-podcast-source.c:1258
 #, c-format
 msgid "%d episode"
 msgid_plural "%d episodes"
@@ -3068,29 +3073,27 @@
 
 #. Translators: this is the toolbar button label
 #. for New Podcast Feed action.
-#: ../podcast/rb-podcast-source.c:1412
+#: ../podcast/rb-podcast-source.c:1312
 msgctxt "Podcast"
 msgid "Add"
 msgstr "Legg til"
 
-#. Translators: this is the toolbar button label
-#. for Update Feed action.
-#: ../podcast/rb-podcast-source.c:1418
+#: ../data/ui/podcast-toolbar.ui.h:5
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../podcast/rb-podcast-add-dialog.c:752
-#: ../podcast/rb-podcast-add-dialog.c:763 ../podcast/rb-podcast-source.c:1460
-#: ../podcast/rb-podcast-source.c:1471
+#: ../podcast/rb-podcast-add-dialog.c:753
+#: ../podcast/rb-podcast-add-dialog.c:764 ../podcast/rb-podcast-source.c:1397
+#: ../podcast/rb-podcast-source.c:1408
 msgid "Date"
 msgstr "Dato"
 
-#: ../podcast/rb-podcast-source.c:1493 ../podcast/rb-podcast-source.c:1548
-#: ../podcast/rb-podcast-source.c:1586
+#: ../podcast/rb-podcast-source.c:1430 ../podcast/rb-podcast-source.c:1485
+#: ../podcast/rb-podcast-source.c:1523
 msgid "Feed"
 msgstr "Strøm"
 
-#: ../podcast/rb-podcast-source.c:1513 ../podcast/rb-podcast-source.c:1531
+#: ../podcast/rb-podcast-source.c:1450 ../podcast/rb-podcast-source.c:1468
 msgid "Status"
 msgstr "Status"
 
@@ -3098,7 +3101,7 @@
 msgid "Don't start a new instance of Rhythmbox"
 msgstr "Ikke start en ny instans av Rhythmbox"
 
-#: ../remote/dbus/rb-client.c:87 ../shell/rb-shell.c:353
+#: ../remote/dbus/rb-client.c:87
 msgid "Quit Rhythmbox"
 msgstr "Avslutt RhythmBox"
 
@@ -3209,12 +3212,12 @@
 msgid "Not playing"
 msgstr "Spiller ikke"
 
-#: ../remote/dbus/rb-client.c:966
+#: ../remote/dbus/rb-client.c:969
 #, c-format
 msgid "Playback volume is %f.\n"
 msgstr "Avspillingsvolum er %f.\n"
 
-#: ../rhythmdb/rhythmdb.c:768
+#: ../rhythmdb/rhythmdb.c:781
 #, c-format
 msgid "Couldn't access %s: %s"
 msgstr "Kunne ikke aksessere %s: %s"
@@ -3224,7 +3227,7 @@
 #. * a local artist name if desired.  Ensure the album name
 #. * and song title are also replaced in this case.
 #. 
-#: ../rhythmdb/rhythmdb.c:1787
+#: ../rhythmdb/rhythmdb.c:1798
 msgid "The Beatles"
 msgstr "The Beatles"
 
@@ -3232,7 +3235,7 @@
 #. * example artist name is localised, this should be replaced
 #. * with the name of an album by that artist.
 #. 
-#: ../rhythmdb/rhythmdb.c:1793
+#: ../rhythmdb/rhythmdb.c:1804
 msgid "Help!"
 msgstr "Help!"
 
@@ -3240,28 +3243,28 @@
 #. * artist and album names are localised, this should be replaced
 #. * with the name of the seventh song from the localised album.
 #. 
-#: ../rhythmdb/rhythmdb.c:1799
+#: ../rhythmdb/rhythmdb.c:1810
 msgid "Ticket To Ride"
 msgstr "Ticket To Ride"
 
 #. Translators: the parameter here is a list of GStreamer plugins.
 #. * The plugin names are already translated.
 #. 
-#: ../rhythmdb/rhythmdb.c:2263
+#: ../rhythmdb/rhythmdb.c:2288
 #, c-format
 msgid "Additional GStreamer plugins are required to play this file: %s"
 msgstr "Flere GStreamer-tillegg kreves for å spille av denne filen: %s"
 
-#: ../rhythmdb/rhythmdb.c:2295
+#: ../rhythmdb/rhythmdb.c:2320
 msgid "invalid unicode in error message"
 msgstr "ugyldig unicode i feilmelding"
 
-#: ../rhythmdb/rhythmdb.c:2362
+#: ../rhythmdb/rhythmdb.c:2387
 #, c-format
 msgid "Empty file"
 msgstr "Tom fil"
 
-#: ../rhythmdb/rhythmdb.c:3038
+#: ../rhythmdb/rhythmdb.c:3063
 msgid "Could not load the music database:"
 msgstr "Kunne ikke laste musikkdatabasen:"
 
@@ -3270,21 +3273,21 @@
 msgid "Checking (%d/%d)"
 msgstr "Sjekker (%d/%d)"
 
-#: ../rhythmdb/rhythmdb.c:4498
+#: ../rhythmdb/rhythmdb.c:4486
 #, c-format
 msgid "%ld minute"
 msgid_plural "%ld minutes"
 msgstr[0] "%ld minutt"
 msgstr[1] "%ld minutter"
 
-#: ../rhythmdb/rhythmdb.c:4499
+#: ../rhythmdb/rhythmdb.c:4487
 #, c-format
 msgid "%ld hour"
 msgid_plural "%ld hours"
 msgstr[0] "%ld time"
 msgstr[1] "%ld timer"
 
-#: ../rhythmdb/rhythmdb.c:4500
+#: ../rhythmdb/rhythmdb.c:4488
 #, c-format
 msgid "%ld day"
 msgid_plural "%ld days"
@@ -3292,7 +3295,7 @@
 msgstr[1] "%ld dager"
 
 #. Translators: the format is "X days, X hours and X minutes"
-#: ../rhythmdb/rhythmdb.c:4506
+#: ../rhythmdb/rhythmdb.c:4494
 #, c-format
 msgid "%s, %s and %s"
 msgstr "%s, %s og %s"
@@ -3300,17 +3303,17 @@
 #. Translators: the format is "X days and X hours"
 #. Translators: the format is "X days and X minutes"
 #. Translators: the format is "X hours and X minutes"
-#: ../rhythmdb/rhythmdb.c:4512 ../rhythmdb/rhythmdb.c:4520
-#: ../rhythmdb/rhythmdb.c:4531
+#: ../rhythmdb/rhythmdb.c:4500 ../rhythmdb/rhythmdb.c:4508
+#: ../rhythmdb/rhythmdb.c:4519
 #, c-format
 msgid "%s and %s"
 msgstr "%s og %s"
 
-#: ../rhythmdb/rhythmdb-property-model.c:496
+#: ../rhythmdb/rhythmdb-property-model.c:511
 msgid "All"
 msgstr "Alle"
 
-#: ../rhythmdb/rhythmdb-tree.c:408
+#: ../rhythmdb/rhythmdb-tree.c:411
 #, c-format
 msgid ""
 "The database was created by a later version of Rhythmbox.  This version of "
@@ -3319,15 +3322,15 @@
 "Databasen ble opprettet av en senere versjon av Rhythmbox. Denne versjonen "
 "av Rhythmbox kan ikke lese databasen."
 
-#: ../shell/rb-playlist-manager.c:180
+#: ../shell/rb-playlist-manager.c:166
 msgid "MPEG Version 3.0 URL"
 msgstr "MPEG versjon 3.0 URL"
 
-#: ../shell/rb-playlist-manager.c:181
+#: ../shell/rb-playlist-manager.c:167
 msgid "Shoutcast playlist"
 msgstr "Shoutcast-spilleliste"
 
-#: ../shell/rb-playlist-manager.c:182
+#: ../shell/rb-playlist-manager.c:168
 msgid "XML Shareable Playlist Format"
 msgstr "Delbart XML-format for spilleliste"
 
@@ -3360,7 +3363,7 @@
 msgid "Choose a playlist to be loaded"
 msgstr "Velg en spilleliste som skal lastes"
 
-#: ../shell/rb-playlist-manager.c:200 ../shell/rb-playlist-manager.c:218
+#: ../data/ui/playlist-menu.ui.h:5 ../data/ui/queue-popups.ui.h:3
 msgid "_Save to File..."
 msgstr "_Lagre til fil …"
 
@@ -3368,7 +3371,7 @@
 msgid "Save a playlist to a file"
 msgstr "Lagre en spilleliste til en fil"
 
-#: ../shell/rb-playlist-manager.c:209
+#: ../data/ui/playlist-menu.ui.h:1
 msgid "_Edit..."
 msgstr "R_ediger …"
 
@@ -3376,7 +3379,7 @@
 msgid "Change this automatic playlist"
 msgstr "Endre denne automatiske spillelisten"
 
-#: ../shell/rb-playlist-manager.c:212
+#: ../data/ui/playlist-menu.ui.h:3
 msgid "_Queue All Tracks"
 msgstr "Legg alle spor i _kø"
 
@@ -3384,7 +3387,7 @@
 msgid "Add all tracks in this playlist to the queue"
 msgstr "Legg til alle spor i denne spille listen i køen"
 
-#: ../shell/rb-playlist-manager.c:215
+#: ../data/ui/playlist-menu.ui.h:4
 msgid "_Shuffle Playlist"
 msgstr "_Stokk om spilleliste"
 
@@ -3396,50 +3399,50 @@
 msgid "Save the play queue to a file"
 msgstr "Lagre spillekøen til en fil"
 
-#: ../shell/rb-playlist-manager.c:323
+#: ../shell/rb-playlist-manager.c:265
 msgid "Unnamed playlist"
 msgstr "Ikke navngitt spilleliste"
 
-#: ../shell/rb-playlist-manager.c:366
+#: ../shell/rb-playlist-manager.c:308
 msgid "The playlist file may be in an unknown format or corrupted."
 msgstr "Spillelistefilen kan være i et ukjent format eller korrupt."
 
-#: ../shell/rb-playlist-manager.c:794
+#: ../shell/rb-playlist-manager.c:773
 msgid "Untitled Playlist"
 msgstr "Spilleliste uten navn"
 
-#: ../shell/rb-playlist-manager.c:1086
+#: ../shell/rb-playlist-manager.c:1061
 msgid "Couldn't read playlist"
 msgstr "Kunne ikke lese spilleliste"
 
-#: ../shell/rb-playlist-manager.c:1112
+#: ../shell/rb-playlist-manager.c:1087
 msgid "All Files"
 msgstr "Alle filer"
 
-#: ../shell/rb-playlist-manager.c:1117
+#: ../shell/rb-playlist-manager.c:1092
 msgid "Load Playlist"
 msgstr "Last spilleliste"
 
-#: ../shell/rb-playlist-manager.c:1173 ../sources/rb-playlist-source.c:669
+#: ../shell/rb-playlist-manager.c:1148 ../sources/rb-playlist-source.c:707
 msgid "Couldn't save playlist"
 msgstr "Kunne ikke lagre spilleliste"
 
-#: ../shell/rb-playlist-manager.c:1173
+#: ../shell/rb-playlist-manager.c:1148
 msgid "Unsupported file extension given."
 msgstr "Oppgitt filtype er ikke støttet."
 
-#: ../shell/rb-playlist-manager.c:1469
+#: ../shell/rb-playlist-manager.c:1481
 #, c-format
 msgid "Playlist %s already exists"
 msgstr "Spillelisten \"%s\" eksisterer allerede"
 
-#: ../shell/rb-playlist-manager.c:1499 ../shell/rb-playlist-manager.c:1532
-#: ../shell/rb-playlist-manager.c:1572 ../shell/rb-playlist-manager.c:1615
+#: ../shell/rb-playlist-manager.c:1511 ../shell/rb-playlist-manager.c:1544
+#: ../shell/rb-playlist-manager.c:1584 ../shell/rb-playlist-manager.c:1627
 #, c-format
 msgid "Unknown playlist: %s"
 msgstr "Ukjent spilleliste: %s"
 
-#: ../shell/rb-playlist-manager.c:1540 ../shell/rb-playlist-manager.c:1580
+#: ../shell/rb-playlist-manager.c:1552 ../shell/rb-playlist-manager.c:1592
 #, c-format
 msgid "Playlist %s is an automatic playlist"
 msgstr "Spilleliste %s er en automatisk spilleliste"
@@ -3452,7 +3455,7 @@
 msgid "Eject this medium"
 msgstr "Løs ut dette mediet"
 
-#: ../shell/rb-removable-media-manager.c:153
+#: ../data/ui/display-page-add-menu.ui.h:4
 msgid "_Check for New Devices"
 msgstr "_Se etter nye enheter"
 
@@ -3462,99 +3465,99 @@
 msgstr ""
 "Se etter nye medielagringsenheter som ikke har blitt funnet automatisk"
 
-#: ../shell/rb-shell.c:336
+#: ../shell/rb-shell.c:350
 msgid "_Music"
 msgstr "_Musikk"
 
-#: ../shell/rb-shell.c:338
+#: ../data/ui/app-menu.ui.h:2
 msgid "_View"
 msgstr "_Vis"
 
-#: ../shell/rb-shell.c:339
+#: ../shell/rb-shell.c:353
 msgid "_Control"
 msgstr "_Kontroll"
 
-#: ../shell/rb-shell.c:340
+#: ../data/ui/app-menu.ui.h:10
 msgid "_Tools"
 msgstr "Verk_tøy"
 
-#: ../shell/rb-shell.c:341
+#: ../data/ui/app-menu.ui.h:13
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../shell/rb-shell.c:347
+#: ../shell/rb-shell.c:357
 msgid "_Import Folder..."
 msgstr "_Importer mappe …"
 
-#: ../shell/rb-shell.c:348
+#: ../shell/rb-shell.c:358
 msgid "Choose folder to be added to the Library"
 msgstr "Velg mappe som skal legges til i biblioteket"
 
-#: ../shell/rb-shell.c:350
+#: ../shell/rb-shell.c:360
 msgid "Import _File..."
 msgstr "Importer _fil …"
 
-#: ../shell/rb-shell.c:351
+#: ../shell/rb-shell.c:361
 msgid "Choose file to be added to the Library"
 msgstr "Velg fil som skal legges til i biblioteket"
 
-#: ../shell/rb-shell.c:346
+#: ../data/ui/app-menu.ui.h:14
 msgid "_About"
 msgstr "_Om"
 
-#: ../shell/rb-shell.c:347
+#: ../shell/rb-shell.c:364
 msgid "Show information about Rhythmbox"
 msgstr "Vis informasjon om Rhythmbox"
 
-#: ../shell/rb-shell.c:349
+#: ../shell/rb-shell.c:366
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../shell/rb-shell.c:350
+#: ../shell/rb-shell.c:367
 msgid "Display Rhythmbox help"
 msgstr "Vis hjelp for RhythmBox"
 
-#: ../shell/rb-shell.c:352
+#: ../data/ui/app-menu.ui.h:15
 msgid "_Quit"
 msgstr "A_vslutt"
 
-#: ../shell/rb-shell.c:355
+#: ../shell/rb-shell.c:372
 msgid "Prefere_nces"
 msgstr "_Brukervalg"
 
-#: ../shell/rb-shell.c:356
+#: ../shell/rb-shell.c:373
 msgid "Edit Rhythmbox preferences"
 msgstr "Rediger brukervalg for Rhytmbox"
 
-#: ../shell/rb-shell.c:358
+#: ../shell/rb-shell.c:375
 msgid "Plu_gins"
 msgstr "Tille_gg"
 
-#: ../shell/rb-shell.c:359
+#: ../shell/rb-shell.c:376
 msgid "Change and configure plugins"
 msgstr "Endre og sett opp tillegg"
 
-#: ../shell/rb-shell.c:361
+#: ../shell/rb-shell.c:378
 msgid "Show _All Tracks"
 msgstr "Vis _alle spor"
 
-#: ../shell/rb-shell.c:362
+#: ../shell/rb-shell.c:379
 msgid "Show all tracks in this music source"
 msgstr "Vis alle spor på denne musikkkilden"
 
-#: ../shell/rb-shell.c:364
+#: ../shell/rb-shell.c:381
 msgid "_Jump to Playing Song"
 msgstr "_Hopp til denne sangen"
 
-#: ../shell/rb-shell.c:365
+#: ../shell/rb-shell.c:382
 msgid "Scroll the view to the currently playing song"
 msgstr "Rull visningen til sangen som spilles av nå"
 
-#: ../shell/rb-shell.c:372
+#: ../shell/rb-shell.c:389
 msgid "Side _Pane"
 msgstr "Side_linje"
 
-#: ../shell/rb-shell.c:373
+#: ../shell/rb-shell.c:390
 msgid "Change the visibility of the side pane"
 msgstr "Endre synlighet for sidelinjen"
 
@@ -3574,75 +3577,75 @@
 msgid "Make the main window smaller"
 msgstr "Gjør hovedvinduet mindre"
 
-#: ../shell/rb-shell.c:375
+#: ../shell/rb-shell.c:398
 msgid "Party _Mode"
 msgstr "Fest_modus"
 
-#: ../shell/rb-shell.c:376
+#: ../shell/rb-shell.c:399
 msgid "Change the status of the party mode"
 msgstr "Endre status for festmodus"
 
-#: ../shell/rb-shell.c:378
+#: ../shell/rb-shell.c:401
 msgid "Play _Queue as Side Pane"
 msgstr "Spille_kø som sidelinje"
 
-#: ../shell/rb-shell.c:379
+#: ../shell/rb-shell.c:402
 msgid "Change whether the queue is visible as a source or a sidebar"
 msgstr "Velg om køen skal være synlig som en kilde eller en sidelinje"
 
-#: ../shell/rb-shell.c:381
+#: ../shell/rb-shell.c:404
 msgid "S_tatusbar"
 msgstr "S_tatuslinje"
 
-#: ../shell/rb-shell.c:382
+#: ../shell/rb-shell.c:405
 msgid "Change the visibility of the statusbar"
 msgstr "Endre synlighet for statuslinjen"
 
-#: ../shell/rb-shell.c:390
+#: ../shell/rb-shell.c:407
 msgid "_Browse"
 msgstr "_Utforsker"
 
-#: ../shell/rb-shell.c:391
+#: ../shell/rb-shell.c:408
 msgid "Change the visibility of the browser"
 msgstr "Endre synlighet for leseren"
 
-#: ../shell/rb-shell.c:887
+#: ../shell/rb-shell.c:905
 msgid "Change the music volume"
 msgstr "Endre volum"
 
-#: ../shell/rb-shell.c:1952
+#: ../shell/rb-application.c:612
 msgid "Enable debug output"
 msgstr "Aktiver kode for feilsøking"
 
-#: ../shell/rb-shell.c:1953
+#: ../shell/rb-application.c:613
 msgid "Enable debug output matching a specified string"
 msgstr "Aktiver feilsøkingsinformasjon basert på en spesifisert streng"
 
-#: ../shell/rb-shell.c:1954
+#: ../shell/rb-application.c:614
 msgid "Do not update the library with file changes"
 msgstr "Ikke oppdater biblioteket når filer endres"
 
-#: ../shell/rb-shell.c:1955
+#: ../shell/rb-application.c:615
 msgid "Do not register the shell"
 msgstr "Ikke registrer skallet"
 
-#: ../shell/rb-shell.c:1956
+#: ../shell/rb-application.c:616
 msgid "Don't save any data permanently (implies --no-registration)"
 msgstr "Ikke lagre data permanent (betinger --no-registration)"
 
-#: ../shell/rb-shell.c:1957
+#: ../shell/rb-application.c:617
 msgid "Disable loading of plugins"
 msgstr "Slå av lasting av tillegg"
 
-#: ../shell/rb-shell.c:1958
+#: ../shell/rb-application.c:618
 msgid "Path for database file to use"
 msgstr "Sti til databasefil som skal brukes"
 
-#: ../shell/rb-shell.c:1959
+#: ../shell/rb-application.c:619
 msgid "Path for playlists file to use"
 msgstr "Sti til spillelistefil som skal brukes"
 
-#: ../shell/rb-shell.c:1970
+#: ../shell/rb-application.c:631
 #, c-format
 msgid ""
 "%s\n"
@@ -3652,28 +3655,28 @@
 "Kjør «%s --help» for å se en full liste med tilgjengelige "
 "kommandolinjeflagg.\n"
 
-#. Translators: this is the short label for the 'add music' action
-#: ../shell/rb-shell.c:2067
+#. Translators: this is the short label for the 'import folder' action
+#: ../shell/rb-shell.c:2131
 msgctxt "Library"
 msgid "Import"
 msgstr "Importer"
 
 #. Translators: this is the short label for the 'view all tracks' action
-#: ../shell/rb-shell.c:2069
+#: ../shell/rb-shell.c:2133
 msgid "Show All"
 msgstr "Vis alle"
 
-#: ../shell/rb-shell.c:2354
+#: ../shell/rb-shell.c:2125
 msgid "Error while saving song information"
 msgstr "Feil under lagring av sanginformasjon"
 
 #. Translators: %s is the song name
-#: ../shell/rb-shell.c:2634
+#: ../shell/rb-shell.c:2451
 #, c-format
 msgid "%s (Paused)"
 msgstr "%s (Pause)"
 
-#: ../shell/rb-shell.c:2709
+#: ../shell/rb-application.c:208
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -3692,6 +3695,7 @@
 "  Halvor Lyche Strandvoll https://launchpad.net/~halvors\n"
 "  Henning jensen https://launchpad.net/~henning-jensen\n"
 "  Ingar Saltvik https://launchpad.net/~ingar\n"
+"  Joakim Langvand https://launchpad.net/~jlangvand\n"
 "  Kjartan Maraas https://launchpad.net/~kmaraas\n"
 "  Kjetil Birkeland Moe https://launchpad.net/~kjetilbmoe\n"
 "  Pion https://launchpad.net/~josteinaj\n"
@@ -3708,7 +3712,7 @@
 "  yakHunter https://launchpad.net/~yaknibor\n"
 "  Øivind Hoel https://launchpad.net/~eruin"
 
-#: ../shell/rb-shell.c:2712
+#: ../shell/rb-application.c:211
 msgid ""
 "Rhythmbox is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -3721,7 +3725,7 @@
 "det)\n"
 "enhver senere versjon.\n"
 
-#: ../shell/rb-shell.c:2716
+#: ../shell/rb-application.c:215
 msgid ""
 "Rhythmbox is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -3733,7 +3737,7 @@
 "SALGBART eller PASSER ET BESTEMT FORMÅL. Se GNU General\n"
 "Public License for detaljer.\n"
 
-#: ../shell/rb-shell.c:2720
+#: ../shell/rb-application.c:219
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with Rhythmbox; if not, write to the Free Software Foundation, Inc.,\n"
@@ -3743,68 +3747,68 @@
 "Rhythmbox. Hvis ikke så skriv til Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
 
-#: ../shell/rb-shell.c:2727
+#: ../shell/rb-application.c:226
 msgid "Maintainers:"
 msgstr "Vedlikeholdt av:"
 
-#: ../shell/rb-shell.c:2730
+#: ../shell/rb-application.c:229
 msgid "Former Maintainers:"
 msgstr "Tidligere vedlikeholdt av:"
 
-#: ../shell/rb-shell.c:2733
+#: ../shell/rb-application.c:232
 msgid "Contributors:"
 msgstr "Bidragsytere:"
 
-#: ../shell/rb-shell.c:2735
+#: ../shell/rb-application.c:234
 msgid "Music management and playback software for GNOME."
 msgstr "Programvare for musikkhåndtering og avspilling for GNOME."
 
-#: ../shell/rb-shell.c:2744
+#: ../shell/rb-application.c:244
 msgid "Rhythmbox Website"
 msgstr "Rhythmbox nettsted"
 
-#: ../shell/rb-shell.c:2791 ../shell/rb-shell-preferences.c:162
+#: ../shell/rb-application.c:272 ../shell/rb-shell-preferences.c:163
 msgid "Couldn't display help"
 msgstr "Kunne ikke vise hjelp"
 
-#: ../shell/rb-shell.c:2836
+#: ../shell/rb-application.c:141
 msgid "Configure Plugins"
 msgstr "Brukervalg for tillegg"
 
-#: ../shell/rb-shell.c:3003
+#: ../shell/rb-shell.c:3064
 msgid "Import Folder into Library"
 msgstr "Importer mappe til biblioteket"
 
-#: ../shell/rb-shell.c:3022
+#: ../shell/rb-shell.c:3083
 msgid "Import File into Library"
 msgstr "Importer fil til biblioteket"
 
-#: ../shell/rb-shell.c:3288 ../sources/rb-play-queue-source.c:629
+#: ../shell/rb-shell.c:2855 ../sources/rb-play-queue-source.c:659
 #, c-format
 msgid "No registered source can handle URI %s"
 msgstr "Ingen registrert kilde kan håndtere URI %s"
 
-#: ../shell/rb-shell.c:3617
+#: ../shell/rb-shell.c:3184
 #, c-format
 msgid "No registered source matches URI %s"
 msgstr "Ingen registrert kilde er lik URI %s"
 
-#: ../shell/rb-shell.c:3650 ../shell/rb-shell.c:3693
+#: ../shell/rb-shell.c:3217 ../shell/rb-shell.c:3260
 #, c-format
 msgid "Unknown song URI: %s"
 msgstr "Ukjent URI til sang: %s"
 
-#: ../shell/rb-shell.c:3702
+#: ../shell/rb-shell.c:3269
 #, c-format
 msgid "Unknown property %s"
 msgstr "Ukjent egenskap %s"
 
-#: ../shell/rb-shell.c:3716
+#: ../shell/rb-shell.c:3283
 #, c-format
 msgid "Invalid property type %s for property %s"
 msgstr "Ugyldig type egenskap %s for egenskap %s"
 
-#: ../shell/rb-shell-clipboard.c:151
+#: ../data/ui/edit-menu.ui.h:4
 msgid "Select _All"
 msgstr "Velg _alle"
 
@@ -3812,7 +3816,7 @@
 msgid "Select all songs"
 msgstr "Velg alle sangene"
 
-#: ../shell/rb-shell-clipboard.c:154
+#: ../data/ui/edit-menu.ui.h:5
 msgid "D_eselect All"
 msgstr "V_elg bort alle"
 
@@ -3820,7 +3824,7 @@
 msgid "Deselect all songs"
 msgstr "Velg bort alle sanger"
 
-#: ../shell/rb-shell-clipboard.c:157
+#: ../data/ui/edit-menu.ui.h:1
 msgid "Cu_t"
 msgstr "Klipp _ut"
 
@@ -3828,7 +3832,7 @@
 msgid "Cut selection"
 msgstr "Klipp ut utvalg"
 
-#: ../shell/rb-shell-clipboard.c:160
+#: ../data/ui/edit-menu.ui.h:2
 msgid "_Copy"
 msgstr "_Kopier"
 
@@ -3836,7 +3840,7 @@
 msgid "Copy selection"
 msgstr "Kopier utvalg"
 
-#: ../shell/rb-shell-clipboard.c:163
+#: ../data/ui/edit-menu.ui.h:3
 msgid "_Paste"
 msgstr "_Lim inn"
 
@@ -3848,7 +3852,7 @@
 msgid "Delete each selected item"
 msgstr "Slett valgte oppføringer"
 
-#: ../shell/rb-shell-clipboard.c:169
+#: ../data/ui/import-errors-popup.ui.h:1 ../data/ui/missing-files-popup.ui.h:1
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -3856,7 +3860,8 @@
 msgid "Remove each selected item from the library"
 msgstr "Fjern valgte oppføringer fra biblioteket"
 
-#: ../shell/rb-shell-clipboard.c:172
+#: ../data/ui/browser-popup.ui.h:5 ../data/ui/edit-menu.ui.h:9
+#: ../data/ui/import-errors-popup.ui.h:2 ../data/ui/playlist-popup.ui.h:5
 msgid "_Move to Trash"
 msgstr "_Flytt til papirkurven"
 
@@ -3880,7 +3885,8 @@
 msgid "Add each selected song to the play queue"
 msgstr "Legg til valgte sanger i avspillingskøen"
 
-#: ../shell/rb-shell-clipboard.c:183
+#: ../plugins/iradio/iradio-popup.ui.h:1 ../shell/rb-shell-clipboard.c:258
+#: ../sources/rb-source.c:1219
 msgid "Remove"
 msgstr "Fjern"
 
@@ -3888,7 +3894,9 @@
 msgid "Remove each selected item from the play queue"
 msgstr "Fjern valgte sanger fra avspillingskøen"
 
-#: ../shell/rb-shell-clipboard.c:187
+#: ../data/ui/browser-popup.ui.h:9 ../data/ui/edit-menu.ui.h:8
+#: ../data/ui/playlist-popup.ui.h:9 ../data/ui/queue-popups.ui.h:4
+#: ../plugins/magnatune/magnatune-popup.ui.h:7
 msgid "Pr_operties"
 msgstr "E_genskaper"
 
@@ -3896,178 +3904,178 @@
 msgid "Show information on each selected song"
 msgstr "Vis informasjon om valgte sanger"
 
-#: ../shell/rb-shell-player.c:314
+#: ../shell/rb-shell-player.c:295 ../shell/rb-shell-player.c:3829
 msgid "_Play"
 msgstr "S_pill"
 
-#: ../shell/rb-shell-player.c:315 ../shell/rb-shell-player.c:3859
+#: ../shell/rb-shell.c:2340
 msgid "Start playback"
 msgstr "Start avspilling"
 
-#: ../shell/rb-shell-player.c:297
+#: ../shell/rb-shell-player.c:298
 msgid "Pre_vious"
 msgstr "Fo_rrige"
 
-#: ../shell/rb-shell-player.c:298
+#: ../data/ui/main-toolbar.ui.h:1
 msgid "Start playing the previous song"
 msgstr "Start avspilling av forrige sang"
 
-#: ../shell/rb-shell-player.c:300
+#: ../shell/rb-shell-player.c:301
 msgid "_Next"
 msgstr "_Neste"
 
-#: ../shell/rb-shell-player.c:301
+#: ../data/ui/main-toolbar.ui.h:5
 msgid "Start playing the next song"
 msgstr "Start avspilling av neste sang"
 
-#: ../shell/rb-shell-player.c:303
+#: ../shell/rb-shell-player.c:304
 msgid "_Increase Volume"
 msgstr "Skru _opp volumet"
 
-#: ../shell/rb-shell-player.c:304
+#: ../shell/rb-shell-player.c:305
 msgid "Increase playback volume"
 msgstr "Skru opp avspillingsvolumet"
 
-#: ../shell/rb-shell-player.c:306
+#: ../shell/rb-shell-player.c:307
 msgid "_Decrease Volume"
 msgstr "Skru ne_d volumet"
 
-#: ../shell/rb-shell-player.c:307
+#: ../shell/rb-shell-player.c:308
 msgid "Decrease playback volume"
 msgstr "Skru ned avspillingsvolumet"
 
-#: ../shell/rb-shell-player.c:317
+#: ../shell/rb-shell-player.c:315
 msgid "Sh_uffle"
 msgstr "Til_feldig"
 
-#: ../shell/rb-shell-player.c:318
+#: ../data/ui/main-toolbar.ui.h:9
 msgid "Play songs in a random order"
 msgstr "Spill av sanger i tilfeldig rekkefølge"
 
-#: ../shell/rb-shell-player.c:320
+#: ../shell/rb-shell-player.c:318
 msgid "_Repeat"
 msgstr "_Gjenta"
 
-#: ../shell/rb-shell-player.c:321
+#: ../data/ui/main-toolbar.ui.h:7
 msgid "Play first song again after all songs are played"
 msgstr "Spill første sang igjen etter at alle sanger er spilt"
 
-#: ../shell/rb-shell.c:384
+#: ../shell/rb-shell-player.c:321
 msgid "_Song Position Slider"
 msgstr "Rullefelt for _sangposisjon"
 
-#: ../shell/rb-shell.c:385
+#: ../shell/rb-shell-player.c:322
 msgid "Change the visibility of the song position slider"
 msgstr "Endre synlighet for rullefelt for sangposisjon"
 
-#: ../shell/rb-shell-player.c:842
+#: ../shell/rb-shell-player.c:389
 msgid "Stream error"
 msgstr "Feil i strøm"
 
-#: ../shell/rb-shell-player.c:843
+#: ../shell/rb-shell-player.c:390
 msgid "Unexpected end of stream!"
 msgstr "Uventet slutt på data!"
 
-#: ../shell/rb-shell-player.c:1010
+#: ../shell/rb-shell-player.c:3247
 msgid "Linear"
 msgstr "Lineær"
 
-#: ../shell/rb-shell-player.c:1012
+#: ../shell/rb-shell-player.c:3249
 msgid "Linear looping"
 msgstr "Lineær gjentakelse"
 
-#: ../shell/rb-shell-player.c:1014
+#: ../data/ui/queue-toolbar.ui.h:2 ../shell/rb-shell-player.c:3251
 msgid "Shuffle"
 msgstr "Tilfeldig"
 
-#: ../shell/rb-shell-player.c:1016
+#: ../shell/rb-shell-player.c:3253
 msgid "Random with equal weights"
 msgstr "Tilfeldig med lik vekting"
 
-#: ../shell/rb-shell-player.c:1018
+#: ../shell/rb-shell-player.c:3255
 msgid "Random by time since last play"
 msgstr "Tilfeldig etter tid for siste avspilling"
 
-#: ../shell/rb-shell-player.c:1020
+#: ../shell/rb-shell-player.c:3257
 msgid "Random by rating"
 msgstr "Tilfeldig med poenggivning"
 
-#: ../shell/rb-shell-player.c:1022
+#: ../shell/rb-shell-player.c:3259
 msgid "Random by time since last play and rating"
 msgstr "Tilfeldig etter tid siden siste avspilling med poenggivning"
 
-#: ../shell/rb-shell-player.c:1024
+#: ../shell/rb-shell-player.c:3261
 msgid "Linear, removing entries once played"
 msgstr "Lineær, fjerner oppføringer når de er spilt av"
 
-#: ../shell/rb-shell-player.c:1034
+#: ../shell/rb-shell-player.c:3271
 #, c-format
 msgid "Failed to create the player: %s"
 msgstr "Klarte ikke å opprette spiller: %s"
 
-#: ../shell/rb-shell-player.c:1595
+#: ../shell/rb-shell-player.c:680
 #, c-format
 msgid "Playlist was empty"
 msgstr "Spillelisten var tom"
 
-#: ../shell/rb-shell-player.c:2065
+#: ../shell/rb-shell-player.c:1115
 #, c-format
 msgid "Not currently playing"
 msgstr "Spiller ikke"
 
-#: ../shell/rb-shell-player.c:2123
+#: ../shell/rb-shell-player.c:1172
 #, c-format
 msgid "No previous song"
 msgstr "Ingen forrige sang"
 
-#: ../shell/rb-shell-player.c:2223
+#: ../shell/rb-shell-player.c:1271
 #, c-format
 msgid "No next song"
 msgstr "Ingen neste sang"
 
-#: ../shell/rb-shell-player.c:2344 ../shell/rb-shell-player.c:3496
+#: ../shell/rb-shell-player.c:2429 ../shell/rb-shell-player.c:2753
 msgid "Couldn't start playback"
 msgstr "Kunne ikke starte avspilling"
 
-#: ../shell/rb-shell-player.c:3199
+#: ../shell/rb-shell-player.c:2132
 msgid "Couldn't stop playback"
 msgstr "Kunne ikke stoppe avspilling"
 
-#: ../shell/rb-shell-player.c:3318
+#: ../shell/rb-shell-player.c:2251
 #, c-format
 msgid "Playback position not available"
 msgstr "Avspillingsposisjon er ikke tilgjengelig"
 
-#: ../shell/rb-shell-player.c:3350 ../shell/rb-shell-player.c:3384
+#: ../shell/rb-shell-player.c:2283 ../shell/rb-shell-player.c:2317
 #, c-format
 msgid "Current song is not seekable"
 msgstr "Kan ikke søke i denne sangen"
 
-#: ../shell/rb-shell-player.c:3854
+#: ../shell/rb-shell.c:2329
 msgid "Pause playback"
 msgstr "Pause avspilling"
 
-#: ../shell/rb-shell-player.c:3852
+#: ../shell/rb-shell-player.c:3820
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../shell/rb-shell-player.c:3856
+#: ../shell/rb-shell.c:2332
 msgid "Stop playback"
 msgstr "Stopp avspilling"
 
-#: ../shell/rb-shell-player.c:3856
+#: ../shell/rb-shell-player.c:3824
 msgid "_Stop"
 msgstr "_Stopp"
 
-#: ../shell/rb-shell-preferences.c:201
+#: ../shell/rb-shell-preferences.c:202
 msgid "Rhythmbox Preferences"
 msgstr "Brukervalg for Rhythmbox"
 
-#: ../shell/rb-shell-preferences.c:247
+#: ../shell/rb-shell-preferences.c:248
 msgid "General"
 msgstr "Generelt"
 
-#: ../shell/rb-shell-preferences.c:311
+#: ../shell/rb-shell-preferences.c:312
 msgid "Playback"
 msgstr "Avspilling"
 
@@ -4168,18 +4176,18 @@
 msgid "Transferring track %d out of %d"
 msgstr "Overfører spor %d av %d"
 
-#: ../sources/rb-auto-playlist-source.c:104 ../sources/rb-browser-source.c:149
-#: ../sources/rb-static-playlist-source.c:124
+#: ../sources/rb-auto-playlist-source.c:254 ../sources/rb-browser-source.c:315
+#: ../sources/rb-static-playlist-source.c:296
 msgid "Search artists"
 msgstr "Søk i artister"
 
-#: ../sources/rb-auto-playlist-source.c:105 ../sources/rb-browser-source.c:150
-#: ../sources/rb-static-playlist-source.c:125
+#: ../sources/rb-auto-playlist-source.c:256 ../sources/rb-browser-source.c:317
+#: ../sources/rb-static-playlist-source.c:298
 msgid "Search albums"
 msgstr "Søk i album"
 
-#: ../sources/rb-auto-playlist-source.c:106 ../sources/rb-browser-source.c:151
-#: ../sources/rb-static-playlist-source.c:126
+#: ../sources/rb-auto-playlist-source.c:257 ../sources/rb-browser-source.c:318
+#: ../sources/rb-static-playlist-source.c:299
 msgid "Search titles"
 msgstr "Søk i titler"
 
@@ -4232,83 +4240,83 @@
 msgstr "Delt"
 
 #. set up info bar for triggering codec installation
-#: ../sources/rb-import-errors-source.c:243
+#: ../sources/rb-import-errors-source.c:235
 msgid "Install Additional Software"
 msgstr "Installer ekstra programvare"
 
-#: ../sources/rb-import-errors-source.c:249
+#: ../sources/rb-import-errors-source.c:241
 msgid "Additional software is required to play some of these files."
 msgstr "Ekstra programvare kreves for å spille av noen av disse filene."
 
-#: ../sources/rb-import-errors-source.c:354
+#: ../sources/rb-import-errors-source.c:346
 msgid "Import Errors"
 msgstr "Feil ved import"
 
-#: ../sources/rb-import-errors-source.c:391
+#: ../sources/rb-import-errors-source.c:383
 #, c-format
 msgid "%d import error"
 msgid_plural "%d import errors"
 msgstr[0] "%d importeringsfeil"
 msgstr[1] "%d importeringsfeil"
 
-#: ../sources/rb-library-source.c:125
+#: ../sources/rb-library-source.c:129
 msgid "Artist/Artist - Album"
 msgstr "Artist/Artist - Album"
 
-#: ../sources/rb-library-source.c:126
+#: ../sources/rb-library-source.c:130
 msgid "Artist/Album"
 msgstr "Artist/Album"
 
-#: ../sources/rb-library-source.c:127
+#: ../sources/rb-library-source.c:131
 msgid "Artist - Album"
 msgstr "Artist - Album"
 
-#: ../sources/rb-library-source.c:128 ../widgets/rb-entry-view.c:1448
+#: ../sources/rb-library-source.c:132 ../widgets/rb-entry-view.c:1471
 #: ../widgets/rb-library-browser.c:136
 msgid "Album"
 msgstr "Album"
 
-#: ../sources/rb-library-source.c:134
+#: ../sources/rb-library-source.c:138
 msgid "Number - Title"
 msgstr "Nummer - Tittel"
 
-#: ../sources/rb-library-source.c:135
+#: ../sources/rb-library-source.c:139
 msgid "Artist - Title"
 msgstr "Artist - Tittel"
 
-#: ../sources/rb-library-source.c:136
+#: ../sources/rb-library-source.c:140
 msgid "Artist - Number - Title"
 msgstr "Artist - Nummer - Tittel"
 
-#: ../sources/rb-library-source.c:137
+#: ../sources/rb-library-source.c:141
 msgid "Artist (Album) - Number - Title"
 msgstr "Artist (Plate) - Nummer - Tittel"
 
-#: ../sources/rb-library-source.c:139
+#: ../sources/rb-library-source.c:143
 msgid "Number. Artist - Title"
 msgstr "Nummer. Artist - Tittel"
 
-#: ../sources/rb-library-source.c:412
+#: ../sources/rb-library-source.c:447
 #: ../sources/sync/rb-sync-settings-ui.c:216
 #: ../sources/sync/rb-sync-settings-ui.c:217
 #: ../sources/sync/rb-sync-state-ui.c:77
 msgid "Music"
 msgstr "Musikk"
 
-#: ../sources/rb-library-source.c:467
+#: ../sources/rb-library-source.c:500
 msgid "Choose Library Location"
 msgstr "Velg lokasjon for bibliotek"
 
-#: ../sources/rb-library-source.c:506
+#: ../sources/rb-library-source.c:539
 msgid "Multiple locations set"
 msgstr "Flere lokasjoner satt"
 
-#: ../sources/rb-library-source.c:1447
+#: ../sources/rb-library-source.c:1509
 msgid "Example Path:"
 msgstr "Eksempel på sti:"
 
-#: ../sources/rb-library-source.c:1620 ../sources/rb-library-source.c:1624
-#: ../sources/rb-transfer-target.c:189
+#: ../sources/rb-library-source.c:1682 ../sources/rb-library-source.c:1686
+#: ../sources/rb-transfer-target.c:190
 msgid "Error transferring track"
 msgstr "Feil ved overføring av spor"
 
@@ -4320,7 +4328,7 @@
 msgid "Synchronize media player with the library"
 msgstr "Synkroniser mediespiller med biblioteket"
 
-#: ../sources/rb-media-player-source.c:663
+#: ../sources/rb-media-player-source.c:668
 msgid ""
 "You have not selected any music, playlists, or podcasts to transfer to this "
 "device."
@@ -4328,7 +4336,7 @@
 "Du har ikke valgt noen musikk, spillelister eller podcaster som skal "
 "overføres til denne enheten."
 
-#: ../sources/rb-media-player-source.c:667
+#: ../sources/rb-media-player-source.c:672
 msgid ""
 "There is not enough space on the device to transfer the selected music, "
 "playlists and podcasts."
@@ -4336,24 +4344,24 @@
 "Ikke nok plass på enheten til å overføre valgt musikk, spilleliste og "
 "podcaster."
 
-#: ../sources/rb-media-player-source.c:718
+#: ../sources/rb-media-player-source.c:723
 #, c-format
 msgid "%s Sync Settings"
 msgstr "Innstillinger for synkronisering med %s"
 
-#: ../sources/rb-media-player-source.c:723
+#: ../sources/rb-media-player-source.c:728
 msgid "Sync with the device"
 msgstr "Synkroniser med enhet"
 
-#: ../sources/rb-media-player-source.c:725
+#: ../sources/rb-media-player-source.c:730
 msgid "Don't sync"
 msgstr "Ikke synkroniser"
 
-#: ../sources/rb-missing-files-source.c:285
+#: ../sources/rb-missing-files-source.c:274
 msgid "Missing Files"
 msgstr "Mangler filer"
 
-#: ../sources/rb-missing-files-source.c:353
+#: ../sources/rb-missing-files-source.c:362
 #, c-format
 msgid "%d missing file"
 msgid_plural "%d missing files"
@@ -4384,8 +4392,7 @@
 msgid "Shuffle the tracks in the play queue"
 msgstr "Stokk om sporene i spillekøen"
 
-#. Translators: this is the toolbutton label for Clear Queue action
-#: ../sources/rb-play-queue-source.c:283
+#: ../data/ui/queue-toolbar.ui.h:3
 msgid "Clear"
 msgstr "Tøm"
 
@@ -4395,27 +4402,27 @@
 msgid "Shuffle"
 msgstr "Tilfeldig"
 
-#: ../sources/rb-play-queue-source.c:304 ../sources/rb-play-queue-source.c:388
-#: ../sources/rb-play-queue-source.c:531
+#: ../sources/rb-play-queue-source.c:292 ../sources/rb-play-queue-source.c:394
+#: ../sources/rb-play-queue-source.c:503
 msgid "Play Queue"
 msgstr "Avspillingskø"
 
-#: ../sources/rb-play-queue-source.c:499 ../widgets/rb-header.c:811
+#: ../sources/rb-play-queue-source.c:473 ../widgets/rb-header.c:868
 msgid "from"
 msgstr "fra"
 
-#: ../sources/rb-play-queue-source.c:499 ../widgets/rb-header.c:810
+#: ../sources/rb-play-queue-source.c:473 ../widgets/rb-header.c:867
 msgid "by"
 msgstr "av"
 
-#: ../sources/rb-source.c:546
+#: ../sources/rb-source.c:598
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr[0] "%d sang"
 msgstr[1] "%d sanger"
 
-#: ../sources/rb-source.c:1328
+#: ../sources/rb-source.c:1366
 #, c-format
 msgid "Importing (%d/%d)"
 msgstr "Importerer (%d/%d)"
@@ -4468,96 +4475,97 @@
 msgid "Show more _details"
 msgstr "Vis flere _detaljer"
 
-#: ../widgets/rb-entry-view.c:1005 ../widgets/rb-entry-view.c:1507
-#: ../widgets/rb-song-info.c:1148
+#: ../widgets/rb-entry-view.c:1012 ../widgets/rb-entry-view.c:1530
+#: ../widgets/rb-song-info.c:1190
 msgid "Lossless"
 msgstr "Tapsfri"
 
-#: ../widgets/rb-entry-view.c:1417
+#: ../widgets/rb-entry-view.c:1430
 msgid "Track"
 msgstr "Spor"
 
-#: ../widgets/rb-entry-view.c:1468
+#: ../widgets/rb-entry-view.c:1491
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../widgets/rb-entry-view.c:1478
+#: ../widgets/rb-entry-view.c:1501
 msgid "Time"
 msgstr "Tid"
 
-#: ../widgets/rb-entry-view.c:1490
+#: ../widgets/rb-entry-view.c:1513
 msgid "Year"
 msgstr "År"
 
-#: ../widgets/rb-entry-view.c:1502
+#: ../plugins/visualizer/rb-visualizer-menu.c:89
+#: ../widgets/rb-entry-view.c:1525
 msgid "Quality"
 msgstr "Kvalitet"
 
-#: ../widgets/rb-entry-view.c:1505
+#: ../widgets/rb-entry-view.c:1528
 msgid "000 kbps"
 msgstr "000 kbps"
 
-#: ../widgets/rb-entry-view.c:1516
+#: ../widgets/rb-entry-view.c:1539
 msgid "Rating"
 msgstr "Poeng"
 
-#: ../widgets/rb-entry-view.c:1538
+#: ../widgets/rb-entry-view.c:1561
 msgid "Play Count"
 msgstr "Ganger spilt"
 
-#: ../widgets/rb-entry-view.c:1550
+#: ../widgets/rb-entry-view.c:1573
 msgid "Last Played"
 msgstr "Sist spilt"
 
-#: ../widgets/rb-entry-view.c:1562
+#: ../widgets/rb-entry-view.c:1585
 msgid "Date Added"
 msgstr "Lagt til dato"
 
-#: ../widgets/rb-entry-view.c:1573
+#: ../widgets/rb-entry-view.c:1596
 msgid "Last Seen"
 msgstr "Sist sett"
 
-#: ../widgets/rb-entry-view.c:1584
+#: ../widgets/rb-entry-view.c:1607
 msgid "Location"
 msgstr "Lokasjon"
 
-#: ../widgets/rb-entry-view.c:1853
+#: ../widgets/rb-entry-view.c:1879
 msgid "Now Playing"
 msgstr "Spiller"
 
-#: ../widgets/rb-entry-view.c:1909
+#: ../widgets/rb-entry-view.c:1938
 msgid "Playback Error"
 msgstr "Feil under avspilling"
 
-#: ../widgets/rb-property-view.c:636
+#: ../widgets/rb-property-view.c:660
 #, c-format
 msgid "%d artist (%d)"
 msgid_plural "All %d artists (%d)"
 msgstr[0] "%d artist (%d)"
 msgstr[1] "Alle %d artister (%d)"
 
-#: ../widgets/rb-property-view.c:639
+#: ../widgets/rb-property-view.c:663
 #, c-format
 msgid "%d album (%d)"
 msgid_plural "All %d albums (%d)"
 msgstr[0] "%d album (%d)"
 msgstr[1] "Alle %d album (%d)"
 
-#: ../widgets/rb-property-view.c:642
+#: ../widgets/rb-property-view.c:666
 #, c-format
 msgid "%d genre (%d)"
 msgid_plural "All %d genres (%d)"
 msgstr[0] "%d sjanger (%d)"
 msgstr[1] "Alle %d sjangre (%d)"
 
-#: ../widgets/rb-property-view.c:645
+#: ../widgets/rb-property-view.c:669
 #, c-format
 msgid "%d (%d)"
 msgid_plural "All %d (%d)"
 msgstr[0] "%d (%d)"
 msgstr[1] "%d (%d)"
 
-#: ../widgets/rb-property-view.c:651
+#: ../widgets/rb-property-view.c:675
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -4580,244 +4588,245 @@
 msgid "Artist"
 msgstr "Artist"
 
-#: ../widgets/rb-query-creator-properties.c:79
+#: ../widgets/rb-query-creator-properties.c:80
 msgctxt "query-criteria"
 msgid "Album"
 msgstr "Album"
 
-#: ../widgets/rb-query-creator-properties.c:80
+#: ../widgets/rb-query-creator-properties.c:81
 msgctxt "query-criteria"
 msgid "Album Artist"
 msgstr "Artist for album"
 
-#: ../widgets/rb-query-creator-properties.c:81
+#: ../widgets/rb-query-creator-properties.c:82
 msgctxt "query-criteria"
 msgid "Genre"
 msgstr "Sjanger"
 
-#: ../widgets/rb-query-creator-properties.c:82
+#: ../widgets/rb-query-creator-properties.c:83
 msgctxt "query-criteria"
 msgid "Year"
 msgstr "År"
 
-#: ../widgets/rb-query-creator-properties.c:83
+#: ../widgets/rb-query-creator-properties.c:84
 msgctxt "query-criteria"
 msgid "Rating"
 msgstr "Poeng"
 
-#: ../widgets/rb-query-creator-properties.c:84
+#: ../widgets/rb-query-creator-properties.c:85
 msgctxt "query-criteria"
 msgid "Path"
 msgstr "Sti"
 
-#: ../widgets/rb-query-creator-properties.c:85
+#: ../widgets/rb-query-creator-properties.c:86
 msgctxt "query-criteria"
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../widgets/rb-query-creator-properties.c:87
+#: ../widgets/rb-query-creator-properties.c:88
 msgctxt "query-criteria"
 msgid "Play Count"
 msgstr "Ganger spilt"
 
-#: ../widgets/rb-query-creator-properties.c:88
+#: ../widgets/rb-query-creator-properties.c:89
 msgctxt "query-criteria"
 msgid "Track Number"
 msgstr "Spornummer"
 
-#: ../widgets/rb-query-creator-properties.c:89
+#: ../widgets/rb-query-creator-properties.c:90
 msgctxt "query-criteria"
 msgid "Disc Number"
 msgstr "Platenummer"
 
-#: ../widgets/rb-query-creator-properties.c:90
+#: ../widgets/rb-query-creator-properties.c:91
 msgctxt "query-criteria"
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: ../widgets/rb-query-creator-properties.c:92
+#: ../widgets/rb-query-creator-properties.c:93
 msgctxt "query-criteria"
 msgid "Duration"
 msgstr "Varighet"
 
-#: ../widgets/rb-query-creator-properties.c:93
+#: ../widgets/rb-query-creator-properties.c:94
 msgctxt "query-criteria"
 msgid "Beats Per Minute"
 msgstr "Slag i minuttet"
 
-#: ../widgets/rb-query-creator-properties.c:94
+#: ../widgets/rb-query-creator-properties.c:95
 msgctxt "query-criteria"
 msgid "Time of Last Play"
 msgstr "Tidspunkt for siste avspilling"
 
-#: ../widgets/rb-query-creator-properties.c:95
+#: ../widgets/rb-query-creator-properties.c:96
 msgctxt "query-criteria"
 msgid "Time Added to Library"
 msgstr "Lagt til i biblioteket"
 
-#: ../widgets/rb-query-creator-properties.c:106
+#: ../widgets/rb-query-creator-properties.c:107
 msgctxt "query-sort"
 msgid "Artist"
 msgstr "Artist"
 
-#: ../widgets/rb-query-creator-properties.c:106
 #: ../widgets/rb-query-creator-properties.c:107
 #: ../widgets/rb-query-creator-properties.c:108
 #: ../widgets/rb-query-creator-properties.c:109
 #: ../widgets/rb-query-creator-properties.c:110
-#: ../widgets/rb-query-creator-properties.c:118
+#: ../widgets/rb-query-creator-properties.c:111
+#: ../widgets/rb-query-creator-properties.c:112
+#: ../widgets/rb-query-creator-properties.c:120
 msgid "_In reverse alphabetical order"
 msgstr "_I omvendt alfabetisk rekkefølge"
 
-#: ../widgets/rb-query-creator-properties.c:107
+#: ../widgets/rb-query-creator-properties.c:109
 msgctxt "query-sort"
 msgid "Album"
 msgstr "Album"
 
-#: ../widgets/rb-query-creator-properties.c:108
+#: ../widgets/rb-query-creator-properties.c:110
 msgctxt "query-sort"
 msgid "Album Artist"
 msgstr "Albumartist"
 
-#: ../widgets/rb-query-creator-properties.c:109
+#: ../widgets/rb-query-creator-properties.c:111
 msgctxt "query-sort"
 msgid "Genre"
 msgstr "Sjanger"
 
-#: ../widgets/rb-query-creator-properties.c:110
+#: ../widgets/rb-query-creator-properties.c:112
 msgctxt "query-sort"
 msgid "Title"
 msgstr "Tittel"
 
-#: ../widgets/rb-query-creator-properties.c:111
+#: ../widgets/rb-query-creator-properties.c:113
 msgctxt "query-sort"
 msgid "Rating"
 msgstr "Poeng"
 
-#: ../widgets/rb-query-creator-properties.c:111
+#: ../widgets/rb-query-creator-properties.c:113
 msgid "W_ith more highly rated tracks first"
 msgstr "_Med sanger som har fått mange poeng først"
 
-#: ../widgets/rb-query-creator-properties.c:112
+#: ../widgets/rb-query-creator-properties.c:114
 msgctxt "query-sort"
 msgid "Play Count"
 msgstr "Ganger spilt"
 
-#: ../widgets/rb-query-creator-properties.c:112
+#: ../widgets/rb-query-creator-properties.c:114
 msgid "W_ith more often played songs first"
 msgstr "_Med ofte spilte sanger først"
 
-#: ../widgets/rb-query-creator-properties.c:113
+#: ../widgets/rb-query-creator-properties.c:115
 msgctxt "query-sort"
 msgid "Year"
 msgstr "År"
 
-#: ../widgets/rb-query-creator-properties.c:113
+#: ../widgets/rb-query-creator-properties.c:115
 msgid "W_ith newer tracks first"
 msgstr "_Med nyere spor først"
 
-#: ../widgets/rb-query-creator-properties.c:114
+#: ../widgets/rb-query-creator-properties.c:116
 msgctxt "query-sort"
 msgid "Duration"
 msgstr "Varighet"
 
-#: ../widgets/rb-query-creator-properties.c:114
+#: ../widgets/rb-query-creator-properties.c:116
 msgid "W_ith longer tracks first"
 msgstr "_Med lengre spor først"
 
-#: ../widgets/rb-query-creator-properties.c:115
+#: ../widgets/rb-query-creator-properties.c:117
 msgctxt "query-sort"
 msgid "Track Number"
 msgstr "Spornummer"
 
-#: ../widgets/rb-query-creator-properties.c:115
+#: ../widgets/rb-query-creator-properties.c:117
 msgid "_In decreasing order"
 msgstr "_I stigende rekkefølge"
 
-#: ../widgets/rb-query-creator-properties.c:116
+#: ../widgets/rb-query-creator-properties.c:118
 msgctxt "query-sort"
 msgid "Last Played"
 msgstr "Sist spilt"
 
-#: ../widgets/rb-query-creator-properties.c:116
+#: ../widgets/rb-query-creator-properties.c:118
 msgid "W_ith more recently played tracks first"
 msgstr "_Med sist spilte spor først"
 
-#: ../widgets/rb-query-creator-properties.c:117
+#: ../widgets/rb-query-creator-properties.c:119
 msgctxt "query-sort"
 msgid "Date Added"
 msgstr "Lagt til dato"
 
-#: ../widgets/rb-query-creator-properties.c:117
+#: ../widgets/rb-query-creator-properties.c:119
 msgid "W_ith more recently added tracks first"
 msgstr "_Med spor som er lagt til nylig først"
 
-#: ../widgets/rb-query-creator-properties.c:118
+#: ../widgets/rb-query-creator-properties.c:120
 msgctxt "query-sort"
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../widgets/rb-query-creator-properties.c:119
+#: ../widgets/rb-query-creator-properties.c:121
 msgctxt "query-sort"
 msgid "Beats Per Minute"
 msgstr "Slag i minuttet"
 
-#: ../widgets/rb-query-creator-properties.c:119
+#: ../widgets/rb-query-creator-properties.c:121
 msgid "W_ith faster tempo tracks first"
 msgstr "M_ed spor med raskere tempo først"
 
-#: ../widgets/rb-query-creator-properties.c:132
+#: ../widgets/rb-query-creator-properties.c:134
 msgid "contains"
 msgstr "inneholder"
 
-#: ../widgets/rb-query-creator-properties.c:133
+#: ../widgets/rb-query-creator-properties.c:135
 msgid "does not contain"
 msgstr "inneholder ikke"
 
-#: ../widgets/rb-query-creator-properties.c:134
-#: ../widgets/rb-query-creator-properties.c:164
+#: ../widgets/rb-query-creator-properties.c:136
+#: ../widgets/rb-query-creator-properties.c:166
 msgid "equals"
 msgstr "er lik"
 
-#: ../widgets/rb-query-creator-properties.c:135
-#: ../widgets/rb-query-creator-properties.c:165
+#: ../widgets/rb-query-creator-properties.c:137
+#: ../widgets/rb-query-creator-properties.c:167
 msgid "not equal to"
 msgstr "ikke lik"
 
-#: ../widgets/rb-query-creator-properties.c:136
+#: ../widgets/rb-query-creator-properties.c:138
 msgid "starts with"
 msgstr "starter med"
 
-#: ../widgets/rb-query-creator-properties.c:137
+#: ../widgets/rb-query-creator-properties.c:139
 msgid "ends with"
 msgstr "slutter med"
 
-#: ../widgets/rb-query-creator-properties.c:166
+#: ../widgets/rb-query-creator-properties.c:168
 msgid "at least"
 msgstr "minst"
 
 #. matches if A >= B
-#: ../widgets/rb-query-creator-properties.c:167
+#: ../widgets/rb-query-creator-properties.c:169
 msgid "at most"
 msgstr "maksimum"
 
 #. Translators: this matches songs within 1-Jan-YEAR to 31-Dec-YEAR
-#: ../widgets/rb-query-creator-properties.c:177
+#: ../widgets/rb-query-creator-properties.c:179
 msgid "in"
 msgstr "i"
 
 #. Translators: this matches songs before 1-Jan-YEAR or after 31-Dec-YEAR
-#: ../widgets/rb-query-creator-properties.c:179
+#: ../widgets/rb-query-creator-properties.c:181
 msgid "not in"
 msgstr "ikke i"
 
 #. Translators: this matches songs after 31-Dec-YEAR
-#: ../widgets/rb-query-creator-properties.c:181
+#: ../widgets/rb-query-creator-properties.c:183
 msgid "after"
 msgstr "etter"
 
 #. Translators: this matches songs before 1-Jan-YEAR
-#: ../widgets/rb-query-creator-properties.c:183
+#: ../widgets/rb-query-creator-properties.c:185
 msgid "before"
 msgstr "før"
 
@@ -4825,7 +4834,7 @@
 #. * Translators: this will match when within <value> of the current time
 #. * e.g. "in the last" "7 days" will match if within 7 days of the current time
 #. 
-#: ../widgets/rb-query-creator-properties.c:247
+#: ../widgets/rb-query-creator-properties.c:249
 msgid "in the last"
 msgstr "de siste"
 
@@ -4833,27 +4842,27 @@
 #. * Translators: this is the opposite of the above, and will match if not
 #. * within <value> of the current time
 #. 
-#: ../widgets/rb-query-creator-properties.c:253
+#: ../widgets/rb-query-creator-properties.c:255
 msgid "not in the last"
 msgstr "ikke de siste"
 
-#: ../widgets/rb-query-creator-properties.c:267
+#: ../widgets/rb-query-creator-properties.c:269
 msgid "seconds"
 msgstr "sekunder"
 
-#: ../widgets/rb-query-creator-properties.c:268
+#: ../widgets/rb-query-creator-properties.c:270
 msgid "minutes"
 msgstr "minutter"
 
-#: ../widgets/rb-query-creator-properties.c:269
+#: ../widgets/rb-query-creator-properties.c:271
 msgid "hours"
 msgstr "timer"
 
-#: ../widgets/rb-query-creator-properties.c:270
+#: ../widgets/rb-query-creator-properties.c:272
 msgid "days"
 msgstr "dager"
 
-#: ../widgets/rb-query-creator-properties.c:271
+#: ../widgets/rb-query-creator-properties.c:273
 msgid "weeks"
 msgstr "uker"
 
@@ -4884,22 +4893,22 @@
 msgid "_Search:"
 msgstr "_Søk:"
 
-#: ../widgets/rb-song-info.c:367
+#: ../widgets/rb-song-info.c:369
 msgid "Song Properties"
 msgstr "Egenskaper for sang"
 
-#: ../widgets/rb-song-info.c:424
+#: ../widgets/rb-song-info.c:426
 msgid "Multiple Song Properties"
 msgstr "Flere egenskaper for sang"
 
-#: ../widgets/rb-song-info.c:1211
+#: ../widgets/rb-song-info.c:1253
 msgid "Unknown file name"
 msgstr "Ukjent filnavn"
 
-#: ../widgets/rb-song-info.c:1233
+#: ../widgets/rb-song-info.c:1275
 msgid "On the desktop"
 msgstr "På skrivebordet"
 
-#: ../widgets/rb-song-info.c:1256
+#: ../widgets/rb-song-info.c:1298
 msgid "Unknown location"
 msgstr "Ukjent plassering"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/seahorse.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/seahorse.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/seahorse.po	2013-01-29 09:33:48.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/seahorse.po	2014-01-07 06:37:21.000000000 +0000
@@ -14,15 +14,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 13:47+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:13+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: no\n"
 
-#: ../gkr/seahorse-add-keyring.xml.h:1
+#: ../gkr/gkr-keyring-add.vala:28
 msgid "Add Password Keyring"
 msgstr "Legg til nøkkelring for passord"
 
-#: ../gkr/seahorse-add-keyring.xml.h:2
+#: ../gkr/seahorse-add-keyring.xml.h:1
 msgid ""
 "Please choose a name for the new keyring. You will be prompted for an unlock "
 "password."
@@ -30,39 +30,39 @@
 "Vennligst velg et navn for den nye nøkkelringen. Du vil bli spurt om et "
 "passord for å låse den opp."
 
-#: ../gkr/seahorse-add-keyring.xml.h:3
+#: ../gkr/seahorse-add-keyring.xml.h:2
 msgid "New Keyring Name:"
 msgstr "Nytt navn på nøkkelring:"
 
-#: ../gkr/seahorse-add-keyring.xml.h:4
+#: ../gkr/seahorse-add-keyring.xml.h:3
 #: ../libseahorse/seahorse-add-keyserver.xml.h:5
 #: ../ssh/seahorse-ssh-upload.xml.h:3
 msgid "The host name or address of the server."
 msgstr "Vertsnavnet eller adressen til tjeneren."
 
-#: ../gkr/seahorse-gkr-add-keyring.c:72
+#: ../gkr/gkr-keyring-add.vala:58
 msgid "Couldn't add keyring"
 msgstr "Kunne ikke legge til nøkkelring"
 
-#: ../gkr/seahorse-gkr-add-item.xml.h:1
+#: ../gkr/gkr-item-add.vala:27
 msgid "Add Password"
 msgstr "Legg til passord"
 
-#: ../gkr/seahorse-gkr-add-item.xml.h:2
-#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3
+#: ../gkr/seahorse-gkr-add-item.xml.h:1
+#: ../gkr/seahorse-gkr-item-properties.xml.h:1 ../pgp/seahorse-revoke.xml.h:3
 #: ../ssh/seahorse-ssh-generate.xml.h:5
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
-#: ../gkr/seahorse-gkr-add-item.xml.h:3
+#: ../gkr/seahorse-gkr-add-item.xml.h:2
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../gkr/seahorse-gkr-add-item.xml.h:4
+#: ../gkr/seahorse-gkr-add-item.xml.h:3
 msgid "_Show Password"
 msgstr "Vi_s passord"
 
-#: ../gkr/seahorse-gkr-add-item.xml.h:5
+#: ../gkr/seahorse-gkr-add-item.xml.h:4
 msgid "_Keyring:"
 msgstr "Nø_kkelring:"
 
@@ -70,12 +70,12 @@
 msgid "Couldn't delete item"
 msgstr "Kunne ikke slette oppføring"
 
-#: ../gkr/seahorse-gkr-item-deleter.c:80
+#: ../gkr/gkr-item.vala:507
 #, c-format
 msgid "Are you sure you want to delete the password '%s'?"
 msgstr "Er du sikker på at du vil slette passordet «%s»?"
 
-#: ../gkr/seahorse-gkr-item-deleter.c:83
+#: ../gkr/gkr-item.vala:509
 #, c-format
 msgid "Are you sure you want to delete %d password?"
 msgid_plural "Are you sure you want to delete %d passwords?"
@@ -88,35 +88,35 @@
 msgstr[0] "Sletter oppføring"
 msgstr[1] "Sletter oppføringer"
 
-#: ../gkr/seahorse-gkr-item-properties.c:66
+#: ../gkr/gkr-item-properties.vala:139
 msgid "Access a network share or resource"
 msgstr "Aksesser en delt nettverksressurs"
 
-#: ../gkr/seahorse-gkr-item-properties.c:69
+#: ../gkr/gkr-item-properties.vala:142
 msgid "Access a website"
 msgstr "Aksesser et nettsted"
 
-#: ../gkr/seahorse-gkr-item-properties.c:72
+#: ../gkr/gkr-item-properties.vala:145
 msgid "Unlocks a PGP key"
 msgstr "Låser opp en GPG-nøkkel"
 
-#: ../gkr/seahorse-gkr-item-properties.c:75
+#: ../gkr/gkr-item-properties.vala:148
 msgid "Unlocks a Secure Shell key"
 msgstr "Låser opp en nøkkel for sikkert skall"
 
-#: ../gkr/seahorse-gkr-item-properties.c:78
+#: ../gkr/gkr-item-properties.vala:151
 msgid "Saved password or login"
 msgstr "Lagret passord eller pålogging"
 
-#: ../gkr/seahorse-gkr-item-properties.c:102
+#: ../gkr/gkr-item-properties.vala:164
 msgid "Network Credentials"
 msgstr "Påloggingsinformasjon for nettverk"
 
-#: ../gkr/seahorse-gkr-item-properties.c:107
+#: ../gkr/gkr-item-properties.vala:169
 msgid "Password"
 msgstr "Passord"
 
-#: ../gkr/seahorse-gkr-item-properties.c:216
+#: ../gkr/gkr-item-properties.vala:238
 msgid "Couldn't change password."
 msgstr "Kunne ikke endre passord"
 
@@ -125,11 +125,10 @@
 msgid "Updating password"
 msgstr "Oppdaterer passord"
 
-#: ../gkr/seahorse-gkr-item-properties.c:346
+#: ../gkr/gkr-item-properties.vala:276
 msgid "Couldn't set description."
 msgstr "Kunne ikke sette beskrivelse"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:1
 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:6
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:6
 #: ../ssh/seahorse-ssh-key-properties.xml.h:1
@@ -137,25 +136,29 @@
 msgstr "Egenskaper for nøkkel"
 
 #. To translators: This is the noun not the verb.
-#: ../gkr/seahorse-gkr-item-properties.xml.h:4
+#: ../gkr/seahorse-gkr-item-properties.xml.h:3
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:23
+#: ../pgp/seahorse-pgp-public-key-properties.xml.h:13
+#: ../ssh/seahorse-ssh-key-properties.xml.h:9
 msgid "Use:"
 msgstr "Bruk:"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:5
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:40
-#: ../pgp/seahorse-pgp-public-key-properties.xml.h:41
+#: ../gkr/seahorse-gkr-item-properties.xml.h:4
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:24
+#: ../pgp/seahorse-pgp-public-key-properties.xml.h:20
+#: ../ssh/seahorse-ssh-key-properties.xml.h:3
 msgid "Type:"
 msgstr "Type:"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:6
+#: ../gkr/seahorse-gkr-item-properties.xml.h:5
 msgid "Server:"
 msgstr "Tjener:"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:7
+#: ../gkr/seahorse-gkr-item-properties.xml.h:6
 msgid "Login:"
 msgstr "Pålogging:"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:8
+#: ../gkr/seahorse-gkr-item-properties.xml.h:7
 msgid "Show pass_word"
 msgstr "Vis pass_ord"
 
@@ -163,7 +166,7 @@
 msgid "<b>Password:</b>"
 msgstr "<b>Passord:</b>"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:10
+#: ../gkr/seahorse-gkr-item-properties.xml.h:9
 #: ../pgp/seahorse-pgp-subkey.c:366
 #: ../ssh/seahorse-ssh-key-properties.xml.h:15
 msgid "Key"
@@ -175,9 +178,9 @@
 msgid "<b>Technical Details:</b>"
 msgstr "<b>Tekniske detaljer:</b>"
 
-#: ../gkr/seahorse-gkr-item-properties.xml.h:12
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:53
-#: ../pgp/seahorse-pgp-public-key-properties.xml.h:49
+#: ../gkr/seahorse-gkr-item-properties.xml.h:11
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51
+#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47
 #: ../ssh/seahorse-ssh-key-properties.xml.h:22
 msgid "Details"
 msgstr "Detaljer"
@@ -192,19 +195,19 @@
 msgid "<b>Passwords:</b> %s"
 msgstr "<b>Passord:</b> %s"
 
-#: ../gkr/seahorse-gkr-actions.c:88
+#: ../gkr/gkr-backend.vala:250
 msgid "Password Keyring"
 msgstr "Nøkkelringer for passord"
 
-#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89
+#: ../gkr/gkr-backend.vala:244 ../gkr/gkr-backend.vala:251
 msgid "Used to store application and network passwords"
 msgstr "Brukes til å lagre passord for programmer og nettverk"
 
-#: ../gkr/seahorse-gkr-actions.c:90
+#: ../gkr/gkr-backend.vala:252
 msgid "Stored Password"
 msgstr "Lagret passord"
 
-#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91
+#: ../gkr/gkr-backend.vala:246 ../gkr/gkr-backend.vala:253
 msgid "Safely store a password or secret."
 msgstr "Lagre et passord eller en hemmelighet på en trygg måte."
 
@@ -216,15 +219,15 @@
 msgid "Couldn't lock keyring"
 msgstr "Kunne ikke låse nøkkelring"
 
-#: ../gkr/seahorse-gkr-actions.c:174
+#: ../gkr/gkr-keyring.vala:176
 msgid "Couldn't set default keyring"
 msgstr "Kunne ikke sette forvalgt nøkkelring"
 
-#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248
+#: ../gkr/gkr-keyring.vala:200 ../gkr/gkr-keyring.vala:205
 msgid "Couldn't change keyring password"
 msgstr "Kunne ikke endre passord for nøkkelring"
 
-#: ../src/seahorse-sidebar.c:946
+#: ../src/seahorse-sidebar.c:942
 msgid "_Lock"
 msgstr "_Lås"
 
@@ -235,7 +238,7 @@
 msgstr ""
 "Lås nøkkelring for passordlager og krev et hovedpassord for å låse den opp."
 
-#: ../src/seahorse-sidebar.c:951
+#: ../src/seahorse-sidebar.c:947
 msgid "_Unlock"
 msgstr "Lås _opp"
 
@@ -246,19 +249,19 @@
 msgstr ""
 "Lås opp nøkkelring for passordlager slik at den er tilgjengelig for bruk."
 
-#: ../gkr/seahorse-gkr-actions.c:281
+#: ../gkr/gkr-keyring.vala:211
 msgid "_Set as default"
 msgstr "_Sett som forvalg"
 
-#: ../gkr/seahorse-gkr-actions.c:282
+#: ../gkr/gkr-keyring.vala:212
 msgid "Applications usually store new passwords in the default keyring."
 msgstr "Programmer lagrer vanligvis nye passord i forvalgt nøkkelring."
 
-#: ../gkr/seahorse-gkr-actions.c:283
+#: ../gkr/gkr-keyring.vala:213
 msgid "Change _Password"
 msgstr "Bytt _passord"
 
-#: ../gkr/seahorse-gkr-actions.c:284
+#: ../gkr/gkr-keyring.vala:214
 msgid "Change the unlock password of the password storage keyring"
 msgstr "Endre passord for å låse opp nøkkelring for lagring av passord"
 
@@ -266,7 +269,7 @@
 msgid "Couldn't delete keyring"
 msgstr "Kunne ikke slette nøkkelring"
 
-#: ../gkr/seahorse-gkr-keyring-deleter.c:76
+#: ../gkr/gkr-keyring.vala:239
 #, c-format
 msgid "Are you sure you want to delete the password keyring '%s'?"
 msgstr "Er du sikker på at du vil slette passordnøkkelringen «%s»?"
@@ -286,18 +289,18 @@
 msgstr "_Navn:"
 
 #. To translators: This is the noun not the verb.
-#: ../gkr/seahorse-gkr-keyring.xml.h:4
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:43
-#: ../pgp/seahorse-pgp-public-key-properties.xml.h:44
+#: ../gkr/seahorse-gkr-keyring.xml.h:3
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:41
+#: ../pgp/seahorse-pgp-public-key-properties.xml.h:42
 msgid "Created:"
 msgstr "Opprettet:"
 
-#: ../gkr/seahorse-gkr-keyring.xml.h:5
+#: ../gkr/seahorse-gkr-keyring.xml.h:4
 msgid "Keyring"
 msgstr "Nøkkelring"
 
-#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586
-#: ../ssh/seahorse-ssh-operation.c:194
+#: ../pgp/seahorse-gpgme.c:74 ../pgp/seahorse-hkp-source.c:512
+#: ../ssh/seahorse-ssh-operation.c:199
 msgid "The operation was cancelled"
 msgstr "Operasjonen ble avbrutt"
 
@@ -608,11 +611,12 @@
 msgid "The port to access the server on."
 msgstr "Port som tjeneren skal aksesseres på."
 
-#: ../pgp/seahorse-gpgme-keyring.c:107
+#: ../pgp/seahorse-gpgme-keyring.c:106
 msgid "Passphrase"
 msgstr "Passord"
 
-#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99
+#: ../gkr/seahorse-gkr-item-properties.xml.h:8
+#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:119
 msgid "Password:"
 msgstr "Passord:"
 
@@ -621,11 +625,11 @@
 msgid "Confirm:"
 msgstr "Bekreft:"
 
-#: ../libseahorse/seahorse-prefs.c:67
+#: ../libseahorse/seahorse-prefs.c:66
 msgid "Not a valid Key Server address."
 msgstr "Ikke en gyldig adresse til nøkkeltjener."
 
-#: ../libseahorse/seahorse-prefs.c:68
+#: ../libseahorse/seahorse-prefs.c:67
 msgid ""
 "For help contact your system adminstrator or the administrator of the key "
 "server."
@@ -633,15 +637,15 @@
 "For hjelp, kontakt din systemadministrator eller nøkkeltjenerens "
 "administrator."
 
-#: ../libseahorse/seahorse-prefs.c:181
+#: ../libseahorse/seahorse-prefs.c:180
 msgid "URL"
 msgstr "URL"
 
-#: ../libseahorse/seahorse-prefs.c:351
+#: ../libseahorse/seahorse-prefs.c:350
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../libseahorse/seahorse-prefs.c:404
+#: ../libseahorse/seahorse-prefs.c:403
 msgid "None: Don't publish keys"
 msgstr "Ingen: Ikke publiser nøkler"
 
@@ -693,19 +697,19 @@
 msgid "%Y-%m-%d"
 msgstr "%d-%m-%Y"
 
-#: ../pgp/seahorse-gpgme-exporter.c:88
+#: ../pgp/seahorse-gpgme-exporter.c:89
 msgid "Key Data"
 msgstr "Nøkkeldata"
 
-#: ../pgp/seahorse-gpgme-exporter.c:84
+#: ../pgp/seahorse-gpgme-exporter.c:85
 msgid "Multiple Keys"
 msgstr "Flere nøkler"
 
-#: ../src/seahorse-key-manager.c:274
+#: ../src/seahorse-key-manager.c:255
 msgid "All key files"
 msgstr "Alle nøkkelfiler"
 
-#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:308
+#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:289
 msgid "All files"
 msgstr "Alle filer"
 
@@ -736,40 +740,34 @@
 msgstr "Ukjent"
 
 #: ../libseahorse/seahorse-validity.c:42
-#: ../pgp/seahorse-pgp-key-properties.c:1260
+#: ../pgp/seahorse-pgp-key-properties.c:1258
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:2
+#: ../pgp/seahorse-pgp-public-key-properties.xml.h:2
 msgctxt "Validity"
 msgid "Never"
 msgstr "Aldri"
 
-#: ../libseahorse/seahorse-validity.c:44
-#: ../pgp/seahorse-pgp-key-properties.c:1267
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:3
+#: ../pgp/seahorse-pgp-key-properties.c:1265
 msgid "Marginal"
 msgstr "Marginal"
 
-#: ../libseahorse/seahorse-validity.c:46
-#: ../pgp/seahorse-pgp-key-properties.c:1273
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:4
+#: ../pgp/seahorse-pgp-key-properties.c:1271
 msgid "Full"
 msgstr "Full"
 
-#: ../libseahorse/seahorse-validity.c:48
-#: ../pgp/seahorse-pgp-key-properties.c:1279
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:5
+#: ../pgp/seahorse-pgp-key-properties.c:1277
 msgid "Ultimate"
 msgstr "Ultimat"
 
-#: ../libseahorse/seahorse-validity.c:50
-#: ../pgp/seahorse-pgp-key-properties.c:1469
+#: ../pgp/seahorse-pgp-key-properties.c:1467
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../libseahorse/seahorse-validity.c:52
-#: ../pgp/seahorse-pgp-key-properties.c:1465
+#: ../pgp/seahorse-pgp-key-properties.c:1463
 msgid "Revoked"
 msgstr "Tilbakekalt"
 
-#: ../libseahorse/seahorse-widget.c:463
+#: ../common/catalog.vala:360 ../libseahorse/seahorse-widget.c:463
 #, c-format
 msgid "Could not display help: %s"
 msgstr "Kunne ikke vise hjelp: %s"
@@ -857,7 +855,7 @@
 msgid "Add subkey to %s"
 msgstr "Legg til undernøkkel til %s"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134
+#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:132
 msgid "DSA (sign only)"
 msgstr "DSA (kun signering)"
 
@@ -865,7 +863,7 @@
 msgid "ElGamal (encrypt only)"
 msgstr "ElGamal (kun kryptering)"
 
-#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135
+#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:133
 msgid "RSA (sign only)"
 msgstr "RSA (kun signering)"
 
@@ -882,7 +880,7 @@
 msgid "Add user ID to %s"
 msgstr "Legg til bruker-ID i %s"
 
-#: ../pgp/seahorse-gpgme.c:69
+#: ../pgp/seahorse-gpgme.c:70
 msgid "Decryption failed. You probably do not have the decryption key."
 msgstr "Dekryptering feilet. Du har muligens ikke dekrypteringsnøkkelen."
 
@@ -903,15 +901,15 @@
 msgid "Expiry: %s"
 msgstr "Utgår: %s"
 
-#: ../pgp/seahorse-gpgme-generate.c:95
+#: ../pgp/seahorse-gpgme-generate.c:93
 msgid "PGP Key"
 msgstr "PGP-nøkkel"
 
-#: ../pgp/seahorse-gpgme-generate.c:96
+#: ../pgp/seahorse-gpgme-generate.c:94
 msgid "Used to encrypt email and files"
 msgstr "Brukes til å kryptere e-post og filer"
 
-#: ../pgp/seahorse-gpgme-generate.c:132
+#: ../pgp/seahorse-gpgme-generate.c:130
 #: ../pkcs11/seahorse-pkcs11-generate.c:91
 #: ../ssh/seahorse-ssh-generate.xml.h:9
 msgid "RSA"
@@ -921,15 +919,15 @@
 msgid "DSA Elgamal"
 msgstr "DSA ElGamal"
 
-#: ../pgp/seahorse-gpgme-generate.c:182
+#: ../pgp/seahorse-gpgme-generate.c:180
 msgid "Couldn't generate PGP key"
 msgstr "Kunne ikke opprette PGP-nøkkel"
 
-#: ../pgp/seahorse-gpgme-generate.c:214
+#: ../pgp/seahorse-gpgme-generate.c:213
 msgid "Passphrase for New PGP Key"
 msgstr "Passordfrase for ny PGP-nøkkel"
 
-#: ../pgp/seahorse-gpgme-generate.c:215
+#: ../pgp/seahorse-gpgme-generate.c:214
 msgid "Enter the passphrase for your new key twice."
 msgstr "Oppgi passordfrasen for din nye nøkkel to ganger."
 
@@ -1088,38 +1086,38 @@
 "Du har ingen personlige PGP-nøkler som kan brukes for å indikere din tillit "
 "til denne nøkkelen."
 
-#: ../pgp/seahorse-gpgme-keyring.c:91
+#: ../pgp/seahorse-gpgme-keyring.c:90
 #, c-format
 msgid "Wrong passphrase."
 msgstr "Feil passordfrase."
 
-#: ../pgp/seahorse-gpgme-keyring.c:95
+#: ../pgp/seahorse-gpgme-keyring.c:94
 #, c-format
 msgid "Enter new passphrase for '%s'"
 msgstr "Oppgi ny passordfrase for «%s»"
 
-#: ../pgp/seahorse-gpgme-keyring.c:97
+#: ../pgp/seahorse-gpgme-keyring.c:96
 #, c-format
 msgid "Enter passphrase for '%s'"
 msgstr "Oppgi passordfrase for «%s»"
 
-#: ../pgp/seahorse-gpgme-keyring.c:100
+#: ../pgp/seahorse-gpgme-keyring.c:99
 #: ../src/seahorse-change-passphrase.xml.h:2
 msgid "Enter new passphrase"
 msgstr "Oppgi nytt passord"
 
-#: ../pgp/seahorse-gpgme-keyring.c:102
+#: ../pgp/seahorse-gpgme-keyring.c:101
 msgid "Enter passphrase"
 msgstr "Oppgi passordfrase"
 
-#: ../pgp/seahorse-gpgme-keyring.c:308
+#: ../pgp/seahorse-gpgme-keyring.c:307
 #, c-format
 msgid "Loaded %d key"
 msgid_plural "Loaded %d keys"
 msgstr[0] "Lastet %d nøkkel"
 msgstr[1] "Lastet %d nøkler"
 
-#: ../pgp/seahorse-gpgme-keyring.c:655
+#: ../pgp/seahorse-gpgme-keyring.c:654
 msgid ""
 "Invalid key data (missing UIDs). This may be due to a computer with a date "
 "set in the future or a missing self-signature."
@@ -1131,41 +1129,41 @@
 msgid "ElGamal"
 msgstr "ElGamal"
 
-#: ../pgp/seahorse-hkp-source.c:1127
+#: ../pgp/seahorse-hkp-source.c:1041
 msgid "HTTP Key Server"
 msgstr "HTTP nøkkeltjener"
 
-#: ../pgp/seahorse-hkp-source.c:604
+#: ../pgp/seahorse-hkp-source.c:530
 #, c-format
 msgid "Search was not specific enough. Server '%s' found too many keys."
 msgstr "Søket var ikke spesifikt nok. Serveren '%s' fant for mange nøkler."
 
-#: ../pgp/seahorse-hkp-source.c:607
+#: ../pgp/seahorse-hkp-source.c:533
 #, c-format
 msgid "Couldn't communicate with server '%s': %s"
 msgstr "Kunne ikke kommunisere med tjener «%s»: %s"
 
-#: ../pgp/seahorse-ldap-source.c:441
+#: ../pgp/seahorse-ldap-source.c:440
 #, c-format
 msgid "Couldn't communicate with '%s': %s"
 msgstr "Kunne ikke kommunisere med «%s»: %s"
 
-#: ../pgp/seahorse-ldap-source.c:652
+#: ../pgp/seahorse-ldap-source.c:651
 #, c-format
 msgid "Connecting to: %s"
 msgstr "Kobler til: %s"
 
-#: ../pgp/seahorse-ldap-source.c:658
+#: ../pgp/seahorse-ldap-source.c:657
 #, c-format
 msgid "Couldn't resolve address: %s"
 msgstr "Kunne ikke slå opp adresse: %s"
 
-#: ../pgp/seahorse-ldap-source.c:702
+#: ../pgp/seahorse-ldap-source.c:701
 #, c-format
 msgid "Resolving server address: %s"
 msgstr "Slår opp tjeneradresse: %s"
 
-#: ../pgp/seahorse-ldap-source.c:1447
+#: ../pgp/seahorse-ldap-source.c:1438
 msgid "LDAP Key Server"
 msgstr "LDAP nøkkeltjener"
 
@@ -1200,7 +1198,7 @@
 msgid "Are you sure you want to permanently delete %d identities?"
 msgstr "Er du sikker på at du vil slette %d identiteter for godt?"
 
-#: ../pgp/seahorse-pgp-key-properties.c:354
+#: ../pgp/seahorse-pgp-key-properties.c:351
 msgid "Couldn't delete user ID"
 msgstr "Kunne ikke slette bruker-ID"
 
@@ -1225,11 +1223,11 @@
 msgstr ""
 "En PGP-nøkkel lar deg kryptere e-post eller filer til andre personer."
 
-#: ../pgp/seahorse-pgp-generate.xml.h:7
+#: ../pgp/seahorse-pgp-generate.xml.h:8
 msgid "_Comment:"
 msgstr "_Kommentar:"
 
-#: ../pgp/seahorse-pgp-generate.xml.h:8
+#: ../pgp/seahorse-pgp-generate.xml.h:7
 msgid "Ne_ver Expires"
 msgstr "Utløper _aldri"
 
@@ -1261,62 +1259,62 @@
 msgid "C_reate"
 msgstr "O_pprett"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1467
+#: ../pgp/seahorse-pgp-key-properties.c:1465
 msgid "Expired"
 msgstr "Utgått"
 
-#: ../pgp/seahorse-pgp-key-properties.c:325
+#: ../pgp/seahorse-pgp-key-properties.c:322
 msgid "Couldn't change primary user ID"
 msgstr "Kunne ikke endre primær bruker-ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:344
+#: ../pgp/seahorse-pgp-key-properties.c:341
 #, c-format
 msgid "Are you sure you want to permanently delete the '%s' user ID?"
 msgstr "Er du sikker på at du vil slette bruker-IDen «%s» for godt?"
 
-#: ../pgp/seahorse-pgp-key-properties.c:429
-#: ../pgp/seahorse-pgp-key-properties.c:1571
+#: ../pgp/seahorse-pgp-key-properties.c:426
+#: ../pgp/seahorse-pgp-key-properties.c:1569
 msgid "[Unknown]"
 msgstr "[Ukjent]"
 
-#: ../pgp/seahorse-pgp-key-properties.c:538
-#: ../pgp/seahorse-pgp-key-properties.c:1854
+#: ../pgp/seahorse-pgp-key-properties.c:535
+#: ../pgp/seahorse-pgp-key-properties.c:1852
 msgid "Name/Email"
 msgstr "Navn/e-post"
 
-#: ../pgp/seahorse-pgp-key-properties.c:545
+#: ../pgp/seahorse-pgp-key-properties.c:542
 msgid "Signature ID"
 msgstr "Signatur-ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:678
+#: ../pgp/seahorse-pgp-key-properties.c:675
 msgid "Couldn't change primary photo"
 msgstr "Kunne ikke endre hovedbilde"
 
 #. TRANSLATORS: (unknown) expiry date
-#: ../pgp/seahorse-pgp-key-properties.c:912
+#: ../pgp/seahorse-pgp-key-properties.c:909
 msgid "(unknown)"
 msgstr "(ukjent)"
 
-#: ../pgp/seahorse-pgp-key-properties.c:915
+#: ../pgp/seahorse-pgp-key-properties.c:912
 #, c-format
 msgid "This key expired on: %s"
 msgstr "Denne nøkkelen gikk ut: %s"
 
-#: ../pgp/seahorse-pgp-key-properties.c:978
+#: ../pgp/seahorse-pgp-key-properties.c:975
 msgid "Name"
 msgstr "Navn"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1091
+#: ../pgp/seahorse-pgp-key-properties.c:1088
 #, c-format
 msgid "Are you sure you want to permanently delete subkey %d of %s?"
 msgstr "Er du sikker på at du vil slette undernøkkelen %d av %s for godt?"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1100
+#: ../pgp/seahorse-pgp-key-properties.c:1097
 msgid "Couldn't delete subkey"
 msgstr "Kunne ikke slette undernøkkel"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1140
-#: ../pgp/seahorse-pgp-key-properties.c:1545
+#: ../pgp/seahorse-pgp-key-properties.c:1137
+#: ../pgp/seahorse-pgp-key-properties.c:1543
 msgid "Unable to change trust"
 msgstr "Kan ikke endre tillitsforhold"
 
@@ -1336,41 +1334,41 @@
 msgid "Couldn't export key."
 msgstr "Kunne ikke eksportere nøkkel."
 
-#: ../pgp/seahorse-pgp-key-properties.c:1385
-#: ../pgp/seahorse-pgp-key-properties.c:1474
+#: ../pgp/seahorse-pgp-key-properties.c:1383
+#: ../pgp/seahorse-pgp-key-properties.c:1472
 msgctxt "Expires"
 msgid "Never"
 msgstr "Aldri"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1432
+#: ../pgp/seahorse-pgp-key-properties.c:1430
 msgid "ID"
 msgstr "ID"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1435
+#: ../pgp/seahorse-pgp-key-properties.c:1433
 msgid "Type"
 msgstr "Type"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1438
+#: ../pgp/seahorse-pgp-key-properties.c:1436
 msgid "Created"
 msgstr "Opprettet"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1441
+#: ../pgp/seahorse-pgp-key-properties.c:1439
 msgid "Expires"
 msgstr "Utgår"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1444
+#: ../pgp/seahorse-pgp-key-properties.c:1442
 msgid "Status"
 msgstr "Status"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1447
+#: ../pgp/seahorse-pgp-key-properties.c:1445
 msgid "Strength"
 msgstr "Styrke"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1471
+#: ../pgp/seahorse-pgp-key-properties.c:1469
 msgid "Good"
 msgstr "God"
 
-#: ../pgp/seahorse-pgp-key-properties.c:1857
+#: ../pgp/seahorse-pgp-key-properties.c:1855
 msgid "Key ID"
 msgstr "Nøkkel-ID"
 
@@ -1505,13 +1503,14 @@
 msgid "Names and Signatures"
 msgstr "Navn og signaturer"
 
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38
-#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:17
+#: ../pgp/seahorse-pgp-public-key-properties.xml.h:15
 msgid "Key ID:"
 msgstr "Nøkkel-ID:"
 
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:39
-#: ../pgp/seahorse-pgp-public-key-properties.xml.h:40
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:38
+#: ../pgp/seahorse-pgp-public-key-properties.xml.h:39
+#: ../ssh/seahorse-ssh-key-properties.xml.h:17
 msgid "Strength:"
 msgstr "Styrke:"
 
@@ -1523,8 +1522,8 @@
 msgid "<b>Fingerprint</b>"
 msgstr "<b>Fingeravtrykk:</b>"
 
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44
-#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:42
+#: ../pgp/seahorse-pgp-public-key-properties.xml.h:43
 msgid "Expires:"
 msgstr "Utgår:"
 
@@ -1532,16 +1531,16 @@
 msgid "<b>Dates</b>"
 msgstr "<b>Datoer</b>"
 
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:44
 msgid "Override Owner _Trust:"
 msgstr "Overstyr _tillit til eier:"
 
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:47
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:45
 msgid "_Export Complete Key:"
 msgstr "_Eksporter hele nøkkelen:"
 
-#: ../libseahorse/seahorse-exportable.c:407
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48
+#: ../common/exportable.vala:195
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46
 msgid "Export"
 msgstr "Eksporter"
 
@@ -1549,11 +1548,11 @@
 msgid "<b>Actions</b>"
 msgstr "<b>Handlinger</b>"
 
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:50
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:48
 msgid "Add"
 msgstr "Legg til"
 
-#: ../pgp/seahorse-pgp-private-key-properties.xml.h:51
+#: ../pgp/seahorse-pgp-private-key-properties.xml.h:49
 msgid "Expire"
 msgstr "Utløpt"
 
@@ -1634,6 +1633,7 @@
 msgstr "_Bare vis signaturer til personer jeg stoler på"
 
 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:37
+#: ../ssh/seahorse-ssh-key-properties.xml.h:11
 msgid "Trust"
 msgstr "Tillit"
 
@@ -1650,7 +1650,7 @@
 msgid "<b>Indicate Trust:</b>"
 msgstr "<b>Indiker tillit:</b>"
 
-#: ../pgp/seahorse-pgp-public-key-properties.xml.h:47
+#: ../pgp/seahorse-pgp-public-key-properties.xml.h:45
 msgid "You _Trust the Owner:"
 msgstr "Du s_toler på eieren:"
 
@@ -1775,12 +1775,12 @@
 msgid "_Sign message with key:"
 msgstr "_Signer melding med nøkkel:"
 
-#: ../pkcs11/seahorse-certificate.c:439
-#: ../pkcs11/seahorse-certificate-der-exporter.c:77
+#: ../pkcs11/certificate-der-exporter.vala:46
+#: ../pkcs11/seahorse-certificate.c:454
 msgid "Certificate"
 msgstr "Sertifikat"
 
-#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:877
+#: ../pkcs11/seahorse-pkcs11-properties.c:186 ../src/seahorse-sidebar.c:874
 msgid "Couldn't delete"
 msgstr "Kunne ikke slette"
 
@@ -1816,8 +1816,8 @@
 msgid "Con_firm Passphrase:"
 msgstr "Bekre_ft passord:"
 
-#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1
-#: ../src/seahorse-key-manager.c:659
+#: ../common/catalog.vala:287 ../src/seahorse.desktop.in.in.h:1
+#: ../src/seahorse-key-manager.c:661
 msgid "Passwords and Keys"
 msgstr "Passord og nøkler"
 
@@ -1844,7 +1844,7 @@
 msgstr[0] "Valgte %d nøkkel"
 msgstr[1] "Valgte %d nøkler"
 
-#: ../pgp/seahorse-keyserver-results.c:175
+#: ../pgp/seahorse-keyserver-results.c:168
 msgid "Couldn't import keys"
 msgstr "Kunne ikke importere nøkler"
 
@@ -1856,7 +1856,7 @@
 msgid "Importing keys"
 msgstr "Importerer nøkler"
 
-#: ../src/seahorse-key-manager.c:262 ../ssh/seahorse-ssh-operation.c:845
+#: ../src/seahorse-key-manager.c:243 ../ssh/seahorse-ssh-operation.c:870
 msgid "Import Key"
 msgstr "Importer nøkkel"
 
@@ -1869,39 +1869,39 @@
 msgstr "Importerer nøkler"
 
 #. TRANSLATORS: The "Remote" menu contains key operations on remote systems.
-#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:508
+#: ../pgp/seahorse-keyserver-results.c:237 ../src/seahorse-key-manager.c:502
 msgid "_Remote"
 msgstr "_Ekstern"
 
-#: ../src/seahorse-key-manager.c:511
+#: ../src/seahorse-key-manager.c:505
 msgid "Close this program"
 msgstr "Lukk dette programmet"
 
-#: ../src/seahorse-key-manager.c:512 ../src/seahorse-key-manager.c:514
+#: ../src/seahorse-key-manager.c:506 ../src/seahorse-key-manager.c:508
 msgid "_New..."
 msgstr "_Ny …"
 
-#: ../src/seahorse-key-manager.c:513
+#: ../src/seahorse-key-manager.c:507
 msgid "Create a new key or item"
 msgstr "Lag en ny nøkkel eller oppføring"
 
-#: ../src/seahorse-key-manager.c:516
+#: ../src/seahorse-key-manager.c:510
 msgid "_Import..."
 msgstr "_Importer …"
 
-#: ../src/seahorse-key-manager.c:517
+#: ../src/seahorse-key-manager.c:511
 msgid "Import from a file"
 msgstr "Importer fra en fil"
 
-#: ../src/seahorse-key-manager.c:519
+#: ../src/seahorse-key-manager.c:513
 msgid "Import from the clipboard"
 msgstr "Importer fra utklippstavlen"
 
-#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:113
+#: ../pgp/seahorse-keyserver-results.c:243 ../pgp/seahorse-pgp-actions.c:113
 msgid "_Find Remote Keys..."
 msgstr "_Finn eksterne nøkler …"
 
-#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:114
+#: ../pgp/seahorse-keyserver-results.c:244 ../pgp/seahorse-pgp-actions.c:114
 msgid "Search for keys on a key server"
 msgstr "Søker etter nøkler på en nøkkeltjener"
 
@@ -1969,7 +1969,7 @@
 msgid "Generate a new key of your own: "
 msgstr "Generer en ny nøkkel til deg selv: "
 
-#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3
+#: ../pgp/seahorse-keyserver-results.c:248 ../src/seahorse-key-manager.xml.h:3
 msgid "_Import"
 msgstr "_Importer"
 
@@ -1981,8 +1981,7 @@
 msgid "To get started with encryption you will need keys."
 msgstr "For å komme i gang med kryptering må du ha nøkler."
 
-#: ../libseahorse/seahorse-catalog.c:239
-#: ../libseahorse/seahorse-key-manager-store.c:443
+#: ../common/catalog.vala:333 ../libseahorse/seahorse-key-manager-store.c:442
 msgid "Couldn't export keys"
 msgstr "Kunne ikke eksportere nøkler"
 
@@ -1995,7 +1994,7 @@
 msgid "Expiration Date"
 msgstr "Utløpsdato"
 
-#: ../pgp/seahorse-keyserver-results.c:246
+#: ../pgp/seahorse-keyserver-results.c:239
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
@@ -2015,11 +2014,11 @@
 msgid "Collapse all listings"
 msgstr "Slå sammen alle lister"
 
-#: ../pgp/seahorse-keyserver-results.c:286
+#: ../pgp/seahorse-keyserver-results.c:280
 msgid "Remote Keys"
 msgstr "Eksterne nøkler"
 
-#: ../pgp/seahorse-keyserver-results.c:288
+#: ../pgp/seahorse-keyserver-results.c:282
 #, c-format
 msgid "Remote Keys Containing '%s'"
 msgstr "Eksterne nøkler som inneholder «%s»"
@@ -2108,15 +2107,15 @@
 msgid "_Sync"
 msgstr "_Synkroniser"
 
-#: ../libseahorse/seahorse-application.c:118
+#: ../libseahorse/seahorse-application.c:136
 msgid "Version of this application"
 msgstr "Versjon av dette programmet"
 
-#: ../libseahorse/seahorse-catalog.c:88
+#: ../common/catalog.vala:259
 msgid "Contributions:"
 msgstr "Bidrag:"
 
-#: ../libseahorse/seahorse-catalog.c:114
+#: ../common/catalog.vala:289
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -2126,44 +2125,44 @@
 "  Kjartan Maraas https://launchpad.net/~kmaraas\n"
 "  Mathias Bynke https://launchpad.net/~mabynke"
 
-#: ../libseahorse/seahorse-catalog.c:117
+#: ../common/catalog.vala:292
 msgid "Seahorse Project Homepage"
 msgstr "Hjemmesiden til Seahorse-prosjektet"
 
 #. Top menu items
-#: ../libseahorse/seahorse-catalog.c:277
+#: ../common/catalog.vala:366
 msgid "_File"
 msgstr "_Fil"
 
-#: ../libseahorse/seahorse-catalog.c:280
+#: ../common/catalog.vala:369
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../libseahorse/seahorse-catalog.c:292
+#: ../common/catalog.vala:381
 msgid "_View"
 msgstr "_Vis"
 
-#: ../libseahorse/seahorse-catalog.c:293
+#: ../common/catalog.vala:382
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../libseahorse/seahorse-catalog.c:290
+#: ../common/catalog.vala:379
 msgid "Prefere_nces"
 msgstr "_Innstillinger"
 
-#: ../libseahorse/seahorse-catalog.c:291
+#: ../common/catalog.vala:380
 msgid "Change preferences for this program"
 msgstr "Endre brukervalg for dette programmet"
 
-#: ../libseahorse/seahorse-catalog.c:295
+#: ../common/catalog.vala:384
 msgid "About this program"
 msgstr "Om dette programmet"
 
-#: ../libseahorse/seahorse-catalog.c:296
+#: ../common/catalog.vala:385
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../libseahorse/seahorse-catalog.c:297
+#: ../common/catalog.vala:386
 msgid "Show Seahorse help"
 msgstr "Vis hjelp for Seahorse"
 
@@ -2193,7 +2192,7 @@
 msgid "%s is a private key. Are you sure you want to proceed?"
 msgstr "%s er en privat nøkkel. Er du sikker på at du vil fortsette?"
 
-#: ../pgp/seahorse-keyserver-results.c:218
+#: ../pgp/seahorse-keyserver-results.c:211
 msgid "Importing keys from key servers"
 msgstr "Importerer nøkler fra nøkkeltjenere"
 
@@ -2206,58 +2205,58 @@
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../libseahorse/seahorse-catalog.c:285
+#: ../common/catalog.vala:374
 msgid "Delete selected items"
 msgstr "Slett valgte oppføringer"
 
-#: ../libseahorse/seahorse-catalog.c:278
+#: ../common/catalog.vala:367
 msgid "E_xport..."
 msgstr "E_ksporter …"
 
-#: ../libseahorse/seahorse-catalog.c:279
+#: ../common/catalog.vala:368
 msgid "Export to a file"
 msgstr "Eksporter til en fil"
 
-#: ../libseahorse/seahorse-catalog.c:283
+#: ../common/catalog.vala:372
 msgid "Copy to the clipboard"
 msgstr "Kopier til utklippstavlen"
 
-#: ../pgp/seahorse-keyserver-results.c:256
+#: ../pgp/seahorse-keyserver-results.c:249
 msgid "Import selected keys to local key ring"
 msgstr "Importer valgte nøkler til lokal nøkkelring"
 
-#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68
+#: ../ssh/seahorse-ssh-askpass.c:80 ../ssh/seahorse-ssh-askpass.c:88
 msgid "Enter your Secure Shell passphrase:"
 msgstr "Oppgi din Secure Shell-passordfrase:"
 
-#: ../ssh/seahorse-ssh-askpass.c:82
+#: ../ssh/seahorse-ssh-askpass.c:102
 msgid "Old Key Passphrase"
 msgstr "Gammel passordfrase for nøkkel"
 
-#: ../ssh/seahorse-ssh-askpass.c:83
+#: ../ssh/seahorse-ssh-askpass.c:103
 #, c-format
 msgid "Enter the old passphrase for: %s"
 msgstr "Oppgi den gamle passordfrasen for: %s"
 
-#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92
+#: ../ssh/seahorse-ssh-askpass.c:107 ../ssh/seahorse-ssh-askpass.c:112
 msgid "New Key Passphrase"
 msgstr "Ny passordfrase for nøkkel"
 
-#: ../ssh/seahorse-ssh-askpass.c:88
+#: ../ssh/seahorse-ssh-askpass.c:108
 #, c-format
 msgid "Enter the new passphrase for: %s"
 msgstr "Oppgi den nye passordfrasen for: %s"
 
-#: ../ssh/seahorse-ssh-askpass.c:93
+#: ../ssh/seahorse-ssh-askpass.c:113
 #, c-format
 msgid "Enter the new passphrase again: %s"
 msgstr "Oppgi den nye passordfrasen igjen: %s"
 
-#: ../ssh/seahorse-ssh-actions.c:100
+#: ../ssh/seahorse-ssh-actions.c:98
 msgid "Configure Key for _Secure Shell..."
 msgstr "Konfigurerer nøkkel for _Secure Shell …"
 
-#: ../ssh/seahorse-ssh-actions.c:101
+#: ../ssh/seahorse-ssh-actions.c:99
 msgid ""
 "Send public Secure Shell key to another machine, and enable logins using "
 "that key."
@@ -2279,20 +2278,20 @@
 msgid "Couldn't delete key"
 msgstr "Kunne ikke slette nøkkel"
 
-#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114
-#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4
+#: ../ssh/seahorse-ssh-generate.c:53 ../ssh/seahorse-ssh-key.c:110
+#: ../ssh/seahorse-ssh-key.c:114 ../ssh/seahorse-ssh-key-properties.xml.h:4
 msgid "Secure Shell Key"
 msgstr "Nøkkel for sikkert skall"
 
-#: ../ssh/seahorse-ssh-generate.c:56
+#: ../ssh/seahorse-ssh-generate.c:54
 msgid "Used to access other computers (eg: via a terminal)"
 msgstr "Brukes til å aksessere andre datamaskiner (f.eks via en terminal)"
 
-#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126
+#: ../ssh/seahorse-ssh-generate.c:108 ../ssh/seahorse-ssh-generate.c:124
 msgid "Couldn't generate Secure Shell key"
 msgstr "Kunne ikke generere Secure Shell-nøkkel"
 
-#: ../ssh/seahorse-ssh-generate.c:192
+#: ../ssh/seahorse-ssh-generate.c:191
 msgid "Creating Secure Shell Key"
 msgstr "Oppretter Secure Shell-nøkkel"
 
@@ -2340,11 +2339,11 @@
 "Hvis det allerede er en datamaskin du vil bruke denne nøkkelen på, kan du "
 "sette opp den datamaskinen til å kjenne igjen nøkkelen nå. "
 
-#: ../ssh/seahorse-ssh-key.c:110
+#: ../ssh/seahorse-ssh-key.c:106
 msgid "(Unreadable Secure Shell Key)"
 msgstr "(Uleslig Secure Shell-nøkkel)"
 
-#: ../ssh/seahorse-ssh-key-properties.c:82
+#: ../ssh/seahorse-ssh-key-properties.c:80
 msgid "Couldn't rename key."
 msgstr "Kunne ikke endre navn på nøkkel."
 
@@ -2352,7 +2351,7 @@
 msgid "Couldn't change authorization for key."
 msgstr "Kunne ikke endre autorisasjon for nøkkelen."
 
-#: ../ssh/seahorse-ssh-key-properties.c:170
+#: ../ssh/seahorse-ssh-key-properties.c:172
 msgid "Couldn't change passphrase for key."
 msgstr "Kunne ikke endre passordfrasen for nøkkel."
 
@@ -2398,36 +2397,36 @@
 msgid "E_xport Complete Key"
 msgstr "E_ksporter hele nøkkelen"
 
-#: ../ssh/seahorse-ssh-operation.c:199
+#: ../ssh/seahorse-ssh-operation.c:204
 msgid "The SSH command was terminated unexpectedly."
 msgstr "SSH-kommando terminerte uventet."
 
-#: ../ssh/seahorse-ssh-operation.c:209
+#: ../ssh/seahorse-ssh-operation.c:214
 msgid "The SSH command failed."
 msgstr "SSH-kommando feilet"
 
-#: ../ssh/seahorse-ssh-operation.c:502
+#: ../ssh/seahorse-ssh-operation.c:523
 msgid "Remote Host Password"
 msgstr "Passord for ekstern vert"
 
-#: ../ssh/seahorse-ssh-operation.c:588
+#: ../ssh/seahorse-ssh-operation.c:610
 msgid "Enter Key Passphrase"
 msgstr "Oppgi passordfrase for nøkkel"
 
-#: ../ssh/seahorse-ssh-operation.c:678
+#: ../ssh/seahorse-ssh-operation.c:701
 msgid "Passphrase for New Secure Shell Key"
 msgstr "Passordfrase for ny Secure Shell-nøkkel"
 
-#: ../ssh/seahorse-ssh-operation.c:862
+#: ../ssh/seahorse-ssh-operation.c:887
 #, c-format
 msgid "Importing key: %s"
 msgstr "Importerer nøkkel: %s"
 
-#: ../ssh/seahorse-ssh-operation.c:864
+#: ../ssh/seahorse-ssh-operation.c:889
 msgid "Importing key. Enter passphrase"
 msgstr "Importerer nøkkel. Oppgi passord"
 
-#: ../ssh/seahorse-ssh-source.c:940
+#: ../ssh/seahorse-ssh-source.c:978
 msgid "No private key file is available for this key."
 msgstr "Ingen privat nøkkelfil er tilgjengelig for denne nøkkelen."
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/sessioninstaller.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/sessioninstaller.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/sessioninstaller.po	2013-01-29 09:33:54.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/sessioninstaller.po	2014-01-07 06:37:36.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: sessioninstaller\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-10-05 20:02+0000\n"
+"POT-Creation-Date: 2013-04-02 18:41+0000\n"
 "PO-Revision-Date: 2012-08-06 23:54+0000\n"
 "Last-Translator: Christian Zechner <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:19+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:13+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../test.py:40
 msgid "Install the given packages"
@@ -118,20 +118,20 @@
 msgid "Installing GStreamer-Resource: %s"
 msgstr "Installerer GStreamer-ressurs: %s"
 
-#: ../sessioninstaller/core.py:252
+#: ../sessioninstaller/core.py:262
 msgid "_Install"
 msgstr "_Installer"
 
-#: ../sessioninstaller/core.py:270
+#: ../sessioninstaller/core.py:280
 msgid "Install"
 msgstr "Installer"
 
-#: ../sessioninstaller/core.py:274
+#: ../sessioninstaller/core.py:284
 msgid "Package"
 msgstr "Pakke"
 
 #. TRANSLATORS: %s is the name of a piece of software
-#: ../sessioninstaller/core.py:323
+#: ../sessioninstaller/core.py:333
 #, python-format
 msgid ""
 "The use of %s may be restricted in some countries. You must verify that one "
@@ -140,12 +140,21 @@
 "- You have permission to use this software (for example, a patent license)\n"
 "- You are using this software for research purposes only"
 msgstr ""
+"Bruk av %s kan være juridisk begrenset i enkelte land. Du må bekrefte at "
+"minst ett av følgende punkter stemmer:\n"
+"\n"
+"– Begrensningene gjelder ikke i ditt land\n"
+"\n"
+"– Noen har gitt deg tillatelse til å bruke denne programvaren (for eksempel "
+"via en gyldig lisens)\n"
+"\n"
+"– Du bruker denne programvaren utelukkende til forskningsformål"
 
-#: ../sessioninstaller/core.py:623
+#: ../sessioninstaller/core.py:638
 msgid "Failed to install multiple package files"
 msgstr "Mislyktes å installere flere pakkefiler"
 
-#: ../sessioninstaller/core.py:624
+#: ../sessioninstaller/core.py:639
 msgid ""
 "Installing more than one package file at the same time isn't supported. "
 "Please install one after the other."
@@ -153,67 +162,71 @@
 "Samtidig installasjon av mer enn én pakkefil støttes ikke. Vennligst "
 "installér en og en."
 
-#: ../sessioninstaller/core.py:628
+#: ../sessioninstaller/core.py:643
 msgid "Relative path to package file"
 msgstr "Relativ sti til pakkefilen"
 
-#: ../sessioninstaller/core.py:629
+#: ../sessioninstaller/core.py:644
 msgid "You have to specify the absolute path to the package file."
 msgstr "Du må angi den absolutte stien til pakkefilen."
 
-#: ../sessioninstaller/core.py:632 ../sessioninstaller/core.py:638
+#: ../sessioninstaller/core.py:647 ../sessioninstaller/core.py:653
 msgid "Unsupported package format"
 msgstr "Ustøttet pakkeformat"
 
-#: ../sessioninstaller/core.py:633 ../sessioninstaller/core.py:639
+#: ../sessioninstaller/core.py:648 ../sessioninstaller/core.py:654
 msgid "Only Debian packages are supported (*.deb)"
 msgstr "Kun Debian-pakker støttes (*.deb)"
 
-#: ../sessioninstaller/core.py:645
+#: ../sessioninstaller/core.py:660
 msgid "Install package file?"
 msgid_plural "Install package files?"
 msgstr[0] "Installere pakkefil?"
 msgstr[1] "Installere pakkefiler?"
 
-#: ../sessioninstaller/core.py:650
+#: ../sessioninstaller/core.py:665
 #, python-format
 msgid "%s requests to install the following package file."
 msgid_plural "%s requests to install the following package files."
 msgstr[0] "%s ønsker å installere følgende pakkefil."
 msgstr[1] "%s ønsker å installere følgende pakkefiler."
 
-#: ../sessioninstaller/core.py:658
+#: ../sessioninstaller/core.py:673
 msgid ""
 "Software from foreign sources could be malicious, could contain security "
 "risks and or even break your system.Install packages from your "
 "distribution's repositories as far as possible."
 msgstr ""
+"Programvare fra ukjente kilder kan være infisert, inneholde skadelig innhold "
+"og/eller ødelegge systemet ditt.\r\n"
+"Du bør kun installere pakker som kommer fra kjente kilder, så sant det er "
+"mulig."
 
 #. FIXME: show a message here that the binaries were not
 #. found instead of falling through to the misleading
 #. other error message
 #. FIXME: use a different error message
-#: ../sessioninstaller/core.py:713
+#: ../sessioninstaller/core.py:728
 msgid "Installing packages by files isn't supported"
 msgstr "Installasjon av pakker via filer støttes ikke"
 
-#: ../sessioninstaller/core.py:714
+#: ../sessioninstaller/core.py:729
 msgid "This method hasn't yet been implemented."
 msgstr "Denne metoden er ikke implementert enda."
 
-#: ../sessioninstaller/core.py:754 ../sessioninstaller/core.py:764
-#: ../sessioninstaller/core.py:771
+#: ../sessioninstaller/core.py:769 ../sessioninstaller/core.py:779
+#: ../sessioninstaller/core.py:786
 msgid "Catalog could not be read"
 msgstr "Kunne ikke lese katalogen."
 
 #. TRANSLATORS: %s is a file path
-#: ../sessioninstaller/core.py:756
+#: ../sessioninstaller/core.py:771
 #, python-format
 msgid "The catalog file '%s' doesn't exist."
 msgstr "Katalogfilen '%s' finnes ikke."
 
 #. TRANSLATORS: %s is a file path
-#: ../sessioninstaller/core.py:766
+#: ../sessioninstaller/core.py:781
 #, python-format
 msgid "The catalog file '%s' could not be opened  and read."
 msgstr "Katalogfilen '%s' kunne ikke åpnes."
@@ -228,25 +241,27 @@
 "Filen '%s' er en ugyldig programvarekatalog. Vennligst last ned på nytt "
 "eller kontakt utgiveren."
 
-#: ../sessioninstaller/core.py:782
+#: ../sessioninstaller/core.py:797
 msgid "Catalog is not supported"
 msgstr "Katalogen støttes ikke"
 
-#: ../sessioninstaller/core.py:783
+#: ../sessioninstaller/core.py:798
 #, python-format
 msgid ""
 "The method '%s' which is used to specify packages isn't supported.\n"
 "Please contact the provider of the catalog about this issue."
 msgstr ""
+"Metoden «%s», som benyttes til å spesifisere pakker, støttes ikke.\n"
+"Vennligst kontakt katalogtilbyderen angående dette problemet."
 
-#: ../sessioninstaller/core.py:803
+#: ../sessioninstaller/core.py:818
 msgid "A required package is not installable"
 msgid_plural "Required packages are not installable"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "En obligatorisk pakke kan ikke installeres"
+msgstr[1] "Obligatoriske pakker kan ikke installeres"
 
 #. TRANSLATORS: %s is the name of the missing packages
-#: ../sessioninstaller/core.py:808
+#: ../sessioninstaller/core.py:823
 #, python-format
 msgid ""
 "The catalog requires the installation of the package %s which is not "
@@ -258,37 +273,37 @@
 msgstr[1] ""
 "Katalogen krever installasjon av følgende utilgjengelige pakker: %s"
 
-#: ../sessioninstaller/core.py:818
+#: ../sessioninstaller/core.py:833
 msgid "Install the following software package?"
 msgid_plural "Install the following software packages?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vil du installere følgende programpakke?"
+msgstr[1] "Vil du installere følgende programpakker?"
 
 #. TRANSLATORS: %s is the name of the application which requested
 #. the installation
-#: ../sessioninstaller/core.py:824
+#: ../sessioninstaller/core.py:839
 #, python-format
 msgid "%s requires the installation of an additional software package."
 msgid_plural "%s requires the installation of additional software packages."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s krever installasjon av en ytterligere programpakke."
+msgstr[1] "%s krever installasjon av ytterligere programpakker."
 
 #. TRANSLATORS: %s is an absolute file path, e.g. /usr/bin/xterm
-#: ../sessioninstaller/core.py:831
+#: ../sessioninstaller/core.py:846
 #, python-format
 msgid "The package catalog %s requests to install the following software."
 msgid_plural "The following catalogs request to install software: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pakkekatalogen %s ber om å installere følgende programvare."
+msgstr[1] "Følgende kataloger ber om å installere programvare: %s"
 
 #. should get from XID, but removed from Gdk 3
-#: ../sessioninstaller/core.py:868
+#: ../sessioninstaller/core.py:883
 msgid "Install additional software package?"
 msgid_plural "Install additional software packages?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vil du installere programpakken?"
+msgstr[1] "Vil du installere programpakkene?"
 
-#: ../sessioninstaller/core.py:873
+#: ../sessioninstaller/core.py:888
 #, python-format
 msgid ""
 "%s requests to install the following software package to provide additional "
@@ -297,23 +312,27 @@
 "%s requests to install the following software packages to provide additional "
 "features."
 msgstr[0] ""
+"%s ber om å installere følgende programpakke for å levere ytterligere "
+"funksjoner."
 msgstr[1] ""
+"%s ber om å installere følgende programpakker for å levere ytterligere "
+"funksjoner."
 
-#: ../sessioninstaller/core.py:881
+#: ../sessioninstaller/core.py:896
 msgid ""
 "The following software package is required to provide additional features."
 msgid_plural ""
 "The following software packages are required to provide additional features."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Følgende programpakke kreves for tilleggsfunksjoner."
+msgstr[1] "Følgende programpakker kreves for tilleggsfunksjoner."
 
-#: ../sessioninstaller/core.py:904
+#: ../sessioninstaller/core.py:919
 msgid "Could not find requested package"
 msgid_plural "Could not find requested packages"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Fant ikke den forespurte pakken"
+msgstr[1] "Fant ikke de forespurte pakkene"
 
-#: ../sessioninstaller/core.py:908
+#: ../sessioninstaller/core.py:923
 #, python-format
 msgid ""
 "%s requests to install the following software package to provide additional "
@@ -322,9 +341,12 @@
 "%s requests to install the following software packages to provide additional "
 "features:"
 msgstr[0] ""
+"%s ber om å installere følgende programpakke for å levere tilleggsfunksjoner:"
 msgstr[1] ""
+"%s ber om å installere følgende programpakker for å levere "
+"tilleggsfunksjoner:"
 
-#: ../sessioninstaller/core.py:915
+#: ../sessioninstaller/core.py:918
 msgid ""
 "The follwing software package is required to provide additional features but "
 "cannot be installed:"
@@ -335,22 +357,24 @@
 msgstr[1] ""
 
 #. FIXME: should provide some information about how to find apps
-#: ../sessioninstaller/core.py:962
+#: ../sessioninstaller/core.py:977
 msgid "Installing mime type handlers isn't supported"
-msgstr ""
+msgstr "Installasjon av mime-typehåndtering støttes ikke"
 
-#: ../sessioninstaller/core.py:963
+#: ../sessioninstaller/core.py:978
 msgid ""
 "To search and install software which can open certain file types you have to "
 "install app-install-data."
 msgstr ""
+"For å finne og installere programvare for åpning av visse filtyper, må du "
+"installere app-install-data."
 
-#: ../sessioninstaller/core.py:971
+#: ../sessioninstaller/core.py:986
 msgid "Searching for suitable software to open files"
 msgstr "Søker etter passende programvare for å åpne filer"
 
 #. TRANSLATORS: %s is an application
-#: ../sessioninstaller/core.py:976
+#: ../sessioninstaller/core.py:991
 #, python-format
 msgid ""
 "%s requires to install software to open files of the following file type:"
@@ -361,7 +385,7 @@
 msgstr[1] ""
 "%s krever installasjon av programvare for åpning av følgende filtyper:"
 
-#: ../sessioninstaller/core.py:983
+#: ../sessioninstaller/core.py:998
 msgid ""
 "Software to open files of the following file type is required but is not "
 "installed:"
@@ -373,41 +397,41 @@
 msgstr[1] ""
 "Programvare for åpning av følgende filtyper kreves, men er ikke installert:"
 
-#: ../sessioninstaller/core.py:1043
+#: ../sessioninstaller/core.py:1061
 msgid "Supported file types"
 msgstr "Støttede filtyper"
 
-#: ../sessioninstaller/core.py:1046
+#: ../sessioninstaller/core.py:1064
 msgid "Install software to open files?"
-msgstr ""
+msgstr "Vil du installere programvare for å åpne files?"
 
 #. TRANSLATORS: %s is either a single file type or a bullet list of
 #. file types
-#: ../sessioninstaller/core.py:1054
+#: ../sessioninstaller/core.py:1072
 #, python-format
 msgid "%s is not supported."
 msgid_plural "Unsupported file types: %s"
 msgstr[0] "%s støttes ikke."
 msgstr[1] "Disse filtypene støttes ikke: %s"
 
-#: ../sessioninstaller/core.py:1060
+#: ../sessioninstaller/core.py:1078
 msgid "Application"
 msgstr "Program"
 
-#: ../sessioninstaller/core.py:1063 ../sessioninstaller/core.py:1385
+#: ../sessioninstaller/core.py:1081 ../sessioninstaller/core.py:1410
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: Separator for a list of plugins
-#: ../sessioninstaller/core.py:1066 ../sessioninstaller/core.py:1388
+#: ../sessioninstaller/core.py:1084 ../sessioninstaller/core.py:1413
 msgid ",\n"
 msgstr ",\n"
 
-#: ../sessioninstaller/core.py:1097
+#: ../sessioninstaller/core.py:1115
 msgid "Installing printer drivers on request isn't supported"
-msgstr ""
+msgstr "Installasjon av skriverdrivere på forespørsel støttes ikke"
 
-#: ../sessioninstaller/core.py:1098
+#: ../sessioninstaller/core.py:1116
 msgid ""
 "Currently autodetection and installation of missing printer drivers is not "
 "supported."
@@ -415,59 +439,68 @@
 "Automatisk gjenkjenning og installasjon av manglende skriverdrivere støttes "
 "ikke for øyeblikket."
 
-#: ../sessioninstaller/core.py:1125
+#: ../sessioninstaller/core.py:1143
 msgid "Installing fonts on request isn't supported"
-msgstr ""
+msgstr "Installasjon av skrifttyper på forespørsel støttes ikke"
 
-#: ../sessioninstaller/core.py:1126
+#: ../sessioninstaller/core.py:1144
 msgid ""
 "Currently autodetection and installation of missing fonts is not supported."
 msgstr ""
 "Automatisk gjenkjenning og installasjon av manglende fonter støttes ikke for "
 "øyeblikket."
 
-#: ../sessioninstaller/core.py:1165
+#: ../sessioninstaller/core.py:1184
 msgid "Invalid search term"
-msgstr ""
+msgstr "Ugyldig søkekriterium"
 
-#: ../sessioninstaller/core.py:1166
+#: ../sessioninstaller/core.py:1185
 #, python-format
 msgid "The following term doesn't describe a GStreamer resource: %s"
-msgstr ""
+msgstr "Følgende kriterium beskriver ikke en GStreamer-ressurs: %s"
 
-#: ../sessioninstaller/core.py:1191
+#: ../sessioninstaller/core.py:1210
 msgid "Searching for multimedia plugins"
 msgstr "Søker etter programtillegg for multimedia"
 
 #. TRANSLATORS: %s is the application requesting the plugins
-#: ../sessioninstaller/core.py:1196
+#: ../sessioninstaller/core.py:1215
 #, python-format
 msgid ""
 "%s requires to install plugins to create media files of the following type:"
 msgid_plural ""
 "%s requires to install plugins to create files of the following types:"
 msgstr[0] ""
+"%s krever å installere programtillegg for oppretting av følgende "
+"mediefiltype:"
 msgstr[1] ""
+"%s krever å installere programtillegg for oppretting av følgende filtyper:"
 
-#: ../sessioninstaller/core.py:1204
+#: ../sessioninstaller/core.py:1223
 msgid ""
 "The plugin to create media files of the following type is not installed:"
 msgid_plural ""
 "The plugin to create media files of the following types is not installed:"
 msgstr[0] ""
+"Programtillegget for oppretting av følgende mediefiltype er ikke installert:"
 msgstr[1] ""
+"Programtillegget for oppretting av følgende mediefiltyper er ikke installert:"
 
 #. TRANSLATORS: %s is the application requesting the plugins
-#: ../sessioninstaller/core.py:1214
+#: ../sessioninstaller/core.py:1233
 #, python-format
 msgid ""
 "%s requires to install plugins to play media files of the following type:"
 msgid_plural ""
 "%s requires to install plugins to play files of the following types:"
 msgstr[0] ""
+"%s krever å installere programtillegg for avspilling av følgende "
+"mediefiltype:"
 msgstr[1] ""
+"%s krever å installere programtillegg for avspilling av følgende "
+"mediefiltyper:"
 
-#: ../sessioninstaller/core.py:1222
+#: ../sessioninstaller/core.py:1241
 msgid ""
 "The plugin to play media files of the following type is not installed:"
 msgid_plural ""
@@ -480,7 +513,7 @@
 "installert:"
 
 #. TRANSLATORS: %s is the application requesting the plugins
-#: ../sessioninstaller/core.py:1232
+#: ../sessioninstaller/core.py:1251
 #, python-format
 msgid ""
 "%s requires to install plugins to create and play media files of the "
@@ -489,9 +522,13 @@
 "%s requires to install plugins to create and play media files of the "
 "following types:"
 msgstr[0] ""
+"%s krever å installere programtillegg for å opprette og spille av følgende "
+"mediefiltype:"
 msgstr[1] ""
+"%s krever å installere programtillegg for å opprette og spille av følgende "
+"mediefiltyper:"
 
-#: ../sessioninstaller/core.py:1240
+#: ../sessioninstaller/core.py:1259
 msgid ""
 "The plugins to create and play media files of the following type are not "
 "installed:"
@@ -506,93 +543,102 @@
 "typer er ikke installert:"
 
 #. TRANSLATORS: %s is the application requesting the plugins
-#: ../sessioninstaller/core.py:1250
+#: ../sessioninstaller/core.py:1269
 #, python-format
 msgid ""
 "%s requires to install plugins to support the following multimedia feature:"
 msgid_plural ""
 "%s requires to install plugins to support the following multimedia features:"
 msgstr[0] ""
+"%s krever å installere programtillegg for å støtte følgende "
+"multimediefunksjon:"
 msgstr[1] ""
+"%s krever å installere programtillegg for å støtte følgende "
+"multimediefunksjoner:"
 
-#: ../sessioninstaller/core.py:1258
+#: ../sessioninstaller/core.py:1277
 msgid ""
 "Extra plugins to provide the following multimedia feature are not installed:"
 msgid_plural ""
 "Extra plugins to provide the following multimedia features are not installed:"
 msgstr[0] ""
+"Ekstra programtillegg for levering av følgende multimediefunksjon er ikke "
+"installert:"
 msgstr[1] ""
+"Ekstra programtillegg for levering av følgende multimediefunksjoner er ikke "
+"installert:"
 
 #. FIXME: Add more info and possible solutions for the user
-#: ../sessioninstaller/core.py:1351
+#: ../sessioninstaller/core.py:1376
 msgid "Required plugin could not be found"
-msgstr ""
+msgstr "Fant ikke påkrevet programtillegg"
 
 #. Show a confirmation dialog
-#: ../sessioninstaller/core.py:1357
+#: ../sessioninstaller/core.py:1382
 msgid "Install extra multimedia plugin?"
 msgid_plural "Install extra multimedia plugins?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vil du installere ekstra multimedietillegg?"
+msgstr[1] "Vil du installere ekstra multimedietillegg?"
 
-#: ../sessioninstaller/core.py:1363
+#: ../sessioninstaller/core.py:1388
 msgid "The following plugin is not available:"
 msgid_plural "The following plugins are not available:"
 msgstr[0] "Følgende programtillegg er utilgjengelig:"
 msgstr[1] "Følgende programtillegg er utilgjengelige:"
 
-#: ../sessioninstaller/core.py:1375
+#: ../sessioninstaller/core.py:1400
 msgid "Provides"
 msgstr "Leverer"
 
-#: ../sessioninstaller/core.py:1382
+#: ../sessioninstaller/core.py:1407
 msgid "Plugin Package"
-msgstr ""
+msgstr "Programtilleggspakke"
 
-#: ../sessioninstaller/core.py:1425
+#: ../sessioninstaller/core.py:1450
 msgid "Searching software to be removed"
 msgstr "Søker etter programvare som skal fjernes"
 
-#: ../sessioninstaller/core.py:1427
+#: ../sessioninstaller/core.py:1452
 #, python-format
 msgid "%s wants to remove the software which provides the following file:"
 msgid_plural ""
 "%s wants to remove the software which provides the following files:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s vil fjerne programvaren som tilbyr følgende fil:"
+msgstr[1] "%s vil fjerne programvaren som tilbyr følgende filer:"
 
-#: ../sessioninstaller/core.py:1453
+#: ../sessioninstaller/core.py:1478
 msgid "Files are not installed"
 msgstr "Filer er ikke installert"
 
-#: ../sessioninstaller/core.py:1454
+#: ../sessioninstaller/core.py:1479
 msgid ""
 "The files which should be removed are not part of any installed software."
 msgstr ""
+"Filene som bør fjernes, inngår ikke som deler av installert programvare."
 
-#: ../sessioninstaller/core.py:1457
+#: ../sessioninstaller/core.py:1482
 msgid "Remove software package?"
 msgid_plural "Remove software packages?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vil du fjerne programvarepakken?"
+msgstr[1] "Vil du fjerne programvarepakkene?"
 
 #. TRANSLATORS: %s is the name of an application
-#: ../sessioninstaller/core.py:1461
+#: ../sessioninstaller/core.py:1486
 #, python-format
 msgid "%s wants to remove the following software package from your computer."
 msgid_plural ""
 "%s wants to remove the following software packages from your computer."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s vil fjerne følgende programvarepakke fra datamaskinen din."
+msgstr[1] "%s vil fjerne følgende programvarepakker fra datamaskinen din."
 
-#: ../sessioninstaller/core.py:1467
+#: ../sessioninstaller/core.py:1492
 msgid "The following software package will be removed from your computer."
 msgid_plural ""
 "The following software packages will be removed from your computer."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Følgende programvarepakke vil bli fjernet fra datamaskinen din."
+msgstr[1] "Følgende programvarepakker vil bli fjernet fra datamaskinen din."
 
-#: ../sessioninstaller/core.py:1474
+#: ../sessioninstaller/core.py:1499
 msgid "_Remove"
 msgstr "_Fjern"
 
@@ -603,7 +649,7 @@
 #: ../sessioninstaller/backends/dummy.py:40
 #, python-format
 msgid "The following packages will be removed with interaction mode %s: %s"
-msgstr ""
+msgstr "Følgende pakker vil bli fjernet med samhandlingsmodus %s: %s"
 
 #: ../sessioninstaller/backends/dummy.py:45
 msgid "Installing packages"
@@ -612,7 +658,7 @@
 #: ../sessioninstaller/backends/dummy.py:46
 #, python-format
 msgid "The following packages will be installed with interaction mode %s: %s"
-msgstr ""
+msgstr "Følgende pakker vil bli installert med samhandlingsmodus %s: %s"
 
 #: ../sessioninstaller/backends/dummy.py:51
 msgid "Installing package files"
@@ -622,8 +668,8 @@
 #, python-format
 msgid ""
 "The following package files will be installed with interaction mode %s: %s"
-msgstr ""
+msgstr "Følgende pakkefiler vil bli installert med samhandlingsmodus %s: %s"
 
 #: ../sessioninstaller/gstinstaller.py:90
 msgid "The X Window ID of the calling application"
-msgstr ""
+msgstr "Den kallende applikasjonens X Window-ID"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/shadow.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/shadow.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/shadow.po	2013-01-29 09:34:00.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/shadow.po	2014-01-07 06:37:07.000000000 +0000
@@ -19,8 +19,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:02+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:14+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #, c-format
@@ -36,21 +36,22 @@
 
 #, c-format
 msgid "configuration error - cannot parse %s value: '%s'"
-msgstr "feil med oppsettet –  kan ikke tolke %s-verdi: «%s»"
+msgstr "feil med oppsettet. Kan ikke tolke %s-verdien «%s»"
 
 msgid "Could not allocate space for config info.\n"
-msgstr "Fant ikke plass til oppsettsinformasjonen.\n"
+msgstr ""
 
 #, c-format
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
-msgstr "feil med oppsettet - ukjent element «%s» (kontakt administrator)\n"
+msgstr ""
+"feil med oppsettet. Elementet «%s» er ukjent. Kontakt administrator.\n"
 
 msgid "Password: "
 msgstr "Passord: "
 
 #, c-format
 msgid "%s's Password: "
-msgstr "%s's Passord: "
+msgstr "Passord for %s: "
 
 #, c-format
 msgid "%s: out of memory\n"
@@ -309,7 +310,7 @@
 msgstr "passwd: passordet er uendret\n"
 
 msgid "passwd: password updated successfully\n"
-msgstr "passwd: passorder ble oppdatert\n"
+msgstr "passwd: passord ble oppdatert\n"
 
 #, c-format
 msgid "Incorrect password for %s.\n"
@@ -873,7 +874,7 @@
 
 #, c-format
 msgid "Adding user %s to group %s\n"
-msgstr "Legger til brukere i  %s gruppa %s\n"
+msgstr "Legger til bruker %s i gruppa %s\n"
 
 #, c-format
 msgid "Removing user %s from group %s\n"
@@ -1148,7 +1149,7 @@
 
 #, c-format
 msgid "%s: the files have been updated\n"
-msgstr "%s: filene er blitt oppdatert\n"
+msgstr "%s: filene er oppdaterte\n"
 
 #, c-format
 msgid "%s: no changes\n"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/shotwell-extras.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/shotwell-extras.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/shotwell-extras.po	2013-01-29 09:33:50.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/shotwell-extras.po	2014-01-07 06:37:36.000000000 +0000
@@ -19,8 +19,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:11+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:02+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: plugins/shotwell-publishing-extras/PiwigoPublishing.vala:33
@@ -48,7 +48,7 @@
 "Shotwell kan ikke kontakte ditt Piwigo fotobiliotek. Vennligst verifiser "
 "URLen du tastet inn"
 
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:590
 msgid "Username and/or password invalid. Please try again"
 msgstr "Brukernavn og/eller passord er feil. Vennligst prøv igjen"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/shotwell.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/shotwell.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/shotwell.po	2013-01-29 09:33:51.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/shotwell.po	2014-01-07 06:37:36.000000000 +0000
@@ -20,13 +20,13 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:10+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:02+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 # Translator credits string for the about box -- translators, add your name
 # below if it's not already present
-#: src/AppWindow.vala:688 plugins/common/Resources.vala:28
+#: src/AppWindow.vala:686 plugins/common/Resources.vala:28
 msgid "translator-credits"
 msgstr ""
 "Jan Roar Roed <janroed@gmail.com>\n"
@@ -34,6 +34,7 @@
 "Launchpad Contributions:\n"
 "  Heggeli https://launchpad.net/~heggelimobile\n"
 "  Jan Roar Rød https://launchpad.net/~janroed\n"
+"  Kevin Brubeck Unhammer https://launchpad.net/~unhammer\n"
 "  Kjetil Birkeland Moe https://launchpad.net/~kjetilbmoe\n"
 "  Kjetil Rydland https://launchpad.net/~kjetilrydl\n"
 "  Mathias Bynke https://launchpad.net/~mabynke\n"
@@ -42,7 +43,7 @@
 "  Vera Yin https://launchpad.net/~vera-yorba"
 
 # GNOME Application Class ("Generic Name")
-#: src/Resources.vala:15
+#: src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Fotobehandler"
 
@@ -51,7 +52,7 @@
 msgstr "Shotwell fotobehandler"
 
 # GNOME Application Class for Direct Edit Mode
-#: src/Resources.vala:16
+#: src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Fotofremviser"
 
@@ -65,7 +66,7 @@
 
 #: src/Dimensions.vala:17
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1170
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1250
 msgid "Original size"
 msgstr "Orginalstørrelse"
 
@@ -82,8 +83,7 @@
 msgstr "Høyde"
 
 # The string %a %b %d, %Y is a format string that describes how dates are formatted (e.g. September 26, 2009 vs. 2009 September 26). Please translate it so that it describes the common date format in use in your language and region. The format string you enter should conform to POSIX date and time formatting conventions. See the strftime manpage for a list of format specifiers and their meanings.
-#: src/util/misc.vala:237 src/util/misc.vala:242 src/util/misc.vala:243
-#: src/util/misc.vala:251
+#: src/Resources.vala:742
 msgid "%a %b %d, %Y"
 msgstr "%a %d. %b. %Y"
 
@@ -172,27 +172,27 @@
 msgid "Printed Image Size"
 msgstr "Utskrevet bildestørrelse"
 
-#: src/Printing.vala:311
+#: ui/shotwell.glade:235
 msgid "Use a _standard size:"
 msgstr "Bruk en _standardstørrelse:"
 
-#: src/Printing.vala:315
+#: ui/shotwell.glade:278
 msgid "Use a c_ustom size:"
 msgstr "Bruk en _tilpasset størrelse:"
 
-#: src/Printing.vala:319
+#: ui/shotwell.glade:392
 msgid "_Autosize:"
 msgstr "_Autostørrelse:"
 
-#: src/Printing.vala:388
+#: src/Printing.vala:348
 msgid "in."
 msgstr "tomme"
 
-#: src/Printing.vala:389
+#: src/Printing.vala:349
 msgid "cm"
 msgstr "cm"
 
-#: src/Printing.vala:405
+#: ui/shotwell.glade:368
 msgid "_Match photo aspect ratio"
 msgstr "oppretthold bildedi_Mensjonene"
 
@@ -200,7 +200,7 @@
 msgid "Titles"
 msgstr "Titler"
 
-#: src/Printing.vala:418
+#: ui/shotwell.glade:449
 msgid "Print image _title"
 msgstr "skriv ut bilde_tittel"
 
@@ -208,79 +208,79 @@
 msgid "Pixel Resolution"
 msgstr "Pikseloppløsning"
 
-#: src/Printing.vala:436
+#: ui/shotwell.glade:513
 msgid "_Output photo at:"
 msgstr "_Send bilde til:"
 
-#: src/Printing.vala:451
+#: ui/shotwell.glade:548
 msgid "pixels per inch"
 msgstr "piksler per tomme"
 
-#: src/Printing.vala:922 src/editing_tools/EditingTools.vala:729
+#: src/Printing.vala:817 src/editing_tools/EditingTools.vala:757
 msgid "Wallet (2 x 3 in.)"
 msgstr "Lommebok (2 x 3 tommer)"
 
-#: src/Printing.vala:925 src/editing_tools/EditingTools.vala:730
+#: src/Printing.vala:820 src/editing_tools/EditingTools.vala:758
 msgid "Notecard (3 x 5 in.)"
 msgstr "Notekort (3 x 5 tommer)"
 
-#: src/Printing.vala:928 src/editing_tools/EditingTools.vala:731
+#: src/Printing.vala:823 src/editing_tools/EditingTools.vala:759
 msgid "4 x 6 in."
 msgstr "4 x 6 tommer"
 
-#: src/Printing.vala:931 src/editing_tools/EditingTools.vala:732
+#: src/Printing.vala:826 src/editing_tools/EditingTools.vala:760
 msgid "5 x 7 in."
 msgstr "5 x 7 tommer"
 
-#: src/Printing.vala:934 src/editing_tools/EditingTools.vala:733
+#: src/Printing.vala:829 src/editing_tools/EditingTools.vala:761
 msgid "8 x 10 in."
 msgstr "8 x 10 tommer"
 
-#: src/Printing.vala:937 src/editing_tools/EditingTools.vala:735
+#: src/Printing.vala:832 src/editing_tools/EditingTools.vala:763
 msgid "11 x 14 in."
 msgstr "11 x 14 tommer"
 
-#: src/Printing.vala:940 src/editing_tools/EditingTools.vala:737
+#: src/Printing.vala:835 src/editing_tools/EditingTools.vala:765
 msgid "16 x 20 in."
 msgstr "16 x 20 tommer"
 
-#: src/Printing.vala:946 src/editing_tools/EditingTools.vala:739
+#: src/Printing.vala:841 src/editing_tools/EditingTools.vala:767
 msgid "Metric Wallet (9 x 13 cm)"
 msgstr "Metrisk Lommebok (9x 13 cm)"
 
-#: src/Printing.vala:949 src/editing_tools/EditingTools.vala:740
+#: src/Printing.vala:844 src/editing_tools/EditingTools.vala:768
 msgid "Postcard (10 x 15 cm)"
 msgstr "Postkort (10 x 15 cm)"
 
-#: src/Printing.vala:952 src/editing_tools/EditingTools.vala:741
+#: src/Printing.vala:847 src/editing_tools/EditingTools.vala:769
 msgid "13 x 18 cm"
 msgstr "13 x 18 cm"
 
-#: src/Printing.vala:955 src/editing_tools/EditingTools.vala:742
+#: src/Printing.vala:850 src/editing_tools/EditingTools.vala:770
 msgid "18 x 24 cm"
 msgstr "18 x 24 cm"
 
-#: src/Printing.vala:958 src/editing_tools/EditingTools.vala:744
+#: src/Printing.vala:853 src/editing_tools/EditingTools.vala:772
 msgid "20 x 30 cm"
 msgstr "20 x 30 cm"
 
-#: src/Printing.vala:961 src/editing_tools/EditingTools.vala:745
+#: src/Printing.vala:856 src/editing_tools/EditingTools.vala:773
 msgid "24 x 40 cm"
 msgstr "24 x 40 cm"
 
-#: src/Printing.vala:964 src/editing_tools/EditingTools.vala:746
+#: src/Printing.vala:859 src/editing_tools/EditingTools.vala:774
 msgid "30 x 40 cm"
 msgstr "30 x 40 cm"
 
-#: src/Printing.vala:980
+#: src/Printing.vala:875
 msgid "Image Settings"
 msgstr "Bildeinnstillinger"
 
-#: src/Printing.vala:993
+#: src/Printing.vala:888
 msgid "Printing..."
 msgstr "Skriver ut..."
 
-#: src/Printing.vala:1013 src/Printing.vala:1216
+#: src/Printing.vala:908 src/Printing.vala:1111
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -295,108 +295,108 @@
 msgid "Adjust the size of the thumbnails"
 msgstr "Juster størrelsen på miniatyrbildene"
 
-#: src/direct/DirectPhotoPage.vala:174 src/PhotoPage.vala:2513
-#: src/MediaPage.vala:323
+#: src/PhotoPage.vala:2583 src/direct/DirectPhotoPage.vala:174
+#: src/MediaPage.vala:325
 msgid "Zoom _In"
 msgstr "Zoom _inn"
 
-#: src/MediaPage.vala:324
+#: src/MediaPage.vala:326
 msgid "Increase the magnification of the thumbnails"
 msgstr "Øk forstørrelsen på miniatyrbildene"
 
-#: src/direct/DirectPhotoPage.vala:180 src/PhotoPage.vala:2519
-#: src/MediaPage.vala:329
+#: src/PhotoPage.vala:2589 src/direct/DirectPhotoPage.vala:180
+#: src/MediaPage.vala:331
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: src/MediaPage.vala:330
+#: src/MediaPage.vala:332
 msgid "Decrease the magnification of the thumbnails"
 msgstr "minske forstørrelsen på miniatyrbildene"
 
-#: src/MediaPage.vala:392
+#: src/MediaPage.vala:399
 msgid "Sort _Photos"
 msgstr "Sorter _bilder"
 
-#: src/MediaPage.vala:401
+#: src/MediaPage.vala:408
 msgid "_Play Video"
 msgstr "S_pill Video"
 
-#: src/MediaPage.vala:402
+#: src/MediaPage.vala:409
 msgid "Open the selected videos in the system video player"
 msgstr "Åpne de valgte videoene i systemets videoavspiller"
 
-#: src/PhotoPage.vala:2558 src/MediaPage.vala:406
+#: src/PhotoPage.vala:2628 src/MediaPage.vala:413
 msgid "_Developer"
 msgstr "_Fremkaller"
 
-#: src/photos/RawSupport.vala:297 src/MediaPage.vala:413
+#: src/photos/RawSupport.vala:297 src/MediaPage.vala:420
 #: misc/shotwell.application:2
 msgid "Shotwell"
 msgstr "Shotwell"
 
-#: src/photos/RawSupport.vala:300 src/camera/Branch.vala:101
-#: src/camera/ImportPage.vala:676 src/camera/ImportPage.vala:692
-#: src/MediaPage.vala:418
+#: src/camera/Branch.vala:101 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:300
+#: src/MediaPage.vala:425
 msgid "Camera"
 msgstr "Kamera"
 
-#: src/camera/ImportPage.vala:837 src/MediaPage.vala:429
+#: src/camera/ImportPage.vala:872 src/MediaPage.vala:436
 msgid "_Titles"
 msgstr "_Titler"
 
-#: src/camera/ImportPage.vala:838 src/MediaPage.vala:430
+#: src/camera/ImportPage.vala:873 src/MediaPage.vala:437
 msgid "Display the title of each photo"
 msgstr "Vis titlene for hvert bilde"
 
-#: src/library/LibraryWindow.vala:369 src/MediaPage.vala:441
+#: src/library/LibraryWindow.vala:376 src/MediaPage.vala:454
 msgid "Ta_gs"
 msgstr "Ta_gger"
 
-#: src/MediaPage.vala:442
+#: src/MediaPage.vala:455
 msgid "Display each photo's tags"
 msgstr "Vis taggene for hvert bilde"
 
-#: src/MediaPage.vala:458
+#: src/MediaPage.vala:471
 msgid "By _Title"
 msgstr "Etter _tittel"
 
-#: src/MediaPage.vala:459
+#: src/MediaPage.vala:472
 msgid "Sort photos by title"
 msgstr "Sorter bilder etter tittel"
 
-#: src/MediaPage.vala:464
+#: src/MediaPage.vala:477
 msgid "By Exposure _Date"
 msgstr "_Etter eksponeringsdato"
 
-#: src/MediaPage.vala:465
+#: src/MediaPage.vala:478
 msgid "Sort photos by exposure date"
 msgstr "Sorter bildene etter eksponeringsdato"
 
-#: src/MediaPage.vala:470
+#: src/MediaPage.vala:483
 msgid "By _Rating"
 msgstr "Etter _Rangering"
 
-#: src/MediaPage.vala:471
+#: src/MediaPage.vala:484
 msgid "Sort photos by rating"
 msgstr "Sorter bilder etter rangering"
 
-#: src/library/LibraryWindow.vala:409 src/MediaPage.vala:481
+#: src/library/LibraryWindow.vala:422 src/MediaPage.vala:494
 msgid "_Ascending"
 msgstr "_Stigende"
 
-#: src/library/LibraryWindow.vala:410 src/MediaPage.vala:482
+#: src/library/LibraryWindow.vala:423 src/MediaPage.vala:495
 msgid "Sort photos in an ascending order"
 msgstr "Sorter bilder i stigende rekkefølge"
 
-#: src/library/LibraryWindow.vala:416 src/MediaPage.vala:487
+#: src/library/LibraryWindow.vala:429 src/MediaPage.vala:500
 msgid "D_escending"
 msgstr "S_ynkende"
 
-#: src/library/LibraryWindow.vala:417 src/MediaPage.vala:488
+#: src/library/LibraryWindow.vala:430 src/MediaPage.vala:501
 msgid "Sort photos in a descending order"
 msgstr "Sorter bilder i synkende rekkefølge"
 
-#: src/MediaPage.vala:688
+#: src/MediaPage.vala:702
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -405,46 +405,46 @@
 "Shotwell greide ikke å spille den valgte videoen:\n"
 "%s"
 
-#: src/Properties.vala:193 src/camera/ImportPage.vala:308
+#: src/camera/ImportPage.vala:312 src/Properties.vala:227
 #, c-format
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
-#: src/camera/ImportPage.vala:433
+#: src/camera/ImportPage.vala:459
 msgid ""
 "Unable to unmount camera.  Try unmounting the camera from the file manager."
 msgstr ""
-"Kan ikke avmontere kameraet. Prøv å avmonter kameraet fra filbehandleren."
+"Kan ikke avmontere kameraet. Prøv å avmontere kameraet fra filbehandleren."
 
-#: src/camera/ImportPage.vala:741
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Skjul bilder som allerede er importert"
 
-#: src/camera/ImportPage.vala:742
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Vis kun bilder som ikke har blitt importert"
 
-#: src/camera/ImportPage.vala:810
+#: src/camera/ImportPage.vala:845
 msgid "Starting import, please wait..."
 msgstr "Importering starter, vennligst vent..."
 
-#: src/camera/ImportPage.vala:849
+#: src/camera/ImportPage.vala:884
 msgid "Import _Selected"
 msgstr "Importer _valgte"
 
-#: src/camera/ImportPage.vala:850
+#: src/camera/ImportPage.vala:885
 msgid "Import the selected photos into your library"
 msgstr "Importer de valgte bildene til ditt bildebibliotek"
 
-#: src/camera/ImportPage.vala:855
+#: src/camera/ImportPage.vala:890
 msgid "Import _All"
 msgstr "Importer _alle"
 
-#: src/camera/ImportPage.vala:856
+#: src/camera/ImportPage.vala:891
 msgid "Import all the photos into your library"
 msgstr "Importer alle bildene til ditt bildebibliotek"
 
-#: src/camera/ImportPage.vala:977
+#: src/camera/ImportPage.vala:1012
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it.  Continue?"
@@ -452,15 +452,15 @@
 "Shotwell trenger å avmontere kameraet fra filsystemet for å få tilgang til "
 "det. Fortsett?"
 
-#: src/camera/ImportPage.vala:983
+#: src/camera/ImportPage.vala:1018
 msgid "_Unmount"
 msgstr "_Avmonter"
 
-#: src/camera/ImportPage.vala:988
+#: src/camera/ImportPage.vala:1023
 msgid "Please unmount the camera."
 msgstr "Vennligst avmonter kameraet."
 
-#: src/camera/ImportPage.vala:993
+#: src/camera/ImportPage.vala:1028
 msgid ""
 "The camera is locked by another application.  Shotwell can only access the "
 "camera when it's unlocked.  Please close any other application using the "
@@ -470,11 +470,11 @@
 "kameraet når det er ulåst. Vennligst steng andre programmer som bruker "
 "kameraet, og prøv igjen."
 
-#: src/camera/ImportPage.vala:1003
+#: src/camera/ImportPage.vala:1038
 msgid "Please close any other application using the camera."
 msgstr "Vennligst lukk alle andre programmer som bruker kameraet."
 
-#: src/camera/ImportPage.vala:1008
+#: src/camera/ImportPage.vala:1043
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -483,443 +483,441 @@
 "Kan ikke hente forhåndsvisninger fra kameraet:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1025
+#: src/camera/ImportPage.vala:1060
 msgid "Unmounting..."
 msgstr "Avmonterer..."
 
-#: src/camera/ImportPage.vala:1131
+#: src/camera/ImportPage.vala:1166
 msgid "Fetching photo information"
 msgstr "Henter bildeinformasjon"
 
-#: src/camera/ImportPage.vala:1465
+#: src/camera/ImportPage.vala:1521
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "innhenter forhåndsvisning for %s"
 
-#: src/camera/ImportPage.vala:1581
+#: src/camera/ImportPage.vala:1637
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Kan ikke låse kamera: %s"
 
-#: src/camera/ImportPage.vala:1664
+#: src/camera/ImportPage.vala:1722
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "Vil du slette dette bildet fra kameraet?"
 msgstr[1] "Vil du slette disse %d bildene fra kameraet?"
 
-#: src/camera/ImportPage.vala:1667
+#: src/camera/ImportPage.vala:1725
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "Vil du slette denne videoen fra kameraet?"
 msgstr[1] "Vil du slette disse %d videoene fra kameraet?"
 
-#: src/camera/ImportPage.vala:1670
+#: src/camera/ImportPage.vala:1728
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "Slette bildet/videoen fra kameraet?"
 msgstr[1] "Slette disse %d bildene/videoene fra kameraet?"
 
-#: src/camera/ImportPage.vala:1673
+#: src/camera/ImportPage.vala:1731
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "Vil du slette disse filene fra kameraet?"
 msgstr[1] "Vil du slette disse %d filene fra kameraet?"
 
-#: src/Dialogs.vala:1025 src/camera/ImportPage.vala:1681
+#: src/camera/ImportPage.vala:1739 src/Dialogs.vala:1328
 msgid "_Keep"
 msgstr "_Behold"
 
-#: src/camera/ImportPage.vala:1700
+#: src/camera/ImportPage.vala:1758
 msgid "Removing photos/videos from camera"
 msgstr "Fjerner bilder/videoer fra kameraet"
 
-#: src/camera/ImportPage.vala:1704
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Unable to delete %d photo/video from the camera due to errors."
 msgid_plural ""
 "Unable to delete %d photos/videos from the camera due to errors."
-msgstr[0] "Kan ikke slette %d bildet/videoen fra kameraet p.g.a feil."
-msgstr[1] "Kan ikke slette %d bildene/videoene fra kameraet p.g.a feil."
+msgstr[0] "Kan ikke slette %d bildet/videoen fra kameraet pga. feil."
+msgstr[1] "Kan ikke slette %d bildene/videoene fra kameraet pga. feil."
 
 #: src/camera/Branch.vala:87
 msgid "Cameras"
 msgstr "Kameraer"
 
-#: src/PhotoPage.vala:531
+#: src/PhotoPage.vala:532
 msgid "Previous photo"
 msgstr "Forrige bilde"
 
-#: src/PhotoPage.vala:536
+#: src/PhotoPage.vala:537
 msgid "Next photo"
 msgstr "Neste bilde"
 
-#: src/PhotoPage.vala:1826
+#: src/PhotoPage.vala:1844
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Kildefil for bilde mangler: %s"
 
-#: src/direct/DirectPhotoPage.vala:165 src/PhotoPage.vala:2351
-#: src/library/LibraryWindow.vala:353
+#: src/PhotoPage.vala:2404 src/library/LibraryWindow.vala:360
+#: src/direct/DirectPhotoPage.vala:165
 msgid "_View"
 msgstr "_Vis"
 
-#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2355
+#: src/PhotoPage.vala:2408 src/direct/DirectPhotoPage.vala:81
 msgid "T_ools"
 msgstr "V_erktøy"
 
-#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2360
+#: src/PhotoPage.vala:2413 src/direct/DirectPhotoPage.vala:86
 msgid "_Previous Photo"
 msgstr "_Forrige bilde"
 
-#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2361
+#: src/PhotoPage.vala:2414 src/direct/DirectPhotoPage.vala:87
 msgid "Previous Photo"
 msgstr "Forrige bilde"
 
-#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2366
+#: src/PhotoPage.vala:2419 src/direct/DirectPhotoPage.vala:92
 msgid "_Next Photo"
 msgstr "_Neste bilde"
 
-#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2367
+#: src/PhotoPage.vala:2420 src/direct/DirectPhotoPage.vala:93
 msgid "Next Photo"
 msgstr "Neste bilde"
 
-#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2514
+#: src/PhotoPage.vala:2584 src/direct/DirectPhotoPage.vala:175
 msgid "Increase the magnification of the photo"
 msgstr "Øk bildets forstørrelsesgrad"
 
-#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2520
+#: src/PhotoPage.vala:2590 src/direct/DirectPhotoPage.vala:181
 msgid "Decrease the magnification of the photo"
 msgstr "minsk bildets forstørrelsesgrad"
 
-#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2525
+#: src/PhotoPage.vala:2595 src/direct/DirectPhotoPage.vala:186
 msgid "Fit to _Page"
 msgstr "Tilpass til _Side"
 
-#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2526
+#: src/PhotoPage.vala:2596 src/direct/DirectPhotoPage.vala:187
 msgid "Zoom the photo to fit on the screen"
 msgstr "Zoom til å passe til skjermen"
 
-#: src/direct/DirectPhotoPage.vala:192 src/PhotoPage.vala:2531
-#, no-c-format
+#: src/PhotoPage.vala:2601 src/direct/DirectPhotoPage.vala:192
 msgid "Zoom _100%"
 msgstr "Zoom _100%"
 
-#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2532
-#, no-c-format
+#: src/PhotoPage.vala:2602 src/direct/DirectPhotoPage.vala:193
+#, c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "Zoom bildet til 100% magnifisering"
 
-#: src/direct/DirectPhotoPage.vala:198 src/PhotoPage.vala:2537
-#, no-c-format
+#: src/PhotoPage.vala:2607 src/direct/DirectPhotoPage.vala:198
 msgid "Zoom _200%"
 msgstr "Zoom _200%"
 
-#: src/direct/DirectPhotoPage.vala:199 src/PhotoPage.vala:2538
-#, no-c-format
+#: src/PhotoPage.vala:2608 src/direct/DirectPhotoPage.vala:199
+#, c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "Zoom bildet til 200% magnifisering"
 
-#: src/CollectionPage.vala:215 src/PhotoPage.vala:2553
+#: src/CollectionPage.vala:230 src/PhotoPage.vala:2623
 msgid "S_lideshow"
 msgstr "L_ysbildefremvisning"
 
-#: src/CollectionPage.vala:216 src/PhotoPage.vala:2554
+#: src/CollectionPage.vala:231 src/PhotoPage.vala:2624
 msgid "Play a slideshow"
 msgstr "vis et diasshow"
 
-#: src/PhotoPage.vala:3002 src/Dialogs.vala:2321
+#: src/Dialogs.vala:2629 src/PhotoPage.vala:3075
 msgid "Remove From Library"
 msgstr "Fjern fra bildebiblioteket"
 
-#: src/PhotoPage.vala:3002 src/Dialogs.vala:2322
+#: src/Dialogs.vala:2630 src/PhotoPage.vala:3075
 msgid "Removing Photo From Library"
 msgstr "Fjerner bilder fra bildebiblioteket"
 
-#: src/CollectionPage.vala:438 src/PhotoPage.vala:3123 src/Dialogs.vala:58
+#: src/CollectionPage.vala:458 src/Dialogs.vala:58 src/PhotoPage.vala:3196
 msgid "Export Photo"
 msgstr "Eksporter bilder"
 
-#: src/PhotoPage.vala:3143
+#: src/PhotoPage.vala:3216
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Kan ikke eksportere %s: %s"
 
-#: src/Commands.vala:670
+#: src/Commands.vala:733
 msgid "Reverting"
 msgstr "Forkaster"
 
-#: src/Commands.vala:670
+#: src/Commands.vala:733
 msgid "Undoing Revert"
 msgstr "Angre forkastelse"
 
-#: src/Commands.vala:714
+#: src/Commands.vala:777
 msgid "Enhancing"
 msgstr "Gjør skarpere"
 
-#: src/Commands.vala:714
+#: src/Commands.vala:777
 msgid "Undoing Enhance"
 msgstr "Angre oppskarping"
 
-#: src/Commands.vala:897
+#: src/Commands.vala:995
 msgid "Creating New Event"
 msgstr "Oppretter ny hendelse"
 
-#: src/Commands.vala:898
+#: src/Commands.vala:996
 msgid "Removing Event"
 msgstr "Fjerner hendelse"
 
-#: src/Commands.vala:907
+#: src/Commands.vala:1005
 msgid "Moving Photos to New Event"
 msgstr "Flytter bilder til den nye hendelsen"
 
-#: src/Commands.vala:908
+#: src/Commands.vala:1006
 msgid "Setting Photos to Previous Event"
 msgstr "angi bilder til forrige hendelse"
 
-#: src/Commands.vala:938
+#: src/Commands.vala:1063
 msgid "Merging"
 msgstr "Fletter"
 
-#: src/Commands.vala:939
+#: src/Commands.vala:1064
 msgid "Unmerging"
 msgstr "Fjerner fletting"
 
-#: src/Commands.vala:948
+#: src/Commands.vala:1073
 msgid "Duplicating photos"
 msgstr "Duplikerer bilder"
 
-#: src/Commands.vala:948
+#: src/Commands.vala:1073
 msgid "Removing duplicated photos"
 msgstr "Fjerner duplikatbilder"
 
-#: src/Commands.vala:971
+#: src/Commands.vala:1096
 #, c-format
 msgid "Unable to duplicate one photo due to a file error"
 msgid_plural "Unable to duplicate %d photos due to file errors"
 msgstr[0] "Kunne ikke duplisere et bilde p.g.a en filfeil"
 msgstr[1] "kunne ikke duplisere %d bilder p.g.a filfeil"
 
-#: src/Commands.vala:1058
+#: src/Commands.vala:1183
 msgid "Restoring previous rating"
 msgstr "Gjenoppretter tidligere rangering"
 
-#: src/Commands.vala:1068 src/Commands.vala:1069
+#: src/Commands.vala:1193 src/Commands.vala:1194
 msgid "Increasing ratings"
 msgstr "Øker rangeringer"
 
-#: src/Commands.vala:1068 src/Commands.vala:1069
+#: src/Commands.vala:1193 src/Commands.vala:1194
 msgid "Decreasing ratings"
 msgstr "Senker rangeringer"
 
-#: src/Commands.vala:1119
+#: src/Commands.vala:1244
 msgid "Setting RAW developer"
 msgstr "Velger RAW-fremkaller"
 
-#: src/Commands.vala:1119
+#: src/Commands.vala:1244
 msgid "Restoring previous RAW developer"
 msgstr "gjenoppretter forrige RAW-fremkaller"
 
-#: src/Commands.vala:1120
+#: src/Commands.vala:1245
 msgid "Set Developer"
 msgstr "juster fremkaller"
 
-#: src/Commands.vala:1210
+#: src/Commands.vala:1335
 msgid "Original photo could not be adjusted."
 msgstr "Orginalbildet kunne ikke justeres"
 
-#: src/Commands.vala:1231
+#: src/Commands.vala:1356
 msgid "Adjusting Date and Time"
 msgstr "Justerer tid og dato"
 
-#: src/Commands.vala:1231
+#: src/Commands.vala:1356
 msgid "Undoing Date and Time Adjustment"
 msgstr "fjerner justering av tid og dato"
 
-#: src/Commands.vala:1262
+#: src/Commands.vala:1387
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] "Ett orginalbilde kunne ikke justeres"
 msgstr[1] "Følgende orginalbilder kunne ikke justeres."
 
-#: src/Commands.vala:1264 src/Commands.vala:1288
+#: src/Commands.vala:1389 src/Commands.vala:1413
 msgid "Time Adjustment Error"
 msgstr "Tidsjusteringsfeil"
 
-#: src/Commands.vala:1286
+#: src/Commands.vala:1411
 msgid "Time adjustments could not be undone on the following photo file."
 msgid_plural ""
 "Time adjustments could not be undone on the following photo files."
 msgstr[0] "Tidsjusteringer kunne ikke omgjøres på den følgende bildefilen."
 msgstr[1] "Tidsjusteringen kunne ikke omgjøres på de følgende bildefiler."
 
-#: src/Commands.vala:1500 src/Commands.vala:1523
+#: src/Commands.vala:1625 src/Commands.vala:1648
 msgid "Create Tag"
 msgstr "Lag en tagg"
 
-#: src/Commands.vala:1558
+#: src/Commands.vala:1683
 #, c-format
 msgid "Move Tag \"%s\""
 msgstr "Flytt taggen \"%s\""
 
-#: src/Commands.vala:2210
+#: src/Commands.vala:2335
 msgid "Move Photos to Trash"
 msgstr "Flytt bilder til søppelbøtten"
 
-#: src/Commands.vala:2210
+#: src/Commands.vala:2335
 msgid "Restore Photos from Trash"
 msgstr "Gjenopprett bilder fra søppelbøtten"
 
-#: src/Commands.vala:2211
+#: src/Commands.vala:2336
 msgid "Move the photos to the Shotwell trash"
 msgstr "Flytt bildene til Shotwells søppelbøtte"
 
-#: src/Commands.vala:2211
+#: src/Commands.vala:2336
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Gjenopprett bildene i Shotwells bildebibliotek"
 
-#: src/Commands.vala:2230
+#: src/Commands.vala:2355
 msgid "Moving Photos to Trash"
 msgstr "Flytter bilder til søppelbøtten"
 
-#: src/Commands.vala:2230
+#: src/Commands.vala:2355
 msgid "Restoring Photos From Trash"
 msgstr "Gjenoppretter bilder fra søppelbøtten"
 
-#: src/Commands.vala:2319
+#: src/Commands.vala:2451
 msgid "Flag"
 msgstr "Flagg"
 
-#: src/Commands.vala:2319
+#: src/Commands.vala:2451
 msgid "Unflag"
 msgstr "Fjern flagg"
 
-#: src/Commands.vala:2320
+#: src/Commands.vala:2441
 msgid "Flag selected photos"
-msgstr "Flagg de valgte bilder"
+msgstr "Flagg valgte bilder"
 
-#: src/Commands.vala:2320
+#: src/Commands.vala:2442
 msgid "Unflag selected photos"
-msgstr "Fjern flagget fra de utvalgte bilder"
+msgstr "Fjern flagget fra valgte bilder"
 
-#: src/Photo.vala:3446
+#: src/Photo.vala:3656
 msgid "modified"
 msgstr "endret"
 
-#: src/slideshow/Slideshow.vala:15
+#: src/slideshow/Slideshow.vala:22
 msgid "Slideshow Transitions"
 msgstr "Overganger for lysbildefremvisning"
 
-#: src/slideshow/TransitionEffects.vala:96
+#: src/slideshow/TransitionEffects.vala:98
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: src/slideshow/TransitionEffects.vala:285
+#: src/slideshow/TransitionEffects.vala:287
 msgid "None"
 msgstr "Ingen"
 
-#: src/SearchFilter.vala:632 src/SearchFilter.vala:633
-#: src/SearchFilter.vala:1029 src/library/FlaggedPage.vala:8
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:587
+#: src/SearchFilter.vala:588 src/SearchFilter.vala:990
 msgid "Flagged"
 msgstr "Flagget"
 
-#: src/SearchFilter.vala:638 src/SearchFilter.vala:639
+#: src/SearchFilter.vala:593 src/SearchFilter.vala:594
 msgid "Photos"
 msgstr "Bilder"
 
-#: src/SearchFilter.vala:644 src/SearchFilter.vala:645
+#: src/SearchFilter.vala:599 src/SearchFilter.vala:600
 msgid "Videos"
 msgstr "Videoer"
 
-#: src/SearchFilter.vala:650
+#: src/SearchFilter.vala:605
 msgid "RAW Photos"
 msgstr "RAW-bilder"
 
-#: src/SearchFilter.vala:651
+#: src/SearchFilter.vala:606
 msgid "RAW photos"
 msgstr "RAW-bilder"
 
-#: src/SearchFilter.vala:991
+#: src/SearchFilter.vala:952
 #, c-format
 msgid "Error loading UI file %s: %s"
 msgstr "Feil under innlasting av UI-fil %s: %s"
 
-#: src/SearchFilter.vala:1008
+#: src/SearchFilter.vala:969
 msgid "Type"
 msgstr "Skriv"
 
-#: src/SearchFilter.vala:1042 src/searches/SearchBoolean.vala:164
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1003
 msgid "Rating"
 msgstr "Rangering"
 
-#: src/SlideshowPage.vala:42 src/SlideshowPage.vala:234
+#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:182
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: src/SlideshowPage.vala:44
+#: ui/shotwell.glade:1469
 msgid "_Delay:"
 msgstr "_Forsinkelse:"
 
-#: src/SlideshowPage.vala:46 src/SlideshowPage.vala:48
+#: ui/shotwell.glade:1603 ui/shotwell.glade:1616
 msgid "seconds"
 msgstr "sekunder"
 
-#: src/SlideshowPage.vala:64
+#: ui/shotwell.glade:1485
 msgid "_Transition effect:"
 msgstr "_Overgangseffekt:"
 
-#: src/SlideshowPage.vala:91
+#: ui/shotwell.glade:1501
 msgid "Transition d_elay:"
 msgstr "Overgangsforsink_else:"
 
-#: src/SlideshowPage.vala:200
+#: src/SlideshowPage.vala:141 src/Screensaver.vala:18
 msgid "Slideshow"
 msgstr "Blidefremvising"
 
-#: src/SlideshowPage.vala:213
+#: src/SlideshowPage.vala:161
 msgid "Back"
 msgstr "Tilbake"
 
-#: src/SlideshowPage.vala:214
+#: src/SlideshowPage.vala:162
 msgid "Go to the previous photo"
 msgstr "Gå tilbake til forrige bilde"
 
-#: src/SlideshowPage.vala:220 src/SlideshowPage.vala:325
+#: src/SlideshowPage.vala:168 src/SlideshowPage.vala:273
 msgid "Pause"
 msgstr "Pause"
 
-#: src/SlideshowPage.vala:221 src/SlideshowPage.vala:326
+#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:274
 msgid "Pause the slideshow"
 msgstr "Pause bildefremvisningen"
 
-#: src/SlideshowPage.vala:227
+#: src/SlideshowPage.vala:175
 msgid "Next"
 msgstr "Neste"
 
-#: src/SlideshowPage.vala:228
+#: src/SlideshowPage.vala:176
 msgid "Go to the next photo"
 msgstr "Gå til det neste bilde"
 
-#: src/SlideshowPage.vala:235
+#: src/SlideshowPage.vala:183
 msgid "Change slideshow settings"
 msgstr "Endre instillinger for bildefremviser"
 
-#: src/SlideshowPage.vala:289
+#: src/SlideshowPage.vala:237
 msgid "All photo source files are missing."
 msgstr "Alle bildekildefiler mangler"
 
-#: src/SlideshowPage.vala:321
+#: src/SlideshowPage.vala:269
 msgid "Play"
 msgstr "Spill av"
 
-#: src/SlideshowPage.vala:322
+#: src/SlideshowPage.vala:270
 msgid "Continue the slideshow"
 msgstr "Fortsett bildefremvisningen"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:853
+#: ui/shotwell.glade:1696
 msgid "_Login"
 msgstr "_Logg inn"
 
@@ -951,35 +949,35 @@
 msgid "Logging in..."
 msgstr "Logger inn..."
 
-#: src/publishing/PublishingUI.vala:181
+#: src/publishing/PublishingUI.vala:183
 msgid "Publish Photos"
 msgstr "Publiser bilder"
 
-#: src/publishing/PublishingUI.vala:182
+#: src/publishing/PublishingUI.vala:184
 msgid "Publish photos _to:"
 msgstr "Publiserer bilder _til:"
 
-#: src/publishing/PublishingUI.vala:184
+#: src/publishing/PublishingUI.vala:186
 msgid "Publish Videos"
 msgstr "Publiser videoer"
 
-#: src/publishing/PublishingUI.vala:185
+#: src/publishing/PublishingUI.vala:187
 msgid "Publish videos _to"
 msgstr "Publiserer videoer _til"
 
-#: src/publishing/PublishingUI.vala:187
+#: src/publishing/PublishingUI.vala:189
 msgid "Publish Photos and Videos"
 msgstr "Publiser bilder og videoer"
 
-#: src/publishing/PublishingUI.vala:188
+#: src/publishing/PublishingUI.vala:190
 msgid "Publish photos and videos _to"
 msgstr "Publiserer bilder og videoer _til"
 
-#: src/publishing/PublishingUI.vala:354
+#: src/publishing/PublishingUI.vala:383
 msgid "Unable to publish"
 msgstr "kan ikke publisere"
 
-#: src/publishing/PublishingUI.vala:355
+#: src/publishing/PublishingUI.vala:384
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -992,15 +990,15 @@
 "Preferanser</b> og slå på en eller flere av publiseringsinnstikkene på "
 "<b>Innstikk</b> fanen."
 
-#: src/publishing/PublishingUI.vala:448
 #: src/data_imports/DataImportsUI.vala:394
+#: src/publishing/PublishingUI.vala:493
 msgid "_Close"
 msgstr "_Lukk"
 
-#: src/AppWindow.vala:617 src/AppWindow.vala:638 src/AppWindow.vala:655
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1058
-#: src/Dialogs.vala:1081 src/publishing/PublishingUI.vala:453
-#: src/data_imports/DataImportsUI.vala:399
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1361
+#: src/Dialogs.vala:1384 src/data_imports/DataImportsUI.vala:399
+#: src/AppWindow.vala:615 src/AppWindow.vala:636 src/AppWindow.vala:653
+#: src/publishing/PublishingUI.vala:498
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -1028,56 +1026,56 @@
 "For å forsøke å publisere til en annen tjeneste: velg tjeneste fra "
 "ovenstående meny."
 
-#: src/events/EventDirectoryItem.vala:74
+#: src/events/EventDirectoryItem.vala:83
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
 msgstr[0] "%d bilde/Video"
 msgstr[1] "%d bilder / videoer"
 
-#: src/Properties.vala:321 src/events/EventDirectoryItem.vala:76
+#: src/Properties.vala:355 src/events/EventDirectoryItem.vala:85
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
 msgstr[0] "%d video"
 msgstr[1] "%d videoer"
 
-#: src/Properties.vala:319 src/events/EventDirectoryItem.vala:78
+#: src/Properties.vala:353 src/events/EventDirectoryItem.vala:87
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
 msgstr[0] "%d bilde"
 msgstr[1] "%d bilder"
 
-#: src/events/EventPage.vala:86
+#: src/events/EventPage.vala:129
 msgid "No Event"
 msgstr "Ingen hendelse"
 
-#: src/events/EventsDirectoryPage.vala:134
+#: src/events/EventsDirectoryPage.vala:155
 msgid "No events"
 msgstr "Ingen eventer"
 
-#: src/events/EventsDirectoryPage.vala:138
+#: src/events/EventsDirectoryPage.vala:159
 msgid "No events found"
 msgstr "Ingen eventer funnet"
 
-#: src/events/EventsDirectoryPage.vala:185
+#: src/events/EventsDirectoryPage.vala:230
 msgid "Events"
 msgstr "Hendelser"
 
-#: src/events/EventsDirectoryPage.vala:199
+#: src/events/EventsDirectoryPage.vala:244
 msgid "Undated"
 msgstr "udatert"
 
-#: src/events/EventsDirectoryPage.vala:200
+#: src/events/EventsDirectoryPage.vala:245
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:201
+#: src/events/EventsDirectoryPage.vala:246
 msgid "%B"
 msgstr "%B"
 
-#: src/VideoSupport.vala:440
+#: src/VideoSupport.vala:464
 msgid "Export Videos"
 msgstr "Eksporter videoer"
 
@@ -1125,11 +1123,11 @@
 msgid "Loading Shotwell"
 msgstr "Laster Shotwell"
 
-#: src/main.vala:334
+#: src/main.vala:338
 msgid "[FILE]"
 msgstr "[FIL]"
 
-#: src/main.vala:338
+#: src/main.vala:342
 #, c-format
 msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
@@ -1137,43 +1135,43 @@
 "Kjør '%s --help' for å se en fullstendig liste over tilgjengelige "
 "kommandolinje kommandoer.\n"
 
-#: src/AppWindow.vala:54
+#: src/AppWindow.vala:49
 msgid "Pin Toolbar"
 msgstr "Lås verktøylinjen"
 
-#: src/AppWindow.vala:55
+#: src/AppWindow.vala:50
 msgid "Pin the toolbar open"
 msgstr "Lås verktøylinjen åpen"
 
-#: src/AppWindow.vala:58 src/AppWindow.vala:136
+#: src/AppWindow.vala:53 src/AppWindow.vala:131
 msgid "Leave fullscreen"
 msgstr "Forlat fullskjerm"
 
-#: src/AppWindow.vala:135
+#: src/AppWindow.vala:130
 msgid "Leave _Fullscreen"
 msgstr "Avslutt _fullskjerm"
 
-#: src/AppWindow.vala:493
+#: src/AppWindow.vala:491
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: src/AppWindow.vala:498
+#: src/AppWindow.vala:496
 msgid "_About"
 msgstr "_Om"
 
-#: src/AppWindow.vala:503
+#: src/AppWindow.vala:501
 msgid "Fulls_creen"
 msgstr "Fulls_kjerm"
 
-#: src/AppWindow.vala:508
+#: src/AppWindow.vala:506
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: src/AppWindow.vala:513
+#: src/AppWindow.vala:511
 msgid "_Frequently Asked Questions"
 msgstr "_Ofte stilte spørsmål (OSS)"
 
-#: src/AppWindow.vala:665
+#: src/AppWindow.vala:663
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
@@ -1186,16 +1184,16 @@
 "\n"
 "%s"
 
-#: src/AppWindow.vala:685 plugins/common/Resources.vala:9
+#: src/AppWindow.vala:683 plugins/common/Resources.vala:9
 msgid "Visit the Yorba web site"
 msgstr "Besøk Yorbas nettsted"
 
-#: src/AppWindow.vala:697
+#: src/AppWindow.vala:695
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Kan ikke vise hjelp: %s"
 
-#: src/AppWindow.vala:713
+#: src/AppWindow.vala:711
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Klarte ikke å vise OSS: %s"
@@ -1205,128 +1203,128 @@
 msgid "%I:%M %p"
 msgstr "%H:%M"
 
-#: src/Properties.vala:50
+#: src/Properties.vala:84
 msgid "Today"
 msgstr "I dag"
 
-#: src/Properties.vala:52
+#: src/Properties.vala:86
 msgid "Yesterday"
 msgstr "I går"
 
-#: src/Properties.vala:306 src/Dialogs.vala:985
+#: src/Properties.vala:340 src/Dialogs.vala:1273
 msgid "Title:"
 msgstr "Tittel:"
 
-#: src/Properties.vala:309
+#: src/Properties.vala:343
 msgid "Items:"
 msgstr "Punkter:"
 
-#: src/Properties.vala:312
+#: src/Properties.vala:346
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
 msgstr[0] "%d hendelse"
 msgstr[1] "%d hendelser"
 
-#: src/Properties.vala:343
+#: src/Properties.vala:377
 msgid "Date:"
 msgstr "Dato:"
 
-#: src/Properties.vala:347
+#: src/Properties.vala:381
 msgid "Time:"
 msgstr "Tid:"
 
-#: src/Properties.vala:350 src/Properties.vala:355
+#: src/Properties.vala:384 src/Properties.vala:389
 msgid "From:"
 msgstr "Fra:"
 
-#: src/Properties.vala:351 src/Properties.vala:356
+#: src/Properties.vala:385 src/Properties.vala:390
 msgid "To:"
 msgstr "Til:"
 
-#: src/Properties.vala:361 src/editing_tools/EditingTools.vala:1830
+#: src/Properties.vala:395 src/editing_tools/EditingTools.vala:1850
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: src/Properties.vala:370
+#: src/Properties.vala:404
 msgid "Duration:"
 msgstr "Varighet:"
 
-#: src/Properties.vala:370
+#: src/Properties.vala:404
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekunder"
 
-#: src/Properties.vala:374
+#: src/Properties.vala:408
 msgid "Developer:"
 msgstr "Fremkaller:"
 
-#: src/Properties.vala:402 src/Properties.vala:406 src/Properties.vala:413
-#: src/editing_tools/EditingTools.vala:2188
+#: src/Properties.vala:436 src/Properties.vala:440 src/Properties.vala:447
+#: src/editing_tools/EditingTools.vala:2218
 msgid "Exposure:"
 msgstr "Eksponering:"
 
-#: src/Properties.vala:500
+#: src/Properties.vala:585
 msgid "Location:"
 msgstr "Plassering:"
 
-#: src/Properties.vala:503
+#: src/Properties.vala:588
 msgid "File size:"
 msgstr "Filstørrelse:"
 
-#: src/Properties.vala:506
+#: src/Properties.vala:594
 msgid "Original dimensions:"
 msgstr "Orginaldimensjoner:"
 
-#: src/Properties.vala:509
+#: src/Properties.vala:597
 msgid "Camera make:"
 msgstr "Kamera merke:"
 
-#: src/Properties.vala:512
+#: src/Properties.vala:600
 msgid "Camera model:"
 msgstr "Kamera modell:"
 
-#: src/Properties.vala:515
+#: src/Properties.vala:603
 msgid "Flash:"
 msgstr "Blits:"
 
-#: src/Properties.vala:517
+#: src/Properties.vala:605
 msgid "Focal length:"
 msgstr "Brennvidde:"
 
-#: src/Properties.vala:520
+#: src/Properties.vala:614
 msgid "Exposure bias:"
 msgstr "Eksponeringsjustering:"
 
-#: src/Properties.vala:522
+#: src/Properties.vala:616
 msgid "GPS latitude:"
 msgstr "GPS-breddegrad:"
 
-#: src/Properties.vala:525
+#: src/Properties.vala:619
 msgid "GPS longitude:"
 msgstr "GPS-lengdegrad:"
 
-#: src/Properties.vala:528
+#: src/Properties.vala:622
 msgid "Artist:"
 msgstr "Kunstner:"
 
-#: src/Properties.vala:530
+#: src/Properties.vala:624
 msgid "Copyright:"
 msgstr "Opphavsrett:"
 
-#: src/Properties.vala:532
+#: src/Properties.vala:626
 msgid "Software:"
 msgstr "Programvare:"
 
-#: src/Properties.vala:541
+#: src/Properties.vala:639
 msgid "Extended Information"
 msgstr "Utvidet informasjon"
 
-#: src/Tag.vala:815
+#: src/Tag.vala:817
 msgid "untitled"
 msgstr "Uten tittel"
 
-#: src/Event.vala:710
+#: src/Event.vala:737
 #, c-format
 msgid "Event %s"
 msgstr "Hendelse %s"
@@ -1339,95 +1337,95 @@
 msgid "Faces"
 msgstr "Ansikt"
 
-#: src/CollectionPage.vala:436
+#: src/CollectionPage.vala:456
 msgid "Export Photo/Video"
 msgstr "Eksporter bilder / videoer"
 
-#: src/CollectionPage.vala:436
+#: src/CollectionPage.vala:456
 msgid "Export Photos/Videos"
 msgstr "Eksporterer bilder/videoer"
 
-#: src/CollectionPage.vala:438 src/Dialogs.vala:87
+#: src/CollectionPage.vala:458 src/Dialogs.vala:87
 msgid "Export Photos"
 msgstr "Eksporter bilder"
 
-#: src/CollectionPage.vala:525 src/CollectionPage.vala:541
+#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
 msgid "Rotating"
 msgstr "Rotering"
 
-#: src/CollectionPage.vala:525 src/CollectionPage.vala:541
+#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
 msgid "Undoing Rotate"
 msgstr "angre rotering"
 
-#: src/CollectionPage.vala:550
+#: src/CollectionPage.vala:570
 msgid "Flipping Horizontally"
 msgstr "Flipper horisontalt"
 
-#: src/CollectionPage.vala:551
+#: src/CollectionPage.vala:571
 msgid "Undoing Flip Horizontally"
 msgstr "Angre horisontal flipp"
 
-#: src/CollectionPage.vala:560
+#: src/CollectionPage.vala:580
 msgid "Flipping Vertically"
 msgstr "Flipper vertikalt"
 
-#: src/CollectionPage.vala:561
+#: src/CollectionPage.vala:581
 msgid "Undoing Flip Vertically"
 msgstr "Angre vertikal flipp"
 
-#: src/BatchImport.vala:25
+#: src/BatchImport.vala:26
 msgid "Success"
 msgstr "Vellykket"
 
-#: src/BatchImport.vala:28
+#: src/BatchImport.vala:29
 msgid "File error"
 msgstr "Filfeil"
 
-#: src/BatchImport.vala:31
+#: src/BatchImport.vala:32
 msgid "Unable to decode file"
 msgstr "kan ikke dekode filen"
 
-#: src/BatchImport.vala:34
+#: src/BatchImport.vala:35
 msgid "Database error"
 msgstr "Databasefeil"
 
-#: src/BatchImport.vala:37
+#: src/BatchImport.vala:38
 msgid "User aborted import"
 msgstr "Brukeren avbrøt import"
 
-#: src/BatchImport.vala:40
+#: src/BatchImport.vala:41
 msgid "Not a file"
 msgstr "Ikke en fil"
 
-#: src/BatchImport.vala:43
+#: src/BatchImport.vala:44
 msgid "File already exists in database"
 msgstr "Filen finnes allerede i databasen"
 
-#: src/BatchImport.vala:46
+#: src/BatchImport.vala:47
 msgid "Unsupported file format"
 msgstr "Filformatet er ikke støttet"
 
-#: src/BatchImport.vala:49
+#: src/BatchImport.vala:50
 msgid "Not an image file"
 msgstr "Ikke en bildefil"
 
-#: src/BatchImport.vala:52
+#: src/BatchImport.vala:53
 msgid "Disk failure"
 msgstr "diskfeil"
 
-#: src/BatchImport.vala:55
+#: src/BatchImport.vala:56
 msgid "Disk full"
 msgstr "Disken er full"
 
-#: src/BatchImport.vala:58
+#: src/BatchImport.vala:59
 msgid "Camera error"
 msgstr "Kamerafeil"
 
-#: src/BatchImport.vala:61
+#: src/BatchImport.vala:62
 msgid "File write error"
 msgstr "Feil under filskriving"
 
-#: src/BatchImport.vala:64
+#: src/BatchImport.vala:68
 #, c-format
 msgid "Imported failed (%d)"
 msgstr "Import feilet (%d)"
@@ -1439,8 +1437,8 @@
 msgstr[0] "Dette vil fjerne taggen \"%s\" fra ett bilde. Fortsett?"
 msgstr[1] "Dette vil fjerne taggen \"%s\" fra %d bilder. Fortsett?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1026
-#: src/Resources.vala:303 src/Resources.vala:351 src/Resources.vala:615
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1329
+#: src/Resources.vala:330 src/Resources.vala:378 src/Resources.vala:643
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -1519,33 +1517,33 @@
 msgid "Export metadata"
 msgstr "Eksporter metadata"
 
-#: src/Dialogs.vala:472
+#: src/Dialogs.vala:481
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(og %d flere)\n"
 
-#: src/Dialogs.vala:528
+#: src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "1 duplikatbilde ble ikke importert:\n"
 msgstr[1] "%d duplikatbilder ble ikke importert:\n"
 
-#: src/Dialogs.vala:531
+#: src/Dialogs.vala:666
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "1 duplikatvideo ble ikke importert:\n"
 msgstr[1] "%d duplikatvideoer ble ikke importert:\n"
 
-#: src/Dialogs.vala:534
+#: src/Dialogs.vala:669
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "1 duplikatbilde/video ble ikke importert:\n"
 msgstr[1] "%d duplikatbilder/videoer ble ikke importert:\n"
 
-#: src/Dialogs.vala:548
+#: src/Dialogs.vala:683
 #, c-format
 msgid "1 photo failed to import due to a file or hardware error:\n"
 msgid_plural "%d photos failed to import due to a file or hardware error:\n"
@@ -1553,7 +1551,7 @@
 "1 bilde ble ikke importert p.g.a en filfeil eller maskinvarefeil:\n"
 msgstr[1] "%d bilder ble ikke importert p.g.a en fil- eller hardwarefeil:\n"
 
-#: src/Dialogs.vala:551
+#: src/Dialogs.vala:686
 #, c-format
 msgid "1 video failed to import due to a file or hardware error:\n"
 msgid_plural "%d videos failed to import due to a file or hardware error:\n"
@@ -1562,7 +1560,7 @@
 msgstr[1] ""
 "%d videoer ble ikke importert p.g.a en fil- eller maskinvarefeil:\n"
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:689
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -1572,14 +1570,14 @@
 msgstr[1] ""
 "%d bilder/videoer ble ikke importert p.g.a en fil- eller maskinvarefeil:\n"
 
-#: src/Dialogs.vala:557
+#: src/Dialogs.vala:692
 #, c-format
 msgid "1 file failed to import due to a file or hardware error:\n"
 msgid_plural "%d files failed to import due to a file or hardware error:\n"
 msgstr[0] "1 fil ble ikke importert p.g.a en fil- eller maskinvarefeil:\n"
 msgstr[1] "%d filer ble ikke importert p.g.a en fil- eller maskinvarefeil:\n"
 
-#: src/Dialogs.vala:571
+#: src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1593,7 +1591,7 @@
 "%d bilder feilet under importering fordi bildebibliotekmappen ikke var "
 "skrivbar:\n"
 
-#: src/Dialogs.vala:574
+#: src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1605,7 +1603,7 @@
 "skrivbar:\n"
 msgstr[1] "%d bla bla\n"
 
-#: src/Dialogs.vala:577
+#: src/Dialogs.vala:712
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1620,7 +1618,7 @@
 "%d videoer feilet under importering fordi bildebibliotekmappen ikke var "
 "skrivbar:\n"
 
-#: src/Dialogs.vala:580
+#: src/Dialogs.vala:715
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1634,63 +1632,63 @@
 "%d filer feilet under importering fordi bildebibliotekmappen ikke var "
 "skrivbar:\n"
 
-#: src/Dialogs.vala:594
+#: src/Dialogs.vala:729
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
 msgstr[0] "1 bilde ble ikke importert p.g.a. en kamerafeil:\n"
 msgstr[1] "%d bilder ble ikke importert p.g.a. en kamerafeil:\n"
 
-#: src/Dialogs.vala:597
+#: src/Dialogs.vala:732
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
 msgstr[0] "1 video ble ikke importert p.g.a. en kamerafeil:\n"
 msgstr[1] "%d videoer ble ikke importert p.g.a. en kamerafeil:\n"
 
-#: src/Dialogs.vala:600
+#: src/Dialogs.vala:735
 #, c-format
 msgid "1 photo/video failed to import due to a camera error:\n"
 msgid_plural "%d photos/videos failed to import due to a camera error:\n"
 msgstr[0] "1 bilde/video ble ikke importert p.g.a. en kamerafeil:\n"
 msgstr[1] "%d bilder/videoer ble ikke importert p.g.a. en kamerafeil:\n"
 
-#: src/Dialogs.vala:603
+#: src/Dialogs.vala:738
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
 msgstr[0] "1 fil ble ikke importert pg.a. en kamerafeil.\n"
 msgstr[1] "%d filer ble ikke importert p.g.a. en kamerafeil:\n"
 
-#: src/Dialogs.vala:620
+#: src/Dialogs.vala:778
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
 msgstr[0] "1 bilde ble utelatt (formatet støttes ikke):\n"
 msgstr[1] "%d bilder ble utelatt (formatet støttes ikke):\n"
 
-#: src/Dialogs.vala:635
+#: src/Dialogs.vala:793
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "1 fil, som ikke er et bilde, ble utelatt.\n"
 msgstr[1] "%d filer, som ikke er bilder, ble utelatt.\n"
 
-#: src/Dialogs.vala:646
+#: src/Dialogs.vala:804
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "1 bilde utelatt p.g.a. brukeren avbrøt operasjonen:\n"
 msgstr[1] "%d bilder utelatt p.g.a. brukeren avbrøt operasjonen:\n"
 
-#: src/Dialogs.vala:649
+#: src/Dialogs.vala:807
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "1 video utelatt p.g.a. brukeren avbrøt operasjonen:\n"
 msgstr[1] "%d videoer utelatt p.g.a. brukeren avbrøt operasjonen:\n"
 
-#: src/Dialogs.vala:652
+#: src/Dialogs.vala:810
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
@@ -1698,106 +1696,106 @@
 msgstr[1] ""
 "%d bilder/videoer ble utelatt p.g.a. brukeren avbrøt operasjonen:\n"
 
-#: src/Dialogs.vala:655
+#: src/Dialogs.vala:813
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "1 fil utelatt p.g.a. brukeren avbrøt operasjonen.\n"
 msgstr[1] "%d filer utelatt p.g.a. brukeren avbrøt operasjonen.\n"
 
-#: src/Dialogs.vala:669
+#: src/Dialogs.vala:827
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "1 bilde importert.\n"
 msgstr[1] "%d bilder importert.\n"
 
-#: src/Dialogs.vala:672
+#: src/Dialogs.vala:830
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "1 video ble importert.\n"
 msgstr[1] "%d videoer ble importert.\n"
 
-#: src/Dialogs.vala:675
+#: src/Dialogs.vala:833
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
 msgstr[0] "1 bilde/video ble importert.\n"
 msgstr[1] "%d bilder/videoer ble importert.\n"
 
-#: src/Dialogs.vala:691
+#: src/Dialogs.vala:849
 msgid "No photos or videos imported.\n"
 msgstr "Ingen bilder eller videoer ble importert.\n"
 
-#: src/Dialogs.vala:706
+#: src/Dialogs.vala:856 src/Dialogs.vala:875
 msgid "Import Complete"
 msgstr "Import ferdig"
 
-#: src/Dialogs.vala:874
+#: src/Dialogs.vala:1103
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: src/Dialogs.vala:877
+#: src/Dialogs.vala:1106
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutt"
 msgstr[1] "%d minutter"
 
-#: src/Dialogs.vala:881
+#: src/Dialogs.vala:1110
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
-#: src/Dialogs.vala:884
+#: src/Dialogs.vala:1113
 msgid "1 day"
 msgstr "1 dag"
 
-#: src/Dialogs.vala:975 src/Resources.vala:184
+#: src/Dialogs.vala:1263 src/Resources.vala:205
 msgid "Rename Event"
 msgstr "Endre navn på hendelse"
 
-#: src/Dialogs.vala:975
+#: src/Dialogs.vala:1263
 msgid "Name:"
 msgstr "Navn:"
 
-#: src/Dialogs.vala:985 src/Resources.vala:253
+#: src/Dialogs.vala:1273 src/Resources.vala:274
 msgid "Edit Title"
 msgstr "Endre tittel"
 
-#: src/util/misc.vala:231 src/util/misc.vala:236
+#: src/Resources.vala:743 src/Resources.vala:745
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: src/util/misc.vala:232
+#: src/Resources.vala:744
 msgid "%d, %Y"
 msgstr "%d, %Y"
 
-#: src/Dialogs.vala:1001
+#: src/Dialogs.vala:1304
 msgid "_Trash File"
 msgid_plural "_Trash Files"
 msgstr[0] "_Slett fil"
 msgstr[1] "_Slett filer"
 
-#: src/Dialogs.vala:1005
+#: src/Dialogs.vala:1308
 msgid "Only _Remove"
 msgstr "_Fjern kun"
 
-#: src/Dialogs.vala:1048
+#: src/Dialogs.vala:1351
 msgid "Revert External Edit?"
 msgstr "Omgjør eksterne redigeringer?"
 
-#: src/Dialogs.vala:1048
+#: src/Dialogs.vala:1351
 msgid "Revert External Edits?"
 msgstr "nullstille eksterne redigeringer?"
 
-#: src/Dialogs.vala:1050
+#: src/Dialogs.vala:1353
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -1809,81 +1807,81 @@
 "Dette vil ødelegge alle endringer som er gjort i de %d eksterne filene. "
 "Fortsett?"
 
-#: src/Dialogs.vala:1054
+#: src/Dialogs.vala:1357
 msgid "Re_vert External Edit"
 msgstr "omgj_ør eksterne redigeringer"
 
-#: src/Dialogs.vala:1054
+#: src/Dialogs.vala:1357
 msgid "Re_vert External Edits"
 msgstr "nu_llstille ekstern redigering"
 
-#: src/Dialogs.vala:1075
+#: src/Dialogs.vala:1378
 #, c-format
 msgid "This will remove the photo from the library.  Continue?"
 msgid_plural "This will remove %d photos from the library.  Continue?"
 msgstr[0] "Dette vil fjerne bildet fra bildebiblioteket. Fortsett?"
 msgstr[1] "Dette vil fjerne %d bilder fra bildebiblioteket. Fortsett?"
 
-#: src/Dialogs.vala:1082
+#: src/Dialogs.vala:1385
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: src/Dialogs.vala:1083
+#: src/Dialogs.vala:1386
 msgid "Remove Photo From Library"
 msgstr "Fjerner bilder fra bildebiblioteket"
 
-#: src/Dialogs.vala:1083
+#: src/Dialogs.vala:1386
 msgid "Remove Photos From Library"
 msgstr "Fjern bilder fra bildebiblioteket"
 
-#: src/Dialogs.vala:1176
+#: src/Dialogs.vala:1479
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1321
+#: src/Dialogs.vala:1626
 msgid "AM"
 msgstr "AM"
 
-#: src/Dialogs.vala:1322
+#: src/Dialogs.vala:1627
 msgid "PM"
 msgstr "PM"
 
-#: src/Dialogs.vala:1323
+#: src/Dialogs.vala:1628
 msgid "24 Hr"
 msgstr "24 t."
 
-#: src/Dialogs.vala:1338
+#: src/Dialogs.vala:1643
 msgid "_Shift photos/videos by the same amount"
 msgstr "_flytt bilder/videoer med den samme mengden"
 
-#: src/Dialogs.vala:1343
+#: src/Dialogs.vala:1648
 msgid "Set _all photos/videos to this time"
 msgstr "Gi _alle bilder/videoer denne dato/tid"
 
-#: src/Dialogs.vala:1353
+#: src/Dialogs.vala:1658
 msgid "_Modify original file"
 msgstr "_Modifiser orginalfilene"
 
-#: src/Dialogs.vala:1353
+#: src/Dialogs.vala:1658
 msgid "_Modify original files"
 msgstr "_Modifiser originalfiler"
 
-#: src/Dialogs.vala:1439
+#: src/Dialogs.vala:1744
 msgid "Original: "
 msgstr "Original: "
 
 # The string %m/%d/%y, %H:%M:%S is a format string that describes a U.S.-style 24 hour date and time (e.g. 9/22/2009, 13:15:04). You should translate %m/%d/%y, %H:%M:%S so that it describes the 24 hour date and time format used in your language and region. The format string you enter should conform to POSIX date and time formatting conventions. See the strftime manpage for a list of format specifiers and their meanings.
-#: src/Dialogs.vala:1440
+#: src/Dialogs.vala:1745
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
 # The string %m/%d/%y, %I:%M:%S %p is a format string that describes a U.S.-style 12 hour date and time (e.g. 9/22/2009, 1:15:04 PM). You should translate %m/%d/%y, %H:%M:%S so that it describes the 12 hour date and time format used in your language and region. The format string you enter should conform to POSIX date and time formatting conventions. See the strftime manpage for a list of format specifiers and their meanings.
-#: src/Dialogs.vala:1441
+#: src/Dialogs.vala:1746
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d/%M/%Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1530
+#: src/Dialogs.vala:1835
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -1892,7 +1890,7 @@
 "Eksponeringstiden vil bli flyttet fram med\n"
 "%d %s, %d %s, %d %s, og %d %s."
 
-#: src/Dialogs.vala:1531
+#: src/Dialogs.vala:1836
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -1901,31 +1899,31 @@
 "Eksponeringstidspunktet vil bli satt tilbake med\n"
 "%d %s, %d %s, %d %s, og %d %s."
 
-#: src/Dialogs.vala:1533
+#: src/Dialogs.vala:1838
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dager"
 
-#: src/Dialogs.vala:1534
+#: src/Dialogs.vala:1839
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: src/Dialogs.vala:1535
+#: src/Dialogs.vala:1840
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
-#: src/Dialogs.vala:1536
+#: src/Dialogs.vala:1841
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekund"
 msgstr[1] "sekunder"
 
-#: src/Dialogs.vala:1580
+#: src/Dialogs.vala:1885
 #, c-format
 msgid ""
 "\n"
@@ -1944,87 +1942,87 @@
 "\n"
 "Og %d andre."
 
-#: src/Dialogs.vala:1602 src/Dialogs.vala:1629
+#: src/Dialogs.vala:1907 src/Dialogs.vala:1934
 msgid "Tags (separated by commas):"
 msgstr "Tagger (kommaseparert):"
 
-#: src/Dialogs.vala:1709
+#: src/Dialogs.vala:2014
 msgid "Welcome!"
 msgstr "Velkommen!"
 
-#: src/Dialogs.vala:1716
+#: src/Dialogs.vala:2021
 #, c-format
 msgid "Welcome to Shotwell!"
 msgstr "Velkommen til Shotwell!"
 
-#: src/Dialogs.vala:1720
+#: src/Dialogs.vala:2025
 #, c-format
 msgid "To get started, import photos in any of these ways:"
 msgstr "For å komme igang, kan du importere bilder på en av følgende måter:"
 
-#: src/Dialogs.vala:1736
+#: src/Dialogs.vala:2044
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Velg <span weight=\"bold\">Import av fil %s fra en mappe</span>"
 
-#: src/Dialogs.vala:1737
+#: src/Dialogs.vala:2045
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Dra og slipp bilder inn i Shotwellvinduet"
 
-#: src/Dialogs.vala:1738
+#: src/Dialogs.vala:2046
 msgid "Connect a camera to your computer and import"
 msgstr "Koble et kamera til din datamaskin og importer bilder"
 
-#: src/Dialogs.vala:1748
+#: src/Dialogs.vala:2056
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importer bilder fra din %s mappe"
 
-#: src/Dialogs.vala:1755
+#: src/Dialogs.vala:2063
 msgid "You can also import photos in any of these ways:"
 msgstr "Du kan også importere bilder på en av følgende måter:"
 
-#: src/Dialogs.vala:1765
+#: src/Dialogs.vala:2073
 msgid "_Don't show this message again"
 msgstr "_Vis ikke denne beskjeden igjen"
 
-#: src/Dialogs.vala:1800
+#: src/Dialogs.vala:2108
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importer bilder fra ditt %s bibliotek"
 
-#: src/Dialogs.vala:1944 src/Dialogs.vala:1948
+#: src/Dialogs.vala:2252 src/Dialogs.vala:2256
 msgid "(Help)"
 msgstr "(Hjelp)"
 
-#: src/Dialogs.vala:1957
+#: src/Dialogs.vala:2265
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "År%sMåned%sDag"
 
-#: src/Dialogs.vala:1959
+#: src/Dialogs.vala:2267
 #, c-format
 msgid "Year%sMonth"
 msgstr "År%sMåned"
 
-#: src/Dialogs.vala:1961
+#: src/Dialogs.vala:2269
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "År%sMåned-Dag"
 
-#: src/Dialogs.vala:1963
+#: src/Dialogs.vala:2271
 msgid "Year-Month-Day"
 msgstr "År-Måned-Dag"
 
-#: src/Dialogs.vala:1964 src/editing_tools/EditingTools.vala:749
+#: src/Dialogs.vala:2272 src/editing_tools/EditingTools.vala:777
 msgid "Custom"
 msgstr "Tilpasset"
 
-#: src/Dialogs.vala:2201
+#: src/Dialogs.vala:2509
 msgid "Invalid pattern"
 msgstr "Ugyldig mønster"
 
-#: src/Dialogs.vala:2304
+#: src/Dialogs.vala:2612
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2032,23 +2030,23 @@
 "Shotwell kan kopiere bildene til din bildebibliotekmappe, eller lenke til "
 "bildene uten å kopiere dem."
 
-#: src/Dialogs.vala:2309
+#: src/Dialogs.vala:2617
 msgid "Co_py Photos"
 msgstr "Ko_pier bilder"
 
-#: src/Dialogs.vala:2310
+#: src/Dialogs.vala:2618
 msgid "_Import in Place"
 msgstr "_Importer til sted"
 
-#: src/Dialogs.vala:2311
+#: src/Dialogs.vala:2619
 msgid "Import to Library"
 msgstr "Importer til biblioteket"
 
-#: src/Dialogs.vala:2322
+#: src/Dialogs.vala:2630
 msgid "Removing Photos From Library"
 msgstr "Fjerner bilder fra bildebiblioteket"
 
-#: src/Dialogs.vala:2336
+#: src/Dialogs.vala:2644
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -2071,7 +2069,7 @@
 "\n"
 "Denne operasjonen kan ikke omgjøres."
 
-#: src/Dialogs.vala:2340
+#: src/Dialogs.vala:2648
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -2094,7 +2092,7 @@
 "\n"
 "Denne operasjonen kan ikke omgjøres."
 
-#: src/Dialogs.vala:2344
+#: src/Dialogs.vala:2652
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -2117,7 +2115,7 @@
 "\n"
 "Denne operasjonen kan ikke omgjøres."
 
-#: src/Dialogs.vala:2376
+#: src/Dialogs.vala:2684
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -2130,149 +2128,149 @@
 "%d bilder/videoer kan ikke flyttes til systemets papirkurv. Skal disse "
 "filene slettes?"
 
-#: src/Dialogs.vala:2393
+#: src/Dialogs.vala:2701
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
 msgstr[0] "Bildet eller videoen kan ikke slettes."
 msgstr[1] "%d bilder/videoer kan ikke slettes."
 
-#: src/library/LibraryWindow.vala:294
+#: src/library/LibraryWindow.vala:301
 msgid "_Import From Folder..."
 msgstr "_Importer fra mappe..."
 
-#: src/library/LibraryWindow.vala:295
+#: src/library/LibraryWindow.vala:302
 msgid "Import photos from disk to library"
 msgstr "Importer bilder fra harddisken til biblioteket"
 
-#: src/library/LibraryWindow.vala:302
+#: src/library/LibraryWindow.vala:309
 msgid "Import From _Application..."
 msgstr "Importer fra _program..."
 
-#: src/library/LibraryWindow.vala:306
+#: src/library/LibraryWindow.vala:313
 msgid "Sort _Events"
 msgstr "Sorter _hendelser"
 
-#: src/library/LibraryWindow.vala:316
+#: src/library/LibraryWindow.vala:323
 msgid "Empty T_rash"
 msgstr "Tøm _Søppelbøtten"
 
-#: src/library/LibraryWindow.vala:317
+#: src/library/LibraryWindow.vala:324
 msgid "Delete all photos in the trash"
 msgstr "Slett alle bilder som befinner seg i søppelbøtten"
 
-#: src/library/LibraryWindow.vala:322
+#: src/library/LibraryWindow.vala:329
 msgid "View Eve_nt for Photo"
 msgstr "Se hen_delsen bildet tilhører"
 
-#: src/library/LibraryWindow.vala:327
+#: src/library/LibraryWindow.vala:334
 msgid "_Find"
 msgstr "_Finn"
 
-#: src/library/LibraryWindow.vala:328
+#: src/library/LibraryWindow.vala:335
 msgid "Find photos and videos by search criteria"
 msgstr "Finn bilder og videoer via søkekriterier"
 
-#: src/sidebar/Tree.vala:196 src/library/LibraryWindow.vala:339
-#: src/searches/Branch.vala:77
+#: src/searches/Branch.vala:77 src/library/LibraryWindow.vala:346
+#: src/sidebar/Tree.vala:195
 msgid "Ne_w Saved Search..."
 msgstr "Nyt_t lagret søk..."
 
-#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:345
+#: src/library/LibraryWindow.vala:352 src/direct/DirectPhotoPage.vala:46
 msgid "_File"
 msgstr "_Fil"
 
-#: src/library/LibraryWindow.vala:349
+#: src/library/LibraryWindow.vala:356 src/direct/DirectPhotoPage.vala:73
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:357
+#: src/library/LibraryWindow.vala:364 src/direct/DirectPhotoPage.vala:77
 msgid "_Photo"
 msgstr "_Bilde"
 
-#: src/library/LibraryWindow.vala:361
+#: src/library/LibraryWindow.vala:368
 msgid "_Photos"
 msgstr "_Bilder"
 
-#: src/library/LibraryWindow.vala:365
+#: src/library/LibraryWindow.vala:372
 msgid "Even_ts"
 msgstr "_Hendelse"
 
-#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:373
+#: src/library/LibraryWindow.vala:380 src/direct/DirectPhotoPage.vala:169
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: src/library/LibraryWindow.vala:384
+#: src/library/LibraryWindow.vala:391
 msgid "_Basic Information"
 msgstr "_Grunnleggende informasjon"
 
-#: src/library/LibraryWindow.vala:385
+#: src/library/LibraryWindow.vala:392
 msgid "Display basic information for the selection"
 msgstr "Vis grunnleggende informasjon for denne markeringen"
 
-#: src/library/LibraryWindow.vala:390
+#: src/library/LibraryWindow.vala:397
 msgid "E_xtended Information"
 msgstr "_Utvidet informasjon"
 
-#: src/library/LibraryWindow.vala:391
+#: src/library/LibraryWindow.vala:398
 msgid "Display extended information for the selection"
 msgstr "Vis utvidet informasjon for denne markeringen"
 
-#: src/library/LibraryWindow.vala:396
+#: src/library/LibraryWindow.vala:403
 msgid "_Search Bar"
 msgstr "_Søkefelt"
 
-#: src/library/LibraryWindow.vala:397
+#: src/library/LibraryWindow.vala:404
 msgid "Display the search bar"
 msgstr "Vis søkefeltet"
 
-#: src/library/LibraryWindow.vala:650
+#: src/library/LibraryWindow.vala:668
 msgid "Import From Folder"
 msgstr "Importer fra mappe"
 
-#: src/library/LibraryWindow.vala:719
+#: src/library/LibraryWindow.vala:737
 msgid "Empty Trash"
 msgstr "Tøm søppelbøtten"
 
-#: src/library/LibraryWindow.vala:719
+#: src/library/LibraryWindow.vala:737
 msgid "Emptying Trash..."
 msgstr "Tømmer søppelbøtten …"
 
-#: src/library/LibraryWindow.vala:862
+#: src/library/LibraryWindow.vala:896
 msgid "Shotwell is configured to import photos to your home directory.\n"
 msgstr ""
 "Shotwell er satt opp til å importere bilder inn i ditt hjemmeområde.\n"
 
-#: src/library/LibraryWindow.vala:865 src/data_imports/DataImportsUI.vala:112
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:899
 msgid "_Import"
 msgstr "_Importer"
 
-#: src/library/LibraryWindow.vala:865
+#: src/library/LibraryWindow.vala:899
 msgid "Library Location"
 msgstr "Bildebibliotekets plassering:"
 
-#: src/library/LibraryWindow.vala:878
+#: src/library/LibraryWindow.vala:912
 msgid "Photos cannot be imported from this directory."
 msgstr "Ingen bilder kan importeres fra denne mappen."
 
-#: src/library/LibraryWindow.vala:1161
+#: src/library/LibraryWindow.vala:1200
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1205 src/library/LibraryWindow.vala:1213
+#: src/library/LibraryWindow.vala:1244 src/library/LibraryWindow.vala:1255
 msgid "Updating library..."
 msgstr "Oppdaterer bildebiblioteket..."
 
-#: src/library/LibraryWindow.vala:1218
+#: src/library/LibraryWindow.vala:1261
 msgid "Preparing to auto-import photos..."
 msgstr "forbereder automatisk importering av bilder..."
 
-#: src/library/LibraryWindow.vala:1223
+#: src/library/LibraryWindow.vala:1266
 msgid "Auto-importing photos..."
 msgstr "Automatisk importering av bilder..."
 
-#: src/library/LibraryWindow.vala:1228
+#: src/library/LibraryWindow.vala:1274
 msgid "Writing metadata to files..."
 msgstr "Skriver metadata til filer..."
 
@@ -2369,119 +2367,119 @@
 msgid "BMP"
 msgstr "BMP"
 
-#: src/searches/SavedSearchDialog.vala:164
+#: src/searches/SavedSearchDialog.vala:169
 msgid "contains"
 msgstr "inneholder"
 
-#: src/searches/SavedSearchDialog.vala:165
-#: src/searches/SavedSearchDialog.vala:430
+#: src/searches/SavedSearchDialog.vala:170
+#: src/searches/SavedSearchDialog.vala:497
 msgid "is exactly"
 msgstr "er eksakt"
 
-#: src/searches/SavedSearchDialog.vala:166
+#: src/searches/SavedSearchDialog.vala:171
 msgid "starts with"
 msgstr "starter med"
 
-#: src/searches/SavedSearchDialog.vala:167
+#: src/searches/SavedSearchDialog.vala:172
 msgid "ends with"
 msgstr "slutter med"
 
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:173
 msgid "does not contain"
 msgstr "inneholder ikke"
 
-#: src/searches/SavedSearchDialog.vala:169
-#: src/searches/SavedSearchDialog.vala:434
+#: src/searches/SavedSearchDialog.vala:174
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is not set"
 msgstr "er ikke satt"
 
-#: src/searches/SavedSearchDialog.vala:240
-#: src/searches/SavedSearchDialog.vala:309
-#: src/searches/SavedSearchDialog.vala:374
+#: src/searches/SavedSearchDialog.vala:245
+#: src/searches/SavedSearchDialog.vala:376
+#: src/searches/SavedSearchDialog.vala:441
 msgid "is"
 msgstr "er"
 
-#: src/searches/SavedSearchDialog.vala:241
+#: src/searches/SavedSearchDialog.vala:246
 msgid "is not"
 msgstr "er ikke"
 
-#: src/searches/SavedSearchDialog.vala:247
+#: src/searches/SavedSearchDialog.vala:252
 msgid "any photo"
 msgstr "hvilket som helst bilde"
 
-#: src/searches/SavedSearchDialog.vala:248
+#: src/searches/SavedSearchDialog.vala:253
 msgid "a raw photo"
 msgstr "et RAW-bilde"
 
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:254
 msgid "a video"
 msgstr "en video"
 
-#: src/searches/SavedSearchDialog.vala:303
+#: src/searches/SavedSearchDialog.vala:370
 msgid "flagged"
 msgstr "flagget"
 
-#: src/searches/SavedSearchDialog.vala:304
+#: src/searches/SavedSearchDialog.vala:371
 msgid "not flagged"
 msgstr "ikke flagget"
 
-#: src/searches/SavedSearchDialog.vala:367
+#: src/searches/SavedSearchDialog.vala:434
 msgid "and higher"
 msgstr "og høyere"
 
-#: src/searches/SavedSearchDialog.vala:368
+#: src/searches/SavedSearchDialog.vala:435
 msgid "only"
 msgstr "bare"
 
-#: src/searches/SavedSearchDialog.vala:369
+#: src/searches/SavedSearchDialog.vala:436
 msgid "and lower"
 msgstr "og lavere"
 
-#: src/searches/SavedSearchDialog.vala:431
+#: src/searches/SavedSearchDialog.vala:498
 msgid "is after"
 msgstr "er etter"
 
-#: src/searches/SavedSearchDialog.vala:432
+#: src/searches/SavedSearchDialog.vala:499
 msgid "is before"
 msgstr "er før"
 
-#: src/searches/SavedSearchDialog.vala:433
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is between"
 msgstr "er mellom"
 
-#: src/searches/SavedSearchDialog.vala:446
+#: src/searches/SavedSearchDialog.vala:513
 msgid "and"
 msgstr "og"
 
-#: src/searches/SavedSearchDialog.vala:653
+#: src/searches/SavedSearchDialog.vala:720
 msgid "any"
 msgstr "enhver"
 
-#: src/searches/SavedSearchDialog.vala:654
+#: src/searches/SavedSearchDialog.vala:721
 msgid "all"
 msgstr "alle"
 
-#: src/searches/SavedSearchDialog.vala:655
+#: src/searches/SavedSearchDialog.vala:722
 msgid "none"
 msgstr "ingen"
 
-#: src/searches/SearchBoolean.vala:143
+#: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "allslags tekst"
 
-#: src/searches/SearchBoolean.vala:146
+#: src/searches/SearchBoolean.vala:160
 msgid "Title"
 msgstr "Tittel"
 
-#: src/searches/SearchBoolean.vala:149
+#: src/searches/SearchBoolean.vala:163
 msgid "Tag"
 msgstr "Tagg"
 
-#: src/searches/SearchBoolean.vala:152
+#: src/searches/SearchBoolean.vala:169
 msgid "Event name"
 msgstr "Hendelsesnavn"
 
-#: src/searches/SearchBoolean.vala:155
+#: src/searches/SearchBoolean.vala:172
 msgid "File name"
 msgstr "Filnavn"
 
@@ -2489,15 +2487,15 @@
 msgid "Face"
 msgstr "Ansikt"
 
-#: src/searches/SearchBoolean.vala:158
+#: src/searches/SearchBoolean.vala:175
 msgid "Media type"
 msgstr "Mediatype"
 
-#: src/searches/SearchBoolean.vala:161
+#: src/searches/SearchBoolean.vala:178
 msgid "Flag state"
 msgstr "Flaggtilstand"
 
-#: src/searches/SearchBoolean.vala:167
+#: src/searches/SearchBoolean.vala:187
 msgid "Date"
 msgstr "Dato"
 
@@ -2509,25 +2507,25 @@
 msgid "Ne_w Search..."
 msgstr "Nyt_t søk"
 
-#: src/sidebar/Tree.vala:200
+#: src/sidebar/Tree.vala:199
 msgid "New _Tag..."
 msgstr "<ny _Tagg..."
 
-#: src/AppDirs.vala:55 src/AppDirs.vala:85
+#: src/AppDirs.vala:58 src/AppDirs.vala:88
 #, c-format
 msgid "Unable to create data directory %s: %s"
 msgstr "Kan ikke lage datakatalog %s: %s"
 
-#: src/AppDirs.vala:132
+#: src/AppDirs.vala:152
 msgid "Pictures"
 msgstr "Bilder"
 
-#: src/AppDirs.vala:170
+#: src/AppDirs.vala:190
 #, c-format
 msgid "Unable to create temporary directory %s: %s"
 msgstr "Kan ikke midlertidig katalog %s: %s"
 
-#: src/AppDirs.vala:187 src/AppDirs.vala:203
+#: src/AppDirs.vala:207 src/AppDirs.vala:223
 #, c-format
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "Kan ikke lage data for underkatalog %s: %s"
@@ -2541,395 +2539,395 @@
 msgid "Copyright 2009-2012 Yorba Foundation"
 msgstr "Copyright 2009-2012 Yorba Foundation"
 
-#: src/Resources.vala:131
+#: src/Resources.vala:144
 msgid "Rotate _Right"
 msgstr "Roter _høyre"
 
-#: src/Resources.vala:132 src/Resources.vala:137
+#: src/Resources.vala:145 src/Resources.vala:150
 msgid "Rotate"
 msgstr "Roter"
 
-#: src/Resources.vala:133
+#: src/Resources.vala:146
 msgid "Rotate Right"
 msgstr "Roter høyre"
 
-#: src/Resources.vala:134
+#: src/Resources.vala:147
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Roter bildene mot høyre (trykk Ctrl for å rotere mot venstre)"
 
-#: src/Resources.vala:136
+#: src/Resources.vala:149
 msgid "Rotate _Left"
 msgstr "Roter _venstre"
 
-#: src/Resources.vala:138
+#: src/Resources.vala:151
 msgid "Rotate Left"
 msgstr "Roter venstre"
 
-#: src/Resources.vala:139
+#: src/Resources.vala:152
 msgid "Rotate the photos left"
 msgstr "Roter bildene mot venstre"
 
-#: src/Resources.vala:141
+#: src/Resources.vala:154
 msgid "Flip Hori_zontally"
 msgstr "Vend hori_sontalt"
 
-#: src/Resources.vala:142
+#: src/Resources.vala:155
 msgid "Flip Horizontally"
 msgstr "Vend horisontalt"
 
-#: src/Resources.vala:144
+#: src/Resources.vala:157
 msgid "Flip Verti_cally"
 msgstr "Vend verti_kalt"
 
-#: src/Resources.vala:145
+#: src/Resources.vala:158
 msgid "Flip Vertically"
 msgstr "Vend vertikalt"
 
-#: src/Resources.vala:147
+#: src/Resources.vala:160
 msgid "_Enhance"
 msgstr "_gjør skarpere"
 
-#: src/Resources.vala:148
+#: src/Resources.vala:161
 msgid "Enhance"
 msgstr "Gjør skarpere"
 
-#: src/Resources.vala:149
+#: src/Resources.vala:162
 msgid "Automatically improve the photo's appearance"
 msgstr "Automatisk forbedring av bildet"
 
-#: src/Resources.vala:151
+#: src/Resources.vala:172
 msgid "_Crop"
 msgstr "_Beskjær"
 
-#: src/Resources.vala:152
+#: src/Resources.vala:173
 msgid "Crop"
 msgstr "Beskjær"
 
-#: src/Resources.vala:153
+#: src/Resources.vala:174
 msgid "Crop the photo's size"
 msgstr "Beskjær bildets størrelse"
 
-#: src/Resources.vala:155
+#: src/Resources.vala:176 src/editing_tools/StraightenTool.vala:100
 msgid "_Straighten"
 msgstr "_Oppretting"
 
-#: src/Resources.vala:156
+#: src/Resources.vala:177
 msgid "Straighten"
 msgstr "Oppretting"
 
-#: src/Resources.vala:157
+#: src/Resources.vala:178
 msgid "Straighten the photo"
 msgstr "Rett opp bildet"
 
-#: src/Resources.vala:159
+#: src/Resources.vala:180
 msgid "_Red-eye"
 msgstr "_Rødeøyne"
 
-#: src/Resources.vala:160
+#: src/Resources.vala:181
 msgid "Red-eye"
 msgstr "Rødøye"
 
-#: src/Resources.vala:161
+#: src/Resources.vala:182
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Reduser eller fjern eventuelle røde øyne i bildet"
 
-#: src/Resources.vala:163
+#: src/Resources.vala:184
 msgid "_Adjust"
 msgstr "_Juster"
 
-#: src/Resources.vala:164
+#: src/Resources.vala:185
 msgid "Adjust"
 msgstr "Juster"
 
-#: src/Resources.vala:165
+#: src/Resources.vala:186
 msgid "Adjust the photo's color and tone"
 msgstr "Juster bildets farge og tonegjengivelse"
 
-#: src/Resources.vala:167
+#: src/Resources.vala:188
 msgid "Re_vert to Original"
 msgstr "omgj_ør til orginal"
 
-#: src/Resources.vala:168
+#: src/Resources.vala:189
 msgid "Revert to Original"
 msgstr "Forkast alle endringer"
 
-#: src/Resources.vala:170
+#: src/Resources.vala:191
 msgid "Revert External E_dits"
 msgstr "Omgjør eksterne re_digeringer"
 
-#: src/Resources.vala:171
+#: src/Resources.vala:192
 msgid "Revert to the master photo"
 msgstr "gå tilbake til orginalbildet"
 
-#: src/Resources.vala:173
+#: src/Resources.vala:194
 msgid "Set as _Desktop Background"
 msgstr "Bruk som _skrivebordsbakgrunn"
 
-#: src/Resources.vala:174
+#: src/Resources.vala:195
 msgid "Set selected image to be the new desktop background"
 msgstr "Bruk det valgte bildet som ny skrivebordsbakgrunn"
 
-#: src/Resources.vala:175
+#: src/Resources.vala:196
 msgid "Set as _Desktop Slideshow..."
 msgstr "Angi som lysbildeshow med _skrivebordsbakgrunner"
 
-#: src/Resources.vala:177
+#: src/Resources.vala:198
 msgid "_Undo"
 msgstr "_Gjenskap"
 
-#: src/Resources.vala:178
+#: src/Resources.vala:199
 msgid "Undo"
 msgstr "Gjenskap"
 
-#: src/Resources.vala:180
+#: src/Resources.vala:201
 msgid "_Redo"
 msgstr "_Gjør om"
 
-#: src/Resources.vala:181
+#: src/Resources.vala:202
 msgid "Redo"
 msgstr "omgjør"
 
-#: src/Resources.vala:183
+#: src/Resources.vala:204
 msgid "Re_name Event..."
 msgstr "_Omdøp hendelsen..."
 
-#: src/Resources.vala:186
+#: src/Resources.vala:207
 msgid "Make _Key Photo for Event"
 msgstr "Lag nøkkelfoto for hendelsen"
 
-#: src/Resources.vala:187
+#: src/Resources.vala:208
 msgid "Make Key Photo for Event"
 msgstr "Lag et nøkkelbilde for hendelsen"
 
-#: src/Resources.vala:189
+#: src/Resources.vala:210
 msgid "_New Event"
 msgstr "_Ny hendelse"
 
-#: src/Resources.vala:190
+#: src/Resources.vala:211
 msgid "New Event"
 msgstr "Ny hendelse"
 
-#: src/Resources.vala:192
+#: src/Resources.vala:213
 msgid "Move Photos"
 msgstr "Flytt bildene"
 
-#: src/Resources.vala:193
+#: src/Resources.vala:214
 msgid "Move photos to an event"
 msgstr "Flytt bildene til en hendelse"
 
-#: src/Resources.vala:195
+#: src/Resources.vala:216
 msgid "_Merge Events"
 msgstr "_Flett hendelser"
 
-#: src/Resources.vala:196
+#: src/Resources.vala:217
 msgid "Merge"
 msgstr "Flett"
 
-#: src/Resources.vala:197
+#: src/Resources.vala:218
 msgid "Combine events into a single event"
 msgstr "Slå sammen flere hendelser til en enkelt hendelse"
 
-#: src/Resources.vala:199
+#: src/Resources.vala:220
 msgid "_Set Rating"
 msgstr "_Gi vurdering"
 
-#: src/Resources.vala:200
+#: src/Resources.vala:221
 msgid "Set Rating"
 msgstr "Gi vurdering"
 
-#: src/Resources.vala:201
+#: src/Resources.vala:222
 msgid "Change the rating of your photo"
 msgstr "Endre vurdering på bildet ditt"
 
-#: src/Resources.vala:203
+#: src/Resources.vala:224
 msgid "_Increase"
 msgstr "_Øk"
 
-#: src/Resources.vala:204
+#: src/Resources.vala:225
 msgid "Increase Rating"
 msgstr "Øk vurderingen"
 
-#: src/Resources.vala:206
+#: src/Resources.vala:227
 msgid "_Decrease"
 msgstr "_Senk"
 
-#: src/Resources.vala:207
+#: src/Resources.vala:228
 msgid "Decrease Rating"
 msgstr "Senk rangering"
 
-#: src/Resources.vala:209
+#: src/Resources.vala:230
 msgid "_Unrated"
 msgstr "_Urangert"
 
-#: src/Resources.vala:210
+#: src/Resources.vala:231
 msgid "Unrated"
 msgstr "urangert"
 
-#: src/Resources.vala:211
+#: src/Resources.vala:232
 msgid "Rate Unrated"
 msgstr "Ranger urangerte"
 
-#: src/Resources.vala:212
+#: src/Resources.vala:233
 msgid "Setting as unrated"
 msgstr "Satt som urangert"
 
-#: src/Resources.vala:213
+#: src/Resources.vala:234
 msgid "Remove any ratings"
 msgstr "Fjern alle rangeringer"
 
-#: src/Resources.vala:215
+#: src/Resources.vala:236
 msgid "_Rejected"
 msgstr "_Forkastet"
 
-#: src/Resources.vala:216
+#: src/Resources.vala:237
 msgid "Rejected"
 msgstr "forkastet"
 
-#: src/Resources.vala:217
+#: src/Resources.vala:238
 msgid "Rate Rejected"
 msgstr "rangering forkastet"
 
-#: src/Resources.vala:218
+#: src/Resources.vala:239
 msgid "Setting as rejected"
 msgstr "Satt som forkastet"
 
-#: src/Resources.vala:219
+#: src/Resources.vala:240
 msgid "Set rating to rejected"
 msgstr "Sett rangeringen til forkastet"
 
-#: src/Resources.vala:221
+#: src/Resources.vala:242
 msgid "Rejected _Only"
 msgstr "_Bare forkastede"
 
-#: src/Resources.vala:222
+#: src/Resources.vala:243
 msgid "Rejected Only"
 msgstr "Bare forkastede"
 
-#: src/Resources.vala:223
+#: src/Resources.vala:244
 msgid "Show only rejected photos"
 msgstr "Vis bare forkastede bilder"
 
-#: src/Resources.vala:225
+#: src/Resources.vala:246
 msgid "All + _Rejected"
 msgstr "Alle + fo_rkastet"
 
-#: src/Resources.vala:226 src/Resources.vala:227
+#: src/Resources.vala:247 src/Resources.vala:248
 msgid "Show all photos, including rejected"
 msgstr "Vis alle bilder, inkludert de som er forkastet"
 
-#: src/Resources.vala:229
+#: src/Resources.vala:250
 msgid "_All Photos"
 msgstr "_Alle bilder"
 
-#: src/Resources.vala:230 src/Resources.vala:231
+#: src/Resources.vala:251 src/Resources.vala:252
 msgid "Show all photos"
 msgstr "Vis alle bilder"
 
-#: src/Resources.vala:233
+#: src/Resources.vala:254
 msgid "_Ratings"
 msgstr "_Rangering"
 
-#: src/Resources.vala:234
+#: src/Resources.vala:255
 msgid "Display each photo's rating"
 msgstr "Vis rangeringen for hvert bilde"
 
-#: src/Resources.vala:236
+#: src/Resources.vala:257
 msgid "_Filter Photos"
 msgstr "_Filtrer bilder"
 
-#: src/Resources.vala:237
+#: src/Resources.vala:258
 msgid "Filter Photos"
 msgstr "Filtrer bilder"
 
-#: src/Resources.vala:238
+#: src/Resources.vala:259
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Begrens antall bilder vist basert på et filter"
 
-#: src/Resources.vala:240
+#: src/Resources.vala:261
 msgid "_Duplicate"
 msgstr "_Dupliker"
 
-#: src/Resources.vala:241
+#: src/Resources.vala:262
 msgid "Duplicate"
 msgstr "Dupliker"
 
-#: src/Resources.vala:242
+#: src/Resources.vala:263
 msgid "Make a duplicate of the photo"
 msgstr "Lag et duplikat av bildet"
 
-#: src/Resources.vala:244
+#: src/Resources.vala:265
 msgid "_Export..."
 msgstr "_Eksporter..."
 
-#: src/Resources.vala:246
+#: src/Resources.vala:267
 msgid "_Print..."
 msgstr "_Utskrift..."
 
-#: src/Resources.vala:248
+#: src/Resources.vala:269
 msgid "Pu_blish..."
 msgstr "Pu_bliser..."
 
-#: src/Resources.vala:249
+#: src/Resources.vala:270
 msgid "Publish"
 msgstr "Publiser"
 
-#: src/Resources.vala:250
+#: src/Resources.vala:271
 msgid "Publish to various websites"
 msgstr "Publiser til diverse nettsteder"
 
-#: src/Resources.vala:252
+#: src/Resources.vala:273
 msgid "Edit _Title..."
 msgstr "Endre _tittel..."
 
-#: src/Resources.vala:255
+#: src/Resources.vala:282
 msgid "_Adjust Date and Time..."
 msgstr "_Juster dato og tid..."
 
-#: src/Resources.vala:256
+#: src/Resources.vala:283
 msgid "Adjust Date and Time"
 msgstr "Juster dato og tid"
 
-#: src/Resources.vala:258
+#: src/Resources.vala:285
 msgid "Add _Tags..."
 msgstr "Legg til _Tagger"
 
-#: src/Resources.vala:260 src/Resources.vala:291
+#: src/Resources.vala:287 src/Resources.vala:318
 msgid "Add Tags"
 msgstr "Legg til tagger"
 
-#: src/Resources.vala:262
+#: src/Resources.vala:289
 msgid "_Preferences"
 msgstr "_Preferanser"
 
-#: src/Resources.vala:264
+#: src/Resources.vala:291
 msgid "Open With E_xternal Editor"
 msgstr "Åpne i en e_kstern bildebehandler"
 
-#: src/Resources.vala:266
+#: src/Resources.vala:293
 msgid "Open With RA_W Editor"
 msgstr "Åpne med en RA_W behandler"
 
-#: src/Resources.vala:268
+#: src/Resources.vala:295
 msgid "Send _To..."
 msgstr "Send _til..."
 
-#: src/Resources.vala:271
+#: src/Resources.vala:298
 msgid "_Find..."
 msgstr "_Finn..."
 
-#: src/Resources.vala:272
+#: src/Resources.vala:299
 msgid "Find"
 msgstr "Finn"
 
-#: src/Resources.vala:273
+#: src/Resources.vala:300
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Finn et bilde ved å skrive tekst som finnes i navn eller nøkkelord"
 
-#: src/Resources.vala:275
+#: src/Resources.vala:302
 msgid "_Flag"
 msgstr "_Flagg"
 
-#: src/Resources.vala:277
+#: src/Resources.vala:304
 msgid "Un_flag"
 msgstr "av_flagg"
 
@@ -2945,133 +2943,133 @@
 msgid "Delete Face"
 msgstr "Slett ansikt"
 
-#: src/Resources.vala:315
+#: src/Resources.vala:342
 msgid "_Rename..."
 msgstr "_Gi nytt navn..."
 
-#: src/Resources.vala:280
+#: src/Resources.vala:307
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Klarer ikke å starte bildebehandleren: %s"
 
-#: src/Resources.vala:285
+#: src/Resources.vala:312
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Legg til tagg \"%s\""
 
-#: src/Resources.vala:287
+#: src/Resources.vala:314
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Legg til taggene \"%s\" og \"%s\""
 
-#: src/Resources.vala:295
+#: src/Resources.vala:322
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "_Slett tagg \"%s\""
 
-#: src/Resources.vala:299
+#: src/Resources.vala:326
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Slett tag \"%s\""
 
-#: src/Resources.vala:302
+#: src/Resources.vala:329
 msgid "Delete Tag"
 msgstr "Slett tagg"
 
-#: src/Resources.vala:305
+#: src/Resources.vala:332
 msgid "_New"
 msgstr "_Ny"
 
-#: src/Resources.vala:308
+#: src/Resources.vala:335
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "_Omdøp tagg  \"%s\"..."
 
-#: src/Resources.vala:312
+#: src/Resources.vala:339
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Omdøp taggen \"%s\" til \"%s\""
 
-#: src/Resources.vala:317
+#: src/Resources.vala:344
 msgid "Modif_y Tags..."
 msgstr "Modif_iser tagger..."
 
-#: src/Resources.vala:318
+#: src/Resources.vala:345
 msgid "Modify Tags"
 msgstr "Modifiser tagger"
 
-#: src/Resources.vala:321
+#: src/Resources.vala:348
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Tagg bildene som \"%s\""
 
-#: src/Resources.vala:321
+#: src/Resources.vala:348
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Tagg bildet som \"%s\""
 
-#: src/Resources.vala:325
+#: src/Resources.vala:352
 #, c-format
 msgid "Tag the selected photo as \"%s\""
 msgstr "Tagg de valgte bildene som \"%s\""
 
-#: src/Resources.vala:326
+#: src/Resources.vala:353
 #, c-format
 msgid "Tag the selected photos as \"%s\""
 msgstr "Tagg de utvalgte bildene som \"%s\""
 
-#: src/Resources.vala:330
+#: src/Resources.vala:357
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Fjern taggen \"%s\" fra _bildene"
 
-#: src/Resources.vala:331
+#: src/Resources.vala:358
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Fjern taggen \"%s\" fra _bildene"
 
-#: src/Resources.vala:335
+#: src/Resources.vala:362
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Fjern taggen \"%s\" fra bildene"
 
-#: src/Resources.vala:336
+#: src/Resources.vala:363
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Fjern taggen \"%s\" fra bildene"
 
-#: src/Resources.vala:340
+#: src/Resources.vala:367
 #, c-format
 msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgstr "Kan ikke omdøpe taggen til \"%s\" fordi den allerede finnes."
 
-#: src/Resources.vala:344
+#: src/Resources.vala:371
 #, c-format
 msgid "Unable to rename search to \"%s\" because the search already exists."
 msgstr "Kan ikke endre søket til \"%s\" da søket allerede finnes."
 
-#: src/Resources.vala:347
+#: src/Resources.vala:374
 msgid "Saved Search"
 msgstr "Lagrede søk"
 
-#: src/Resources.vala:349
+#: src/Resources.vala:376
 msgid "Delete Search"
 msgstr "slett søk"
 
-#: src/Resources.vala:352
+#: src/Resources.vala:379
 msgid "_Edit..."
 msgstr "_Redger..."
 
-#: src/Resources.vala:353
+#: src/Resources.vala:380
 msgid "Re_name..."
 msgstr "nytt_navn...."
 
-#: src/Resources.vala:356
+#: src/Resources.vala:383
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "omdøp søk \"%s\" til \"%s\""
 
-#: src/Resources.vala:360
+#: src/Resources.vala:387
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "Slett søk \"%s\""
@@ -3122,93 +3120,93 @@
 msgid "Delete Face \"%s\""
 msgstr "Slett ansikt \"%s\""
 
-#: src/Resources.vala:517
+#: src/Resources.vala:545
 #, c-format
 msgid "Rate %s"
 msgstr "Ranger %s"
 
-#: src/Resources.vala:518
+#: src/Resources.vala:546
 #, c-format
 msgid "Set rating to %s"
 msgstr "Sett rangering til %s"
 
-#: src/Resources.vala:519
+#: src/Resources.vala:547
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Setter rangering til %s"
 
 # Må sjekkes om det menes vis eller skjerm her..
-#: src/Resources.vala:521
+#: src/Resources.vala:549
 #, c-format
 msgid "Display %s"
 msgstr "Vis %s"
 
-#: src/Resources.vala:522
+#: src/Resources.vala:550
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Bare vis bilder som er rangert til %s"
 
-#: src/Resources.vala:523
+#: src/Resources.vala:551
 #, c-format
 msgid "%s or Better"
 msgstr "%s eller bedre"
 
-#: src/Resources.vala:524
+#: src/Resources.vala:552
 #, c-format
 msgid "Display %s or Better"
 msgstr "Vis %s eller bedre"
 
-#: src/Resources.vala:525
+#: src/Resources.vala:553
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Bare vis bilder med en rangering på %s eller bedre"
 
-#: src/Resources.vala:616
+#: src/Resources.vala:644
 msgid "Remove the selected photos from the trash"
 msgstr "Fjern de valgte bildene fra søppelbøtten"
 
-#: src/Resources.vala:617
+#: src/Resources.vala:645
 msgid "Remove the selected photos from the library"
 msgstr "Fjern de utvalgte bildene fra bildebiblioteket"
 
-#: src/Resources.vala:619
+#: src/Resources.vala:647
 msgid "_Restore"
 msgstr "_Gjenopprett"
 
-#: src/Resources.vala:620
+#: src/Resources.vala:648
 msgid "Move the selected photos back into the library"
 msgstr "Flytt de valgte bildene tilbake til biblioteket"
 
-#: src/Resources.vala:622
+#: src/Resources.vala:650
 msgid "Show in File Mana_ger"
 msgstr "Åpne med filhåndtereren"
 
-#: src/Resources.vala:623
+#: src/Resources.vala:651
 msgid "Open the selected photo's directory in the file manager"
 msgstr "Åpne de valgte bildemappene i filbehandleren"
 
-#: src/Resources.vala:626
+#: src/Resources.vala:654
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Kan ikke åpnes i filbehandleren: %s"
 
-#: src/Resources.vala:629
+#: src/Resources.vala:657
 msgid "R_emove From Library"
 msgstr "Fj_ern fra bildebiblioteket"
 
-#: src/Resources.vala:631
+#: src/Resources.vala:659
 msgid "_Move to Trash"
 msgstr "Flytt til søppelbøtten"
 
-#: src/Resources.vala:633
+#: src/Resources.vala:661
 msgid "Select _All"
 msgstr "Velg _alle"
 
-#: src/Resources.vala:634
+#: src/Resources.vala:662
 msgid "Select all items"
 msgstr "Velg alle"
 
-#: src/DirectoryMonitor.vala:885
+#: src/DirectoryMonitor.vala:889
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Kan ikke overvåke %s: Dette er ingen mappe (%s)"
@@ -3282,47 +3280,47 @@
 msgid "Tags"
 msgstr "Tagger"
 
-#: src/editing_tools/EditingTools.vala:635
+#: src/editing_tools/EditingTools.vala:661
 msgid "Return to current photo dimensions"
 msgstr "Gå tilbake til aktuelle bildedimensjoner"
 
-#: src/editing_tools/EditingTools.vala:638
+#: src/editing_tools/EditingTools.vala:664
 msgid "Set the crop for this photo"
 msgstr "Angi beskjæring av dette bildet"
 
-#: src/editing_tools/EditingTools.vala:650
+#: src/editing_tools/EditingTools.vala:676
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Pivoter beskjæringsrektanglet mellom stående eller liggende"
 
-#: src/editing_tools/EditingTools.vala:721
+#: src/editing_tools/EditingTools.vala:749
 msgid "Unconstrained"
 msgstr "Ubegrenset"
 
-#: src/editing_tools/EditingTools.vala:722
+#: src/editing_tools/EditingTools.vala:750
 msgid "Square"
 msgstr "Firkant"
 
-#: src/editing_tools/EditingTools.vala:723
+#: src/editing_tools/EditingTools.vala:751
 msgid "Screen"
 msgstr "Skjerm"
 
-#: src/editing_tools/EditingTools.vala:724
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1224
+#: src/editing_tools/EditingTools.vala:752
+#: plugins/shotwell-publishing/PicasaPublishing.vala:750
 msgid "Original Size"
 msgstr "Opprinnelig størrelse"
 
-#: src/editing_tools/EditingTools.vala:725
-#: src/editing_tools/EditingTools.vala:728
-#: src/editing_tools/EditingTools.vala:738
-#: src/editing_tools/EditingTools.vala:748
+#: src/editing_tools/EditingTools.vala:753
+#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:766
+#: src/editing_tools/EditingTools.vala:776
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:726
+#: src/editing_tools/EditingTools.vala:754
 msgid "SD Video (4 : 3)"
 msgstr "SD Video (4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:727
+#: src/editing_tools/EditingTools.vala:755
 msgid "HD Video (16 : 9)"
 msgstr "HD Video (16 : 9)"
 
@@ -3357,64 +3355,64 @@
 msgstr ""
 "Flytt eller modifiser ansiktsformen eller navnet. Trykk deretter enter"
 
-#: src/editing_tools/EditingTools.vala:1845
+#: src/editing_tools/EditingTools.vala:1865
 msgid "Close the red-eye tool"
 msgstr "Steng ned rødøye-verktøyet"
 
-#: src/editing_tools/EditingTools.vala:1848
+#: src/editing_tools/EditingTools.vala:1868
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Fjern eventuelle rødeøyer i det valgte området"
 
-#: src/editing_tools/EditingTools.vala:2177
 #: src/editing_tools/StraightenTool.vala:102
+#: src/editing_tools/EditingTools.vala:2204
 msgid "_Reset"
 msgstr "_Nullstill"
 
-#: src/editing_tools/EditingTools.vala:2195
+#: src/editing_tools/EditingTools.vala:2226
 msgid "Saturation:"
 msgstr "Metning:"
 
-#: src/editing_tools/EditingTools.vala:2202
+#: src/editing_tools/EditingTools.vala:2234
 msgid "Tint:"
 msgstr "Nyanse"
 
-#: src/editing_tools/EditingTools.vala:2210
+#: src/editing_tools/EditingTools.vala:2243
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: src/editing_tools/EditingTools.vala:2217
+#: src/editing_tools/EditingTools.vala:2251
 msgid "Shadows:"
 msgstr "Skygger:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2313
 msgid "Reset Colors"
 msgstr "Nullstill farger"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2313
 msgid "Reset all color adjustments to original"
 msgstr "tilbakestill alle fargejusteringer til orginalverdiene"
 
-#: src/editing_tools/EditingTools.vala:2614
+#: src/editing_tools/EditingTools.vala:2665
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: src/editing_tools/EditingTools.vala:2627
+#: src/editing_tools/EditingTools.vala:2678
 msgid "Tint"
 msgstr "Nyanse"
 
-#: src/editing_tools/EditingTools.vala:2640
+#: src/editing_tools/EditingTools.vala:2691
 msgid "Saturation"
 msgstr "Metning"
 
-#: src/editing_tools/EditingTools.vala:2653
+#: src/editing_tools/EditingTools.vala:2704
 msgid "Exposure"
 msgstr "Eksponering"
 
-#: src/editing_tools/EditingTools.vala:2666
+#: src/editing_tools/EditingTools.vala:2717
 msgid "Shadows"
 msgstr "Skygger"
 
-#: src/editing_tools/EditingTools.vala:2676
+#: src/editing_tools/EditingTools.vala:2740
 msgid "Contrast Expansion"
 msgstr "Kontrastutvidelse"
 
@@ -3422,15 +3420,15 @@
 msgid "Angle:"
 msgstr "Vinkel:"
 
-#: src/Page.vala:1265
+#: src/Page.vala:1268
 msgid "No photos/videos"
 msgstr "Ingen bilder/videoer"
 
-#: src/Page.vala:1269
+#: src/Page.vala:1272
 msgid "No photos/videos found"
 msgstr "Ingen bilder/videoer funnet"
 
-#: src/Page.vala:2555
+#: src/Page.vala:2569
 msgid "Photos cannot be exported to this directory."
 msgstr "Bilder kan ikke eksporteres til denne mappen."
 
@@ -3512,8 +3510,7 @@
 msgid "Data Imports"
 msgstr "Dataimporteringer"
 
-#: plugins/common/RESTSupport.vala:427
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1291
+#: plugins/common/RESTSupport.vala:424
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "En midlertidig fil, som trengs for publisering, er ikke tilgjengelig"
 
@@ -3551,7 +3548,7 @@
 msgid "Verifying authorization..."
 msgstr "Kontrollerer autorisasjon..."
 
-#: .././plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:16
 msgid ""
 "Enter the confirmation number which appears after you log into Flickr in "
 "your Web browser."
@@ -3559,7 +3556,7 @@
 "Skriv inn bekreftelsesnummeret som dukker opp etter du logger på Flickr i "
 "din nettleser."
 
-#: .././plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.glade:37
 msgid "Authorization _Number:"
 msgstr "Autorisasjons_nummer:"
 
@@ -3598,29 +3595,27 @@
 msgid "Photos and videos _visible to:"
 msgstr "Bilder og videoer er _synlige for:"
 
-#: .././plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:6
-#: .././plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:6
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:61
 msgid "Photo _size:"
-msgstr "_Bildestørrelse:"
+msgstr "Bilde_størrelse:"
 
-#: .././plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:7
-#: .././plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
-#: .././plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:197
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:137
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:229
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:99
 msgid "_Logout"
 msgstr "_Logg ut"
 
-#: .././plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:8
-#: .././plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
-#: .././plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:8
-#: .././plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:8
-#: .././plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:10
-#: .././plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:212
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.glade:153
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:243
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:115
 msgid "_Publish"
 msgstr "_Publiser"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1703
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1207
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1154
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1182
 msgid "Everyone"
 msgstr "Alle"
 
@@ -3628,38 +3623,38 @@
 msgid "Friends & family only"
 msgstr "Kun venner & familie"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1700
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1180
 msgid "Just me"
 msgstr "Bare meg selv"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1229
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1166
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1246
 msgid "500 x 375 pixels"
 msgstr "500 x 375 piksler"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1230
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1167
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1247
 msgid "1024 x 768 pixels"
 msgstr "1024 x 768 piksler"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1168
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1248
 msgid "2048 x 1536 pixels"
 msgstr "2048 x 1536 piksler"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1169
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1249
 msgid "4096 x 3072 pixels"
 msgstr "4096 x 3072 piksler"
 
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1127
 #: plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: plugins/shotwell-publishing/FacebookPublishing.vala:63
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1072
+#: plugins/shotwell-publishing/FacebookPublishing.vala:61
 msgid "Shotwell Connect"
 msgstr "Shotwell - tilkopling"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:68
+#: plugins/shotwell-publishing/FacebookPublishing.vala:63
 msgid ""
 "You are not currently logged into Facebook.\n"
 "\n"
@@ -3670,12 +3665,12 @@
 msgstr ""
 "Det er nå ikke innlogget på Facebook.\n"
 "\n"
-"Hvis du ikke har en Facebook-konto, kan du opprette en under innloggings "
-"prosessen. Under innloggingen, kan Shotwell komme til å spørre deg om "
-"tillatelse til å laste opp bilder og publisere dem i din facebook-strøm. "
-"Disse tillatelsene er påkrevd for at Shotwell Connector skal fungere."
+"Hvis du ikke har en Facebook-konto, kan du opprette en under "
+"innloggingsprosessen. Under innloggingen, kan Shotwell komme til å spørre "
+"deg om tillatelse til å laste opp bilder og publisere dem i din Facebook-"
+"strøm. Disse tillatelsene er påkrevd for at Shotwell Connector skal fungere."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:70
+#: plugins/shotwell-publishing/FacebookPublishing.vala:65
 msgid ""
 "You have already logged in and out of Facebook during this Shotwell "
 "session.\n"
@@ -3686,24 +3681,24 @@
 "For å fortsette å publisere ttil Facebook: Avslutt og restart Shotwell, "
 "deretter forsøk å publiser igjen."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:134
+#: plugins/shotwell-publishing/FacebookPublishing.vala:86
 msgid "Standard (720 pixels)"
 msgstr "Standard (720 piksler)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:137
+#: plugins/shotwell-publishing/FacebookPublishing.vala:89
 msgid "Large (2048 pixels)"
 msgstr "Stor (2048 piksler)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:269
+#: plugins/shotwell-publishing/FacebookPublishing.vala:254
 msgid "Testing connection to Facebook..."
 msgstr "Tester forbindelsen til Facebook..."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:715
-#: plugins/shotwell-publishing/FacebookPublishing.vala:481
+#: plugins/shotwell-publishing/PicasaPublishing.vala:379
+#: plugins/shotwell-publishing/FacebookPublishing.vala:347
 msgid "Creating album..."
 msgstr "Oppretter album..."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1543
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1019
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -3712,23 +3707,23 @@
 "Du er innlogget på Facebook som %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1544
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1020
 msgid "Where would you like to publish the selected photos?"
 msgstr "Hvor vil du publisere de utvalgte bildene?"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1545
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1021
 msgid "Upload _size:"
 msgstr "Opplastningsstørrelse"
 
-#: .././plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:39
 msgid "Publish to an e_xisting album:"
 msgstr "Publiser til et eks_isterende album:"
 
-#: .././plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:57
 msgid "Create a _new album named:"
 msgstr "Lag et _nytt album med navnet:"
 
-#: .././plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.glade:139
 msgid "Videos and new photo albums _visible to:"
 msgstr "videoer og nye fotoalbum er _synlige for:"
 
@@ -3822,45 +3817,45 @@
 msgid "Go _Back"
 msgstr "Gå _tilbake"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1137
+#: plugins/shotwell-publishing/PicasaPublishing.vala:659
 #, c-format
 msgid "You are logged into Picasa Web Albums as %s."
 msgstr "Du er innlogget hos Picasa Web Albums som %s."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1142
+#: plugins/shotwell-publishing/PicasaPublishing.vala:665
 msgid "Videos will appear in:"
 msgstr "Videoer vil dukke opp i:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1147
+#: plugins/shotwell-publishing/PicasaPublishing.vala:670
 msgid "Photos will appear in:"
 msgstr "Bildene vil vises i:"
 
-#: .././plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:75
 msgid "An _existing album:"
 msgstr "Et _eksisterende album:"
 
-#: .././plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
-#: .././plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:94
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.glade:52
 msgid "A _new album named:"
-msgstr "Et _nytt album med navnet:"
+msgstr "Et _nytt album ved navn:"
 
-#: .././plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:5
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:113
 msgid "L_ist album in public gallery"
 msgstr "V_is albumet i offentlig galleri"
 
-#: .././plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:8
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.glade:150
 msgid "Photo _size preset:"
 msgstr "_Standardstørrelse på bildet:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1220
+#: plugins/shotwell-publishing/PicasaPublishing.vala:746
 msgid "Small (640 x 480 pixels)"
 msgstr "Liten (640 x 480 piksler)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1221
+#: plugins/shotwell-publishing/PicasaPublishing.vala:747
 msgid "Medium (1024 x 768 pixels)"
 msgstr "Medium (1024 x 768 piksler)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:1222
+#: plugins/shotwell-publishing/PicasaPublishing.vala:748
 msgid "Recommended (1600 x 1200 pixels)"
 msgstr "Anbefalt (1600 x 1200 piksler)"
 
@@ -3929,29 +3924,29 @@
 "din nettleser for å logge inn på YouTube, og deretter laste opp en video. "
 "For å forsøke på nytt: Skriv inn din epostadresse og passord nedenfor"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:939
+#: plugins/shotwell-publishing/YouTubePublishing.vala:461
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Du er innlogget på YouTube som %s."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:940
+#: plugins/shotwell-publishing/YouTubePublishing.vala:463
 #, c-format
 msgid "Videos will appear in '%s'"
 msgstr "Videoer vil dukke opp i '%s'"
 
-#: .././plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.glade:55
 msgid "Video privacy _setting:"
 msgstr "video inn_stilling for personvern:"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:970
+#: plugins/shotwell-publishing/YouTubePublishing.vala:495
 msgid "Public listed"
 msgstr "Offentlig listet"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:971
+#: plugins/shotwell-publishing/YouTubePublishing.vala:496
 msgid "Public unlisted"
 msgstr "Offentlig ulistet"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:972
+#: plugins/shotwell-publishing/YouTubePublishing.vala:497
 msgid "Private"
 msgstr "Privat"
 
@@ -3959,7 +3954,7 @@
 msgid "Slide"
 msgstr "Lysbilde"
 
-#: plugins/shotwell-transitions/shotwell-transitions.vala:21
+#: plugins/shotwell-transitions/shotwell-transitions.vala:28
 msgid "Core Slideshow Transitions"
 msgstr "Hovedoverganger for lysbildefremviser"
 
@@ -4045,11 +4040,11 @@
 "You can close this dialog and start using Shotwell while the import is "
 "taking place in the background."
 msgstr ""
-"Shotwell har funnet %d bilder i F-Spot biblioteket, er i gang med å  "
-"importere dem. Duplikater vil bli automatisk bli oppdaget og fjernet.\n"
+"Shotwell har funnet %d bilder i F-Spot biblioteket, og er i gang med å "
+"importere dem. Duplikater vil automatisk bli oppdaget og fjernet.\n"
 "\n"
-"Du kan stenge dette dialogvinduet, og bruke Shotwell. Importeringen vil bli "
-"utført i bakgrunnen."
+"Du kan stenge dette dialogvinduet, og bruke Shotwell. Importeringen vil "
+"fortsette i bakgrunnen."
 
 #: plugins/shotwell-data-imports/FSpotImporter.vala:84
 #, c-format
@@ -4096,83 +4091,83 @@
 msgid "of the following:"
 msgstr "for de følgende:"
 
-#: ui/shotwell.glade:309
+#: ui/shotwell.glade:719
 msgid "Shotwell Preferences"
 msgstr "Shotwell innstillinger"
 
-#: ui/shotwell.glade:388
+#: ui/shotwell.glade:796
 msgid "white"
 msgstr "hvit"
 
-#: ui/shotwell.glade:415
+#: ui/shotwell.glade:823
 msgid "black"
 msgstr "svart"
 
-#: ui/shotwell.glade:463
+#: ui/shotwell.glade:871
 msgid "_Watch library directory for new files"
 msgstr "_Følg med biblioteksmappen for å oppdage nye filer"
 
-#: ui/shotwell.glade:493
+#: ui/shotwell.glade:900
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ui/shotwell.glade:513
+#: ui/shotwell.glade:920
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "Skriv merkelapper, titler og andre _metadata for bildefiler"
 
 # Må sjekkes om det menes vis eller skjerm her..
-#: ui/shotwell.glade:540
+#: ui/shotwell.glade:946
 msgid "Display"
 msgstr "Display"
 
-#: ui/shotwell.glade:561
+#: ui/shotwell.glade:967
 msgid "_Import photos to:"
 msgstr "_Importer bilde til:"
 
-#: ui/shotwell.glade:584
+#: ui/shotwell.glade:990
 msgid "_Background:"
 msgstr "_Bakgrunn:"
 
-#: ui/shotwell.glade:607
+#: ui/shotwell.glade:1013
 msgid "Importing"
 msgstr "Importerer"
 
-#: ui/shotwell.glade:630
+#: ui/shotwell.glade:1036
 msgid "_Directory structure:"
 msgstr "_Mappestruktur"
 
-#: ui/shotwell.glade:669
+#: ui/shotwell.glade:1075
 msgid "_Pattern:"
 msgstr "_Mønster:"
 
-#: ui/shotwell.glade:751
+#: ui/shotwell.glade:1157
 msgid "Example:"
 msgstr "Eksempel:"
 
-#: ui/shotwell.glade:768
+#: ui/shotwell.glade:1174
 msgid "R_ename imported files to lowercase"
 msgstr "E_ndre filnavnene til importerte filer til småbokstaver."
 
-#: ui/shotwell.glade:798
+#: ui/shotwell.glade:1203
 msgid "RAW Developer"
 msgstr "RAW-Fremkaller"
 
-#: ui/shotwell.glade:833
+#: ui/shotwell.glade:1238
 msgid "De_fault:"
 msgstr "St_andard:"
 
-#: ui/shotwell.glade:887
+#: ui/shotwell.glade:1292
 msgid "E_xternal photo editor:"
 msgstr "E_kstern bilderedigeringsprogram:"
 
-#: ui/shotwell.glade:903
+#: ui/shotwell.glade:1308
 msgid "External _RAW editor:"
 msgstr "Ekstern _RAW behandler:"
 
-#: ui/shotwell.glade:968
+#: ui/shotwell.glade:1373
 msgid "External Editors"
 msgstr "Ekstern bildebehandler"
 
-#: ui/shotwell.glade:995
+#: ui/shotwell.glade:1400
 msgid "Plugins"
 msgstr "Innstikk"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/simple-scan.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/simple-scan.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/simple-scan.po	2013-01-29 09:33:50.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/simple-scan.po	2014-01-07 06:37:36.000000000 +0000
@@ -7,108 +7,108 @@
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-05-02 09:04+0000\n"
+"POT-Creation-Date: 2013-03-29 00:50+0000\n"
 "PO-Revision-Date: 2011-09-19 19:50+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
+"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:16+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:08+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sk_ann"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Enkel _side"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Alle sider fra papirmater"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Stopp skanning"
 
 #. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
+#: ../data/simple-scan.ui.h:8
 msgid "Text"
 msgstr "Tekst"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
+#: ../data/simple-scan.ui.h:10
 msgid "Photo"
 msgstr "Bilde"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Roter mot _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Roter mot _høyre"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Beskjær"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "US Le_gal"
 
@@ -118,157 +118,157 @@
 msgstr "4&#xD7;6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "E_gendefinert"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Roter beskjæringsområdet"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Flytt til venstre"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Flytt til høyre"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Innhold"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Begynn et nytt dokument"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Ny"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Skann én enkel side fra skanneren"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Skann"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Lagre dokument til fil"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Lagre"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Stopp skanning"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Stopp"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Roter siden til venstre (mot urviseren)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Roter mot venstre"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Roter siden til høyre (med urviseren)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Roter mot høyre"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Beskjær valgt side"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Beskjær"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:4
 msgid "_Username for resource:"
 msgstr "_Brukernavn for ressurs:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:6
 msgid "_Password:"
 msgstr "_Passord:"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:2
 msgid "_Authorize"
 msgstr "_Autoriser"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Innstillinger"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Hent fra:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Tekstoppløsning"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Bildeoppløsning:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Skann side:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Sidestørrelse:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:12
 msgid "Front and Back"
 msgstr "For- og bakside"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:14
 msgid "Front"
 msgstr "Forside"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:16
 msgid "Back"
 msgstr "Bakside"
 
@@ -361,64 +361,64 @@
 msgstr ""
 "Papirhøyde i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Resolution of last scanned image"
 msgstr "Oppløsning på sist skannede bilde"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "Oppløsning i punkter-per-tomme til sist utførte skanning."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
 msgid "Resolution for text scans"
 msgstr "Oppløsning for tekstskanning"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Oppløsningen i punkter-per-tomme for skanning av tekst."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
 msgid "Resolution for photo scans"
 msgstr "Oppløsning for bildeskanning"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Oppløsning i punkter-per-tomme for skanning av bilder."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
 msgid "Page side to scan"
 msgstr "Side som skal skannes"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
 msgid "The page side to scan."
 msgstr "Siden som skal scannes."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
 msgid "Directory to save files to"
 msgstr "Lagre filer i mappe"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr "Mappen filer skal lagres til. Standard er dokumentmappen."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:791
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ingen skanner tilgjengelig. Vennligst koble til en skanner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:821
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Klarte ikke å koble til skanneren"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1151
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Klarte ikke å sette i gang skanneren"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1164 ../src/scanner.vala:1264
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Det oppsto en kommunikasjonsfeil mellom skanneren og datamaskinen"
 
@@ -459,98 +459,98 @@
 msgstr ""
 "Kjør «%s --help» for å se en full liste over tilgjengelige kommandolinjevalg."
 
-#: ../src/ui.vala:82
+#: ../src/ui.vala:103
 msgid "Scanned Document.pdf"
 msgstr "Skannet_dokument.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:148
+#: ../src/ui.vala:233
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Behøver brukernavn og passord for å få tilgang til '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:191
+#: ../src/ui.vala:276
 msgid "No scanners detected"
 msgstr "Fant ingen skannere"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:193
+#: ../src/ui.vala:278
 msgid "Please check your scanner is connected and powered on"
 msgstr "Undersøk om skanneren er riktig tilkoblet, og at den er slått på"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:347
+#: ../src/ui.vala:414
 msgid "Save As..."
 msgstr "Lagre som..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:361
+#: ../src/ui.vala:428
 msgid "Image Files"
 msgstr "Bildefiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:367
+#: ../src/ui.vala:434
 msgid "All Files"
 msgstr "Alle Filer"
 
 #. 
-#: ../src/ui.vala:372
+#: ../src/ui.vala:439
 msgid "Select File _Type"
 msgstr "Velg fil_type"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:386
+#: ../src/ui.vala:453
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidig dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:392
+#: ../src/ui.vala:459
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimert)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:398
+#: ../src/ui.vala:465
 msgid "PNG (lossless)"
 msgstr "PNG (tapsfri)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:475
+#: ../src/ui.vala:554
 msgid "Failed to save file"
 msgstr "Lagring av fil mislyktes"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:498
+#: ../src/ui.vala:577
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Hvis du ikke lagrer vil endringene gå tapt."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:534
+#: ../src/ui.vala:614
 msgid "Save current document?"
 msgstr "Lagre gjeldende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:536
+#: ../src/ui.vala:616
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:799
+#: ../src/ui.vala:879
 msgid "Unable to save image for preview"
 msgstr "Kunne ikke lagre forhåndsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:811
+#: ../src/ui.vala:891
 msgid "Unable to open image preview application"
 msgstr "Åpning av forhåndsvisning mislyktes"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1050
+#: ../src/ui.vala:1138
 msgid "Unable to open help file"
 msgstr "Kan ikke åpne hjelpfil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1061
+#: ../src/ui.vala:1149
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -579,16 +579,16 @@
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1064
+#: ../src/ui.vala:1152
 msgid "About Simple Scan"
 msgstr "Om Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1067
+#: ../src/ui.vala:1155
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktøy for å skanne dokumenter"
 
-#: ../src/ui.vala:1076
+#: ../src/ui.vala:1164
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -599,55 +599,55 @@
 "  Mats Taraldsvik https://launchpad.net/~meastp"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1087
+#: ../src/ui.vala:1175
 msgid "Save document before quitting?"
 msgstr "Lagre dokumentet før du avslutter?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1089
+#: ../src/ui.vala:1177
 msgid "Quit without Saving"
 msgstr "Avslutt uten å lagre"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1307
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1217
+#: ../src/ui.vala:1310
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (kladd)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1220
+#: ../src/ui.vala:1313
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høy oppløsning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1316
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1258
+#: ../src/ui.vala:1351
 msgid "Files missing"
 msgstr "Manglende filer"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1260
+#: ../src/ui.vala:1353
 msgid "Please check your installation"
 msgstr "Vennligst undersøk installasjonen"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1321
+#: ../src/ui.vala:1421
 msgid "Change _Scanner"
 msgstr "Bytt _skanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1327
+#: ../src/ui.vala:1427
 msgid "Automatic"
 msgstr "Automatisk"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/software-center.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/software-center.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/software-center.po	2013-01-29 09:34:04.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/software-center.po	2014-01-07 06:37:36.000000000 +0000
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: software-center\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-19 01:12+0000\n"
-"PO-Revision-Date: 2012-08-06 20:46+0000\n"
-"Last-Translator: Simen <Unknown>\n"
+"POT-Creation-Date: 2013-11-18 19:23+0000\n"
+"PO-Revision-Date: 2013-12-13 14:24+0000\n"
+"Last-Translator: Rolf Riis Bjørnsen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:14+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:06+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../data/ubuntu-software-center.desktop.in.h:1
 #: ../softwarecenter/distro/Ubuntu.py:75
@@ -34,9 +34,10 @@
 msgid "Lets you choose from thousands of applications available for Ubuntu"
 msgstr "Velg blant tusenvis av programmer for Ubuntu"
 
+#: ../data/ubuntu-software-center.desktop.in.h:4
 #: ../data/unbranded-software-center.desktop.in.h:3
 msgid "Sources;PPA;Install;Uninstall;Remove;Purchase;Catalogue;Store;"
-msgstr ""
+msgstr "Kilder;PPA;Installer;Avinstaller;Fjern;Kjøp;Katalog;Butikk;"
 
 #: ../data/unbranded-software-center.desktop.in.h:2
 msgid ""
@@ -283,7 +284,7 @@
 
 #: ../data/software-center.menu.in.h:58
 msgid "Books &amp; Magazines"
-msgstr ""
+msgstr "Bøker og blader"
 
 #: ../softwarecenter/backend/channel.py:233
 msgid "Canonical Partners"
@@ -324,7 +325,7 @@
 msgstr "Annet"
 
 #: ../softwarecenter/backend/channel.py:324
-#: ../softwarecenter/ui/gtk3/panes/availablepane.py:336
+#: ../softwarecenter/ui/gtk3/panes/availablepane.py:339
 #: ../softwarecenter/ui/gtk3/panes/viewswitcher.py:81
 msgid "All Software"
 msgstr "Alle programmer"
@@ -362,19 +363,19 @@
 "programvaren som er installert på dem.\n"
 "Ingen andre vil kunne se hva du har installert."
 
-#: ../softwarecenter/backend/installbackend_impl/aptd.py:798
+#: ../softwarecenter/backend/installbackend_impl/aptd.py:802
 #: ../softwarecenter/ui/gtk3/app.py:1337
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:424
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:431
 msgid "Error"
 msgstr "Feil"
 
-#: ../softwarecenter/backend/installbackend_impl/aptd.py:842
+#: ../softwarecenter/backend/installbackend_impl/aptd.py:854
 msgid "_Ignore and install"
 msgstr "_Ignorer og installer"
 
-#: ../softwarecenter/backend/installbackend_impl/aptd.py:856
-#: ../softwarecenter/backend/installbackend_impl/aptd.py:872
+#: ../softwarecenter/backend/installbackend_impl/aptd.py:868
+#: ../softwarecenter/backend/installbackend_impl/aptd.py:884
 #: ../data/ui/gtk3/dialogs.ui.h:2
 msgid "Repair"
 msgstr "Reparer"
@@ -438,7 +439,7 @@
 #: ../softwarecenter/db/categories.py:206
 #: ../softwarecenter/ui/gtk3/widgets/recommendations.py:324
 msgid "People Also Installed"
-msgstr ""
+msgstr "Folk installerte også"
 
 #. TRANSLATORS: List of "grey-listed" words sperated with ";"
 #. Do not translate this list directly. Instead,
@@ -516,7 +517,7 @@
 
 #: ../softwarecenter/distro/Debian.py:81
 msgid "Meets the Debian Free Software Guidelines"
-msgstr ""
+msgstr "Oppfyller kravene i Debians retningslinjer for fri programvare"
 
 #: ../softwarecenter/distro/Debian.py:83
 msgid ""
@@ -531,6 +532,8 @@
 "Non-free since it is either restricted in use, redistribution or "
 "modification."
 msgstr ""
+"Er ikke å regne som fri programvare, fordi det begrenser enten bruk, "
+"videredistribusjon, og/eller endring."
 
 #: ../softwarecenter/distro/Debian.py:130
 msgid "Debian does not provide critical updates."
@@ -556,6 +559,8 @@
 "Debian only provides updates for %s during a transition phase. Please "
 "consider upgrading to a later stable release of Debian."
 msgstr ""
+"Debian tilbyr kun kritiske oppdateringer for %s i en overgangsfase. Du bør "
+"vurdere å oppgradere til en nyere, stabil versjon av Debian."
 
 #: ../softwarecenter/distro/Debian.py:144
 #, python-format
@@ -563,6 +568,8 @@
 "Debian provides critical updates for %s. But updates could be delayed or "
 "skipped."
 msgstr ""
+"Debian tilbyr kritiske oppdateringer for %s, men oppdateringene kan bli "
+"forsinket eller hoppet over."
 
 #: ../softwarecenter/distro/Debian.py:147
 #, python-format
@@ -683,7 +690,7 @@
 
 #: ../softwarecenter/distro/Ubuntu.py:150
 msgid "Canonical-Maintained Software"
-msgstr ""
+msgstr "Programvare vedlikeholdt av Canonical"
 
 #: ../softwarecenter/distro/Ubuntu.py:204
 #: ../softwarecenter/distro/Ubuntu.py:217
@@ -713,9 +720,9 @@
 "Canonical tilbyr kritiske oppdateringer fra utviklerne for %(appname)s fram "
 "til %(support_end_month_str)s %(support_end_year)s."
 
-#: ../softwarecenter/distro/ubuntu.py:243
+#: ../softwarecenter/distro/ubuntu.py:235
 msgid "Provided by the vendor."
-msgstr ""
+msgstr "Levert av produsenten."
 
 #: ../softwarecenter/distro/Ubuntu.py:237
 #, python-format
@@ -746,7 +753,7 @@
 
 #: ../softwarecenter/enums.py:133
 msgid "Most helpful first"
-msgstr ""
+msgstr "Mest nyttige først"
 
 #: ../softwarecenter/enums.py:133
 msgid "Newest first"
@@ -759,7 +766,7 @@
 
 #: ../softwarecenter/hw.py:30
 msgid "digicam"
-msgstr ""
+msgstr "digitalt kamera"
 
 #: ../softwarecenter/hw.py:31
 msgid "mouse"
@@ -767,7 +774,7 @@
 
 #: ../softwarecenter/hw.py:32
 msgid "joystick"
-msgstr ""
+msgstr "styrespak"
 
 #: ../softwarecenter/hw.py:33
 msgid "touchscreen"
@@ -779,7 +786,7 @@
 
 #: ../softwarecenter/hw.py:35
 msgid "notebook computer"
-msgstr ""
+msgstr "bærbar datamaskin"
 
 #: ../softwarecenter/hw.py:36
 msgid "printer"
@@ -791,7 +798,7 @@
 
 #: ../softwarecenter/hw.py:38
 msgid "CD drive"
-msgstr ""
+msgstr "CD-stasjon"
 
 #: ../softwarecenter/hw.py:39
 msgid "CD burner"
@@ -799,7 +806,7 @@
 
 #: ../softwarecenter/hw.py:40
 msgid "DVD drive"
-msgstr ""
+msgstr "DVD-stasjon"
 
 #: ../softwarecenter/hw.py:41
 msgid "DVD burner"
@@ -811,13 +818,13 @@
 
 #: ../softwarecenter/hw.py:43
 msgid "OpenGL hardware acceleration"
-msgstr ""
+msgstr "Maskinvaredrevet OpenGL-grafikk"
 
 #. "special" private tag extension that needs special handling
 #: ../softwarecenter/hw.py:45
 #, python-format
 msgid "Graphics driver that is not %s"
-msgstr ""
+msgstr "Grafikkdriver som ikke er %s."
 
 #: ../softwarecenter/hw.py:49
 msgid ""
@@ -836,10 +843,14 @@
 #: ../softwarecenter/hw.py:53
 msgid "This software requires a mouse, but none is currently setup."
 msgstr ""
+"Dette programmet krever en mus. Ingen mus ser ut til å være tilkoblet og "
+"satt opp."
 
 #: ../softwarecenter/hw.py:55
 msgid "This software requires a joystick, but none are currently connected."
 msgstr ""
+"Dette programmet krever en styrespak. Ingen styrespak ser ut til å være "
+"tilkoblet og satt opp."
 
 #: ../softwarecenter/hw.py:57
 msgid ""
@@ -853,19 +864,25 @@
 
 #: ../softwarecenter/hw.py:61
 msgid "This software is for notebook computers."
-msgstr ""
+msgstr "Dette programmet er laget for bærbare datamaskiner."
 
 #: ../softwarecenter/hw.py:62
 msgid "This software requires a printer, but none are currently set up."
 msgstr ""
+"Dette programmet krever en skriver. Ingen skriver ser ut til å være "
+"tilkoblet og satt opp."
 
 #: ../softwarecenter/hw.py:64
 msgid "This software requires a scanner, but none are currently set up."
 msgstr ""
+"Dette programmet krever en skanner. Ingen skanner ser ut til å være "
+"tilkoblet og satt opp."
 
 #: ../softwarecenter/hw.py:66
 msgid "This software requires a CD drive, but none are currently connected."
 msgstr ""
+"Dette programmet krever en CD-stasjon. Ingen CD-stasjon ser ut til å være "
+"tilkoblet og satt opp."
 
 #: ../softwarecenter/hw.py:68
 msgid "This software requires a CD burner, but none are currently connected."
@@ -876,6 +893,8 @@
 #: ../softwarecenter/hw.py:70
 msgid "This software requires a DVD drive, but none are currently connected."
 msgstr ""
+"Dette programmet krever en DVD-stasjon. Ingen DVD-stasjon ser ut til å være "
+"tilkoblet og satt opp."
 
 #: ../softwarecenter/hw.py:72
 msgid ""
@@ -893,7 +912,7 @@
 
 #: ../softwarecenter/hw.py:76
 msgid "This computer does not have graphics fast enough for this software."
-msgstr ""
+msgstr "Grafikkprosessoren din er ikke kraftig nok for dette programmet."
 
 #. private extension
 #: ../softwarecenter/hw.py:79
@@ -902,6 +921,8 @@
 "This software does not work with the “%s” graphics driver this computer is "
 "using."
 msgstr ""
+"Denne programvaren virker ikke med “%s”-grafikkdriveren som denne maskinen "
+"bruker."
 
 #. warning displayed if region does not match
 #: ../softwarecenter/region.py:34
@@ -939,15 +960,15 @@
 msgstr[1] "for %(days)i dager siden"
 
 #. TRANSLATORS: this is a generic list delimit char, e.g. "foo, bar"
-#: ../softwarecenter/utils.py:784
+#: ../softwarecenter/utils.py:795
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #. TRANSLATORS: this is the last part of a list, e.g. "foo, bar and baz"
-#: ../softwarecenter/utils.py:786
+#: ../softwarecenter/utils.py:797
 #, python-format
 msgid "%s and %s"
-msgstr ""
+msgstr "%s og %s"
 
 #: ../data/ui/gtk3/SoftwareCenter.ui.h:1
 msgid "_Go Back"
@@ -975,6 +996,7 @@
 "  Halvor Lyche Strandvoll https://launchpad.net/~halvors\n"
 "  Hans Joachim Desserud https://launchpad.net/~hjd\n"
 "  Herman Lucas https://launchpad.net/~hermaluk\n"
+"  Joakim Langvand https://launchpad.net/~jlangvand\n"
 "  Jon Arne Westgaard https://launchpad.net/~westgaard\n"
 "  Karl Eivind Dahl https://launchpad.net/~foralle.org\n"
 "  Kenneth Jenssen https://launchpad.net/~kennethjenssen-b\n"
@@ -985,12 +1007,13 @@
 "  Pion https://launchpad.net/~josteinaj\n"
 "  Potet https://launchpad.net/~5tein4rne\n"
 "  Rolf Riis Bjørnsen https://launchpad.net/~rolf-bjornsen\n"
-"  Roy S https://launchpad.net/~clean-carrier\n"
+"  Roy S https://launchpad.net/~clean-carrier-deactivatedaccount\n"
 "  Simen https://launchpad.net/~simen-burud\n"
 "  Terje Andre Arnøy https://launchpad.net/~terjeaar\n"
 "  Thomas Amland https://launchpad.net/~amland\n"
 "  Thorben Dahl https://launchpad.net/~thorbendahl\n"
 "  magnusp https://launchpad.net/~magnusp\n"
+"  Åka Sikrom https://launchpad.net/~akrosikam\n"
 "  Øyvind Hauge https://launchpad.net/~haugeoy"
 
 #: ../data/ui/gtk3/SoftwareCenter.ui.h:5
@@ -1060,7 +1083,7 @@
 #: ../data/ui/gtk3/SoftwareCenter.ui.h:21
 #: ../softwarecenter/ui/gtk3/dialogs/dialog_tos.py:38
 msgid "Terms of Use"
-msgstr ""
+msgstr "Vilkår for bruk"
 
 #: ../data/ui/gtk3/SoftwareCenter.ui.h:22
 msgid "Updating software catalog…"
@@ -1236,7 +1259,7 @@
 
 #: ../softwarecenter/distro/SUSELINUX.py:56
 msgid "Provided by openSUSE"
-msgstr ""
+msgstr "Tilbudt av openSUSE"
 
 #: ../softwarecenter/ui/gtk3/app.py:293
 #: ../softwarecenter/ui/gtk3/dialogs/deauthorize_dialog.py:129
@@ -1390,7 +1413,7 @@
 #. add "all" to both combo and accounts (the later is only pseudo)
 #: ../softwarecenter/ui/gtk3/review_gui_helper.py:963
 msgid "All my Gwibber services"
-msgstr ""
+msgstr "Alle Gwibber-tjenester"
 
 #: ../softwarecenter/ui/gtk3/review_gui_helper.py:978
 #, python-format
@@ -1405,8 +1428,8 @@
 #, python-format
 msgid "There was a problem posting this review to %s."
 msgid_plural "There was a problem posting this review to %s."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Det var et problem med å publisere denne omtalen til %s."
+msgstr[1] "Det var et problem med å publisere denne omtalen til %s."
 
 #: ../softwarecenter/ui/gtk3/review_gui_helper.py:1144
 #, python-format
@@ -1516,15 +1539,15 @@
 msgid "Get Software"
 msgstr "Skaff programvare"
 
-#: ../softwarecenter/ui/gtk3/panes/availablepane.py:269
+#: ../softwarecenter/ui/gtk3/panes/availablepane.py:272
 msgid "Failure in the purchase process."
 msgstr "Feil i betalingsprosessen."
 
-#: ../softwarecenter/ui/gtk3/panes/availablepane.py:270
+#: ../softwarecenter/ui/gtk3/panes/availablepane.py:273
 msgid "Sorry, something went wrong. Your payment has been cancelled."
 msgstr "Beklager, noe skar seg. Ditt kjøp har blitt avbrutt."
 
-#: ../softwarecenter/ui/gtk3/panes/availablepane.py:511
+#: ../softwarecenter/ui/gtk3/panes/availablepane.py:522
 #, python-format
 msgid "Install %(amount)s Item"
 msgid_plural "Install %(amount)s Items"
@@ -1716,7 +1739,7 @@
 
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:381
 msgid "Change"
-msgstr ""
+msgstr "Endre"
 
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:394
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:413
@@ -1828,7 +1851,7 @@
 
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:1416
 msgid "Support Web Site"
-msgstr ""
+msgstr "Nettside for hjelp og brukerstøtte"
 
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:1472
 #, python-format
@@ -1891,12 +1914,12 @@
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:2033
 #, python-format
 msgid "%s on disk"
-msgstr ""
+msgstr "%s på disken"
 
 #: ../softwarecenter/ui/gtk3/views/appdetailsview.py:2036
 #, python-format
 msgid "%s to be freed"
-msgstr ""
+msgstr "%s blir frigjort"
 
 #: ../softwarecenter/ui/gtk3/views/appview.py:139
 msgid "By Name"
@@ -2026,7 +2049,7 @@
 #: ../softwarecenter/ui/gtk3/widgets/labels.py:42
 #, python-format
 msgid "%(sym)s%(hardware)s"
-msgstr ""
+msgstr "%(sym)s%(hardware)s"
 
 #. TRANSLATORS: this is a substring that used to build the
 #. "hardware-supported" string, where sym is
@@ -2036,7 +2059,7 @@
 #: ../softwarecenter/ui/gtk3/widgets/labels.py:49
 #, python-format
 msgid "%(sym)s%(hardware)s,"
-msgstr ""
+msgstr "%(sym)s%(hardware)s,"
 
 #: ../softwarecenter/ui/gtk3/widgets/reviews.py:113
 msgid "Reviews"
@@ -2373,10 +2396,12 @@
 "To make recommendations, Ubuntu Software Center will occasionally send to "
 "Canonical a list of software currently installed."
 msgstr ""
+"For å komme med anbefalinger, vil Ubuntu programvaresenter fra tid til annen "
+"sende Canonical en liste over den programvaren som er installert."
 
 #: ../softwarecenter/ui/gtk3/widgets/recommendations.py:280
 msgid "Submitting inventory…"
-msgstr ""
+msgstr "Sender programvareutvalg …"
 
 #: ../utils/delete_review_gtk3.py:105 ../utils/modify_review_gtk3.py:105
 #: ../utils/report_review_gtk3.py:105 ../utils/submit_review_gtk3.py:105
@@ -2400,4 +2425,4 @@
 #: ../utils/submit_usefulness_gtk3.py:187
 #: ../utils/submit_usefulness_gtk3.py:211
 msgid "Missing review-id argument"
-msgstr ""
+msgstr "Mangler argument for «review-id»"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/system-config-printer.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/system-config-printer.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/system-config-printer.po	2013-01-29 09:34:03.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/system-config-printer.po	2014-01-07 06:37:27.000000000 +0000
@@ -13,70 +13,70 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 14:41+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 15:16+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
-#: ../asyncipp.py:454 ../authconn.py:439 ../authconn.py:441
-#: ../errordialogs.py:62 ../pysmb.py:90 ../pysmb.py:92
+#: ../asyncipp.py:467 ../authconn.py:444 ../authconn.py:446
+#: ../errordialogs.py:67 ../pysmb.py:91 ../pysmb.py:93
 msgid "Not authorized"
 msgstr "Ikke autorisert"
 
-#: ../asyncipp.py:455 ../authconn.py:442 ../pysmb.py:93
+#: ../asyncipp.py:468 ../authconn.py:447 ../pysmb.py:94
 msgid "The password may be incorrect."
 msgstr "Passordet kan være feil."
 
-#: ../asyncipp.py:466 ../authconn.py:463
+#: ../asyncipp.py:479 ../authconn.py:468
 #, python-format
 msgid "Authentication (%s)"
 msgstr "Autentisering (%s)"
 
-#: ../asyncipp.py:541 ../authconn.py:290 ../errordialogs.py:53
-#: ../errordialogs.py:67
+#: ../asyncipp.py:554 ../authconn.py:295 ../errordialogs.py:58
+#: ../errordialogs.py:72
 msgid "CUPS server error"
 msgstr "Feil med CUPS-tjener"
 
-#: ../asyncipp.py:543 ../authconn.py:288
+#: ../asyncipp.py:556 ../authconn.py:293
 #, python-format
 msgid "CUPS server error (%s)"
 msgstr "Feil med CUPS-tjener (%s)"
 
-#: ../asyncipp.py:560 ../authconn.py:299 ../errordialogs.py:54
-#: ../troubleshoot/PrintTestPage.py:430
+#: ../asyncipp.py:573 ../authconn.py:304 ../errordialogs.py:59
+#: ../troubleshoot/PrintTestPage.py:432
 #, python-format
 msgid "There was an error during the CUPS operation: '%s'."
 msgstr "Det oppstod en feil under utførelse av CUPS-operasjon: «%s»."
 
-#: ../asyncipp.py:563 ../authconn.py:302
+#: ../asyncipp.py:576 ../authconn.py:307
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: ../asyncipp.py:575 ../authconn.py:247 ../authconn.py:271
+#: ../asyncipp.py:593 ../authconn.py:251 ../authconn.py:275
 msgid "Operation canceled"
 msgstr "Operasjon avbrutt"
 
-#: ../authconn.py:33 ../pysmb.py:123 ../ui/NewPrinterWindow.ui.h:40
+#: ../authconn.py:36 ../pysmb.py:125 ../ui/NewPrinterWindow.ui.h:40
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../authconn.py:34 ../pysmb.py:129 ../ui/NewPrinterWindow.ui.h:39
+#: ../authconn.py:37 ../pysmb.py:131 ../ui/NewPrinterWindow.ui.h:39
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../authconn.py:35 ../pysmb.py:126
+#: ../authconn.py:38 ../pysmb.py:128
 msgid "Domain:"
 msgstr "Domene:"
 
 #. After that, prompt
-#: ../authconn.py:44 ../authconn.py:465 ../pysmb.py:98
+#: ../authconn.py:47 ../authconn.py:470 ../pysmb.py:99
 msgid "Authentication"
 msgstr "Autentisering<"
 
-#: ../authconn.py:83
+#: ../authconn.py:86
 msgid "Remember password"
 msgstr "Husk passord"
 
-#: ../errordialogs.py:63
+#: ../errordialogs.py:68
 msgid ""
 "The password may be incorrect, or the server may be configured to deny "
 "remote administration."
@@ -84,81 +84,81 @@
 "Passordet kan være feil eller tjeneren kan være konfigurert til å nekte "
 "ekstern administrasjon."
 
-#: ../errordialogs.py:69
+#: ../errordialogs.py:74
 msgid "Bad request"
 msgstr "Ugyldig forespørsel"
 
-#: ../errordialogs.py:71
+#: ../errordialogs.py:76
 msgid "Not found"
 msgstr "Ikke funnet"
 
-#: ../errordialogs.py:73
+#: ../errordialogs.py:78
 msgid "Request timeout"
 msgstr "Tidsavbrudd for forespørsel"
 
-#: ../errordialogs.py:75
+#: ../errordialogs.py:80
 msgid "Upgrade required"
 msgstr "Oppdatering kreves"
 
-#: ../errordialogs.py:77
+#: ../errordialogs.py:82
 msgid "Server error"
 msgstr "Feil med tjener"
 
-#: ../errordialogs.py:79 ../system-config-printer.py:669
+#: ../errordialogs.py:84 ../system-config-printer.py:672
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
 
-#: ../errordialogs.py:81
+#: ../errordialogs.py:86
 #, python-format
 msgid "status %s"
 msgstr "status %s"
 
-#: ../errordialogs.py:83
+#: ../errordialogs.py:88
 #, python-format
 msgid "There was an HTTP error: %s."
 msgstr "Det oppsto en HTTP-feil: %s."
 
-#: ../jobviewer.py:183
+#: ../jobviewer.py:186
 msgid "Delete Jobs"
 msgstr "Slett jobber"
 
-#: ../jobviewer.py:184
+#: ../jobviewer.py:187
 msgid "Do you really want to delete these jobs?"
 msgstr "Vil du virkelig slette disse jobbene?"
 
-#: ../jobviewer.py:186
+#: ../jobviewer.py:189
 msgid "Delete Job"
 msgstr "Slett jobb"
 
-#: ../jobviewer.py:187
+#: ../jobviewer.py:190
 msgid "Do you really want to delete this job?"
 msgstr "Vil du virkelig slette denne jobben?"
 
-#: ../jobviewer.py:190
+#: ../jobviewer.py:193
 msgid "Cancel Jobs"
 msgstr "Avbryt jobber"
 
-#: ../jobviewer.py:191
+#: ../jobviewer.py:194
 msgid "Do you really want to cancel these jobs?"
 msgstr "Vil du virkelig avbryte disse jobbene?"
 
-#: ../jobviewer.py:193
+#: ../jobviewer.py:196
 msgid "Cancel Job"
 msgstr "Avbryt jobb"
 
-#: ../jobviewer.py:194
+#: ../jobviewer.py:197
 msgid "Do you really want to cancel this job?"
 msgstr "Vil du virkelig avbryte denne jobben?"
 
-#: ../jobviewer.py:200
+#: ../jobviewer.py:202
 msgid "Keep Printing"
 msgstr "Fortsett utskrift"
 
-#: ../jobviewer.py:267
+#: ../jobviewer.py:269
 msgid "deleting job"
 msgstr "sletter jobb"
 
-#: ../jobviewer.py:269
+#: ../jobviewer.py:271
 msgid "canceling job"
 msgstr "avbryter jobb"
 
@@ -222,11 +222,11 @@
 msgid "_View Attributes"
 msgstr "_Vis attributter"
 
-#: ../jobviewer.py:386 ../jobviewer.py:594
+#: ../jobviewer.py:386 ../jobviewer.py:595
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: ../jobviewer.py:449 ../troubleshoot/PrintTestPage.py:82
+#: ../jobviewer.py:449 ../troubleshoot/PrintTestPage.py:84
 msgid "Job"
 msgstr "Jobb"
 
@@ -234,12 +234,12 @@
 msgid "User"
 msgstr "Bruker"
 
-#: ../jobviewer.py:451 ../troubleshoot/PrintTestPage.py:86
+#: ../jobviewer.py:451 ../troubleshoot/PrintTestPage.py:88
 msgid "Document"
 msgstr "Dokument"
 
-#: ../jobviewer.py:452 ../system-config-printer.py:812
-#: ../troubleshoot/PrintTestPage.py:84
+#: ../jobviewer.py:452 ../system-config-printer.py:818
+#: ../troubleshoot/PrintTestPage.py:86
 msgid "Printer"
 msgstr "Skriver"
 
@@ -251,7 +251,7 @@
 msgid "Time submitted"
 msgstr "Tid sendt"
 
-#: ../jobviewer.py:473 ../troubleshoot/PrintTestPage.py:87
+#: ../jobviewer.py:473 ../troubleshoot/PrintTestPage.py:89
 msgid "Status"
 msgstr "Status"
 
@@ -273,20 +273,20 @@
 msgid "Document Print Status (%s)"
 msgstr "Utskriftsstatus for dokument (%s)"
 
-#: ../jobviewer.py:584
+#: ../jobviewer.py:585
 msgid "Job attributes"
 msgstr "Attributter for jobb"
 
-#: ../jobviewer.py:720 ../jobviewer.py:1023 ../jobviewer.py:1743
-#: ../jobviewer.py:1773 ../jobviewer.py:2159 ../jobviewer.py:2164
-#: ../jobviewer.py:2178 ../jobviewer.py:2257 ../printerproperties.py:1621
-#: ../ui/NewPrinterWindow.ui.h:93 ../troubleshoot/ChooseNetworkPrinter.py:100
-#: ../troubleshoot/ChooseNetworkPrinter.py:101
-#: ../troubleshoot/ChooseNetworkPrinter.py:104
-#: ../troubleshoot/ChooseNetworkPrinter.py:105
-#: ../troubleshoot/ChoosePrinter.py:87 ../troubleshoot/ChoosePrinter.py:88
-#: ../troubleshoot/ChoosePrinter.py:91 ../troubleshoot/ChoosePrinter.py:92
-#: ../troubleshoot/DeviceListed.py:92 ../troubleshoot/DeviceListed.py:93
+#: ../jobviewer.py:720 ../jobviewer.py:1034 ../jobviewer.py:1772
+#: ../jobviewer.py:1802 ../jobviewer.py:2190 ../jobviewer.py:2195
+#: ../jobviewer.py:2209 ../jobviewer.py:2289 ../printerproperties.py:1647
+#: ../ui/NewPrinterWindow.ui.h:93 ../troubleshoot/ChooseNetworkPrinter.py:102
+#: ../troubleshoot/ChooseNetworkPrinter.py:103
+#: ../troubleshoot/ChooseNetworkPrinter.py:106
+#: ../troubleshoot/ChooseNetworkPrinter.py:107
+#: ../troubleshoot/ChoosePrinter.py:94 ../troubleshoot/ChoosePrinter.py:95
+#: ../troubleshoot/ChoosePrinter.py:98 ../troubleshoot/ChoosePrinter.py:99
+#: ../troubleshoot/DeviceListed.py:99 ../troubleshoot/DeviceListed.py:100
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -326,489 +326,489 @@
 msgid "%d weeks ago"
 msgstr "%d uker siden"
 
-#: ../jobviewer.py:973 ../jobviewer.py:1054
+#: ../jobviewer.py:983 ../jobviewer.py:1066
 msgid "authenticating job"
 msgstr "autentiserer jobb"
 
-#: ../jobviewer.py:1021
+#: ../jobviewer.py:1032
 #, python-format
 msgid "Authentication required for printing document `%s' (job %d)"
 msgstr "Autentisering kreves for å skrive ut dokument «%s» (jobb %d)"
 
-#: ../jobviewer.py:1305
+#: ../jobviewer.py:1327
 msgid "holding job"
 msgstr "holder tilbake jobb"
 
-#: ../jobviewer.py:1330
+#: ../jobviewer.py:1353
 msgid "releasing job"
 msgstr "slipper løs jobb"
 
 #. give the default filename some meaningful name
-#: ../jobviewer.py:1386
+#: ../jobviewer.py:1411
 msgid "retrieved"
 msgstr "hentet"
 
-#: ../jobviewer.py:1396
+#: ../jobviewer.py:1421
 msgid "Save File"
 msgstr "Lagre fil"
 
-#: ../jobviewer.py:1474 ../system-config-printer.py:249
-#: ../ui/NewPrinterWindow.ui.h:9 ../troubleshoot/ChooseNetworkPrinter.py:35
-#: ../troubleshoot/ChoosePrinter.py:36 ../troubleshoot/DeviceListed.py:36
+#: ../jobviewer.py:1501 ../system-config-printer.py:242
+#: ../ui/NewPrinterWindow.ui.h:9 ../troubleshoot/ChooseNetworkPrinter.py:37
+#: ../troubleshoot/ChoosePrinter.py:43 ../troubleshoot/DeviceListed.py:43
 msgid "Name"
 msgstr "Navn"
 
-#: ../jobviewer.py:1477
+#: ../jobviewer.py:1504
 msgid "Value"
 msgstr "Verdi"
 
-#: ../jobviewer.py:1602
+#: ../jobviewer.py:1628
 msgid "No documents queued"
 msgstr "Ingen dokumenter i kø"
 
-#: ../jobviewer.py:1604
+#: ../jobviewer.py:1630
 msgid "1 document queued"
 msgstr "1 dokument i kø"
 
-#: ../jobviewer.py:1606
+#: ../jobviewer.py:1632
 #, python-format
 msgid "%d documents queued"
 msgstr "%d dokumenter i kø"
 
-#: ../jobviewer.py:1661
+#: ../jobviewer.py:1688
 #, python-format
 msgid "processing / pending:   %d / %d"
-msgstr ""
+msgstr "prosesserer / utestående:   %d / %d"
 
-#: ../jobviewer.py:1774
+#: ../jobviewer.py:1803
 msgid "Document printed"
 msgstr "Dokument skrevet ut"
 
-#: ../jobviewer.py:1775
+#: ../jobviewer.py:1804
 #, python-format
 msgid "Document `%s' has been sent to `%s' for printing."
 msgstr "Dokument «%s» er sendt til «%s» for utskrift."
 
-#: ../jobviewer.py:1936
+#: ../jobviewer.py:1966
 #, python-format
 msgid "There was a problem sending document `%s' (job %d) to the printer."
 msgstr ""
 "Det oppstod et problem ved sending av dokument «%s» (jobb %d) til skriveren."
 
-#: ../jobviewer.py:1939
+#: ../jobviewer.py:1970
 #, python-format
 msgid "There was a problem processing document `%s' (job %d)."
 msgstr "Det oppsto et problem under prosessering av dokument «%s» (jobb %d)."
 
 #. Give up and use the provided message untranslated.
-#: ../jobviewer.py:1946
+#: ../jobviewer.py:1977
 #, python-format
 msgid "There was a problem printing document `%s' (job %d): `%s'."
 msgstr ""
 "Det oppsto et problem under utskrift av dokument «%s» (jobb %d): «%s»."
 
-#: ../jobviewer.py:1953 ../jobviewer.py:1969
+#: ../jobviewer.py:1984 ../jobviewer.py:2000
 msgid "Print Error"
 msgstr "Feil med utskrift"
 
-#: ../jobviewer.py:1954
+#: ../jobviewer.py:1985
 msgid "_Diagnose"
 msgstr "_Diagnose"
 
-#: ../jobviewer.py:1975
+#: ../jobviewer.py:2006
 #, python-format
 msgid "The printer called `%s' has been disabled."
 msgstr "Skriver med navn «%s» er deaktivert."
 
-#: ../jobviewer.py:2170
+#: ../jobviewer.py:2201
 msgid "disabled"
 msgstr "deaktivert"
 
-#: ../jobviewer.py:2192
+#: ../jobviewer.py:2223
 msgid "Held for authentication"
 msgstr "Holdt tilbake for autentisering"
 
-#: ../jobviewer.py:2194 ../troubleshoot/PrintTestPage.py:42
+#: ../jobviewer.py:2225 ../troubleshoot/PrintTestPage.py:44
 msgid "Held"
 msgstr "Holdt"
 
-#: ../jobviewer.py:2230
+#: ../jobviewer.py:2261
 #, python-format
 msgid "Held until %s"
 msgstr "Hold tilbake til %s"
 
-#: ../jobviewer.py:2234
+#: ../jobviewer.py:2266
 msgid "Held until day-time"
 msgstr "Holdt tilbake til dag-tid"
 
-#: ../jobviewer.py:2236
+#: ../jobviewer.py:2268
 msgid "Held until evening"
 msgstr "Holdt tilbake til i kveld"
 
-#: ../jobviewer.py:2238
+#: ../jobviewer.py:2270
 msgid "Held until night-time"
 msgstr "Holdt tilbake til natt"
 
-#: ../jobviewer.py:2240
+#: ../jobviewer.py:2272
 msgid "Held until second shift"
 msgstr "Holdt tilbake til andre skift"
 
-#: ../jobviewer.py:2242
+#: ../jobviewer.py:2274
 msgid "Held until third shift"
 msgstr "Holdt tilbake til tredje skift"
 
-#: ../jobviewer.py:2244
+#: ../jobviewer.py:2276
 msgid "Held until weekend"
 msgstr "Holdt tilbake til helg"
 
-#: ../jobviewer.py:2247 ../troubleshoot/PrintTestPage.py:41
+#: ../jobviewer.py:2279 ../troubleshoot/PrintTestPage.py:43
 msgid "Pending"
 msgstr "Venter"
 
-#: ../jobviewer.py:2248 ../printerproperties.py:68
-#: ../system-config-printer.py:133 ../troubleshoot/PrintTestPage.py:43
+#: ../jobviewer.py:2280 ../printerproperties.py:72
+#: ../system-config-printer.py:126 ../troubleshoot/PrintTestPage.py:45
 msgid "Processing"
 msgstr "Prosesserer"
 
-#: ../jobviewer.py:2249 ../printerproperties.py:70
-#: ../system-config-printer.py:135 ../troubleshoot/PrintTestPage.py:44
+#: ../jobviewer.py:2281 ../printerproperties.py:76
+#: ../system-config-printer.py:128 ../troubleshoot/PrintTestPage.py:46
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../jobviewer.py:2250 ../troubleshoot/PrintTestPage.py:45
+#: ../jobviewer.py:2282 ../troubleshoot/PrintTestPage.py:47
 msgid "Canceled"
 msgstr "Kansellert"
 
-#: ../jobviewer.py:2251 ../troubleshoot/PrintTestPage.py:46
+#: ../jobviewer.py:2283 ../troubleshoot/PrintTestPage.py:48
 msgid "Aborted"
 msgstr "Avbrutt"
 
-#: ../jobviewer.py:2252 ../troubleshoot/PrintTestPage.py:47
+#: ../jobviewer.py:2284 ../troubleshoot/PrintTestPage.py:49
 msgid "Completed"
 msgstr "Ferdig"
 
-#: ../newprinter.py:79
+#: ../newprinter.py:75
 msgid ""
 "The firewall may need adjusting in order to detect network printers.  Adjust "
 "the firewall now?"
 msgstr ""
-"Brannmuren må muligens justeres for at nettverksskrivere skal bli synlige. "
-"Vil du justere innstillingene nå?"
+"Brannmur trenger kanskje justering for at nettverksskriver skal kunne "
+"gjenkjennes. Juster brannmur nå?"
 
-#: ../newprinter.py:356 ../newprinter.py:367 ../newprinter.py:373
-#: ../newprinter.py:378
+#: ../newprinter.py:352 ../newprinter.py:363 ../newprinter.py:369
+#: ../newprinter.py:374
 msgid "Default"
 msgstr "Forvalg"
 
-#: ../newprinter.py:357
+#: ../newprinter.py:359
 msgid "1200"
 msgstr "1200"
 
-#: ../newprinter.py:358
+#: ../newprinter.py:360
 msgid "2400"
 msgstr "2400"
 
-#: ../newprinter.py:359
+#: ../newprinter.py:361
 msgid "4800"
 msgstr "4800"
 
-#: ../newprinter.py:360
+#: ../newprinter.py:362
 msgid "9600"
 msgstr "9600"
 
-#: ../newprinter.py:361
+#: ../newprinter.py:363
 msgid "19200"
 msgstr "19200"
 
-#: ../newprinter.py:362
+#: ../newprinter.py:364
 msgid "38400"
 msgstr "38400"
 
-#: ../newprinter.py:363
+#: ../newprinter.py:365
 msgid "57600"
 msgstr "57600"
 
-#: ../newprinter.py:364
+#: ../newprinter.py:366
 msgid "115200"
 msgstr "115200"
 
 #. See section 4.2.6 of this document for explanation of finishing types:
 #. ftp://ftp.pwg.org/pub/pwg/candidates/cs-ippfinishings10-20010205-5100.1.pdf
-#: ../newprinter.py:368 ../newprinter.py:379 ../newprinter.py:3631
-#: ../ppdippstr.py:63 ../printerproperties.py:274
+#: ../newprinter.py:364 ../newprinter.py:375 ../newprinter.py:3710
+#: ../ppdippstr.py:65 ../printerproperties.py:280
 msgid "None"
 msgstr "Ingen"
 
-#: ../newprinter.py:369
+#: ../newprinter.py:365
 msgid "Odd"
 msgstr "Ulik"
 
-#: ../newprinter.py:370
+#: ../newprinter.py:366
 msgid "Even"
 msgstr "Lik"
 
-#: ../newprinter.py:374
+#: ../newprinter.py:376
 msgid "8"
 msgstr "8"
 
-#: ../newprinter.py:375
+#: ../newprinter.py:377
 msgid "7"
 msgstr "7"
 
-#: ../newprinter.py:380
+#: ../newprinter.py:376
 msgid "XON/XOFF (Software)"
 msgstr "XON/XOFF (programvare)"
 
-#: ../newprinter.py:381
+#: ../newprinter.py:377
 msgid "RTS/CTS (Hardware)"
 msgstr "RTS/CTS (maskinvare)"
 
-#: ../newprinter.py:382
+#: ../newprinter.py:378
 msgid "DTR/DSR (Hardware)"
 msgstr "DTR/DSR (maskinvare)"
 
-#: ../newprinter.py:399 ../printerproperties.py:228
+#: ../newprinter.py:396 ../printerproperties.py:234
 msgid "Members of this class"
 msgstr "Medlemmer av denne klassen"
 
-#: ../newprinter.py:401 ../printerproperties.py:229
+#: ../newprinter.py:398 ../printerproperties.py:235
 msgid "Others"
 msgstr "Andre"
 
-#: ../newprinter.py:402
+#: ../newprinter.py:399
 msgid "Devices"
 msgstr "Enheter"
 
-#: ../newprinter.py:403
+#: ../newprinter.py:400
 msgid "Connections"
 msgstr "Tilkoblinger"
 
-#: ../newprinter.py:404
+#: ../newprinter.py:401
 msgid "Makes"
 msgstr "Merker"
 
-#: ../newprinter.py:405
+#: ../newprinter.py:402
 msgid "Models"
 msgstr "Modeller"
 
-#: ../newprinter.py:406
+#: ../newprinter.py:403
 msgid "Drivers"
 msgstr "Drivere"
 
-#: ../newprinter.py:407 ../ui/NewPrinterWindow.ui.h:101
+#: ../newprinter.py:404 ../ui/NewPrinterWindow.ui.h:101
 msgid "Downloadable Drivers"
 msgstr "Nedlastbare drivere"
 
-#: ../newprinter.py:491
+#: ../newprinter.py:482
 msgid "Browsing not available (pysmbc not installed)"
 msgstr "Kan ikke bla gjennom skrivere (pysmbc er ikke installert)"
 
 #. SMB list columns
-#: ../newprinter.py:497
+#: ../newprinter.py:488
 msgid "Share"
 msgstr "Share"
 
-#: ../newprinter.py:503
+#: ../newprinter.py:494
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../newprinter.py:518
+#: ../newprinter.py:509
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, "
 "*.PPD.GZ)"
 msgstr ""
 "PostScript skriverbeskrivelse (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
 
-#: ../newprinter.py:527
+#: ../newprinter.py:518
 msgid "All files (*)"
 msgstr "Alle filer (*)"
 
-#: ../newprinter.py:674 ../newprinter.py:1503 ../newprinter.py:3125
-#: ../newprinter.py:3256 ../newprinter.py:3299 ../applet.py:131
+#: ../newprinter.py:669 ../newprinter.py:1553 ../newprinter.py:3189
+#: ../newprinter.py:3320 ../newprinter.py:3368 ../applet.py:127
 msgid "Search"
 msgstr "Søk"
 
-#: ../newprinter.py:701 ../newprinter.py:722 ../ui/NewPrinterWindow.ui.h:1
+#: ../newprinter.py:696 ../newprinter.py:718 ../ui/NewPrinterWindow.ui.h:1
 msgid "New Printer"
 msgstr "Ny skriver"
 
-#: ../newprinter.py:709
+#: ../newprinter.py:704
 msgid "New Class"
 msgstr "Ny klasse"
 
-#: ../newprinter.py:714
+#: ../newprinter.py:709
 msgid "Change Device URI"
 msgstr "Endre URI for enhet"
 
-#: ../newprinter.py:720
+#: ../newprinter.py:716
 msgid "Change Driver"
 msgstr "Endre driver"
 
-#: ../newprinter.py:731 ../newprinter.py:1988
+#: ../newprinter.py:729 ../newprinter.py:2048
 msgid "fetching device list"
 msgstr "henter enhetsliste"
 
-#: ../newprinter.py:1288 ../newprinter.py:1439 ../newprinter.py:2932
-#: ../newprinter.py:3151 ../ppdsloader.py:84
+#: ../newprinter.py:1334 ../newprinter.py:1489 ../newprinter.py:2996
+#: ../newprinter.py:3215 ../ppdsloader.py:86
 msgid "Searching"
 msgstr "Søker"
 
-#: ../newprinter.py:1296 ../newprinter.py:1440 ../ppdsloader.py:92
+#: ../newprinter.py:1342 ../newprinter.py:1490 ../ppdsloader.py:94
 msgid "Searching for drivers"
 msgstr "Søker etter drivere"
 
 #. device-info
 #. PhysicalDevice obj
 #. Separator?
-#: ../newprinter.py:1890
+#: ../newprinter.py:1947
 msgid "Enter URI"
-msgstr "Skriv inn URI"
+msgstr "Oppgi URI"
 
-#: ../newprinter.py:1895
+#: ../newprinter.py:1952
 msgid "Network Printer"
 msgstr "Nettverksskriver"
 
-#: ../newprinter.py:1899
+#: ../newprinter.py:1956
 msgid "Find Network Printer"
 msgstr "Finn nettverksskriver"
 
-#: ../newprinter.py:1948
+#: ../newprinter.py:2008
 msgid "Allow all incoming IPP Browse packets"
-msgstr "Tillat alle innkommende IPP-pakker"
+msgstr "Tillat alle innkommende IPP-pakker for lesing"
 
-#: ../newprinter.py:1953
+#: ../newprinter.py:2013
 msgid "Allow all incoming mDNS traffic"
 msgstr "Tillat all innkommende mDNS-trafikk"
 
-#: ../newprinter.py:1964 ../newprinter.py:1967 ../newprinter.py:2381
-#: ../newprinter.py:2387 ../serversettings.py:549 ../serversettings.py:554
+#: ../newprinter.py:2024 ../newprinter.py:2027 ../newprinter.py:2450
+#: ../newprinter.py:2456 ../serversettings.py:559 ../serversettings.py:564
 msgid "Adjust Firewall"
 msgstr "Juster brannmur"
 
-#: ../newprinter.py:1966 ../newprinter.py:2386
+#: ../newprinter.py:2026 ../newprinter.py:2455
 msgid "Do It Later"
 msgstr "Gjør det senere"
 
-#: ../newprinter.py:2075 ../newprinter.py:3530
+#: ../newprinter.py:2135 ../newprinter.py:3601
 msgid " (Current)"
 msgstr " (aktiv)"
 
-#: ../newprinter.py:2145
+#: ../newprinter.py:2205
 msgid "Scanning..."
 msgstr "Søker..."
 
-#: ../newprinter.py:2200
+#: ../newprinter.py:2261
 msgid "No Print Shares"
 msgstr "Ingen delte utskriftsressurser"
 
-#: ../newprinter.py:2201
+#: ../newprinter.py:2262
 msgid ""
 "There were no print shares found.  Please check that the Samba service is "
 "marked as trusted in your firewall configuration."
 msgstr ""
-"Det ble ikke oppdaget noen delte skriverressurser. Pass på at Samba-"
-"tjenesten er merket som pålitelig i brannmurinnstillingene."
+"Ingen delte skrivere ble funnet. Vennligst sjekk at Samba-tjenesten er "
+"merket for tillit i brannmurkonfigurasjonen."
 
-#: ../newprinter.py:2383
+#: ../newprinter.py:2452
 msgid "Allow all incoming SMB/CIFS browse packets"
-msgstr ""
+msgstr "Tillat alle innkommende SMB/CIFS-lesepakker"
 
-#: ../newprinter.py:2498
+#: ../newprinter.py:2568
 msgid "Print Share Verified"
 msgstr "Delt skriver verifisert"
 
-#: ../newprinter.py:2499
+#: ../newprinter.py:2569
 msgid "This print share is accessible."
 msgstr "Denne delte skriveren er tilgjengelig."
 
-#: ../newprinter.py:2504
+#: ../newprinter.py:2574
 msgid "This print share is not accessible."
 msgstr "Denne delte skriveren kan ikke aksesseres."
 
-#: ../newprinter.py:2507
+#: ../newprinter.py:2577
 msgid "Print Share Inaccessible"
 msgstr "Delt skriver er ikke tilgjengelig"
 
-#: ../newprinter.py:2598
+#: ../newprinter.py:2667
 msgid "Parallel Port"
 msgstr "Parallellport"
 
-#: ../newprinter.py:2600
+#: ../newprinter.py:2669
 msgid "Serial Port"
 msgstr "Seriellport"
 
-#: ../newprinter.py:2602
+#: ../newprinter.py:2671
 msgid "USB"
 msgstr "USB"
 
-#: ../newprinter.py:2604
+#: ../newprinter.py:2673
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../newprinter.py:2606 ../newprinter.py:2609
+#: ../newprinter.py:2675 ../newprinter.py:2678
 msgid "HP Linux Imaging and Printing (HPLIP)"
 msgstr "HP Linux Imaging and Printing (HPLIP)"
 
-#: ../newprinter.py:2608 ../newprinter.py:2737 ../newprinter.py:2739
-#: ../system-config-printer.py:815
+#: ../newprinter.py:2677 ../newprinter.py:2807 ../newprinter.py:2809
+#: ../system-config-printer.py:821
 msgid "Fax"
 msgstr "Faks"
 
-#: ../newprinter.py:2611
+#: ../newprinter.py:2680
 msgid "Hardware Abstraction Layer (HAL)"
 msgstr "Hardware Abstraction Layer (HAL)."
 
-#: ../newprinter.py:2613 ../ppdippstr.py:176
+#: ../newprinter.py:2682 ../ppdippstr.py:178
 msgid "AppSocket/HP JetDirect"
 msgstr "AppSocket/HP JetDirect"
 
-#: ../newprinter.py:2622
+#: ../newprinter.py:2691
 #, python-format
 msgid "LPD/LPR queue '%s'"
 msgstr "LPD-/LPR-kø «%s»"
 
-#: ../newprinter.py:2624
+#: ../newprinter.py:2694
 msgid "LPD/LPR queue"
 msgstr "LPD-/LPR-kø"
 
-#: ../newprinter.py:2627 ../ppdippstr.py:182
+#: ../newprinter.py:2697 ../ppdippstr.py:184
 msgid "Windows Printer via SAMBA"
 msgstr "Windows-skriver via SAMBA"
 
-#: ../newprinter.py:2638 ../newprinter.py:2640
+#: ../newprinter.py:2708 ../newprinter.py:2710
 msgid "IPP"
 msgstr "IPP"
 
-#: ../newprinter.py:2642
+#: ../newprinter.py:2712
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../newprinter.py:2650 ../newprinter.py:2801
+#: ../newprinter.py:2720 ../newprinter.py:2871
 msgid "Remote CUPS printer via DNS-SD"
-msgstr ""
+msgstr "Ekstern CUPS-skriver via DNS-SD"
 
-#: ../newprinter.py:2663 ../newprinter.py:2811
+#: ../newprinter.py:2732 ../newprinter.py:2881
 #, python-format
 msgid "%s network printer via DNS-SD"
 msgstr "%s nettverksskriver via DNS-SD"
 
-#: ../newprinter.py:2666 ../newprinter.py:2813
+#: ../newprinter.py:2736 ../newprinter.py:2883
 msgid "Network printer via DNS-SD"
 msgstr "Nettverksskriver via DNS-SD"
 
-#: ../newprinter.py:2780
+#: ../newprinter.py:2850
 msgid "A printer connected to the parallel port."
 msgstr "En skriver koblet til en parallellport."
 
-#: ../newprinter.py:2782
+#: ../newprinter.py:2852
 msgid "A printer connected to a USB port."
 msgstr "En skriver koblet til en USB port."
 
-#: ../newprinter.py:2784
+#: ../newprinter.py:2854
 msgid "A printer connected via Bluetooth."
 msgstr "En skriver koblet til via Bluetooth."
 
-#: ../newprinter.py:2786
+#: ../newprinter.py:2856
 msgid ""
 "HPLIP software driving a printer, or the printer function of a multi-"
 "function device."
@@ -816,7 +816,7 @@
 "HPLIP-programvare som kjører en skriver eller skriverfunksjonen i en "
 "multifunksjonsenhet."
 
-#: ../newprinter.py:2789
+#: ../newprinter.py:2859
 msgid ""
 "HPLIP software driving a fax machine, or the fax function of a multi-"
 "function device."
@@ -824,47 +824,47 @@
 "HPLIP-programvare som driver en faksmaskin eller faksfunksjonen på en "
 "multifunksjonsenhet."
 
-#: ../newprinter.py:2792
+#: ../newprinter.py:2862
 msgid "Local printer detected by the Hardware Abstraction Layer (HAL)."
 msgstr "Lokal skriver gjenkjent av Hardware Abstraction Layer (HAL)."
 
-#: ../newprinter.py:2933
+#: ../newprinter.py:2997
 msgid "Searching for printers"
 msgstr "Søker etter skrivere"
 
-#: ../newprinter.py:3038 ../ui/NewPrinterWindow.ui.h:45
+#: ../newprinter.py:3103 ../ui/NewPrinterWindow.ui.h:45
 msgid "No printer was found at that address."
 msgstr "Ingen skriver ble funnet på den adressen."
 
-#: ../newprinter.py:3261
+#: ../newprinter.py:3325
 msgid "-- Select from search results --"
 msgstr "-- Velg fra søkeresultatene --"
 
-#: ../newprinter.py:3263
+#: ../newprinter.py:3327
 msgid "-- No matches found --"
 msgstr "-- Ingen treff funnet --"
 
-#: ../newprinter.py:3379 ../newprinter.py:3442 ../newprinter.py:3538
+#: ../newprinter.py:3449 ../newprinter.py:3512 ../newprinter.py:3610
 msgid " (recommended)"
 msgstr " (anbefalt)"
 
-#: ../newprinter.py:3570
+#: ../newprinter.py:3642
 msgid "This PPD is generated by foomatic."
 msgstr "Denne PPDen er generert av foomatic."
 
-#: ../newprinter.py:3613
+#: ../newprinter.py:3692
 msgid "OpenPrinting"
 msgstr "OpenPrinting"
 
-#: ../newprinter.py:3624
+#: ../newprinter.py:3703
 msgid "Distributable"
 msgstr "Distribuerbar"
 
-#: ../newprinter.py:3666
+#: ../newprinter.py:3745
 msgid ", "
 msgstr ", "
 
-#: ../newprinter.py:3671
+#: ../newprinter.py:3750
 #, python-format
 msgid ""
 "\n"
@@ -873,20 +873,20 @@
 "\n"
 "(%s)"
 
-#: ../newprinter.py:3676
+#: ../newprinter.py:3755
 msgid "No support contacts known"
 msgstr "Ingen brukerstøttekontakter kjent"
 
-#: ../newprinter.py:3680 ../newprinter.py:3693
+#: ../newprinter.py:3759 ../newprinter.py:3772
 msgid "Not specified."
 msgstr "Ikke spesifisert."
 
 #. Foomatic database problem of some sort.
-#: ../newprinter.py:3741
+#: ../newprinter.py:3820
 msgid "Database error"
 msgstr "Database-feil"
 
-#: ../newprinter.py:3742
+#: ../newprinter.py:3821
 #, python-format
 msgid "The '%s' driver cannot be used with printer '%s %s'."
 msgstr "Driveren '%s' kan ikke brukes sammen med skriver '%s' %s."
@@ -894,571 +894,571 @@
 #. This printer references some XML that is not
 #. installed by default.  Point the user at the
 #. package they need to install.
-#: ../newprinter.py:3752
+#: ../newprinter.py:3831
 #, python-format
 msgid ""
 "You will need to install the '%s' package in order to use this driver."
 msgstr "Du er nødt til å installere pakken '%s' for å bruke denne skriveren."
 
 #. This error came from trying to open the PPD file.
-#: ../newprinter.py:3759
+#: ../newprinter.py:3838
 msgid "PPD error"
 msgstr "PPD-feil"
 
-#: ../newprinter.py:3761
+#: ../newprinter.py:3840
 msgid "Failed to read PPD file.  Possible reason follows:"
 msgstr "Kunne ikke lese PPD-fil. Mulige årsaker følger:"
 
 #. Failed to get PPD downloaded from OpenPrinting XXX
-#: ../newprinter.py:3779
+#: ../newprinter.py:3858
 msgid "Downloadable drivers"
 msgstr "Nedlastbare drivere"
 
-#: ../newprinter.py:3780
+#: ../newprinter.py:3859
 msgid "Failed to download PPD."
 msgstr "Klarte ikke å laste ned PPD."
 
-#: ../newprinter.py:3788
+#: ../newprinter.py:3867
 msgid "fetching PPD"
 msgstr "henter PPD"
 
-#: ../newprinter.py:3817 ../newprinter.py:3855
+#: ../newprinter.py:3896 ../newprinter.py:3934
 msgid "No Installable Options"
 msgstr "Ingen installerbare alternativer"
 
-#: ../newprinter.py:3917
+#: ../newprinter.py:3998
 #, python-format
 msgid "adding printer %s"
 msgstr "legger til skriver %s"
 
-#: ../newprinter.py:3944 ../newprinter.py:3955 ../newprinter.py:3972
-#: ../printerproperties.py:989 ../system-config-printer.py:1562
-#: ../system-config-printer.py:1587
+#: ../newprinter.py:4023 ../newprinter.py:4035 ../newprinter.py:4053
+#: ../printerproperties.py:1008 ../system-config-printer.py:1606
+#: ../system-config-printer.py:1639
 #, python-format
 msgid "modifying printer %s"
 msgstr "endrer skriver %s"
 
-#: ../optionwidgets.py:129
+#: ../optionwidgets.py:131
 msgid "Conflicts with:"
 msgstr "I konflikt med:"
 
-#: ../ppdippstr.py:47
+#: ../ppdippstr.py:49
 msgid "Abort job"
 msgstr "Avbryt jobb"
 
-#: ../ppdippstr.py:48
+#: ../ppdippstr.py:50
 msgid "Retry current job"
 msgstr "Prøv denne jobben på nytt"
 
-#: ../ppdippstr.py:49
+#: ../ppdippstr.py:51
 msgid "Retry job"
 msgstr "Prøv jobb på nytt"
 
-#: ../ppdippstr.py:50
+#: ../ppdippstr.py:52
 msgid "Stop printer"
 msgstr "Stopp skriver"
 
-#: ../ppdippstr.py:56
+#: ../ppdippstr.py:58
 msgid "Default behavior"
 msgstr "Forvalgt oppførsel"
 
-#: ../ppdippstr.py:57
+#: ../ppdippstr.py:59
 msgid "Authenticated"
 msgstr "Autentisert"
 
-#: ../ppdippstr.py:64
+#: ../ppdippstr.py:66
 msgid "Classified"
 msgstr "Klassifisert"
 
-#: ../ppdippstr.py:65
+#: ../ppdippstr.py:67
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: ../ppdippstr.py:66
+#: ../ppdippstr.py:68
 msgid "Secret"
 msgstr "Hemmelig"
 
-#: ../ppdippstr.py:67
+#: ../ppdippstr.py:69
 msgid "Standard"
 msgstr "Standard"
 
-#: ../ppdippstr.py:68
+#: ../ppdippstr.py:70
 msgid "Top secret"
 msgstr "Topphemmelig"
 
-#: ../ppdippstr.py:69
+#: ../ppdippstr.py:71
 msgid "Unclassified"
 msgstr "Ikke klassifisert"
 
-#: ../ppdippstr.py:75
+#: ../ppdippstr.py:77
 msgid "No hold"
 msgstr "Ikke hold"
 
-#: ../ppdippstr.py:76
+#: ../ppdippstr.py:78
 msgid "Indefinite"
 msgstr "For alltid"
 
-#: ../ppdippstr.py:77
+#: ../ppdippstr.py:79
 msgid "Daytime"
 msgstr "Dagtid"
 
-#: ../ppdippstr.py:78
+#: ../ppdippstr.py:80
 msgid "Evening"
 msgstr "Kveld"
 
-#: ../ppdippstr.py:79
+#: ../ppdippstr.py:81
 msgid "Night"
 msgstr "Natt"
 
-#: ../ppdippstr.py:80
+#: ../ppdippstr.py:82
 msgid "Second shift"
 msgstr "Andre skift"
 
-#: ../ppdippstr.py:81
+#: ../ppdippstr.py:83
 msgid "Third shift"
 msgstr "Tredje skift"
 
-#: ../ppdippstr.py:82
+#: ../ppdippstr.py:84
 msgid "Weekend"
 msgstr "Helg"
 
-#: ../ppdippstr.py:92
+#: ../ppdippstr.py:94
 msgid "General"
 msgstr "Generell"
 
 #. HPIJS options
-#: ../ppdippstr.py:95
+#: ../ppdippstr.py:97
 msgid "Printout mode"
 msgstr "Utskriftsmodus"
 
-#: ../ppdippstr.py:97
+#: ../ppdippstr.py:99
 msgid "Draft (auto-detect-paper type)"
 msgstr "Skisse (gjenkjenn papirtype automatisk)"
 
-#: ../ppdippstr.py:99
+#: ../ppdippstr.py:101
 msgid "Draft grayscale (auto-detect-paper type)"
-msgstr "Skisse i gråtone (gjenkjenn papirtype automatisk)"
+msgstr "Skisse gråtone (automatisk gjenkjenning av papirtype)"
 
-#: ../ppdippstr.py:101
+#: ../ppdippstr.py:103
 msgid "Normal (auto-detect-paper type)"
 msgstr "Normal (automatisk gjenkjenning av papirtype)"
 
-#: ../ppdippstr.py:103
+#: ../ppdippstr.py:105
 msgid "Normal grayscale (auto-detect-paper type)"
 msgstr "Normal gråtone (automatisk gjenkjenning av papirtype)"
 
-#: ../ppdippstr.py:105
+#: ../ppdippstr.py:107
 msgid "High quality (auto-detect-paper type)"
 msgstr "Høy kvalitet (automatisk gjenkjenning av papirtype)"
 
-#: ../ppdippstr.py:107
+#: ../ppdippstr.py:109
 msgid "High quality grayscale (auto-detect-paper type)"
 msgstr "Høy kvalitet gråtone (gjenkjenn papirtype automatisk)"
 
-#: ../ppdippstr.py:108
+#: ../ppdippstr.py:110
 msgid "Photo (on photo paper)"
 msgstr "Foto (på fotopapir)"
 
-#: ../ppdippstr.py:110
+#: ../ppdippstr.py:112
 msgid "Best quality (color on photo paper)"
 msgstr "Best kvalitet (farge på fotopapir)"
 
-#: ../ppdippstr.py:112
+#: ../ppdippstr.py:114
 msgid "Normal quality (color on photo paper)"
 msgstr "Normal kvalitet (farge på fotopapir)"
 
-#: ../ppdippstr.py:114
+#: ../ppdippstr.py:116
 msgid "Media source"
 msgstr "Mediakilde"
 
-#: ../ppdippstr.py:115
+#: ../ppdippstr.py:117
 msgid "Printer default"
 msgstr "Forvalg for skriver"
 
-#: ../ppdippstr.py:116
+#: ../ppdippstr.py:118
 msgid "Photo tray"
 msgstr "Fotoskuff"
 
-#: ../ppdippstr.py:117
+#: ../ppdippstr.py:119
 msgid "Upper tray"
 msgstr "Øvre skuff"
 
-#: ../ppdippstr.py:118
+#: ../ppdippstr.py:120
 msgid "Lower tray"
 msgstr "Nedre skuff"
 
-#: ../ppdippstr.py:119
+#: ../ppdippstr.py:121
 msgid "CD or DVD tray"
 msgstr "CD- eller DVD-skuff"
 
-#: ../ppdippstr.py:120
+#: ../ppdippstr.py:122
 msgid "Envelope feeder"
 msgstr "Konvoluttmater"
 
-#: ../ppdippstr.py:121
+#: ../ppdippstr.py:123
 msgid "Large capacity tray"
 msgstr "Skuff med høy kapasitet"
 
-#: ../ppdippstr.py:122
+#: ../ppdippstr.py:124
 msgid "Manual feeder"
 msgstr "Manuell mating"
 
-#: ../ppdippstr.py:123
+#: ../ppdippstr.py:125
 msgid "Multi-purpose tray"
 msgstr "Skuff med flere formål"
 
-#: ../ppdippstr.py:125
+#: ../ppdippstr.py:127
 msgid "Page size"
 msgstr "Størrelse på siden"
 
-#: ../ppdippstr.py:126
+#: ../ppdippstr.py:128
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../ppdippstr.py:127
+#: ../ppdippstr.py:129
 msgid "Photo or 4x6 inch index card"
 msgstr "Foto eller 4x6 tommers indekskort"
 
-#: ../ppdippstr.py:128
+#: ../ppdippstr.py:130
 msgid "Photo or 5x7 inch index card"
 msgstr "Foto eller 5x7 tommer indekskort"
 
-#: ../ppdippstr.py:129
+#: ../ppdippstr.py:131
 msgid "Photo with tear-off tab"
 msgstr "Foto med avrivingsfane"
 
-#: ../ppdippstr.py:130
+#: ../ppdippstr.py:132
 msgid "3x5 inch index card"
 msgstr "3x5 tommers kartotekkort"
 
-#: ../ppdippstr.py:131
+#: ../ppdippstr.py:133
 msgid "5x8 inch index card"
-msgstr "5x8 indekskort"
+msgstr "5x8 tommers indekskort"
 
-#: ../ppdippstr.py:132
+#: ../ppdippstr.py:134
 msgid "A6 with tear-off tab"
-msgstr "A6 med avrivningsremse"
+msgstr "A6 med fane for avriving"
 
-#: ../ppdippstr.py:133
+#: ../ppdippstr.py:135
 msgid "CD or DVD 80mm"
 msgstr "CD eller DVD 80mm"
 
-#: ../ppdippstr.py:134
+#: ../ppdippstr.py:136
 msgid "CD or DVD 120mm"
 msgstr "CD eller DVD 120mm"
 
-#: ../ppdippstr.py:136
+#: ../ppdippstr.py:138
 msgid "Double-sided printing"
 msgstr "Dobbeltsidig utskrift"
 
-#: ../ppdippstr.py:137
+#: ../ppdippstr.py:139
 msgid "Long edge (standard)"
 msgstr "Lang kant (forvalg)"
 
-#: ../ppdippstr.py:138
+#: ../ppdippstr.py:140
 msgid "Short edge (flip)"
 msgstr "Kort kant (vend)"
 
-#: ../ppdippstr.py:139
+#: ../ppdippstr.py:141
 msgid "Off"
 msgstr "Av"
 
-#: ../ppdippstr.py:142
+#: ../ppdippstr.py:144
 msgid "Resolution, quality, ink type, media type"
 msgstr "Oppløsing, kvalitet, blekktype, medietype"
 
-#: ../ppdippstr.py:143
+#: ../ppdippstr.py:145
 msgid "Controlled by 'Printout mode'"
 msgstr "Kontrollert av «Utskriftsmodus»"
 
-#: ../ppdippstr.py:145
+#: ../ppdippstr.py:147
 msgid "300 dpi, color, black + color cartridge"
-msgstr "300 dpi, farge, sort- + fargepatron"
+msgstr "300 dpi, farge, sort + farge kassett"
 
-#: ../ppdippstr.py:147
+#: ../ppdippstr.py:149
 msgid "300 dpi, draft, color, black + color cartridge"
-msgstr "300 dpi, skisse, sort- + fargepatron"
+msgstr "300 dpi, skisse, farge, sort + farge kassett"
 
-#: ../ppdippstr.py:149
+#: ../ppdippstr.py:151
 msgid "300 dpi, draft, grayscale, black + color cartridge"
-msgstr "300 dpi, skisse,gråtoner,  sort- + fargepatron"
+msgstr "300 dpi, skisse, gråtone, sort + farge kassett"
 
-#: ../ppdippstr.py:151
+#: ../ppdippstr.py:153
 msgid "300 dpi, grayscale, black + color cartridge"
-msgstr "300 dpi, gråtoner, sort- + fargepatron"
+msgstr "300 dpi, gråtone, sort + farge kassett"
 
-#: ../ppdippstr.py:153
+#: ../ppdippstr.py:155
 msgid "600 dpi, color, black + color cartridge"
-msgstr "600 dpi, farger, sort- + fargepatron"
+msgstr "600 dpi, farge, sort + farge kassett"
 
-#: ../ppdippstr.py:155
+#: ../ppdippstr.py:157
 msgid "600 dpi, grayscale, black + color cartridge"
-msgstr "600 dpi, gråstoner, sort- + fargepatron"
+msgstr "600 dpi, gråtone, sort + farge kassett"
 
-#: ../ppdippstr.py:157
+#: ../ppdippstr.py:159
 msgid "600 dpi, photo, black + color cartridge, photo paper"
-msgstr "600 dpi, fotokvalitet, sort- + fargepatron, fotopapir"
+msgstr "600 dpi, foto, sort + farge kassett, fotopapir"
 
-#: ../ppdippstr.py:159
+#: ../ppdippstr.py:161
 msgid "600 dpi, color, black + color cartridge, photo paper, normal"
-msgstr "600 dpi, farger, sort- + fargepatron, fotopapir, normal"
+msgstr "600 dpi, farge, sort + farge kassett, fotopapir, normal"
 
-#: ../ppdippstr.py:161
+#: ../ppdippstr.py:163
 msgid "1200 dpi, photo, black + color cartridge, photo paper"
-msgstr "1200 dpi, fotokvalitet, sort- + fargepatron, fotopapir"
+msgstr "1200 dpi, foto, sort + farge kassett, fotopapir"
 
-#: ../ppdippstr.py:168
+#: ../ppdippstr.py:170
 msgid "Internet Printing Protocol (ipp)"
 msgstr "Internet Printing Protocol (ipp)"
 
-#: ../ppdippstr.py:170
+#: ../ppdippstr.py:172
 msgid "Internet Printing Protocol (http)"
 msgstr "Internet Printing Protocol (http)"
 
-#: ../ppdippstr.py:172
+#: ../ppdippstr.py:174
 msgid "Internet Printing Protocol (https)"
 msgstr "Internet Printing Protocol (https)"
 
-#: ../ppdippstr.py:174
+#: ../ppdippstr.py:176
 msgid "LPD/LPR Host or Printer"
 msgstr "LPD/LPR-vert eller skriver"
 
-#: ../ppdippstr.py:178
+#: ../ppdippstr.py:180
 msgid "Serial Port #1"
 msgstr "Seriellport #1"
 
-#: ../ppdippstr.py:180
+#: ../ppdippstr.py:182
 msgid "LPT #1"
 msgstr "LPT #1"
 
-#: ../ppdsloader.py:153
+#: ../ppdsloader.py:156
 msgid "fetching PPDs"
 msgstr "henter PPDer"
 
-#: ../printerproperties.py:67 ../system-config-printer.py:132
+#: ../printerproperties.py:70 ../system-config-printer.py:125
 msgid "Idle"
 msgstr "Ledig"
 
-#: ../printerproperties.py:69 ../system-config-printer.py:134
+#: ../printerproperties.py:74 ../system-config-printer.py:127
 msgid "Busy"
 msgstr "Opptatt"
 
 #. Printer state reasons list
-#: ../printerproperties.py:208
+#: ../printerproperties.py:214
 msgid "Message"
 msgstr "Beskjed"
 
-#: ../printerproperties.py:230
+#: ../printerproperties.py:236
 msgid "Users"
 msgstr "Brukere"
 
-#: ../printerproperties.py:253
+#: ../printerproperties.py:259
 msgid "Portrait (no rotation)"
 msgstr "Portrett (ingen rotering)"
 
-#: ../printerproperties.py:254
+#: ../printerproperties.py:260
 msgid "Landscape (90 degrees)"
 msgstr "Landskap (90 grader)"
 
-#: ../printerproperties.py:255
+#: ../printerproperties.py:261
 msgid "Reverse landscape (270 degrees)"
 msgstr "Omvendt landskap (270 grader)"
 
-#: ../printerproperties.py:256
+#: ../printerproperties.py:262
 msgid "Reverse portrait (180 degrees)"
 msgstr "Omvendt portrett (180 grader)"
 
-#: ../printerproperties.py:262
+#: ../printerproperties.py:268
 msgid "Left to right, top to bottom"
 msgstr "Venstre til høyre, topp til bunn"
 
-#: ../printerproperties.py:263
+#: ../printerproperties.py:269
 msgid "Left to right, bottom to top"
 msgstr "Venstre til høyre, bunn til topp"
 
-#: ../printerproperties.py:264
+#: ../printerproperties.py:270
 msgid "Right to left, top to bottom"
 msgstr "Høyre til venstre, topp til bunn"
 
-#: ../printerproperties.py:265
+#: ../printerproperties.py:271
 msgid "Right to left, bottom to top"
 msgstr "Høyre til venstre, bunn til topp"
 
-#: ../printerproperties.py:266
+#: ../printerproperties.py:272
 msgid "Top to bottom, left to right"
 msgstr "Topp til bunn, venstre til høyre"
 
-#: ../printerproperties.py:267
+#: ../printerproperties.py:273
 msgid "Top to bottom, right to left"
 msgstr "Topp til bunn, høyre til venstre"
 
-#: ../printerproperties.py:268
+#: ../printerproperties.py:274
 msgid "Bottom to top, left to right"
 msgstr "Bunn til topp, venstre til høyre"
 
-#: ../printerproperties.py:269
+#: ../printerproperties.py:275
 msgid "Bottom to top, right to left"
 msgstr "Bunn til topp, høyre til venstre"
 
-#: ../printerproperties.py:275
+#: ../printerproperties.py:281
 msgid "Staple"
 msgstr "Stift"
 
-#: ../printerproperties.py:276
+#: ../printerproperties.py:282
 msgid "Punch"
-msgstr "Gjennomhulling"
+msgstr "Stans ut"
 
-#: ../printerproperties.py:277
+#: ../printerproperties.py:283
 msgid "Cover"
 msgstr "Lokk"
 
-#: ../printerproperties.py:278
+#: ../printerproperties.py:284
 msgid "Bind"
 msgstr "Innbinding"
 
-#: ../printerproperties.py:279
+#: ../printerproperties.py:285
 msgid "Saddle stitch"
 msgstr "Ryggstifting"
 
-#: ../printerproperties.py:280
+#: ../printerproperties.py:286
 msgid "Edge stitch"
 msgstr "Stift ved kant"
 
-#: ../printerproperties.py:281
+#: ../printerproperties.py:287
 msgid "Fold"
 msgstr "Fold"
 
-#: ../printerproperties.py:282
+#: ../printerproperties.py:288
 msgid "Trim"
 msgstr "Trim"
 
-#: ../printerproperties.py:283
+#: ../printerproperties.py:289
 msgid "Bale"
-msgstr ""
+msgstr "Bunke"
 
-#: ../printerproperties.py:284
+#: ../printerproperties.py:290
 msgid "Booklet maker"
-msgstr "Hefteveileder"
+msgstr "Lag hefte"
 
-#: ../printerproperties.py:285
+#: ../printerproperties.py:291
 msgid "Job offset"
-msgstr "Jobbforskyvning"
+msgstr "Jobbavstand"
 
-#: ../printerproperties.py:286
+#: ../printerproperties.py:292
 msgid "Staple (top left)"
 msgstr "Stift (oppe til venstre)"
 
-#: ../printerproperties.py:287
+#: ../printerproperties.py:293
 msgid "Staple (bottom left)"
 msgstr "Stift (nede til venstre)"
 
-#: ../printerproperties.py:288
+#: ../printerproperties.py:294
 msgid "Staple (top right)"
 msgstr "Stift (oppe til høyre)"
 
-#: ../printerproperties.py:289
+#: ../printerproperties.py:295
 msgid "Staple (bottom right)"
 msgstr "Stift (nede til høyre)"
 
-#: ../printerproperties.py:290
+#: ../printerproperties.py:296
 msgid "Edge stitch (left)"
 msgstr "Kantstift (venstre)"
 
-#: ../printerproperties.py:291
+#: ../printerproperties.py:297
 msgid "Edge stitch (top)"
 msgstr "Kantstift (topp)"
 
-#: ../printerproperties.py:292
+#: ../printerproperties.py:298
 msgid "Edge stitch (right)"
 msgstr "Kantstift (høyre)"
 
-#: ../printerproperties.py:293
+#: ../printerproperties.py:299
 msgid "Edge stitch (bottom)"
 msgstr "Kantstift (bunn)"
 
-#: ../printerproperties.py:294
+#: ../printerproperties.py:300
 msgid "Staple dual (left)"
 msgstr "Dobbel stift (venstre)"
 
-#: ../printerproperties.py:295
+#: ../printerproperties.py:301
 msgid "Staple dual (top)"
 msgstr "Dobbel stift (topp)"
 
-#: ../printerproperties.py:296
+#: ../printerproperties.py:302
 msgid "Staple dual (right)"
 msgstr "Dobbel stift (høyre)"
 
-#: ../printerproperties.py:297
+#: ../printerproperties.py:303
 msgid "Staple dual (bottom)"
 msgstr "Dobbel stift (bunn)"
 
-#: ../printerproperties.py:298
+#: ../printerproperties.py:304
 msgid "Bind (left)"
 msgstr "Bind (venstre)"
 
-#: ../printerproperties.py:299
+#: ../printerproperties.py:305
 msgid "Bind (top)"
 msgstr "Bind (topp)"
 
-#: ../printerproperties.py:300
+#: ../printerproperties.py:306
 msgid "Bind (right)"
 msgstr "Bind (høyre)"
 
-#: ../printerproperties.py:301
+#: ../printerproperties.py:307
 msgid "Bind (bottom)"
 msgstr "Bind (bunn)"
 
-#: ../printerproperties.py:306
+#: ../printerproperties.py:312
 msgid "One-sided"
 msgstr "Ensidig"
 
-#: ../printerproperties.py:307
+#: ../printerproperties.py:313
 msgid "Two-sided (long edge)"
 msgstr "Tosidig (lang kant)"
 
-#: ../printerproperties.py:308
+#: ../printerproperties.py:314
 msgid "Two-sided (short edge)"
 msgstr "Tosidig (kort kant)"
 
-#: ../printerproperties.py:313 ../printerproperties.py:318
+#: ../printerproperties.py:319 ../printerproperties.py:324
 msgid "Normal"
 msgstr "Normal"
 
-#: ../printerproperties.py:314
+#: ../printerproperties.py:320
 msgid "Reverse"
 msgstr "Omvendt"
 
-#: ../printerproperties.py:317
+#: ../printerproperties.py:323
 msgid "Draft"
-msgstr "Kladd"
+msgstr "Skisse"
 
-#: ../printerproperties.py:319
+#: ../printerproperties.py:325
 msgid "High"
 msgstr "Høy"
 
-#: ../printerproperties.py:343
+#: ../printerproperties.py:347
 msgid "Automatic rotation"
 msgstr "Automatisk rotasjon"
 
-#: ../printerproperties.py:584
+#: ../printerproperties.py:594
 msgid "CUPS test page"
 msgstr "CUPS testside"
 
-#: ../printerproperties.py:585
+#: ../printerproperties.py:595
 msgid ""
 "Typically shows whether all jets on a print head are functioning and that "
 "the print feed mechanisms are working properly."
 msgstr ""
-"Viser vanligvis om alle dysene i et skriverhode fungerer, og at "
-"matemekanismene i skriveren virker som de skal"
+"Viser typisk om alle dysene på et skriverhode fungerer og at "
+"utskriftsmekanismene virker korrekt."
 
-#: ../printerproperties.py:592
+#: ../printerproperties.py:602
 #, python-format
 msgid "Printer Properties - '%s' on %s"
 msgstr "Egenskaper for skriver - «%s» på %s"
 
 #. The Conflict button was pressed.
-#: ../printerproperties.py:602
+#: ../printerproperties.py:612
 msgid ""
 "There are conflicting options.\n"
 "Changes can only be applied after\n"
@@ -1468,24 +1468,24 @@
 "Endringer kan kun aktiveres etter\n"
 "at disse konfliktene er løst."
 
-#: ../printerproperties.py:950
+#: ../printerproperties.py:967
 msgid "Installable Options"
 msgstr "Installerbare alternativer"
 
-#: ../printerproperties.py:951 ../ui/PrinterPropertiesDialog.ui.h:41
+#: ../printerproperties.py:968 ../ui/PrinterPropertiesDialog.ui.h:41
 msgid "Printer Options"
 msgstr "Alternativer for skriver"
 
-#: ../printerproperties.py:987
+#: ../printerproperties.py:1006
 #, python-format
 msgid "modifying class %s"
 msgstr "endrer klasse %s"
 
-#: ../printerproperties.py:1004
+#: ../printerproperties.py:1023
 msgid "This will delete this class!"
 msgstr "Dette vil slette denne klassen!"
 
-#: ../printerproperties.py:1005
+#: ../printerproperties.py:1024
 msgid "Proceed anyway?"
 msgstr "Fortsett likevel?"
 
@@ -1493,19 +1493,19 @@
 #. but we have never fetched the server settings to see whether
 #. the server is publishing shared printers.  Fetch the settings
 #. now so that we can update the "not published" label if necessary.
-#: ../printerproperties.py:1097 ../serversettings.py:196
+#: ../printerproperties.py:1117 ../serversettings.py:199
 msgid "fetching server settings"
 msgstr "henter innstillinger for tjener"
 
-#: ../printerproperties.py:1180
+#: ../printerproperties.py:1200
 msgid "printing test page"
 msgstr "skriver ut testside"
 
-#: ../printerproperties.py:1193 ../printerproperties.py:1233
+#: ../printerproperties.py:1214 ../printerproperties.py:1255
 msgid "Not possible"
 msgstr "Ikke mulig"
 
-#: ../printerproperties.py:1194 ../printerproperties.py:1234
+#: ../printerproperties.py:1215 ../printerproperties.py:1256
 msgid ""
 "The remote server did not accept the print job, most likely because the "
 "printer is not shared."
@@ -1513,134 +1513,134 @@
 "Ekstern tjener tok ikke imot jobben. Sannsynligvis fordi skriveren ikke er "
 "delt."
 
-#: ../printerproperties.py:1206 ../printerproperties.py:1226
+#: ../printerproperties.py:1227 ../printerproperties.py:1247
 msgid "Submitted"
 msgstr "Sendt"
 
-#: ../printerproperties.py:1207
+#: ../printerproperties.py:1228
 #, python-format
 msgid "Test page submitted as job %d"
 msgstr "Testside sendt som jobb %d"
 
-#: ../printerproperties.py:1219
+#: ../printerproperties.py:1240
 msgid "sending maintenance command"
 msgstr "sender vedlikeholdskommando"
 
-#: ../printerproperties.py:1227
+#: ../printerproperties.py:1248
 #, python-format
 msgid "Maintenance command submitted as job %d"
 msgstr "Vedlikeholdskommando sendt som jobb %d"
 
-#: ../printerproperties.py:1314 ../printerproperties.py:1319
-#: ../printerproperties.py:1415
+#: ../printerproperties.py:1337 ../printerproperties.py:1342
+#: ../printerproperties.py:1439
 msgid "Error"
 msgstr "Feil"
 
-#: ../printerproperties.py:1315
+#: ../printerproperties.py:1338
 msgid "The PPD file for this queue is damaged."
 msgstr "PPD-filen for denne køen er ødelagt."
 
-#: ../printerproperties.py:1320
+#: ../printerproperties.py:1343
 msgid "There was a problem connecting to the CUPS server."
 msgstr "Det oppstod et problem ved tilkobling til CUPS-tjeneren."
 
-#: ../printerproperties.py:1416
+#: ../printerproperties.py:1440
 #, python-format
 msgid "Option '%s' has value '%s' and cannot be edited."
-msgstr "Valget «%s» har verdien «%s», og kan ikke endres."
+msgstr "Alternativ «%s» har verdi «%s» og kan ikke redigeres."
 
-#: ../printerproperties.py:1532
+#: ../printerproperties.py:1557
 msgid "Marker levels are not reported for this printer."
-msgstr ""
+msgstr "Blekknivå rapporteres ikke for denne skriveren."
 
-#: ../pysmb.py:113
+#: ../pysmb.py:114
 #, python-format
 msgid "You must log in to access %s."
 msgstr "Du må logge inn for å få tilgang til %s."
 
-#: ../serversettings.py:92
+#: ../serversettings.py:93
 msgid "Problems?"
 msgstr "Problemer?"
 
-#: ../serversettings.py:268
+#: ../serversettings.py:272
 msgid "Enter hostname"
-msgstr "Skriv inn vertsnavn"
+msgstr "Oppgi vertsnavn"
 
-#: ../serversettings.py:513
+#: ../serversettings.py:519
 msgid "modifying server settings"
 msgstr "endrer innstillinger for tjener"
 
-#: ../serversettings.py:550
+#: ../serversettings.py:560
 msgid "Adjust the firewall now to allow all incoming IPP connections?"
 msgstr ""
-"Vil du justere brannmuren nå for å slippe til innkommende IPP-forbindelser?"
+"Juster brannmuren for å tillate alle innkommende IPP-tilkoblinger nå?"
 
-#: ../system-config-printer.py:214
+#: ../system-config-printer.py:207
 msgid "_Connect..."
-msgstr "_Koble til..."
+msgstr "_Koble til …"
 
-#: ../system-config-printer.py:215
+#: ../system-config-printer.py:208
 msgid "Choose a different CUPS server"
 msgstr "Velg en annen CUPS-tjener"
 
-#: ../system-config-printer.py:217
+#: ../system-config-printer.py:210
 msgid "_Settings..."
-msgstr "Inn_stillinger..."
+msgstr "Inn_stillinger …"
 
-#: ../system-config-printer.py:218
+#: ../system-config-printer.py:211
 msgid "Adjust server settings"
 msgstr "Juster innstillinger for tjener"
 
-#: ../system-config-printer.py:220 ../ui/PrintersWindow.ui.h:3
+#: ../system-config-printer.py:213 ../ui/PrintersWindow.ui.h:3
 msgid "_Printer"
 msgstr "S_kriver"
 
-#: ../system-config-printer.py:222
+#: ../system-config-printer.py:215
 msgid "_Class"
 msgstr "_Klasse"
 
-#: ../system-config-printer.py:227
+#: ../system-config-printer.py:220
 msgid "_Rename"
 msgstr "End_re navn"
 
-#: ../system-config-printer.py:229
+#: ../system-config-printer.py:222
 msgid "_Duplicate"
 msgstr "_Dupliser"
 
-#: ../system-config-printer.py:233
+#: ../system-config-printer.py:226
 msgid "Set As De_fault"
 msgstr "Sett som _forvalg"
 
-#: ../system-config-printer.py:237
+#: ../system-config-printer.py:230
 msgid "_Create class"
 msgstr "_Lag klasse"
 
-#: ../system-config-printer.py:239
+#: ../system-config-printer.py:232
 msgid "View Print _Queue"
 msgstr "Vis utskrifts_kø"
 
-#: ../system-config-printer.py:243
+#: ../system-config-printer.py:236
 msgid "E_nabled"
 msgstr "A_ktivert"
 
-#: ../system-config-printer.py:245
+#: ../system-config-printer.py:238
 msgid "_Shared"
 msgstr "_Delt"
 
-#: ../system-config-printer.py:250
+#: ../system-config-printer.py:243
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../system-config-printer.py:251 ../troubleshoot/ChooseNetworkPrinter.py:37
-#: ../troubleshoot/ChoosePrinter.py:38
+#: ../system-config-printer.py:244 ../troubleshoot/ChooseNetworkPrinter.py:39
+#: ../troubleshoot/ChoosePrinter.py:45
 msgid "Location"
 msgstr "Lokasjon"
 
-#: ../system-config-printer.py:252
+#: ../system-config-printer.py:245
 msgid "Manufacturer / Model"
 msgstr "Produsent / modell"
 
-#: ../system-config-printer.py:326
+#: ../system-config-printer.py:319
 msgid "_New"
 msgstr "_Ny"
 
@@ -1649,152 +1649,149 @@
 msgid "Printing - %s"
 msgstr "Skriver ut - %s"
 
-#: ../system-config-printer.py:667
+#: ../system-config-printer.py:670
 #, python-format
 msgid "Connected to %s"
 msgstr "Koblet til %s"
 
-#: ../system-config-printer.py:718
+#: ../system-config-printer.py:721
 msgid "obtaining queue details"
 msgstr "henter detaljer om kø"
 
-#: ../system-config-printer.py:806
+#: ../system-config-printer.py:812
 msgid "Network printer (discovered)"
 msgstr "Nettverksskriver (oppdaget)"
 
-#: ../system-config-printer.py:809
+#: ../system-config-printer.py:815
 msgid "Network class (discovered)"
 msgstr "Nettverksklasse (oppdaget)"
 
-#: ../system-config-printer.py:818
+#: ../system-config-printer.py:824
 msgid "Class"
 msgstr "Klasse"
 
-#: ../system-config-printer.py:821 ../system-config-printer.py:827
+#: ../system-config-printer.py:827 ../system-config-printer.py:833
 #: ../troubleshoot/LocalOrRemote.py:30
 msgid "Network printer"
 msgstr "Nettverksskriver"
 
-#: ../system-config-printer.py:824
+#: ../system-config-printer.py:830
 msgid "Network print share"
 msgstr "Delt nettverksskriver"
 
-#: ../system-config-printer.py:978
+#: ../system-config-printer.py:984
 msgid "Service framework not available"
-msgstr ""
+msgstr "Tjenesterammeverk er ikke tilgjengelig"
 
-#: ../system-config-printer.py:980
+#: ../system-config-printer.py:986
 msgid "Cannot start service on remote server"
-msgstr ""
+msgstr "Kan ikke starte tjeneste på ekstern tjener"
 
-#: ../system-config-printer.py:1028 ../ui/ConnectingDialog.ui.h:4
+#: ../system-config-printer.py:1034 ../ui/ConnectingDialog.ui.h:4
 #, no-c-format, python-format
 msgid "<i>Opening connection to %s</i>"
 msgstr "<i>Åpner tilkobling til %s</i>"
 
-#: ../system-config-printer.py:1183
+#: ../system-config-printer.py:1191
 msgid "Set Default Printer"
 msgstr "Sett forvalgt skriver"
 
-#: ../system-config-printer.py:1185
+#: ../system-config-printer.py:1193
 msgid "Do you want to set this as the system-wide default printer?"
-msgstr ""
-"Ønsker du å sette denne skriveren som standardskriver for hele systemet?"
+msgstr "Vil du sette denne som forvalgt skriver for hele systemet?"
 
-#: ../system-config-printer.py:1187
+#: ../system-config-printer.py:1195
 msgid "Set as the _system-wide default printer"
 msgstr "Sett som forvalgt skriver for _systemet"
 
-#: ../system-config-printer.py:1189
+#: ../system-config-printer.py:1197
 msgid "_Clear my personal default setting"
 msgstr "_Tøm mine personlige forvalgte innstillinger"
 
-#: ../system-config-printer.py:1190
+#: ../system-config-printer.py:1198
 msgid "Set as my _personal default printer"
 msgstr "Set som min _personlige forvalgte skriver"
 
-#: ../system-config-printer.py:1195
+#: ../system-config-printer.py:1203
 msgid "setting default printer"
 msgstr "setter forvalgt skriver"
 
-#: ../system-config-printer.py:1241
+#: ../system-config-printer.py:1252
 msgid "Cannot Rename"
 msgstr "Kan ikke endre navn"
 
-#: ../system-config-printer.py:1242
+#: ../system-config-printer.py:1253
 msgid "There are queued jobs."
 msgstr "Det ligger jobber i kø."
 
-#: ../system-config-printer.py:1260
+#: ../system-config-printer.py:1271
 msgid "Renaming will lose history"
 msgstr "Endring av navn vil medføre tap av historikk"
 
-#: ../system-config-printer.py:1262
+#: ../system-config-printer.py:1273
 msgid "Completed jobs will no longer be available for re-printing."
-msgstr ""
-"Fullførte utskrifter vil ikke lenger være tilgjengelig for å skrives ut på "
-"nytt."
+msgstr "Fullførte jobber vil ikke være tilgjengelige for ny utskrift."
 
-#: ../system-config-printer.py:1363
+#: ../system-config-printer.py:1386
 msgid "renaming printer"
 msgstr "endrer navn på skriver"
 
-#: ../system-config-printer.py:1515
+#: ../system-config-printer.py:1549
 #, python-format
 msgid "Really delete class '%s'?"
 msgstr "Vil du virkelig slette klassen «%s»?"
 
-#: ../system-config-printer.py:1517
+#: ../system-config-printer.py:1551
 #, python-format
 msgid "Really delete printer '%s'?"
 msgstr "Vil du virkelig slette skriver «%s»?"
 
-#: ../system-config-printer.py:1519
+#: ../system-config-printer.py:1555
 msgid "Really delete selected destinations?"
 msgstr "Vil du virkelig slette valgte mål?"
 
-#: ../system-config-printer.py:1540
+#: ../system-config-printer.py:1578
 #, python-format
 msgid "deleting printer %s"
 msgstr "sletter skriver %s"
 
-#: ../system-config-printer.py:1627
+#: ../system-config-printer.py:1680
 msgid "Publish Shared Printers"
 msgstr "Publiser delte skrivere"
 
-#: ../system-config-printer.py:1628
+#: ../system-config-printer.py:1681
 msgid ""
 "Shared printers are not available to other people unless the 'Publish shared "
 "printers' option is enabled in the server settings."
 msgstr ""
-"Delte skrivere er ikke tilgjengelig for andre, med mindre valget "
-"«offentliggjør delte skrivere» er valgt under delingsinnstillingene."
+"Delte skrivere er ikke tilgjengelige for andre med mindre alternativet "
+"«Publiser delte skrivere» er slått på under tjenerinnstillinger."
 
-#: ../system-config-printer.py:1794
+#: ../system-config-printer.py:1893
 msgid "Would you like to print a test page?"
 msgstr "Vil du skrive ut en testside?"
 
 #. Not more than 25 characters
-#: ../system-config-printer.py:1796 ../ui/PrinterPropertiesDialog.ui.h:12
-#: ../troubleshoot/PrintTestPage.py:72
+#: ../system-config-printer.py:1895 ../ui/PrinterPropertiesDialog.ui.h:12
+#: ../troubleshoot/PrintTestPage.py:74
 msgid "Print Test Page"
 msgstr "Skriv ut testside"
 
-#: ../system-config-printer.py:1882
+#: ../system-config-printer.py:1982
 msgid "Install driver"
 msgstr "Installer driver"
 
-#: ../system-config-printer.py:1883 ../troubleshoot/CheckPPDSanity.py:133
+#: ../system-config-printer.py:1983 ../troubleshoot/CheckPPDSanity.py:135
 #, python-format
 msgid ""
 "Printer '%s' requires the %s package but it is not currently installed."
 msgstr "Skriver «%s» er avhengig av pakke %s, men den er ikke installert."
 
-#: ../system-config-printer.py:1899
+#: ../system-config-printer.py:1998
 msgid "Missing driver"
 msgstr "Mangler driver"
 
-#: ../system-config-printer.py:1900
+#: ../system-config-printer.py:1999
 #, python-format
 msgid ""
 "Printer '%s' requires the '%s' program but it is not currently installed.  "
@@ -1827,6 +1824,18 @@
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA."
 msgstr ""
+"Dette programmet er fri programvare. Du kan redistribuere og/eller endre "
+"programmet under betingelsene gitt i GNU General Public License som utgitt "
+"av Free Software Foundation; enten versjon 2 av lisensen, eller (hvis du "
+"ønsker det) enhver senere versjon.\n"
+"\n"
+"Programmet distribueres i håp om at programmet er nyttig, men uten NOEN "
+"GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER ET "
+"BESTEMT FORMÅL. Se GNU General Public License for detaljer.\n"
+"\n"
+"Du skal ha mottatt en kopi av GNU General Public License sammen med dette "
+"programmet. Hvis dette ikke er tilfelle, kan du skrive til Free Software "
+"Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
 
 #. TRANSLATORS: Replace this string with your names, one name per line.  Thank you very much for your effort on translating system-config-printer and all our other tools!
 #: ../ui/AboutDialog.ui.h:9
@@ -1846,7 +1855,9 @@
 "  Mathias Bynke https://launchpad.net/~mabynke\n"
 "  Rune Nakim https://launchpad.net/~rnakim\n"
 "  Stig Sandbeck Mathisen https://launchpad.net/~ssm\n"
-"  Terje Andre Arnøy https://launchpad.net/~terjeaar"
+"  Terje Andre Arnøy https://launchpad.net/~terjeaar\n"
+"  Tim Waugh https://launchpad.net/~twaugh\n"
+"  Åka Sikrom https://launchpad.net/~akrosikam"
 
 #: ../ui/ConnectDialog.ui.h:1
 msgid "Connect to CUPS server"
@@ -1911,7 +1922,7 @@
 
 #: ../ui/NewPrinterWindow.ui.h:5
 msgid "Human-readable description such as \"HP LaserJet with Duplexer\""
-msgstr "Intuitiv beskrivelse, f.eks. \"HP LaserJet med Duplexer\""
+msgstr "Beskrivelse. F.eks. «HP LaserJet med dupleksenhet»"
 
 #: ../ui/NewPrinterWindow.ui.h:6
 msgid "<b>Description</b> (optional)"
@@ -1919,7 +1930,7 @@
 
 #: ../ui/NewPrinterWindow.ui.h:7
 msgid "Human-readable location such as \"Lab 1\""
-msgstr "Lesbar plassering, f.eks. \"Lab 1\""
+msgstr "Lokasjon. F.eks. «Kursrom 1»"
 
 #: ../ui/NewPrinterWindow.ui.h:8
 msgid "<b>Location</b> (optional)"
@@ -1951,8 +1962,11 @@
 "ipp://cups-server/printers/printer-queue\n"
 "ipp://printer.mydomain/ipp"
 msgstr ""
+"For eksempel:\n"
+"ipp://cups-tjener/skrivere/skriverkø\n"
+"ipp://skriver.mittdomene/ipp"
 
-#: ../ui/NewPrinterWindow.ui.h:18 ../troubleshoot/DeviceListed.py:40
+#: ../ui/NewPrinterWindow.ui.h:18 ../troubleshoot/DeviceListed.py:47
 msgid "Device URI"
 msgstr "URI til enhet"
 
@@ -2152,7 +2166,7 @@
 
 #: ../ui/NewPrinterWindow.ui.h:66
 msgid "Use the new PPD (Postscript Printer Description) as is."
-msgstr "Bruk den nye PPD-en som den er."
+msgstr "Bruk den nye PPD (Postscript Printer Description) som den er."
 
 #: ../ui/NewPrinterWindow.ui.h:67
 msgid ""
@@ -2164,7 +2178,7 @@
 
 #: ../ui/NewPrinterWindow.ui.h:68
 msgid "Try to copy the option settings over from the old PPD. "
-msgstr "Forsøk å bruke innstillingene fra den gamle PPD-en. "
+msgstr "Prøv å kopiere innstillinger for alternativet fra den gamle PPDen. "
 
 #: ../ui/NewPrinterWindow.ui.h:69
 msgid ""
@@ -2190,7 +2204,7 @@
 "This driver supports additional hardware that may be installed in the "
 "printer."
 msgstr ""
-"Denne driveren støtter tilleggsmaskinvare som kan installéres i skriveren."
+"Denne driveren støtter ekstra maskinvare som kan være installert i skriveren."
 
 #: ../ui/NewPrinterWindow.ui.h:73 ../ui/PrinterPropertiesDialog.ui.h:40
 msgid "Installed Options"
@@ -2208,6 +2222,9 @@
 "be covered by their commercial support.  See the support and license terms "
 "of the driver's supplier."
 msgstr ""
+"Disse driverne følger ikke med operativsystemet, og dekkes således ikke av "
+"brukerstøtteavtalen der. Se bruks- og brukerstøttevilkårene til "
+"driverleverandøren."
 
 #: ../ui/NewPrinterWindow.ui.h:76
 msgid "<b>Note</b>"
@@ -2225,7 +2242,7 @@
 "Dette valget sørger for at en driver ikke vil lastes ned. I de neste stegene "
 "vil en lokal driver bli valgt."
 
-#: ../newprinter.py:3347 ../ui/NewPrinterWindow.ui.h:79
+#: ../newprinter.py:3417 ../ui/NewPrinterWindow.ui.h:79
 msgid "Local Driver"
 msgstr "Lokal driver"
 
@@ -2335,11 +2352,11 @@
 
 #: ../ui/PrinterPropertiesDialog.ui.h:8
 msgid "printer state"
-msgstr "skriverstatus"
+msgstr "skrivertilstand"
 
 #: ../ui/PrinterPropertiesDialog.ui.h:9
 msgid "make and model"
-msgstr ""
+msgstr "merke og modell"
 
 #: ../ui/PrinterPropertiesDialog.ui.h:10
 msgid "<b>Settings</b>"
@@ -2389,7 +2406,7 @@
 
 #: ../ui/PrinterPropertiesDialog.ui.h:25
 msgid "Error Policy: \t"
-msgstr "Feilhandling: \t"
+msgstr "Regelsett for feil: » \t"
 
 #: ../ui/PrinterPropertiesDialog.ui.h:26
 msgid "Operation Policy:"
@@ -2405,7 +2422,7 @@
 
 #: ../ui/PrinterPropertiesDialog.ui.h:29
 msgid "Ending Banner:"
-msgstr "Sluttbanner:"
+msgstr "Avsluttende omslagstekst:"
 
 #: ../ui/PrinterPropertiesDialog.ui.h:30
 msgid "<b>Banner</b>"
@@ -2479,7 +2496,7 @@
 
 #: ../ui/PrinterPropertiesDialog.ui.h:50
 msgid "Finishings:"
-msgstr "Etterbehandlinger:"
+msgstr "Fullføring:"
 
 #: ../ui/PrinterPropertiesDialog.ui.h:51
 msgid "Job priority:"
@@ -2503,15 +2520,15 @@
 
 #: ../ui/PrinterPropertiesDialog.ui.h:56
 msgid "Print quality:"
-msgstr "Kvalitet på utskrift:"
+msgstr "Utskriftskvalitet:"
 
 #: ../ui/PrinterPropertiesDialog.ui.h:57
 msgid "Printer resolution:"
-msgstr "Oppløsning på utskrift:"
+msgstr "Oppløsing for skriver:"
 
 #: ../ui/PrinterPropertiesDialog.ui.h:58
 msgid "Output bin:"
-msgstr ""
+msgstr "Utdatakurv:"
 
 #: ../ui/PrinterPropertiesDialog.ui.h:59
 msgid "More"
@@ -2571,7 +2588,7 @@
 
 #: ../ui/PrinterPropertiesDialog.ui.h:73
 msgid "Pretty print"
-msgstr "Pen utskrift"
+msgstr "Skriv ut _igjen"
 
 #: ../ui/PrinterPropertiesDialog.ui.h:74
 msgid "Word wrap"
@@ -2654,19 +2671,19 @@
 
 #: ../ui/PrintersWindow.ui.h:8
 msgid "There are no printers configured yet."
-msgstr "Ingen skrivere har blitt satt opp enda."
+msgstr "Ingen skrivere er konfigurert ennå."
 
 #: ../ui/PrintersWindow.ui.h:9
 msgid ""
 "Printing service not available.  Start the service on this computer or "
 "connect to another server."
 msgstr ""
-"Skrivertjenesten er ikke tilgjengelig. Start tjenesten på denne datamaskinen "
-"eller koble til en annen tjener."
+"Utskriftstjenesten er ikke tilgjengelig. Start tjenesten på denne "
+"datamaskinen eller koble til en annen tjener."
 
 #: ../ui/PrintersWindow.ui.h:10
 msgid "Start Service"
-msgstr "Start tjenesten"
+msgstr "Start tjeneste"
 
 #: ../ui/ServerSettingsDialog.ui.h:1
 msgid "Server Settings"
@@ -2756,140 +2773,140 @@
 msgid "Configure printers"
 msgstr "Konfigurer skrivere"
 
-#: ../statereason.py:94
+#: ../statereason.py:96
 msgid "Toner low"
 msgstr "Lite toner"
 
-#: ../statereason.py:95
+#: ../statereason.py:97
 #, python-format
 msgid "Printer '%s' is low on toner."
 msgstr "Skriver '%s' har lite toner igjen"
 
-#: ../statereason.py:96
+#: ../statereason.py:98
 msgid "Toner empty"
 msgstr "Tomt for toner"
 
-#: ../statereason.py:97
+#: ../statereason.py:99
 #, python-format
 msgid "Printer '%s' has no toner left."
 msgstr "Skriver '%s' har ikke toner igjen"
 
-#: ../statereason.py:98
+#: ../statereason.py:100
 msgid "Cover open"
 msgstr "Lokket er åpent"
 
-#: ../statereason.py:99
+#: ../statereason.py:101
 #, python-format
 msgid "The cover is open on printer '%s'."
 msgstr "Lokket er åpent på skriver '%s'."
 
-#: ../statereason.py:100
+#: ../statereason.py:102
 msgid "Door open"
 msgstr "Dør åpen"
 
-#: ../statereason.py:101
+#: ../statereason.py:103
 #, python-format
 msgid "The door is open on printer '%s'."
 msgstr "Døren er åpen på skriver «%s»."
 
-#: ../statereason.py:102
+#: ../statereason.py:104
 msgid "Paper low"
 msgstr "Lite papir"
 
-#: ../statereason.py:103
+#: ../statereason.py:105
 #, python-format
 msgid "Printer '%s' is low on paper."
 msgstr "Skriver '%s' har lite papir"
 
-#: ../statereason.py:104
+#: ../statereason.py:106
 msgid "Out of paper"
 msgstr "Tom for papir"
 
-#: ../statereason.py:105
+#: ../statereason.py:107
 #, python-format
 msgid "Printer '%s' is out of paper."
 msgstr "Skriver '%s' er tom for papir"
 
-#: ../statereason.py:106
+#: ../statereason.py:108
 msgid "Ink low"
 msgstr "Lite blekk"
 
-#: ../statereason.py:107
+#: ../statereason.py:109
 #, python-format
 msgid "Printer '%s' is low on ink."
 msgstr "Skriver '%s' har lite blekk igjen"
 
-#: ../statereason.py:108
+#: ../statereason.py:110
 msgid "Ink empty"
 msgstr "Tomt for blekk"
 
-#: ../statereason.py:109
+#: ../statereason.py:111
 #, python-format
 msgid "Printer '%s' has no ink left."
 msgstr "Skriver '%s' er tom for blekk"
 
-#: ../statereason.py:110
+#: ../statereason.py:112
 msgid "Printer off-line"
 msgstr "Skriver er frakoblet"
 
-#: ../statereason.py:111
+#: ../statereason.py:113
 #, python-format
 msgid "Printer '%s' is currently off-line."
 msgstr "Skriver '%s' er frakoblet."
 
-#: ../statereason.py:112
+#: ../statereason.py:114
 msgid "Not connected?"
 msgstr "Ikke tilkoblet?"
 
-#: ../statereason.py:113
+#: ../statereason.py:115
 #, python-format
 msgid "Printer '%s' may not be connected."
 msgstr "Skriver '%s' er kanskje ikke tilkoblet."
 
-#: ../statereason.py:114 ../statereason.py:134
+#: ../statereason.py:116 ../statereason.py:136
 msgid "Printer error"
 msgstr "Skriverfeil"
 
-#: ../statereason.py:115
+#: ../statereason.py:117
 #, python-format
 msgid "There is a problem on printer '%s'."
 msgstr "Det er problemer på skriver «%s»."
 
-#: ../statereason.py:117
+#: ../statereason.py:119
 msgid "Printer configuration error"
 msgstr "Feil med skriverkonfigurasjon"
 
-#: ../statereason.py:118
+#: ../statereason.py:120
 #, python-format
 msgid "There is a missing print filter for printer '%s'."
 msgstr "Det mangler et utskriftsfilter for skriver «%s»."
 
-#: ../statereason.py:130
+#: ../statereason.py:132
 msgid "Printer report"
 msgstr "Skriverrapport"
 
-#: ../statereason.py:132
+#: ../statereason.py:134
 msgid "Printer warning"
 msgstr "Skriveradvarsel"
 
-#: ../statereason.py:151
+#: ../statereason.py:153
 #, python-format
 msgid "Printer '%s': '%s'."
 msgstr "Skriver '%s': '%s'"
 
-#: ../timedops.py:112 ../timedops.py:192
+#: ../timedops.py:116 ../timedops.py:196
 msgid "Please wait"
 msgstr "Vennligst vent"
 
-#: ../timedops.py:118 ../timedops.py:199
+#: ../timedops.py:122 ../timedops.py:203
 msgid "Gathering information"
 msgstr "Henter informasjon"
 
-#: ../ToolbarSearchEntry.py:69
+#: ../ToolbarSearchEntry.py:73
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../troubleshoot/__init__.py:54
+#: ../troubleshoot/__init__.py:55
 msgid "Printing troubleshooter"
 msgstr "Feilsøking for utskrift"
 
@@ -2921,15 +2938,15 @@
 "Velg 'Kringkast delte skrivere tilkoblet dette systemet' i "
 "delingsinnstillingene ved hjelp av administrasjonsverktøyet for utskrifter."
 
-#: ../troubleshoot/CheckPPDSanity.py:45 ../applet.py:182
+#: ../troubleshoot/CheckPPDSanity.py:47 ../applet.py:179
 msgid "Install"
 msgstr "Installer"
 
-#: ../troubleshoot/CheckPPDSanity.py:97
+#: ../troubleshoot/CheckPPDSanity.py:99
 msgid "Invalid PPD File"
 msgstr "Ugyldig PPD-fil"
 
-#: ../troubleshoot/CheckPPDSanity.py:108
+#: ../troubleshoot/CheckPPDSanity.py:110
 #, python-format
 msgid ""
 "The PPD file for printer '%s' does not conform to the specification.  "
@@ -2939,27 +2956,27 @@
 "dette kan være:"
 
 #. Perhaps cupstestppd is not in the path.
-#: ../troubleshoot/CheckPPDSanity.py:114
+#: ../troubleshoot/CheckPPDSanity.py:116
 #, python-format
 msgid "There is a problem with the PPD file for printer '%s'."
 msgstr "Det er problemer med PPD-filen for skriver «%s»."
 
-#: ../troubleshoot/CheckPPDSanity.py:124
+#: ../troubleshoot/CheckPPDSanity.py:126
 msgid "Missing Printer Driver"
 msgstr "Mangler skriverdriver"
 
-#: ../troubleshoot/CheckPPDSanity.py:138
+#: ../troubleshoot/CheckPPDSanity.py:140
 #, python-format
 msgid ""
 "Printer '%s' requires the '%s' program but it is not currently installed."
 msgstr ""
 "Skriver «%s» er avhengig av programmet %s, men dette er ikke installert."
 
-#: ../troubleshoot/ChooseNetworkPrinter.py:29
+#: ../troubleshoot/ChooseNetworkPrinter.py:31
 msgid "Choose Network Printer"
 msgstr "Velg nettverksskriver"
 
-#: ../troubleshoot/ChooseNetworkPrinter.py:30
+#: ../troubleshoot/ChooseNetworkPrinter.py:32
 msgid ""
 "Please select the network printer you are trying to use from the list below. "
 "If it does not appear in the list, select 'Not listed'."
@@ -2967,21 +2984,21 @@
 "Velg den nettverksprinteren du prøver å bruke fra listen under. Hvis den "
 "ikke er i listen, velg \"ikke i listen\""
 
-#: ../troubleshoot/ChooseNetworkPrinter.py:39
-#: ../troubleshoot/ChoosePrinter.py:40 ../troubleshoot/DeviceListed.py:38
+#: ../troubleshoot/ChooseNetworkPrinter.py:41
+#: ../troubleshoot/ChoosePrinter.py:47 ../troubleshoot/DeviceListed.py:45
 msgid "Information"
 msgstr "Informasjon"
 
-#: ../troubleshoot/ChooseNetworkPrinter.py:73
-#: ../troubleshoot/ChoosePrinter.py:64 ../troubleshoot/DeviceListed.py:70
+#: ../troubleshoot/ChooseNetworkPrinter.py:75
+#: ../troubleshoot/ChoosePrinter.py:71 ../troubleshoot/DeviceListed.py:77
 msgid "Not listed"
 msgstr "Ikke listet"
 
-#: ../troubleshoot/ChoosePrinter.py:30
+#: ../troubleshoot/ChoosePrinter.py:37
 msgid "Choose Printer"
 msgstr "Velg skriver"
 
-#: ../troubleshoot/ChoosePrinter.py:31
+#: ../troubleshoot/ChoosePrinter.py:38
 msgid ""
 "Please select the printer you are trying to use from the list below. If it "
 "does not appear in the list, select 'Not listed'."
@@ -2989,11 +3006,11 @@
 "Velg den printeren du prøver å bruke fra listen under. Hvis den ikke er i "
 "listen, velg \"ikke i listen\""
 
-#: ../troubleshoot/DeviceListed.py:30
+#: ../troubleshoot/DeviceListed.py:37
 msgid "Choose Device"
 msgstr "Velg enhet"
 
-#: ../troubleshoot/DeviceListed.py:31
+#: ../troubleshoot/DeviceListed.py:38
 msgid ""
 "Please select the device you want to use from the list below. If it does not "
 "appear in the list, select 'Not listed'."
@@ -3001,11 +3018,11 @@
 "Velg den enheten du vil bruke fra listen under. Hvis den ikke er i listen, "
 "velg \"ikke i listen\""
 
-#: ../troubleshoot/ErrorLogCheckpoint.py:31
+#: ../troubleshoot/ErrorLogCheckpoint.py:33
 msgid "Debugging"
 msgstr "Feilsøking"
 
-#: ../troubleshoot/ErrorLogCheckpoint.py:32
+#: ../troubleshoot/ErrorLogCheckpoint.py:34
 msgid ""
 "This step will enable debugging output from the CUPS scheduler.  This may "
 "cause the scheduler to restart.  Click the button below to enable debugging."
@@ -3014,31 +3031,31 @@
 "kan forårsake omstart av planleggeren. Klikk på knappen under for å velge "
 "feilsøking."
 
-#: ../troubleshoot/ErrorLogCheckpoint.py:36
+#: ../troubleshoot/ErrorLogCheckpoint.py:38
 msgid "Enable Debugging"
 msgstr "Slå på feilsøking"
 
-#: ../troubleshoot/ErrorLogCheckpoint.py:215
+#: ../troubleshoot/ErrorLogCheckpoint.py:217
 msgid "Debug logging enabled."
 msgstr "Logging av feilsøkingsinformasjon aktivert."
 
-#: ../troubleshoot/ErrorLogCheckpoint.py:217
+#: ../troubleshoot/ErrorLogCheckpoint.py:219
 msgid "Debug logging was already enabled."
-msgstr "Feilsøkingslogg var allerede slått på."
+msgstr "Logging for feilsøking var allerede slått på."
 
-#: ../troubleshoot/ErrorLogParse.py:29
+#: ../troubleshoot/ErrorLogParse.py:31
 msgid "Error log messages"
 msgstr "Logg med feilmeldinger"
 
-#: ../troubleshoot/ErrorLogParse.py:30
+#: ../troubleshoot/ErrorLogParse.py:32
 msgid "There are messages in the error log."
 msgstr "Det finnes meldinger i feilloggen."
 
-#: ../troubleshoot/Locale.py:29
+#: ../troubleshoot/Locale.py:31
 msgid "Incorrect Page Size"
 msgstr "Feil sidestørrelse"
 
-#: ../troubleshoot/Locale.py:30
+#: ../troubleshoot/Locale.py:32
 msgid ""
 "The page size for the print job was not the printer's default page size.  If "
 "this is not intentional it may cause alignment problems."
@@ -3047,11 +3064,11 @@
 "standardstørrelse. Hvis dette ikke var intensjonelt kan de resultere i "
 "forskjøvet plassering."
 
-#: ../troubleshoot/Locale.py:43
+#: ../troubleshoot/Locale.py:45
 msgid "Print job page size:"
 msgstr "Sidestørrelse for utskriftsjobb:"
 
-#: ../troubleshoot/Locale.py:48
+#: ../troubleshoot/Locale.py:50
 msgid "Printer page size:"
 msgstr "Sidestørrelse for skriver:"
 
@@ -3077,32 +3094,32 @@
 msgid "The CUPS printer on the server is not shared."
 msgstr "CUPS-skriver på tjeneren er ikke delt."
 
-#: ../troubleshoot/PrinterStateReasons.py:31
+#: ../troubleshoot/PrinterStateReasons.py:33
 msgid "Status Messages"
 msgstr "Statusmeldinger"
 
-#: ../troubleshoot/PrinterStateReasons.py:32
+#: ../troubleshoot/PrinterStateReasons.py:34
 msgid "There are status messages associated with this queue."
 msgstr "Det finnes statusmeldinger assosiert med denne køen."
 
-#: ../troubleshoot/PrinterStateReasons.py:62
+#: ../troubleshoot/PrinterStateReasons.py:64
 #, python-format
 msgid "The printer's state message is: '%s'."
 msgstr "Skriverens tilstandsmelding er: «%s»."
 
-#: ../troubleshoot/PrinterStateReasons.py:87
+#: ../troubleshoot/PrinterStateReasons.py:89
 msgid "Errors are listed below:"
 msgstr "Feilene er listet under:"
 
-#: ../troubleshoot/PrinterStateReasons.py:92
+#: ../troubleshoot/PrinterStateReasons.py:94
 msgid "Warnings are listed below:"
 msgstr "Advarsler er listet under:"
 
-#: ../troubleshoot/PrintTestPage.py:62
+#: ../troubleshoot/PrintTestPage.py:64
 msgid "Test Page"
 msgstr "Testside"
 
-#: ../troubleshoot/PrintTestPage.py:63
+#: ../troubleshoot/PrintTestPage.py:65
 msgid ""
 "Now print a test page.  If you are having problems printing a specific "
 "document, print that document now and mark the print job below."
@@ -3111,70 +3128,73 @@
 "spesifikt dokument, skriv ut dokumentet nå og marker utskriftsjobben "
 "nedenfor."
 
-#: ../troubleshoot/PrintTestPage.py:75
+#: ../troubleshoot/PrintTestPage.py:77
 msgid "Cancel All Jobs"
 msgstr "Avbryt alle jobber"
 
-#: ../troubleshoot/PrintTestPage.py:81
+#: ../troubleshoot/PrintTestPage.py:83
 msgid "Test"
 msgstr "Test"
 
-#: ../troubleshoot/PrintTestPage.py:111
+#: ../troubleshoot/PrintTestPage.py:113
 msgid "Did the marked print jobs print correctly?"
 msgstr "Ble merkede utskrifter skrevet ut korrekt?"
 
-#: ../troubleshoot/PrintTestPage.py:118
+#: ../troubleshoot/PrintTestPage.py:120
 msgid "Yes"
 msgstr "Ja"
 
-#: ../troubleshoot/PrintTestPage.py:119
+#: ../troubleshoot/PrintTestPage.py:121
 msgid "No"
 msgstr "Nei"
 
-#: ../troubleshoot/PrintTestPage.py:143
+#: ../troubleshoot/PrintTestPage.py:144
 #, python-format
 msgid "Remember to load paper of type '%s' into the printer first."
 msgstr "Husk å legge i papir av type «%s» i skriveren først."
 
-#: ../troubleshoot/PrintTestPage.py:429
+#: ../troubleshoot/PrintTestPage.py:431
 msgid "Error submitting test page"
 msgstr "Feil ved sending av testside"
 
-#: ../troubleshoot/QueueNotEnabled.py:56
-#: ../troubleshoot/QueueRejectingJobs.py:66
+#: ../troubleshoot/QueueNotEnabled.py:58
+#: ../troubleshoot/QueueRejectingJobs.py:68
 #, python-format
 msgid "The reason given is: '%s'."
 msgstr "Oppgitt årsak er: «%s»."
 
-#: ../troubleshoot/QueueNotEnabled.py:58
+#: ../troubleshoot/QueueNotEnabled.py:60
 msgid "This may be due to the printer being disconnected or switched off."
-msgstr "Dette kan skyldes at skriveren er frakoblet eller avslått."
+msgstr ""
+"Dette kan være forårsaket av at skriveren er koblet fra eller slått av."
 
-#: ../troubleshoot/QueueNotEnabled.py:62
+#: ../troubleshoot/QueueNotEnabled.py:64
 msgid "Queue Not Enabled"
 msgstr "Køen er ikke aktiv"
 
-#: ../troubleshoot/QueueNotEnabled.py:63
+#: ../troubleshoot/QueueNotEnabled.py:65
 #, python-format
 msgid "The queue '%s' is not enabled."
 msgstr "Køen «%s» er ikke aktivert."
 
-#: ../troubleshoot/QueueNotEnabled.py:71
+#: ../troubleshoot/QueueNotEnabled.py:73
 msgid ""
 "To enable it, select the 'Enabled' checkbox in the 'Policies' tab for the "
 "printer in the printer administration tool."
 msgstr ""
+"Kryss av for «Aktivert» under «Regler»-fanen for skriveren i verktøyet for "
+"skriveradministrasjon."
 
-#: ../troubleshoot/QueueRejectingJobs.py:31
+#: ../troubleshoot/QueueRejectingJobs.py:33
 msgid "Queue Rejecting Jobs"
 msgstr "Køen avviser jobber"
 
-#: ../troubleshoot/QueueRejectingJobs.py:63
+#: ../troubleshoot/QueueRejectingJobs.py:65
 #, python-format
 msgid "The queue '%s' is rejecting jobs."
 msgstr "Køen «%s» tar ikke imot jobber."
 
-#: ../troubleshoot/QueueRejectingJobs.py:70
+#: ../troubleshoot/QueueRejectingJobs.py:72
 msgid ""
 "To make the queue accept jobs, select the 'Accepting Jobs' checkbox in the "
 "'Policies' tab for the printer in the printer administration tool."
@@ -3182,23 +3202,23 @@
 "For at køen skal akseptere utskrifter, velg avkrysningsboksen for «aksepter "
 "utskrifter» under «poliser»-fanen i administrasjonsverktøyet for utskrifter."
 
-#: ../troubleshoot/RemoteAddress.py:26
+#: ../troubleshoot/RemoteAddress.py:28
 msgid "Remote Address"
 msgstr "Ekstern adresse"
 
-#: ../troubleshoot/RemoteAddress.py:27
+#: ../troubleshoot/RemoteAddress.py:29
 msgid ""
 "Please enter as many details as you can about the network address of this "
 "printer."
 msgstr ""
-"Vennligst fyll inn så mange detaljer som mulig om nettverksadressen til "
-"denne skriveren."
+"Vennligst oppgi så mange detaljer du kan om nettverksadressen for denne "
+"skriveren."
 
-#: ../troubleshoot/RemoteAddress.py:35
+#: ../troubleshoot/RemoteAddress.py:37
 msgid "Server name:"
 msgstr "Navn på tjener:"
 
-#: ../troubleshoot/RemoteAddress.py:42
+#: ../troubleshoot/RemoteAddress.py:44
 msgid "Server IP address:"
 msgstr "IP-adresse for tjener:"
 
@@ -3215,28 +3235,28 @@
 "Tjenesten CUPS-utskrifter synes ikke å kjøre. For å rette opp dette, velg "
 "System->Administrasjon->Tjenester fra hovedmenyen og se etter «cups»."
 
-#: ../troubleshoot/ServerFirewalled.py:26
+#: ../troubleshoot/ServerFirewalled.py:28
 msgid "Check Server Firewall"
 msgstr "Sjekk brannmur på tjener"
 
-#: ../troubleshoot/ServerFirewalled.py:27
+#: ../troubleshoot/ServerFirewalled.py:29
 msgid "It is not possible to connect to the server."
 msgstr "Det er ikke mulig å koble til tjeneren."
 
-#: ../troubleshoot/ServerFirewalled.py:42
+#: ../troubleshoot/ServerFirewalled.py:44
 #, python-format
 msgid ""
 "Please check to see if a firewall or router configuration is blocking TCP "
 "port %d on server '%s'."
 msgstr ""
-"Vennligst kontroller om brannmuren eller ruteren blokkerer TCP-porten %d på "
-"verten '%s'."
+"Vennligst sjekk om en brannmur- eller ruterkonfigurasjon blokkerer TCP-port "
+"%d på tjener «%s»."
 
-#: ../troubleshoot/Shrug.py:26
+#: ../troubleshoot/Shrug.py:28
 msgid "Sorry!"
 msgstr "Beklager!"
 
-#: ../troubleshoot/Shrug.py:27
+#: ../troubleshoot/Shrug.py:29
 msgid ""
 "There is no obvious solution to this problem.  Your answers have been "
 "collected together with other useful information.  If you would like to "
@@ -3246,89 +3266,89 @@
 "sammen med annen nyttig informasjon. Hvis du vil sende inn en feilrapport, "
 "vennligst inkluder denne informasjonen."
 
-#: ../troubleshoot/Shrug.py:34
+#: ../troubleshoot/Shrug.py:36
 msgid "Diagnostic Output (Advanced)"
-msgstr "Diagnostisk Utdata (Avansert)"
+msgstr "Diagnoseutskrift (avansert)"
 
-#: ../troubleshoot/Shrug.py:93
+#: ../troubleshoot/Shrug.py:96
 msgid "Error saving file"
-msgstr ""
+msgstr "Feil ved lagring av fil"
 
-#: ../troubleshoot/Shrug.py:94
+#: ../troubleshoot/Shrug.py:97
 msgid "There was an error saving the file:"
-msgstr "Det oppstod en feil under lagringen av filen:"
+msgstr "Det oppsto en feil ved lagring av filen:"
 
-#: ../troubleshoot/Welcome.py:43
+#: ../troubleshoot/Welcome.py:45
 msgid "Trouble-shooting Printing"
-msgstr "Feilsøker utskrift"
+msgstr "Feilsøk av utskrift"
 
-#: ../troubleshoot/Welcome.py:45
+#: ../troubleshoot/Welcome.py:47
 msgid ""
 "The next few screens will contain some questions about your problem with "
 "printing. Based on your answers a solution may be suggested."
 msgstr ""
-"De neste sidene vil inneholde spørsmål om problemer du har med utskriving. "
-"Basert på dine svar kan en løsning foreslås."
+"De neste skjermene vil inneholde noen spørsmål om ditt problem med utskrift. "
+"En løsning vil kanskje bli foreslått på bakgrunn av dine svar."
 
-#: ../troubleshoot/Welcome.py:49
+#: ../troubleshoot/Welcome.py:51
 msgid "Click 'Forward' to begin."
 msgstr "Klikk «Fremover» for å starte."
 
-#: ../applet.py:87
+#: ../applet.py:83
 msgid "Configuring new printer"
 msgstr "Konfigurerer ny skriver"
 
-#: ../applet.py:88
+#: ../applet.py:84
 msgid "Please wait..."
-msgstr "Vennligst vent..."
+msgstr "Vennligst vent …"
 
 #. name is a URI, no queue was generated, because no suitable
 #. driver was found
-#: ../applet.py:117 ../applet.py:170
+#: ../applet.py:113 ../applet.py:166
 msgid "Missing printer driver"
 msgstr "Mangler skriverdriver"
 
-#: ../applet.py:124
+#: ../applet.py:120
 #, python-format
 msgid "No printer driver for %s."
 msgstr "Ingen skriverdriver for %s."
 
-#: ../applet.py:126
+#: ../applet.py:122
 msgid "No driver for this printer."
 msgstr "Har ingen driver for denne skriveren."
 
-#: ../applet.py:168
+#: ../applet.py:164
 msgid "Printer added"
 msgstr "Skriver lagt til"
 
-#: ../applet.py:174
+#: ../applet.py:170
 msgid "Install printer driver"
 msgstr "Installer skriverdriver"
 
-#: ../applet.py:175
+#: ../applet.py:171
 #, python-format
 msgid "`%s' requires driver installation: %s."
 msgstr "«%s» krever installasjon av driver: %s."
 
-#: ../applet.py:198
+#: ../applet.py:195
 #, python-format
 msgid "`%s' is ready for printing."
 msgstr "«%s» er klar for utskrift."
 
-#: ../applet.py:202 ../applet.py:214
+#: ../applet.py:199 ../applet.py:211
 msgid "Print test page"
 msgstr "Skriv ut testside"
 
-#: ../applet.py:205
+#: ../applet.py:202
 msgid "Configure"
 msgstr "Konfigurer"
 
-#: ../applet.py:209
+#: ../applet.py:206
 #, python-format
 msgid "`%s' has been added, using the `%s' driver."
 msgstr "«%s» er lagt til. Bruker driver «%s»."
 
-#: ../applet.py:217
+#: ../applet.py:214
 msgid "Find driver"
 msgstr "Finn driver"
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/telepathy-indicator.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/telepathy-indicator.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/telepathy-indicator.po	2013-01-29 09:34:03.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/telepathy-indicator.po	2014-01-07 06:37:52.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:41+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 21:13+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../data/telepathy-indicator.desktop.in.h:1
 msgid "Chat"
@@ -25,20 +25,20 @@
 msgid "Telepathy Indicator Service"
 msgstr "Telepathy indikatortjeneste"
 
-#: ../src/indicator-approver.c:292
+#: ../src/indicator-approver.c:293
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ønsker rettigheter til å se når du er tilkoblet"
 
-#: ../src/indicator-approver.c:294
+#: ../src/indicator-approver.c:295
 #, c-format
 msgid "Subscription Request"
 msgstr "Abonnementsforespørsel"
 
-#: ../src/indicator-approver.c:306
+#: ../src/indicator-approver.c:307
 msgid "_Decline"
 msgstr "Av_slå"
 
-#: ../src/indicator-approver.c:308
+#: ../src/indicator-approver.c:309
 msgid "_Accept"
 msgstr "_Aksepter"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/totem-pl-parser.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/totem-pl-parser.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/totem-pl-parser.po	2013-01-29 09:33:50.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/totem-pl-parser.po	2014-01-07 06:37:30.000000000 +0000
@@ -14,38 +14,38 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:21+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 16:02+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
-#: ../plparse/totem-disc.c:276 ../plparse/totem-disc.c:290
-#: ../plparse/totem-disc.c:525
+#: ../plparse/totem-disc.c:276 ../plparse/totem-disc.c:289
+#: ../plparse/totem-disc.c:528
 #, c-format
 msgid "Failed to mount %s."
 msgstr "Kunne ikke montere %s."
 
-#: ../plparse/totem-disc.c:414
+#: ../plparse/totem-disc.c:413
 #, c-format
 msgid "No media in drive for device '%s'."
 msgstr "Ingen medier i stasjonen for enhet «%s»."
 
-#: ../plparse/totem-disc.c:468
+#: ../plparse/totem-disc.c:471
 #, c-format
 msgid "Please check that a disc is present in the drive."
 msgstr "Du bør sjekke at det finnes en plate i spilleren."
 
-#: ../plparse/totem-disc.c:907
+#: ../plparse/totem-disc.c:910
 msgid "Audio CD"
-msgstr "Audio-CD"
+msgstr "Lyd-CD"
 
-#: ../plparse/totem-disc.c:909
+#: ../plparse/totem-disc.c:912
 msgid "Video CD"
 msgstr "Video-CD"
 
-#: ../plparse/totem-disc.c:911
+#: ../plparse/totem-disc.c:914
 msgid "DVD"
 msgstr "DVD"
 
-#: ../plparse/totem-disc.c:913
+#: ../plparse/totem-disc.c:916
 msgid "Digital Television"
 msgstr "Digital TV"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/totem.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/totem.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/totem.po	2013-01-29 09:34:08.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/totem.po	2014-01-07 06:37:08.000000000 +0000
@@ -15,15 +15,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:13+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:26+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Forlat fullskjerm"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:88
 msgid "Time:"
 msgstr "Tid:"
 
@@ -35,19 +35,19 @@
 msgid "Remove file from playlist"
 msgstr "Fjern filen fra spillelisten"
 
-#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
+#: ../data/playlist.ui.h:3
 msgid "_Copy Location"
 msgstr "_Kopier lokasjon"
 
-#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
+#: ../data/playlist.ui.h:4
 msgid "Copy the location to the clipboard"
 msgstr "Kopier lokasjonen til utklippstavlen"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
 msgid "_Select Text Subtitles..."
 msgstr "_Velg undertittel …"
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
 msgid "Select a file to use for text subtitles"
 msgstr "Velg en fil som skal brukes som undertekst"
 
@@ -117,8 +117,7 @@
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
-#: ../src/totem-properties-view.c:275
+#: ../data/properties.ui.h:9 ../src/totem-properties-view.c:285
 msgid "Video"
 msgstr "Film"
 
@@ -156,8 +155,8 @@
 msgid "0 kbps"
 msgstr "0 kbps"
 
-#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
-#: ../src/totem-properties-view.c:273
+#: ../data/preferences.ui.h:43 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:283
 msgid "Audio"
 msgstr "Lyd"
 
@@ -185,7 +184,7 @@
 msgid "0 Channels"
 msgstr "0 kanaler"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+#: ../src/totem-dnd-menu.c:98
 msgid "_Add to Playlist"
 msgstr "_Legg til i spilleliste"
 
@@ -223,13 +222,14 @@
 msgid "Mute"
 msgstr "Demp"
 
+#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../data/totem.desktop.in.in.in.h:8 ../src/totem-object.c:4051
-#: ../src/totem-object.c:4053
+#: ../data/totem.desktop.in.in.in.h:8 ../src/totem-object.c:4043
+#: ../src/totem-object.c:4045
 msgid "Fullscreen"
 msgstr "Fullskjerm"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:1
 msgid "_Movie"
 msgstr "_Film"
 
@@ -249,31 +249,31 @@
 msgid "Open a non-local file"
 msgstr "Åpne en ekstern fil"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:6
 msgid "_Eject"
 msgstr "_Løs ut"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:7
 msgid "Eject the current disc"
 msgstr "Løs ut aktiv plate"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:8
 msgid "_Properties"
 msgstr "Egenska_per"
 
-#: ../data/totem.ui.h:12
+#: ../data/totem.ui.h:9
 msgid "View the properties of the current stream"
 msgstr "Vis egenskaper for aktiv strøm"
 
-#: ../data/totem.ui.h:13
+#: ../data/totem.ui.h:10
 msgid "Play / P_ause"
 msgstr "Spill av / p_ause"
 
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:11
 msgid "Play or pause the movie"
 msgstr "Spill av eller pause en film"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:12
 msgid "_Quit"
 msgstr "A_vslutt"
 
@@ -281,19 +281,19 @@
 msgid "Quit the program"
 msgstr "Avslutt programmet"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:14
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:15
 msgid "_Clear Playlist"
 msgstr "_Tøm spilleliste"
 
-#: ../data/totem.ui.h:17
+#: ../data/totem.ui.h:16
 msgid "Clear the playlist"
 msgstr "Tøm spillelisten"
 
-#: ../data/totem.ui.h:4
+#: ../data/totem.ui.h:17
 msgid "Prefere_nces"
 msgstr "_Brukervalg"
 
@@ -301,19 +301,19 @@
 msgid "Configure the application"
 msgstr "Konfigurer programmet"
 
-#: ../data/totem.ui.h:18
+#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Tillegg …"
 
-#: ../data/totem.ui.h:19
+#: ../data/totem.ui.h:20
 msgid "Configure plugins to extend the application"
 msgstr "Konfigurer tillegg for å utvide programmet"
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:21
 msgid "_View"
 msgstr "_Vis"
 
-#: ../data/totem.ui.h:3
+#: ../data/totem.ui.h:22
 msgid "_Fullscreen"
 msgstr "_Fullskjerm"
 
@@ -321,143 +321,143 @@
 msgid "Switch to fullscreen"
 msgstr "Bytt til fullskjerm"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:24
 msgid "Fit Window to Movie"
 msgstr "Tilpass vinduet til filmen"
 
-#: ../data/totem.ui.h:22
+#: ../data/totem.ui.h:25
 msgid "_Resize 1:2"
 msgstr "End_re størrelse 1:2"
 
-#: ../data/totem.ui.h:23
+#: ../data/totem.ui.h:26
 msgid "Resize to half the original video size"
 msgstr "Endre størrelse til halvparten av filmens størrelse"
 
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:27
 msgid "Resize _1:1"
 msgstr "Endre størrelse til _1:1"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:28
 msgid "Resize to the original video size"
 msgstr "Endre størrelse til opprinnelig størrelse"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:29
 msgid "Resize _2:1"
 msgstr "Endre størrelse til _2:1"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:30
 msgid "Resize to double the original video size"
 msgstr "Endre størrelse til det dobbelte av filmens størrelse"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:31
 msgid "_Aspect Ratio"
 msgstr "_Bildeforhold"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:32
 msgid "Switch An_gles"
 msgstr "Bytt vi_nkel"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:33
 msgid "Switch camera angles"
 msgstr "Bytt kameravinkel"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:34
 msgid "_Go"
 msgstr "_Start"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:35
 msgid "_DVD Menu"
 msgstr "_DVD-meny"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:36
 msgid "Go to the DVD menu"
 msgstr "Gå til DVD-menyen"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:37
 msgid "_Title Menu"
 msgstr "_Tittelmeny"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:38
 msgid "Go to the title menu"
 msgstr "Gå til tittelmenyen"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:39
 msgid "A_udio Menu"
 msgstr "L_ydmeny"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:40
 msgid "Go to the audio menu"
 msgstr "Gå til lydmenyen"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:41
 msgid "_Angle Menu"
 msgstr "_Vinkelmeny"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:42
 msgid "Go to the angle menu"
 msgstr "Gå til vinkelmenyen"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:43
 msgid "_Chapter Menu"
 msgstr "_Kapittelmeny"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:44
 msgid "Go to the chapter menu"
 msgstr "Gå til kapittelmenyen"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:45
 msgid "_Next Chapter/Movie"
 msgstr "_Neste kapittel/film"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:46
 msgid "Next chapter or movie"
 msgstr "Neste kapittel eller film"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:47
 msgid "_Previous Chapter/Movie"
 msgstr "_Forrige kapittel/film"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:48
 msgid "Previous chapter or movie"
 msgstr "Forrige kapittel eller film"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:49
 msgid "_Sound"
 msgstr "_Lyd"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:50
 msgid "Volume _Up"
 msgstr "Volum _opp"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:51
 msgid "Increase volume"
 msgstr "Skru opp volumet"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:52
 msgid "Volume _Down"
 msgstr "Volum ne_d"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:53
 msgid "Decrease volume"
 msgstr "Skru ned volumet"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:54
 msgid "_Help"
-msgstr "_Hjelp:"
+msgstr "_Hjelp"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:55
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:56
 msgid "Help contents"
 msgstr "Innhold i hjelp"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:57
 msgid "_About"
 msgstr "_Om"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:58
 msgid "About this application"
 msgstr "Om dette programmet"
 
@@ -477,76 +477,76 @@
 msgid "Set the shuffle mode"
 msgstr "Sett byttemodus"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:63
 msgid "Show _Controls"
 msgstr "Vis _kontroller"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:64
 msgid "Show controls"
 msgstr "Vis kontroller"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:65
 msgid "S_idebar"
 msgstr "S_idelinje"
 
-#: ../data/totem.ui.h:59
+#: ../data/totem.ui.h:66
 msgid "Show or hide the sidebar"
 msgstr "Vis eller skjul sidelinjen"
 
-#: ../data/totem.ui.h:60
+#: ../data/totem.ui.h:67
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Auto"
 
-#: ../data/totem.ui.h:61
+#: ../data/totem.ui.h:68
 msgid "Sets automatic aspect ratio"
 msgstr "Sett automatisk høyde-/breddeforhold"
 
-#: ../data/totem.ui.h:62
+#: ../data/totem.ui.h:69
 msgid "Square"
 msgstr "Kvadratisk"
 
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:70
 msgid "Sets square aspect ratio"
 msgstr "Sett kvadratisk høyde-/breddeforhold"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:71
 msgid "4:3 (TV)"
 msgstr "4:3 (TV)"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:72
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "Sett høyde-/breddeforhold til 4:3"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:73
 msgid "16:9 (Widescreen)"
 msgstr "16:9 (widescreen)"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:74
 msgid "Sets 16:9 (widescreen) aspect ratio"
 msgstr "Sett høyde-/breddeforhold til 16:9 (widescreen)"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:75
 msgid "2.11:1 (DVB)"
 msgstr "2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:76
 msgid "Sets 2.11:1 (DVB) aspect ratio"
 msgstr "Sett høyde-/breddeforhold til 2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:77
 msgid "S_ubtitles"
 msgstr "_Undertekster"
 
-#: ../data/totem.ui.h:73
+#: ../data/totem.ui.h:80
 msgid "_Languages"
 msgstr "_Språk"
 
-#: ../data/totem.ui.h:74
+#: ../data/totem.ui.h:81
 msgid "Zoom In"
 msgstr "Zoom inn"
 
-#: ../data/totem.ui.h:75
+#: ../data/totem.ui.h:82
 msgid "Zoom in"
 msgstr "Zoom inn"
 
@@ -566,19 +566,19 @@
 msgid "Zoom out"
 msgstr "Zoom ut"
 
-#: ../data/totem.ui.h:76
+#: ../data/totem.ui.h:83
 msgid "Skip _Forward"
 msgstr "Hopp _fremover"
 
-#: ../data/totem.ui.h:77
+#: ../data/totem.ui.h:84
 msgid "Skip forward"
 msgstr "Hopp fremover"
 
-#: ../data/totem.ui.h:78
+#: ../data/totem.ui.h:85
 msgid "Skip _Backwards"
 msgstr "Hopp _bakover"
 
-#: ../data/totem.ui.h:79
+#: ../data/totem.ui.h:86
 msgid "Skip backwards"
 msgstr "Hopp bakover"
 
@@ -645,8 +645,8 @@
 msgid "Extra Large"
 msgstr "Ekstra stor"
 
-#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5518
-#: ../src/totem-properties-view.c:232
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5468
+#: ../src/totem-properties-view.c:242
 msgid "Stereo"
 msgstr "Stereo"
 
@@ -731,59 +731,60 @@
 msgid "Disable screensaver when playing "
 msgstr "Slå av skjermsparer ved avspilling "
 
-#: ../data/preferences.ui.h:29
+#. Translators: this is part of the sentence 'Disable screensaver when playing [] Video [] Video or Audio
+#: ../data/preferences.ui.h:30
 msgid "Video or Audio"
 msgstr "Video eller lyd"
 
-#: ../data/preferences.ui.h:30
+#: ../data/preferences.ui.h:31
 msgid "Visual Effects"
 msgstr "Visuelle effekter?"
 
-#: ../data/preferences.ui.h:31
+#: ../data/preferences.ui.h:32
 msgid "Show _visual effects when an audio file is played"
 msgstr "Vis _visuelle effekter når en lydfil spilles av"
 
-#: ../data/preferences.ui.h:32
+#: ../data/preferences.ui.h:33
 msgid "_Type of visualization:"
 msgstr "_Type visualisering"
 
-#: ../data/preferences.ui.h:33
+#: ../data/preferences.ui.h:34
 msgid "Visualization _size:"
 msgstr "_Størrelse på visualisering:"
 
-#: ../data/preferences.ui.h:34
+#: ../data/preferences.ui.h:35
 msgid "Color Balance"
 msgstr "Fargebalanse"
 
-#: ../data/preferences.ui.h:35
+#: ../data/preferences.ui.h:36
 msgid "_Brightness:"
 msgstr "_Lysstyrke:"
 
-#: ../data/preferences.ui.h:36
+#: ../data/preferences.ui.h:37
 msgid "Co_ntrast:"
 msgstr "Ko_ntrast:"
 
-#: ../data/preferences.ui.h:37
+#: ../data/preferences.ui.h:38
 msgid "Sat_uration:"
 msgstr "Me_tning:"
 
-#: ../data/preferences.ui.h:38
+#: ../data/preferences.ui.h:39
 msgid "_Hue:"
 msgstr "_Glød:"
 
-#: ../data/preferences.ui.h:39
+#: ../data/preferences.ui.h:40
 msgid "Reset to _Defaults"
 msgstr "Sett til _forvalg"
 
-#: ../data/preferences.ui.h:40
+#: ../data/preferences.ui.h:41
 msgid "Audio Output"
 msgstr "Lydutgang"
 
-#: ../data/preferences.ui.h:41
+#: ../data/preferences.ui.h:42
 msgid "_Audio output type:"
 msgstr "Type _lydutgang:"
 
-#: ../data/totem.ui.h:82
+#: ../data/totem.ui.h:89
 msgid "Time seek bar"
 msgstr "Søk på tid"
 
@@ -1087,13 +1088,13 @@
 msgid "N/A"
 msgstr "I/T"
 
-#: ../src/totem-properties-view.c:180
+#: ../src/totem-properties-view.c:190
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:163
+#: ../src/totem-properties-view.c:173
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
@@ -1107,13 +1108,13 @@
 msgstr[0] "%d bilde per sekund"
 msgstr[1] "%d bilder per sekund"
 
-#: ../src/totem-properties-view.c:212
+#: ../src/totem-properties-view.c:222
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:220
+#: ../src/totem-properties-view.c:230
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
@@ -1127,15 +1128,15 @@
 msgid "Unknown video"
 msgstr "Ukjent video"
 
-#: ../src/totem-dnd-menu.c:94
+#: ../src/totem-dnd-menu.c:95
 msgid "_Play Now"
 msgstr "S_pill av nå"
 
-#: ../src/totem-dnd-menu.c:103
+#: ../src/totem-dnd-menu.c:104
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../src/totem-fullscreen.c:573
+#: ../src/totem-fullscreen.c:574
 msgid "No File"
 msgstr "Ingen fil"
 
@@ -1195,12 +1196,12 @@
 "tillegg."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:291
+#: ../src/totem-menu.c:191
 msgid "None"
 msgstr "Ingen"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:296
+#: ../src/totem-menu.c:196
 msgctxt "Language"
 msgid "Auto"
 msgstr "Automatisk"
@@ -1230,11 +1231,11 @@
 msgid "Movie Player using %s"
 msgstr "Filmavspiller bruker %s"
 
-#: ../src/totem-menu.c:788
+#: ../src/totem-menu.c:712
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Opphavsrett © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:792
+#: ../src/totem-menu.c:716
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -1255,44 +1256,44 @@
 "  Terance Edward Sola https://launchpad.net/~tedsola\n"
 "  markild https://launchpad.net/~markild"
 
-#: ../src/totem-menu.c:796
+#: ../src/totem-menu.c:720
 msgid "Totem Website"
 msgstr "Totem nettsted"
 
-#: ../src/totem-menu.c:827
+#: ../src/totem-menu.c:751
 msgid "Configure Plugins"
 msgstr "Konfigurer tillegg"
 
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:591
+#: ../src/totem-object.c:590
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1167
 msgid "Playing"
 msgstr "Spiller"
 
-#: ../src/totem-object.c:1168 ../src/totem-options.c:52
+#: ../src/totem-object.c:1169 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Pause"
 
-#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1174
 msgid "Paused"
 msgstr "Pause"
 
-#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
+#: ../src/totem-object.c:1176 ../src/totem-object.c:1186
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Spill av"
 
-#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
-#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1181
+#: ../src/totem-object.c:1644 ../src/totem-statusbar.c:115
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
-#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
+#: ../src/totem-object.c:1268 ../src/totem-object.c:1295
+#: ../src/totem-object.c:1919
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem kunne ikke spille av «%s»."
@@ -1359,7 +1360,7 @@
 msgid "Totem was not able to play this disc."
 msgstr "Totem kunne ikke spille av denne platen."
 
-#: ../src/totem-object.c:4184
+#: ../src/totem-object.c:4175
 msgid "No reason."
 msgstr "Ingen årsak."
 
@@ -1374,31 +1375,31 @@
 "Vennligst bruk et musikkavspillingsprogram eller en CD-ripper til å spille "
 "av denne CDen"
 
-#: ../src/totem-object.c:1793
+#: ../src/totem-object.c:1794
 msgid "No error message"
 msgstr "Ingen feilmelding"
 
-#: ../src/totem-object.c:2133
+#: ../src/totem-object.c:2110
 msgid "Totem could not display the help contents."
 msgstr "Totem kunne ikke vise hjelpinnhold."
 
-#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+#: ../browser-plugin/totem-plugin-viewer.c:1340 ../src/totem-object.c:2452
 msgid "An error occurred"
 msgstr "En feil oppsto"
 
-#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
+#: ../src/totem-object.c:4010 ../src/totem-object.c:4012
 msgid "Previous Chapter/Movie"
 msgstr "Forrige kapittel/film"
 
-#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Play / Pause"
 msgstr "Spill av/pause"
 
-#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
+#: ../src/totem-object.c:4029 ../src/totem-object.c:4031
 msgid "Next Chapter/Movie"
 msgstr "Neste kapittel/film"
 
-#: ../src/totem-object.c:4184
+#: ../src/totem-object.c:4175
 msgid "Totem could not startup."
 msgstr "Totem kunne ikke starte opp."
 
@@ -1506,12 +1507,12 @@
 msgid "Playlist"
 msgstr "Spilleliste"
 
-#: ../src/totem-playlist.c:1862
+#: ../src/totem-playlist.c:1861
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "Spilleliste «%s» kunne ikke leses. Den kan være skadet."
 
-#: ../src/totem-playlist.c:1863
+#: ../src/totem-playlist.c:1862
 msgid "Playlist error"
 msgstr "Feil med spilleliste"
 
@@ -1523,7 +1524,7 @@
 msgid "Select Subtitle Font"
 msgstr "Velg skrift for teksting"
 
-#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:271
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:281
 msgid "Audio/Video"
 msgstr "Lyd/bilde"
 
@@ -1718,7 +1719,7 @@
 #. Translators: The first string is "Filename" (as translated); the second is an actual filename.
 #. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
 #. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:848
+#: ../src/totem-video-thumbnailer.c:877
 #, c-format
 msgid ""
 "<b>%s</b>: %s\n"
@@ -1729,23 +1730,23 @@
 "<b>%s</b>: %dx%d\n"
 "<b>%s</b>: %s"
 
-#: ../src/totem-video-thumbnailer.c:849
+#: ../src/totem-video-thumbnailer.c:878
 msgid "Filename"
 msgstr "Filnavn"
 
-#: ../src/totem-video-thumbnailer.c:851
+#: ../src/totem-video-thumbnailer.c:880
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: ../src/totem-video-thumbnailer.c:854
+#: ../src/totem-video-thumbnailer.c:883
 msgid "Duration"
 msgstr "Varighet"
 
-#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:984
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:981
 msgid "Supported files"
 msgstr "Støttede filer"
 
@@ -1783,29 +1784,29 @@
 "Kjør «%s --help» for å se en full liste med tilgjengelige "
 "komanndolinjeflagg.\n"
 
-#: ../browser-plugin/totem-plugin-viewer.c:676
-#: ../browser-plugin/totem-plugin-viewer.c:1700
+#: ../browser-plugin/totem-plugin-viewer.c:675
+#: ../browser-plugin/totem-plugin-viewer.c:1699
 msgid "Totem Movie Player"
 msgstr "Totem filmavspiller"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:246
+#: ../browser-plugin/totem-plugin-viewer.c:2143 ../src/totem.c:265
 msgid "Could not initialize the thread-safe libraries."
 msgstr "Kunne ikke initiere trådsikre biblioteker."
 
-#: ../src/totem.c:246
+#: ../src/totem.c:265
 msgid "Verify your system installation. Totem will now exit."
 msgstr "Sjekk systeminstallasjonen. Totem avslutter nå."
 
-#: ../src/backend/bacon-video-widget.c:1643
+#: ../src/backend/bacon-video-widget.c:1668
 msgid "Password requested for RTSP server"
 msgstr "Passord forespurt for RTSP-tjener"
 
-#: ../src/backend/bacon-video-widget.c:2942
+#: ../src/backend/bacon-video-widget.c:2912
 #, c-format
 msgid "Audio Track #%d"
 msgstr "Lydspor #%d"
 
-#: ../src/backend/bacon-video-widget.c:2946
+#: ../src/backend/bacon-video-widget.c:2916
 #, c-format
 msgid "Subtitle #%d"
 msgstr "Undertekst #%d"
@@ -1878,11 +1879,11 @@
 msgid "Media file could not be played."
 msgstr "Mediet kunne ikke spilles av."
 
-#: ../src/backend/bacon-video-widget.c:5514 ../src/totem-properties-view.c:228
+#: ../src/backend/bacon-video-widget.c:5464 ../src/totem-properties-view.c:238
 msgid "Surround"
 msgstr "Surround"
 
-#: ../src/backend/bacon-video-widget.c:5516 ../src/totem-properties-view.c:230
+#: ../src/backend/bacon-video-widget.c:5466 ../src/totem-properties-view.c:240
 msgid "Mono"
 msgstr "Mono"
 
@@ -1890,7 +1891,7 @@
 msgid "Too old version of GStreamer installed."
 msgstr "Den installerte versjonen av GStreamer er for gammel"
 
-#: ../src/backend/bacon-video-widget.c:5801
+#: ../src/backend/bacon-video-widget.c:5753
 msgid "Media contains no supported video streams."
 msgstr "Medier inneholder ingen støttede videostrømmer."
 
@@ -1952,7 +1953,7 @@
 #, c-format
 msgctxt "long time format"
 msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+msgstr "%d.%02d.%02d"
 
 #. minutes:seconds
 #. Translators: This is a time format, like "5:02" for 5
@@ -1964,7 +1965,7 @@
 #, c-format
 msgctxt "short time format"
 msgid "%d:%02d"
-msgstr "%d:%02d"
+msgstr "%d.%02d"
 
 #: ../src/properties/bacon-video-widget-properties.c:156
 #, c-format
@@ -2076,7 +2077,7 @@
 msgstr "Tar opp (S)VCDer eller video-DVDer"
 
 #: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
+#: ../src/plugins/chapters/totem-chapters.c:1125
 msgid "Chapters"
 msgstr "Kapitler"
 
@@ -2149,59 +2150,59 @@
 "<b>Tittel: </b>%s\n"
 "<b>Starttid: </b>%s"
 
-#: ../src/plugins/chapters/totem-chapters.c:328
+#: ../src/plugins/chapters/totem-chapters.c:323
 msgid "Error while reading file with chapters"
 msgstr "Feil under lesing av fil med kapitler"
 
-#: ../src/plugins/chapters/totem-chapters.c:543
+#: ../src/plugins/chapters/totem-chapters.c:542
 msgid "Chapter with the same time already exists"
 msgstr "Kapittel med dette navnet eksisterer allerede"
 
-#: ../src/plugins/chapters/totem-chapters.c:544
+#: ../src/plugins/chapters/totem-chapters.c:543
 msgid "Try another name or remove an existing chapter."
 msgstr "Prøv et annet navn eller fjern et eksisterende kapittel."
 
-#: ../src/plugins/chapters/totem-chapters.c:717
+#: ../src/plugins/chapters/totem-chapters.c:703
 msgid "Error while writing file with chapters"
 msgstr "Feil under skriving av fil med kapittel"
 
-#: ../src/plugins/chapters/totem-chapters.c:842
+#: ../src/plugins/chapters/totem-chapters.c:828
 msgid "Error occurred while saving chapters"
 msgstr "En feil oppsto under lagring av kapitler"
 
-#: ../src/plugins/chapters/totem-chapters.c:843
+#: ../src/plugins/chapters/totem-chapters.c:829
 msgid ""
 "Please check you have permission to write to the folder containing the movie."
 msgstr ""
 "Sjekk at du har rettigheter til å skrive til mappen som inneholder filmen."
 
-#: ../src/plugins/chapters/totem-chapters.c:976
+#: ../src/plugins/chapters/totem-chapters.c:962
 msgid "Open Chapter File"
 msgstr "Åpne kapittelfil"
 
-#: ../src/plugins/chapters/totem-chapters.c:1093
+#: ../src/plugins/chapters/totem-chapters.c:1079
 msgid "Chapter Screenshot"
 msgstr "Skjermdump for kapittel"
 
-#: ../src/plugins/chapters/totem-chapters.c:1104
+#: ../src/plugins/chapters/totem-chapters.c:1090
 msgid "Chapter Title"
 msgstr "Tittel på kapittel"
 
-#: ../src/plugins/chapters/totem-chapters.c:1184
+#: ../src/plugins/chapters/totem-chapters.c:1170
 msgid "Save changes to chapter list before closing?"
 msgstr "Lagre endringer i kapittellisten før programmet lukkes?"
 
 #. Translators: close Totem without saving changes to the chapter list of the current movie.
-#: ../src/plugins/chapters/totem-chapters.c:1189
+#: ../src/plugins/chapters/totem-chapters.c:1175
 msgid "Close without Saving"
 msgstr "Lukk uten å lagre"
 
 #. Translators: save changes to the chapter list of the current movie before closing Totem.
-#: ../src/plugins/chapters/totem-chapters.c:1191
+#: ../src/plugins/chapters/totem-chapters.c:1177
 msgid "Save"
 msgstr "Lagre"
 
-#: ../src/plugins/chapters/totem-chapters.c:1194
+#: ../src/plugins/chapters/totem-chapters.c:1180
 msgid "If you don't save, changes to the chapter list will be lost."
 msgstr "Hvis du ikke lagrer vil endringer i kapittellisten gå tapt."
 
@@ -2762,15 +2763,15 @@
 msgid "Take _Screenshot..."
 msgstr "Ta _skjermdump …"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Take a screenshot"
 msgstr "Ta et bilde av skjermen"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:335
 msgid "Create Screenshot _Gallery..."
 msgstr "Lag _galleri av skjermdump …"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:335
 msgid "Create a gallery of screenshots"
 msgstr "Lag et galleri av skjermdump"
 
@@ -2867,8 +2868,8 @@
 msgstr "Et tillegg som lar deg se på YouTube-videoer."
 
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:245
-#: ../src/totem.c:253 ../src/totem-menu.c:789 ../src/totem-object.c:1658
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:87 ../src/totem.c:264
+#: ../src/totem.c:272 ../src/totem-menu.c:713 ../src/totem-object.c:1652
 msgid "Videos"
 msgstr "Filmer"
 
@@ -2940,14 +2941,14 @@
 "Denne videoen er ikke tilgjengelig i et format som støttes av Totem. Vil du "
 "åpne den i nettleseren i stedet?"
 
-#: ../browser-plugin/totem-plugin-viewer.c:443
+#: ../browser-plugin/totem-plugin-viewer.c:442
 msgid "No URI to play"
 msgstr "Ingen URI å spille av"
 
 #. translators: this is:
 #. * Open With ApplicationName
 #. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1120
+#: ../browser-plugin/totem-plugin-viewer.c:1119
 #, c-format
 msgid "_Open with \"%s\""
 msgstr "_Åpne med «%s»"
@@ -2961,15 +2962,15 @@
 msgid "Totem Browser Plugin"
 msgstr "Totem nettlesertillegg"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2033
+#: ../browser-plugin/totem-plugin-viewer.c:2032
 msgid "No playlist or playlist empty"
 msgstr "Ingen spilleliste eller tom spilleliste"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2128
+#: ../browser-plugin/totem-plugin-viewer.c:2127
 msgid "Movie browser plugin"
 msgstr "Tillegg for filmvisning"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2144
+#: ../browser-plugin/totem-plugin-viewer.c:2143
 msgid "Verify your system installation. The Totem plugin will now exit."
 msgstr "Sjekk systeminstallasjonen. Tillegget for Totem avslutter nå."
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/ubuntuone-client-gnome.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/ubuntuone-client-gnome.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/ubuntuone-client-gnome.po	2013-01-29 09:33:53.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/ubuntuone-client-gnome.po	2014-01-07 06:37:51.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:28+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 20:56+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. Build the dialog
 #: ../nautilus/add-contact-dialog.c:78
@@ -141,7 +141,7 @@
 #: ../nautilus/file-watcher.c:105
 #, c-format
 msgid "There was an error sharing the folder '%s'"
-msgstr ""
+msgstr "Det oppstod en feil ved deling av mappa: «%s»"
 
 #: ../nautilus/file-watcher.c:123
 msgid "Error deleting share."
@@ -150,7 +150,7 @@
 #: ../nautilus/file-watcher.c:124
 #, c-format
 msgid "There was an error deleting the share for folder '%s'"
-msgstr ""
+msgstr "Det oppsto en feil da mappa «%s» skulle slettes"
 
 #: ../nautilus/file-watcher.c:195
 msgid "Error publishing file."
@@ -217,6 +217,8 @@
 "This folder contains shared folders and/or published files:\n"
 "\n"
 msgstr ""
+"Denne mappa inneholder delte mapper og/eller filer:\n"
+"\n"
 
 #: ../nautilus/utils.c:65
 msgid " (Shared folder)\n"
@@ -224,7 +226,7 @@
 
 #: ../nautilus/utils.c:87
 msgid " (Published at "
-msgstr ""
+msgstr " (Publisert "
 
 #: ../nautilus/utils.c:99
 msgid ""
@@ -232,7 +234,10 @@
 "This action will make these files and folders no longer available to other "
 "users. Would you like to proceed?"
 msgstr ""
+"\n"
+"Denne handlinga vil gjøre disse filene og mappene utilgjengelige for andre "
+"brukere. Vil du fortsette?"
 
 #: ../gsd/ubuntuone.gnome-settings-plugin.in.h:1
 msgid "Shows a warning when the Ubuntu One account runs out of space"
-msgstr ""
+msgstr "Vis en advarsel når Ubuntu One-kontoen går tom for lagringsplass"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/unity-greeter.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/unity-greeter.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/unity-greeter.po	2013-01-29 09:33:49.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/unity-greeter.po	2014-01-07 06:37:51.000000000 +0000
@@ -7,29 +7,29 @@
 msgstr ""
 "Project-Id-Version: unity-greeter\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-20 22:01+0000\n"
+"POT-Creation-Date: 2013-06-20 23:32+0000\n"
 "PO-Revision-Date: 2012-04-17 18:29+0000\n"
 "Last-Translator: Simen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:27+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 20:54+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
-#: ../src/main-window.vala:47
+#: ../src/main-window.vala:49
 msgid "Login Screen"
 msgstr "Innloggingsskjermbilde"
 
-#: ../src/menubar.vala:236
+#: ../src/menubar.vala:217
 msgid "Onscreen keyboard"
 msgstr "Skjermtastatur"
 
-#: ../src/menubar.vala:241
+#: ../src/menubar.vala:222
 msgid "High Contrast"
 msgstr "Høy kontrast"
 
-#: ../src/menubar.vala:247
+#: ../src/menubar.vala:228
 msgid "Screen Reader"
 msgstr "Skjermleser"
 
@@ -38,43 +38,42 @@
 msgstr "_Tilbake"
 
 #. Help string for command line --version flag
-#: ../src/unity-greeter.vala:450
+#: ../src/unity-greeter.vala:480
 msgid "Show release version"
 msgstr "Vis lanseringsversjon"
 
 #. Help string for command line --test-mode flag
-#: ../src/unity-greeter.vala:453
+#: ../src/unity-greeter.vala:483
 msgid "Run in test mode"
 msgstr "Kjør i testmodus"
 
-#: ../src/greeter-list.vala:735 ../src/user-list.vala:622
-#: ../src/user-list.vala:1340 ../src/user-list.vala:1434
-#: ../src/user-list.vala:1457 ../src/user-list.vala:1461
-#: ../src/user-list.vala:1465 ../src/user-list.vala:1471
-#: ../src/user-list.vala:1475 ../src/user-list.vala:1478
+#: ../src/greeter-list.vala:802 ../src/user-list.vala:661
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/greeter-list.vala:737 ../src/user-list.vala:616
-#: ../src/user-list.vala:1437
+#: ../src/greeter-list.vala:804 ../src/user-list.vala:655
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../src/greeter-list.vala:789
+#: ../src/greeter-list.vala:856
 msgid "Invalid password, please try again"
 msgstr "Ugyldig passord, prøv igjen"
 
-#: ../src/greeter-list.vala:800
+#: ../src/greeter-list.vala:867
 msgid "Failed to authenticate"
 msgstr "Klarte ikke å autentisere"
 
+#: ../src/user-list.vala:1538
+msgid "Favorite Color (blue):"
+msgstr "Favorittfarge (blå):"
+
 #. Arguments and description for --help text
-#: ../src/unity-greeter.vala:459
+#: ../src/unity-greeter.vala:489
 msgid "- Unity Greeter"
 msgstr "- Unity Greeter"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/unity-greeter.vala:470
+#: ../src/unity-greeter.vala:500
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -88,37 +87,37 @@
 msgid "Session Options"
 msgstr "Øktvalg"
 
-#: ../src/greeter-list.vala:245
+#: ../src/greeter-list.vala:300
 #, c-format
 msgid "Enter password for %s"
 msgstr "Oppgi passord for %s"
 
-#: ../src/user-list.vala:387
+#: ../src/user-list.vala:444
 msgid "Enter username"
 msgstr "Skriv inn brukernavn"
 
-#: ../src/user-list.vala:389
+#: ../src/user-list.vala:446
 msgid "Enter password"
 msgstr "Skriv inn passord"
 
-#: ../src/user-list.vala:747
+#: ../src/user-list.vala:786
 #, c-format
 msgid "Login as %s"
 msgstr "Logg inn som %s"
 
 #. 'Log In' here is the button for logging in.
-#: ../src/user-list.vala:746
+#: ../src/user-list.vala:785
 msgid "Log In"
 msgstr "Logg inn"
 
-#: ../src/user-list.vala:751
+#: ../src/user-list.vala:790
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: ../src/greeter-list.vala:855
+#: ../src/greeter-list.vala:903
 msgid "Logging in..."
 msgstr "Logger på..."
 
-#: ../src/user-list.vala:791
+#: ../src/user-list.vala:829
 msgid "Login"
 msgstr "Påloggingsnavn"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/unity-lens-applications.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/unity-lens-applications.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/unity-lens-applications.po	2013-01-29 09:34:08.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/unity-lens-applications.po	2014-01-07 06:37:51.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:29+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 20:58+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #. scope.icon = @"$(Config.PREFIX)/share/unity/themes/applications.png";
 #. TRANSLATORS: Please make sure this string is short enough to fit
@@ -32,9 +32,9 @@
 
 #: ../src/daemon.vala:198 ../applications.lens.in.in.h:2
 msgid "Search Applications"
-msgstr "Søk etter programmer"
+msgstr "Søk i programmer"
 
-#: ../src/daemon.vala:201
+#: ../src/daemon.vala:268
 msgid "Sources"
 msgstr "Kilder"
 
@@ -46,7 +46,7 @@
 msgid "Recent Apps"
 msgstr "Nylig brukte programmer"
 
-#: ../src/daemon.vala:261
+#: ../src/daemon.vala:228
 msgid "Installed"
 msgstr "Installert"
 
@@ -54,55 +54,67 @@
 msgid "Apps Available for Download"
 msgstr "Applikasjoner som kan lastes ned"
 
-#: ../src/daemon.vala:269 ../applications.lens.in.in.h:1
+#: ../src/daemon.vala:216 ../data/applications.scope.in.in.h:1
 msgid "Applications"
 msgstr "Programmer"
 
-#: ../src/daemon.vala:282
+#: ../src/daemon.vala:245 ../src/scopes-scope.vala:146
+#: ../src/running-apps-scope.vala:95
 msgid "Type"
 msgstr "Type"
 
-#: ../src/daemon.vala:285
+#: ../src/daemon.vala:248 ../src/scopes-scope.vala:149
+#: ../src/running-apps-scope.vala:98
 msgid "Accessories"
 msgstr "Tilbehør"
 
-#: ../src/daemon.vala:286
+#: ../src/daemon.vala:249 ../src/scopes-scope.vala:150
+#: ../src/running-apps-scope.vala:99
 msgid "Education"
 msgstr "Opplæring"
 
-#: ../src/daemon.vala:287
+#: ../src/daemon.vala:250 ../src/scopes-scope.vala:151
+#: ../src/running-apps-scope.vala:100
 msgid "Games"
 msgstr "Spill"
 
-#: ../src/daemon.vala:288
+#: ../src/daemon.vala:251 ../src/scopes-scope.vala:152
+#: ../src/running-apps-scope.vala:101
 msgid "Graphics"
 msgstr "Grafikk"
 
-#: ../src/daemon.vala:289
+#: ../src/daemon.vala:252 ../src/scopes-scope.vala:153
+#: ../src/running-apps-scope.vala:102
 msgid "Internet"
 msgstr "Internett"
 
-#: ../src/daemon.vala:290
+#: ../src/daemon.vala:253 ../src/scopes-scope.vala:154
+#: ../src/running-apps-scope.vala:103
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: ../src/daemon.vala:291
+#: ../src/daemon.vala:254 ../src/scopes-scope.vala:155
+#: ../src/running-apps-scope.vala:104
 msgid "Office"
 msgstr "Kontor"
 
-#: ../src/daemon.vala:292
+#: ../src/daemon.vala:255 ../src/scopes-scope.vala:156
+#: ../src/running-apps-scope.vala:105
 msgid "Media"
 msgstr "Media"
 
-#: ../src/daemon.vala:293
+#: ../src/daemon.vala:256 ../src/scopes-scope.vala:157
+#: ../src/running-apps-scope.vala:106
 msgid "Customization"
 msgstr "Tilpassing"
 
-#: ../src/daemon.vala:294
+#: ../src/daemon.vala:257 ../src/scopes-scope.vala:158
+#: ../src/running-apps-scope.vala:107
 msgid "Accessibility"
 msgstr "Tilgjengelighet"
 
-#: ../src/daemon.vala:295
+#: ../src/daemon.vala:258 ../src/scopes-scope.vala:159
+#: ../src/running-apps-scope.vala:108
 msgid "Developer"
 msgstr "Utvikler"
 
@@ -110,7 +122,8 @@
 msgid "Science & Engineering"
 msgstr "Teknikk og vitenskap"
 
-#: ../src/daemon.vala:297
+#: ../src/daemon.vala:261 ../src/scopes-scope.vala:162
+#: ../src/running-apps-scope.vala:111
 msgid "System"
 msgstr "System"
 
@@ -118,31 +131,30 @@
 msgid "Rating"
 msgstr "Vurdering"
 
-#: ../src/daemon.vala:554
+#: ../src/daemon.vala:705
 msgid "Sorry, there are no applications that match your search."
 msgstr "Søket gav ingen treff i programmer."
 
-#: ../src/runner.vala:89 ../commands.lens.in.in.h:2
+#: ../src/commands-scope.vala:184 ../data/commands.scope.in.in.h:3
 msgid "Run a command"
 msgstr "Kjør en kommando"
 
-#: ../src/runner.vala:113
+#: ../src/commands-scope.vala:158
 msgid "Results"
 msgstr "Resultater"
 
-#: ../src/runner.vala:117
+#: ../src/commands-scope.vala:162
 msgid "History"
 msgstr "Historikk"
 
-#: ../src/runner.vala:162
+#: ../src/commands-scope.vala:284
 msgid "There is no easter egg in Unity"
 msgstr "Det er ingen påskeegg i Unity"
 
-#: ../src/runner.vala:174
+#: ../src/commands-scope.vala:293
 msgid "Still no easter egg in Unity"
 msgstr "Fremdeles ingen påskeegg i Unity"
 
-#. namespace
 #: ../data/X-Unity-All-Applications.directory.in.h:1
 msgid "All Applications"
 msgstr "Alle programmer"
@@ -151,6 +163,6 @@
 msgid "All Available Applications"
 msgstr "Alle tilgjengelige programmer"
 
-#: ../commands.lens.in.in.h:1
+#: ../data/commands.scope.in.in.h:1
 msgid "Commands"
 msgstr "Kommandoer"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/unity-lens-files.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/unity-lens-files.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/unity-lens-files.po	2013-01-29 09:33:50.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/unity-lens-files.po	2014-01-07 06:37:51.000000000 +0000
@@ -7,73 +7,73 @@
 msgstr ""
 "Project-Id-Version: unity-lens-files\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-13 03:28+0000\n"
+"POT-Creation-Date: 2013-06-20 22:03+0000\n"
 "PO-Revision-Date: 2012-08-06 20:19+0000\n"
 "Last-Translator: Roy S <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:31+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 20:58+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
-#: ../src/daemon.vala:73 ../files.lens.in.in.h:3
+#: ../src/daemon.vala:69 ../local.scope.in.in.h:3
 msgid "Search Files & Folders"
-msgstr "Søk i filer og mapper"
+msgstr "Søk etter filer og mapper"
 
-#: ../src/daemon.vala:143
+#: ../src/daemon.vala:135
 msgid "Sorry, there are no files or folders that match your search."
-msgstr "Beklager, det er ingen filer eller mapper som passer med ditt søk."
+msgstr "Beklager. Det er ingen filer eller mapper som passer med ditt søk."
 
-#: ../src/daemon.vala:156
+#: ../src/daemon.vala:148
 msgid "Last modified"
 msgstr "Sist endret"
 
-#: ../src/daemon.vala:158
+#: ../src/daemon.vala:150
 msgid "Last 7 days"
 msgstr "Siste 7 dager"
 
-#: ../src/daemon.vala:159
+#: ../src/daemon.vala:151
 msgid "Last 30 days"
 msgstr "Siste 30 dager"
 
-#: ../src/daemon.vala:160
+#: ../src/daemon.vala:152
 msgid "Last year"
 msgstr "I fjor"
 
-#: ../src/daemon.vala:167
+#: ../src/daemon.vala:159
 msgid "Type"
 msgstr "Type"
 
-#: ../src/daemon.vala:170
+#: ../src/daemon.vala:162
 msgid "Documents"
 msgstr "Dokumenter"
 
-#: ../src/daemon.vala:171 ../src/daemon.vala:216
+#: ../src/daemon.vala:163 ../src/daemon.vala:208
 msgid "Folders"
 msgstr "Mapper"
 
-#: ../src/daemon.vala:172
+#: ../src/daemon.vala:164
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/daemon.vala:173
+#: ../src/daemon.vala:165
 msgid "Audio"
 msgstr "Lyd"
 
-#: ../src/daemon.vala:174
+#: ../src/daemon.vala:166
 msgid "Videos"
 msgstr "Videoer"
 
-#: ../src/daemon.vala:175
+#: ../src/daemon.vala:167
 msgid "Presentations"
 msgstr "Presentasjoner"
 
-#: ../src/daemon.vala:176
+#: ../src/daemon.vala:168
 msgid "Other"
 msgstr "Annet"
 
-#: ../src/daemon.vala:183 ../src/daemon.vala:1023 ../src/daemon.vala:1033
+#: ../src/daemon.vala:175 ../src/daemon.vala:1026 ../src/daemon.vala:1036
 msgid "Size"
 msgstr "Størrelse"
 
@@ -85,40 +85,40 @@
 msgid "100KB"
 msgstr "100 KB"
 
-#: ../src/daemon.vala:187
+#: ../src/daemon.vala:179
 msgid "1MB"
 msgstr "1 MB"
 
-#: ../src/daemon.vala:188
+#: ../src/daemon.vala:180
 msgid "10MB"
 msgstr "10 MB"
 
-#: ../src/daemon.vala:189
+#: ../src/daemon.vala:181
 msgid "100MB"
 msgstr "100 MB"
 
-#: ../src/daemon.vala:190
+#: ../src/daemon.vala:182
 msgid "1GB"
 msgstr "1 GB"
 
-#: ../src/daemon.vala:191
+#: ../src/daemon.vala:183
 msgid ">1GB"
 msgstr ">1 GB"
 
-#: ../src/daemon.vala:204
+#: ../src/daemon.vala:200
 msgid "Recent"
-msgstr "Siste"
+msgstr "Nylig brukt"
 
 #: ../src/daemon.vala:208
 msgid "Recent Files"
 msgstr "Nylig brukte filer"
 
-#: ../src/daemon.vala:212
+#: ../src/daemon.vala:204
 msgid "Downloads"
 msgstr "Nedlastinger"
 
 #. namespace
-#: ../src/daemon.vala:220 ../files.lens.in.in.h:1
+#: ../src/daemon.vala:196 ../local.scope.in.in.h:1
 msgid "Files & Folders"
 msgstr "Filer og mapper"
 
@@ -128,79 +128,79 @@
 
 #: ../src/utils.vala:115
 msgid "January"
-msgstr "Januar"
+msgstr "januar"
 
 #: ../src/utils.vala:117
 msgid "February"
-msgstr "Februar"
+msgstr "februar"
 
 #: ../src/utils.vala:119
 msgid "March"
-msgstr "Mars"
+msgstr "mars"
 
 #: ../src/utils.vala:121
 msgid "April"
-msgstr "April"
+msgstr "april"
 
 #: ../src/utils.vala:123
 msgid "May"
-msgstr "Mai"
+msgstr "mai"
 
 #: ../src/utils.vala:125
 msgid "June"
-msgstr "Juni"
+msgstr "juni"
 
 #: ../src/utils.vala:127
 msgid "July"
-msgstr "Juli"
+msgstr "juli"
 
 #: ../src/utils.vala:129
 msgid "August"
-msgstr "August"
+msgstr "august"
 
 #: ../src/utils.vala:131
 msgid "September"
-msgstr "September"
+msgstr "september"
 
 #: ../src/utils.vala:133
 msgid "October"
-msgstr "Oktober"
+msgstr "oktober"
 
 #: ../src/utils.vala:135
 msgid "November"
-msgstr "November"
+msgstr "november"
 
 #: ../src/utils.vala:137
 msgid "December"
-msgstr "Desember"
+msgstr "desember"
 
 #: ../src/utils.vala:148
 msgid "Monday"
-msgstr "Mandag"
+msgstr "mandag"
 
 #: ../src/utils.vala:150
 msgid "Tuesday"
-msgstr "Tirsdag"
+msgstr "tirsdag"
 
 #: ../src/utils.vala:152
 msgid "Wednesday"
-msgstr "Onsdag"
+msgstr "onsdag"
 
 #: ../src/utils.vala:154
 msgid "Thursday"
-msgstr "Torsdag"
+msgstr "torsdag"
 
 #: ../src/utils.vala:156
 msgid "Friday"
-msgstr "Fredag"
+msgstr "fredag"
 
 #: ../src/utils.vala:158
 msgid "Saturday"
-msgstr "Lørdag"
+msgstr "lørdag"
 
 #: ../src/utils.vala:160
 msgid "Sunday"
-msgstr "Søndag"
+msgstr "søndag"
 
 #: ../src/utils.vala:190
 msgid "Earlier today"
@@ -240,7 +240,7 @@
 
 #: ../src/utils.vala:238
 msgid "A month ago"
-msgstr "En måned siden"
+msgstr "Én måned siden"
 
 #: ../files.lens.in.in.h:2
 msgid "Find documents, downloads, and other files"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/unity-lens-music.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/unity-lens-music.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/unity-lens-music.po	2013-01-29 09:34:02.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/unity-lens-music.po	2014-01-07 06:37:51.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:31+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 20:59+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../src/daemon.vala:37 ../music.lens.in.in.h:3
 msgid "Search Music Collection"
@@ -25,43 +25,43 @@
 msgid "Sources"
 msgstr "Kilder"
 
-#: ../src/daemon.vala:71
+#: ../src/simple-scope.vala:70
 msgid "Decade"
 msgstr "Tiår"
 
-#: ../src/daemon.vala:73
+#: ../src/simple-scope.vala:72
 msgid "Old"
 msgstr "Gammel"
 
-#: ../src/daemon.vala:74
+#: ../src/simple-scope.vala:73
 msgid "60s"
 msgstr "60-tallet"
 
-#: ../src/daemon.vala:75
+#: ../src/simple-scope.vala:74
 msgid "70s"
 msgstr "70-tallet"
 
-#: ../src/daemon.vala:76
+#: ../src/simple-scope.vala:75
 msgid "80s"
 msgstr "80-tallet"
 
-#: ../src/daemon.vala:77
+#: ../src/simple-scope.vala:76
 msgid "90s"
 msgstr "90s"
 
-#: ../src/daemon.vala:78
+#: ../src/simple-scope.vala:77
 msgid "00s"
 msgstr "00s"
 
-#: ../src/daemon.vala:79
+#: ../src/simple-scope.vala:78
 msgid "10s"
 msgstr "10s"
 
-#: ../src/daemon.vala:86
+#: ../src/simple-scope.vala:85
 msgid "Genre"
 msgstr "Sjanger"
 
-#: ../src/daemon.vala:89
+#: ../src/simple-scope.vala:88
 msgid "Blues"
 msgstr "Blues"
 
@@ -69,75 +69,75 @@
 msgid "Classic"
 msgstr "Klassisk"
 
-#: ../src/daemon.vala:91
+#: ../src/simple-scope.vala:90
 msgid "Country"
 msgstr "Country"
 
-#: ../src/daemon.vala:92
+#: ../src/simple-scope.vala:91
 msgid "Disco"
 msgstr "Disco"
 
-#: ../src/daemon.vala:93
+#: ../src/simple-scope.vala:92
 msgid "Funk"
 msgstr "Funk"
 
-#: ../src/daemon.vala:94
+#: ../src/simple-scope.vala:93
 msgid "Rock"
 msgstr "Rock"
 
-#: ../src/daemon.vala:95
+#: ../src/simple-scope.vala:94
 msgid "Metal"
 msgstr "Metal"
 
-#: ../src/daemon.vala:96
+#: ../src/simple-scope.vala:95
 msgid "Hip-hop"
 msgstr "Hip-hop"
 
-#: ../src/daemon.vala:97
+#: ../src/simple-scope.vala:96
 msgid "House"
 msgstr "House"
 
-#: ../src/daemon.vala:98
+#: ../src/simple-scope.vala:97
 msgid "New-wave"
 msgstr "New-wave"
 
-#: ../src/daemon.vala:99
+#: ../src/simple-scope.vala:98
 msgid "R&B"
 msgstr "R&B"
 
-#: ../src/daemon.vala:100
+#: ../src/simple-scope.vala:99
 msgid "Punk"
 msgstr "Punk"
 
-#: ../src/daemon.vala:101
+#: ../src/simple-scope.vala:100
 msgid "Jazz"
 msgstr "Jazz"
 
-#: ../src/daemon.vala:102
+#: ../src/simple-scope.vala:101
 msgid "Pop"
 msgstr "Pop"
 
-#: ../src/daemon.vala:103
+#: ../src/simple-scope.vala:102
 msgid "Reggae"
 msgstr "Reggae"
 
-#: ../src/daemon.vala:104
+#: ../src/simple-scope.vala:103
 msgid "Soul"
 msgstr "Soul"
 
-#: ../src/daemon.vala:105
+#: ../src/simple-scope.vala:104
 msgid "Techno"
 msgstr "Tekno"
 
-#: ../src/daemon.vala:106
+#: ../src/simple-scope.vala:105
 msgid "Other"
 msgstr "Annet"
 
-#: ../src/daemon.vala:122
+#: ../src/simple-scope.vala:124
 msgid "Songs"
 msgstr "Låter"
 
-#: ../src/daemon.vala:126
+#: ../src/simple-scope.vala:128
 msgid "Albums"
 msgstr "Albumer"
 
@@ -145,19 +145,19 @@
 msgid "Available for Purchase"
 msgstr "Kan kjøpes"
 
-#: ../src/daemon.vala:135 ../music.lens.in.in.h:1
+#: ../src/simple-scope.vala:120
 msgid "Music"
 msgstr "Musikk"
 
-#: ../src/banshee-scope.vala:37
+#: ../src/banshee-scope.vala:40 ../banshee.scope.in.in.h:1
 msgid "Banshee"
 msgstr "Banshee"
 
-#: ../src/rhythmbox-scope.vala:41
+#: ../src/rhythmbox-scope.vala:42 ../rhythmbox.scope.in.in.h:1
 msgid "Rhythmbox"
 msgstr "Rhythmbox"
 
-#: ../src/simple-scope.vala:125
+#: ../src/simple-scope.vala:205
 msgid "Sorry, there is no music that matches your search."
 msgstr "Beklager, det er ingen musikk som passer med ditt søk."
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/unity-lens-video.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/unity-lens-video.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/unity-lens-video.po	2013-01-29 09:33:57.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/unity-lens-video.po	2014-01-07 06:37:52.000000000 +0000
@@ -14,18 +14,18 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:42+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 21:13+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
-#: ../src/unity-lens-video:49 ../src/unity-lens-video:56
+#: ../src/daemon.vala:72 ../src/scope.vala:63
 msgid "My Videos"
 msgstr "Mine videoer"
 
-#: ../src/unity-lens-video:50
+#: ../src/remote-scope.vala:92 ../src/scope.vala:86
 msgid "Online"
 msgstr "Tilkoblet"
 
-#: ../src/unity-lens-video:51 ../video.lens.in.h:1
+#: ../data/local.scope.in.in.h:1
 msgid "Videos"
 msgstr "Videoer"
 
@@ -33,14 +33,14 @@
 msgid "Recently Viewed"
 msgstr "Nylig sett"
 
-#: ../src/unity-lens-video:54
+#: ../src/daemon.vala:33
 msgid "Search Videos"
 msgstr "Søk etter videoer"
 
-#: ../src/unity-lens-video:55
+#: ../src/daemon.vala:34
 msgid "Sources"
 msgstr "Kilder"
 
-#: ../video.lens.in.h:2
+#: ../data/video.lens.in.in.h:2
 msgid "Search local videos"
 msgstr "Søk i lokale videoer"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/unity.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/unity.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/unity.po	2013-01-29 09:33:49.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/unity.po	2014-01-07 06:37:36.000000000 +0000
@@ -6,26 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
-"Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-11-28 11:13+0000\n"
-"PO-Revision-Date: 2012-08-06 20:15+0000\n"
-"Last-Translator: Einar Svensen <Unknown>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-19 10:33+0000\n"
+"PO-Revision-Date: 2013-12-13 14:04+0000\n"
+"Last-Translator: Jonas Braathen <Unknown>\n"
 "Language-Team: Norwegian Bokmal\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 16:15+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 17:07+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../plugins/gtkloader/gtkloader.xml.in.h:1
 msgid "GTK Loader"
-msgstr ""
+msgstr "GTK-laster"
 
 #: ../plugins/gtkloader/gtkloader.xml.in.h:2
 msgid "Initializes GTK once"
-msgstr ""
+msgstr "Initialiserer GTK én gang"
 
 #. namespace unity
 #: ../plugins/networkarearegion/networkarearegion.xml.in.h:1
@@ -84,7 +84,7 @@
 
 #: ../plugins/unity-mt-grab-handles/unitymtgrabhandles.xml.in.h:4
 msgid "Key to toggle the handles"
-msgstr "Tast for å skru håndtak av eller på"
+msgstr "Tast for å skru håndtak på eller av"
 
 #: ../plugins/unity-mt-grab-handles/unitymtgrabhandles.xml.in.h:5
 msgid "Show Handles"
@@ -110,40 +110,44 @@
 msgid "How long the fade should last"
 msgstr "Hvor lenge uttoningen skal vare"
 
-#: ../launcher/BamfLauncherIcon.cpp:1007
+#: ../launcher/ApplicationLauncherIcon.cpp:947
+#: ../launcher/ApplicationLauncherIcon.cpp:1071
 msgid "Lock to Launcher"
 msgstr "Lås til oppstarter"
 
-#: ../launcher/BamfLauncherIcon.cpp:1007
-#: ../launcher/VolumeLauncherIcon.cpp:163
+#: ../launcher/ApplicationLauncherIcon.cpp:947
+#: ../launcher/ApplicationLauncherIcon.cpp:1071
+#: ../launcher/VolumeLauncherIcon.cpp:191
 msgid "Unlock from Launcher"
 msgstr "Lås opp fra oppstarter"
 
-#: ../launcher/BamfLauncherIcon.cpp:1016
+#: ../plugins/unityshell/src/BamfLauncherIcon.cpp:930
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../launcher/BFBLauncherIcon.cpp:37 ../launcher/BFBLauncherIcon.cpp:115
+#: ../plugins/unityshell/src/BFBLauncherIcon.cpp:40
+#: ../plugins/unityshell/src/BFBLauncherIcon.cpp:119
 msgid "Dash Home"
 msgstr "Dashbord"
 
-#: ../dash/DashView.cpp:83
+#: ../plugins/unityshell/src/DashView.cpp:80
 msgid "Home"
 msgstr "Hjem"
 
-#: ../dash/DashView.cpp:83
+#: ../plugins/unityshell/src/DashView.cpp:80
 msgid "Home screen"
 msgstr "Hjemmeskjerm"
 
-#: ../dash/DashView.cpp:83
+#: ../plugins/unityshell/src/DashView.cpp:80
 msgid "Search"
 msgstr "Søk"
 
-#: ../launcher/DesktopLauncherIcon.cpp:35
+#: ../launcher/DesktopLauncherIcon.cpp:36
+#: ../plugins/unityshell/unityshell.xml.in.h:8
 msgid "Show Desktop"
 msgstr "Vis skrivebordet"
 
-#: ../launcher/VolumeLauncherIcon.cpp:180
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:162
 msgid "Open"
 msgstr "Åpne"
 
@@ -152,67 +156,67 @@
 msgid "Format..."
 msgstr "Formater …"
 
-#: ../launcher/VolumeLauncherIcon.cpp:198
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:196
 msgid "Eject"
 msgstr "Løs ut"
 
-#: ../launcher/VolumeLauncherIcon.cpp:198
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:198
 msgid "Eject parent drive"
 msgstr "Løs ut eierstasjon"
 
-#: ../launcher/VolumeLauncherIcon.cpp:216
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:221
 msgid "Safely remove"
 msgstr "Trygg fjerning"
 
-#: ../launcher/VolumeLauncherIcon.cpp:216
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:223
 msgid "Safely remove parent drive"
 msgstr "Trygg fjerning av eierstasjon"
 
-#: ../launcher/VolumeLauncherIcon.cpp:234
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:246
 msgid "Unmount"
 msgstr "Avmonter"
 
-#: ../launcher/DeviceNotificationDisplayImp.cpp:54
+#: ../plugins/unityshell/src/DeviceLauncherIcon.cpp:350
 msgid "The drive has been successfully ejected"
 msgstr "Stasjonen ble løst ut"
 
-#: ../dash/FilterAllButton.cpp:35
+#: ../dash/FilterAllButton.cpp:38
 msgid "All"
 msgstr "Alle"
 
-#: ../dash/FilterGenreWidget.cpp:40
+#: ../dash/FilterGenreWidget.cpp:42
 msgid "Categories"
 msgstr "Kategorier"
 
-#: ../dash/FilterMultiRangeWidget.cpp:41
+#: ../dash/FilterMultiRangeWidget.cpp:43
 msgid "Multi-range"
-msgstr ""
+msgstr "Multirekkevidde"
 
-#: ../dash/FilterRatingsWidget.cpp:47
+#: ../dash/FilterRatingsWidget.cpp:49
 msgid "Rating"
 msgstr "Vurdering"
 
-#: ../hud/HudView.cpp:191 ../hud/HudView.cpp:384
+#: ../hud/HudView.cpp:198 ../hud/HudView.cpp:382
 msgid "Type your command"
 msgstr "Skriv inn en kommando"
 
-#: ../launcher/ExpoLauncherIcon.cpp:34
+#: ../plugins/unityshell/src/LauncherController.cpp:547
 msgid "Workspace Switcher"
 msgstr "Arbeidsområdeskifter"
 
-#: ../dash/LensView.cpp:572
+#: ../dash/ScopeView.cpp:734
 msgid "Sorry, there is nothing that matches your search."
-msgstr "Søket ga ingen treff."
+msgstr "Beklager. Søket ga ingen treff."
 
-#: ../panel/PanelMenuView.cpp:72
+#: ../panel/PanelMenuView.cpp:75
 msgid "Ubuntu Desktop"
 msgstr "Ubuntu skrivebord"
 
-#: ../dash/PlacesGroup.cpp:370
+#: ../plugins/unityshell/src/PlacesGroup.cpp:336
 msgid "See fewer results"
 msgstr "Vis færre resultater"
 
-#: ../dash/PlacesGroup.cpp:376
+#: ../dash/PlacesGroup.cpp:335
 #, c-format
 msgid "See one more result"
 msgid_plural "See %d more results"
@@ -228,19 +232,19 @@
 msgid "min"
 msgstr "min"
 
-#: ../unity-shared/SearchBar.cpp:185
+#: ../unity-shared/SearchBar.cpp:191
 msgid "Filter results"
-msgstr "Filtrer resultatene"
+msgstr "Filtrer resultater"
 
-#: ../shortcuts/ShortcutHintPrivate.cpp:85
+#: ../shortcuts/ShortcutHintPrivate.cpp:84
 msgid "Left Mouse"
 msgstr "Venstre musetast"
 
-#: ../shortcuts/ShortcutHintPrivate.cpp:86
+#: ../shortcuts/ShortcutHintPrivate.cpp:85
 msgid "Middle Mouse"
 msgstr "Midtre musetast"
 
-#: ../shortcuts/ShortcutHintPrivate.cpp:87
+#: ../shortcuts/ShortcutHintPrivate.cpp:86
 msgid "Right Mouse"
 msgstr "Høyre musetast"
 
@@ -249,31 +253,30 @@
 msgstr "Hurtigtaster"
 
 #. Application is being installed, or hasn't been installed yet
-#: ../launcher/SoftwareCenterLauncherIcon.cpp:56
+#: ../launcher/SoftwareCenterLauncherIcon.cpp:75
 msgid "Waiting to install"
 msgstr "Venter på installasjon"
 
-#: ../launcher/SpacerLauncherIcon.cpp:36
+#: ../plugins/unityshell/src/SpacerLauncherIcon.cpp:37
 msgid "Drop To Add Application"
-msgstr "Slipp for å legge til applikasjonen"
+msgstr "Slipp for å legge til programmet"
 
-#: ../launcher/TrashLauncherIcon.cpp:47
+#: ../plugins/unityshell/src/TrashLauncherIcon.cpp:45
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: ../launcher/TrashLauncherIcon.cpp:85
+#: ../plugins/unityshell/src/TrashLauncherIcon.cpp:91
 msgid "Empty Trash..."
 msgstr "Tøm papirkurven …"
 
-#. Dash...
 #: ../plugins/unityshell/src/unity-dash-view-accessible.cpp:100
-#: ../plugins/unityshell/src/unityshell.cpp:3206
+#: ../shortcuts/CompizShortcutModeller.cpp:161
 msgid "Dash"
 msgstr "Dashbord"
 
-#. Launcher...
 #: ../plugins/unityshell/src/unity-launcher-accessible.cpp:137
-#: ../plugins/unityshell/src/unityshell.cpp:3166
+#: ../plugins/unityshell/unityshell.xml.in.h:31
+#: ../shortcuts/CompizShortcutModeller.cpp:120
 msgid "Launcher"
 msgstr "Oppstarter"
 
@@ -281,214 +284,210 @@
 msgid "Quicklist"
 msgstr "Hurtigliste"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3094
-#: ../plugins/unityshell/src/unityshell.cpp:3116
+#: ../plugins/unityshell/src/unityshell.cpp:3081
+#: ../plugins/unityshell/src/unityshell.cpp:3103
 msgid " (Press)"
 msgstr " (Hold inne)"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3094
+#: ../plugins/unityshell/src/unityshell.cpp:3081
 msgid "Open Launcher, displays shortcuts."
 msgstr "Åpne oppstarteren og vis hurtigtaster."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3095
+#: ../plugins/unityshell/src/unityshell.cpp:3082
 msgid "Open Launcher keyboard navigation mode."
 msgstr "Åpne oppstarteren i modus for tastaturnavigering."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3096
+#: ../plugins/unityshell/src/unityshell.cpp:3083
 msgid "Switch applications via Launcher."
 msgstr "Veksle mellom programmer med oppstarteren."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3186
+#: ../shortcuts/CompizShortcutModeller.cpp:140
 msgid " + 1 to 9"
 msgstr " + 1 til 9"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3187
+#: ../shortcuts/CompizShortcutModeller.cpp:141
 msgid "Same as clicking on a Launcher icon."
 msgstr "Tilsvarer å trykke på et oppstarterikon."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3192
+#: ../shortcuts/CompizShortcutModeller.cpp:146
 msgid " + Shift + 1 to 9"
 msgstr " + Shift + 1 til 9"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3098
+#: ../plugins/unityshell/src/unityshell.cpp:3085
 msgid "Open new window of the app."
 msgstr "Åpne programmet i et nytt vindu."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3099
+#: ../plugins/unityshell/src/unityshell.cpp:3086
 msgid "Open the Trash."
 msgstr "Åpne papirkurven."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3208
-#: ../plugins/unityshell/src/unityshell.cpp:3256
+#: ../shortcuts/CompizShortcutModeller.cpp:163
+#: ../shortcuts/CompizShortcutModeller.cpp:219
 msgid " (Tap)"
 msgstr " (Trykk)"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3104
+#: ../plugins/unityshell/src/unityshell.cpp:3091
 msgid "Open the Dash Home."
 msgstr "Åpne dashbordets hovedside."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3105
+#: ../plugins/unityshell/src/unityshell.cpp:3092
 msgid "Open the Dash App Lens."
 msgstr "Åpne programlinsen på dashbordet"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3106
+#: ../plugins/unityshell/src/unityshell.cpp:3093
 msgid "Open the Dash Files Lens."
 msgstr "Åpne fillinsen på dashbordet."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3107
+#: ../plugins/unityshell/src/unityshell.cpp:3094
 msgid "Open the Dash Music Lens."
 msgstr "Åpne musikklinsen på dashbordet."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3239
+#: ../shortcuts/CompizShortcutModeller.cpp:200
 msgid "Switches between Lenses."
 msgstr "Bytter mellom linser."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3241
+#: ../shortcuts/CompizShortcutModeller.cpp:202
 msgid "Ctrl + Tab"
-msgstr "Ctrl + Tab"
+msgstr "Ctrl + Tabulator"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3244
-#: ../plugins/unityshell/src/unityshell.cpp:3294
+#: ../shortcuts/CompizShortcutModeller.cpp:205
+#: ../shortcuts/CompizShortcutModeller.cpp:259
 msgid "Moves the focus."
 msgstr "Flytter fokuset."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3109
+#: ../plugins/unityshell/src/unityshell.cpp:3096
 msgid "Cursor Keys"
 msgstr "Piltaster"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3110
+#: ../plugins/unityshell/src/unityshell.cpp:3097
 msgid "Open currently focused item."
 msgstr "Åpne objektet i fokus."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3110
+#: ../plugins/unityshell/src/unityshell.cpp:3097
 msgid "Enter & Return"
 msgstr ""
 
-#. Menu Bar
-#: ../plugins/unityshell/src/unityshell.cpp:3254
+#: ../shortcuts/CompizShortcutModeller.cpp:217
 msgid "HUD & Menu Bar"
 msgstr "HUD & menylinje"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3115
+#: ../plugins/unityshell/src/unityshell.cpp:3102
 msgid "Open the HUD."
 msgstr "Åpne HUD."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3116
+#: ../plugins/unityshell/src/unityshell.cpp:3103
 msgid "Reveals application menu."
 msgstr "Viser program-menyen."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3268
+#: ../shortcuts/CompizShortcutModeller.cpp:231
 msgid "Opens the indicator menu."
 msgstr "Åpner indikatormeyen."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3274
+#: ../shortcuts/CompizShortcutModeller.cpp:237
 msgid "Moves focus between indicators."
 msgstr "Flytter fokuset mellom indikatorene."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3276
-#: ../plugins/unityshell/src/unityshell.cpp:3296
+#: ../shortcuts/CompizShortcutModeller.cpp:239
+#: ../shortcuts/CompizShortcutModeller.cpp:261
 msgid "Cursor Left or Right"
 msgstr "Venstre eller høyre piltast"
 
-#. Switching
-#: ../plugins/unityshell/src/unityshell.cpp:3279
+#: ../shortcuts/CompizShortcutModeller.cpp:244
 msgid "Switching"
 msgstr "Veksling"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3123
+#: ../plugins/unityshell/src/unityshell.cpp:3110
 msgid "Switch between applications."
 msgstr "Veksle mellom programmer."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3124
+#: ../plugins/unityshell/src/unityshell.cpp:3111
 msgid "Switch windows of current application."
 msgstr "Bytt vindu innenfor det aktive programmet"
 
-#. Workspaces
-#: ../plugins/unityshell/src/unityshell.cpp:3299
+#: ../shortcuts/CompizShortcutModeller.cpp:266
 msgid "Workspaces"
 msgstr "Arbeidsområder"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3130
+#: ../plugins/unityshell/src/unityshell.cpp:3117
 msgid "Spread workspaces."
 msgstr "Spre arbeidsområdene."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3131
-#: ../plugins/unityshell/src/unityshell.cpp:3132
+#: ../plugins/unityshell/src/unityshell.cpp:3118
+#: ../plugins/unityshell/src/unityshell.cpp:3119
 msgid " + Cursor Keys"
 msgstr " + piltaster"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3131
+#: ../plugins/unityshell/src/unityshell.cpp:3118
 msgid "Switch workspaces."
 msgstr "Bytt arbeidsområde."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3132
+#: ../plugins/unityshell/src/unityshell.cpp:3119
 msgid "Move focused window to different workspace."
 msgstr "Flytt vinduet i fokus til et annet arbeidsområde."
 
-#. Windows
-#: ../plugins/unityshell/src/unityshell.cpp:3321
+#: ../shortcuts/CompizShortcutModeller.cpp:289
 msgid "Windows"
 msgstr "Vinduer"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3324
+#: ../shortcuts/CompizShortcutModeller.cpp:292
 msgid "Spreads all windows in the current workspace."
 msgstr "Sprer vinduene i det aktive arbeidsområdet."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3330
+#: ../shortcuts/CompizShortcutModeller.cpp:298
 msgid "Minimises all windows."
 msgstr "Minimerer alle vinduer."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3336
+#: ../shortcuts/CompizShortcutModeller.cpp:304
 msgid "Maximises the current window."
 msgstr "Maksimerer aktivt vindu."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3139
+#: ../plugins/unityshell/src/unityshell.cpp:3126
 msgid "Restores or minimises current window."
 msgstr "Gjenoppretter eller minimerer det aktive vinduet."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3347
+#: ../shortcuts/CompizShortcutModeller.cpp:315
 msgid " or Right"
 msgstr " eller høyre"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3140
+#: ../plugins/unityshell/src/unityshell.cpp:3127
 msgid "Semi-maximises current window."
-msgstr ""
+msgstr "Halvmaksimerer aktivt vindu"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3141
+#: ../plugins/unityshell/src/unityshell.cpp:3128
 msgid "Closes current window."
 msgstr "Lukker vinduet i fokus."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3142
+#: ../plugins/unityshell/src/unityshell.cpp:3129
 msgid "Opens window accessibility menu."
 msgstr "Åpner vinduets tilgjengelighetsmeny"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3142
+#: ../plugins/unityshell/src/unityshell.cpp:3129
 msgid "Alt + Space"
 msgstr "Alt + Mellomrom"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3143
+#: ../plugins/unityshell/src/unityshell.cpp:3130
 msgid "Places window in corresponding positions."
 msgstr "Plasserer vinduet i tilsvarende posisjoner"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3368
+#: ../plugins/unityshell/src/unityshell.cpp:3130
 msgid "Ctrl + Alt + Num"
 msgstr "Ctrl + Alt + Num"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3370
-#: ../plugins/unityshell/src/unityshell.cpp:3376
+#: ../shortcuts/CompizShortcutModeller.cpp:338
+#: ../shortcuts/CompizShortcutModeller.cpp:344
 msgid " Drag"
 msgstr " Dra"
 
-#: ../plugins/unityshell/src/unityshell.cpp:3144
+#: ../plugins/unityshell/src/unityshell.cpp:3131
 msgid "Move window."
 msgstr "Flytt vindu."
 
-#: ../plugins/unityshell/src/unityshell.cpp:3145
+#: ../plugins/unityshell/src/unityshell.cpp:3132
 msgid "Resize window."
 msgstr "Endre størrelse på vinduet."
 
 #: ../plugins/unityshell/src/unity-switcher-accessible.cpp:147
-#: ../plugins/unityshell/unityshell.xml.in.h:25
+#: ../plugins/unityshell/unityshell.xml.in.h:104
 msgid "Switcher"
 msgstr "Programveksler"
 
@@ -509,13 +508,13 @@
 #: ../plugins/unityshell/unityshell.xml.in.h:4
 #: ../gnome/50-unity-launchers.xml.in.h:2
 msgid "Key to show the HUD"
-msgstr "Tast for å åpne HUD"
+msgstr "Tast for å vise HUD"
 
 #: ../plugins/unityshell/unityshell.xml.in.h:5
 msgid "Make the HUD appear with this key"
 msgstr "Vis HUD med denne tasten"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:6
+#: ../plugins/unityshell/unityshell.xml.in.h:44
 msgid "Hide Launcher"
 msgstr "Skjul oppstarteren"
 
@@ -527,23 +526,23 @@
 "Skjul oppstarteren automatisk etter en tid uten aktivitet: alltid eller bare "
 "når vinduet i fokus ikke er over oppstarteren."
 
-#: ../plugins/unityshell/unityshell.xml.in.h:8
+#: ../plugins/unityshell/unityshell.xml.in.h:46
 msgid "Never"
 msgstr "Aldri"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:9
+#: ../plugins/unityshell/unityshell.xml.in.h:47
 msgid "Autohide"
 msgstr "Skjul automatisk"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:10
+#: ../plugins/unityshell/unityshell.xml.in.h:54
 msgid "Reveal Trigger"
 msgstr "Visningsutløser"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:11
+#: ../plugins/unityshell/unityshell.xml.in.h:55
 msgid "Left Edge"
 msgstr "Venstre kant"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:12
+#: ../plugins/unityshell/unityshell.xml.in.h:56
 msgid "Top Left Corner"
 msgstr "Øvre venstre hjørne"
 
@@ -567,15 +566,15 @@
 "Sett tastaturfokuset på oppstarteren, sånn at den kan navigeres i med "
 "piltastene"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:17
+#: ../plugins/unityshell/unityshell.xml.in.h:6
 msgid "Key to execute a command"
-msgstr "Tast for å kjøre kommando"
+msgstr "Tast for å kjøre en kommando"
 
 #: ../plugins/unityshell/unityshell.xml.in.h:18
 msgid "Key to open a folder or execute a command"
 msgstr "Tast for å åpne mappe eller kjøre kommando"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:19
+#: ../plugins/unityshell/unityshell.xml.in.h:10
 msgid "Key to open the first panel menu"
 msgstr "Tast for å åpne den første menyen i panelet"
 
@@ -613,7 +612,7 @@
 "Spre ut vinduene innenfor samme program i et rutenett etter en kort "
 "forsinkelse"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:28
+#: ../plugins/unityshell/unityshell.xml.in.h:121
 msgid "Bias alt-tab to prefer windows on the current viewport"
 msgstr "Favoriser vinduer i arbeidsområdet som er i bruk"
 
@@ -623,59 +622,59 @@
 "Få programveksleren til å favorisere de vinduene som er i arbeidsområdet som "
 "er i bruk"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:32
+#: ../plugins/unityshell/unityshell.xml.in.h:30
 msgid "Key to start the switcher"
 msgstr "Tast for å starte programveksleren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:33
+#: ../plugins/unityshell/unityshell.xml.in.h:31
 msgid "Start switching between windows"
 msgstr "Begynn å veksle mellom vinduer"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:34
+#: ../plugins/unityshell/unityshell.xml.in.h:32
 msgid "Key to start the switcher in reverse"
 msgstr "Tast for å starte programveksleren baklengs"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:35
+#: ../plugins/unityshell/unityshell.xml.in.h:33
 msgid "Start switching between windows in reverse order"
 msgstr "Begynn å baklengs veksle mellom vinduer"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:36
+#: ../plugins/unityshell/unityshell.xml.in.h:34
 msgid "Key to start the switcher for all viewports"
 msgstr "Tast for å starte programveksleren for alle arbeidsområder"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:37
+#: ../plugins/unityshell/unityshell.xml.in.h:35
 msgid "Start switching between windows on all viewports"
 msgstr "Begynn å veksle mellom vinduene på alle arbeidsområder"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:38
+#: ../plugins/unityshell/unityshell.xml.in.h:36
 msgid "Key to start the switcher in reverse for all viewports"
 msgstr "Tast for å starte programveksleren baklengs for alle arbeidsområder"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:39
+#: ../plugins/unityshell/unityshell.xml.in.h:37
 msgid "Start switching between windows on all viewports, in reverse order"
 msgstr "Begynn å baklengs veksle mellom vinduene på alle arbeidsområder"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:40
+#: ../plugins/unityshell/unityshell.xml.in.h:38
 msgid "Go right in the switcher"
 msgstr "Gå til høyre i velgeren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:41
+#: ../plugins/unityshell/unityshell.xml.in.h:39
 msgid "Navigate one window right in the switcher"
 msgstr "Gå ett vindu til høyre i programveksleren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:42
+#: ../plugins/unityshell/unityshell.xml.in.h:40
 msgid "Go left in the switcher"
 msgstr "Gå til venstre i velgeren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:43
+#: ../plugins/unityshell/unityshell.xml.in.h:41
 msgid "Navigate one window left in the switcher"
 msgstr "Gå ett vindu til venstre i programveksleren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:44
+#: ../plugins/unityshell/unityshell.xml.in.h:42
 msgid "Key to expose the windows in the switcher"
 msgstr "Tast for å vise vinduer i programveksleren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:45
+#: ../plugins/unityshell/unityshell.xml.in.h:43
 msgid ""
 "Display a preview of the selected window; grid if there is multiple windows "
 "of that application"
@@ -683,131 +682,133 @@
 "Vis en forhåndsvisning av det valgte vinduet, og vis i rutenett hvis "
 "programmet har flere vinduer"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:46
+#: ../plugins/unityshell/unityshell.xml.in.h:44
 msgid "Key to collapse windows in the switcher"
 msgstr "Tast for å lukke vindusvisning i programveksleren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:47
+#: ../plugins/unityshell/unityshell.xml.in.h:45
 msgid "Return the previews to icons in the switcher"
 msgstr "Gjør forhåndsvisningene i programveksleren om til ikoner igjen"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:48
+#: ../plugins/unityshell/unityshell.xml.in.h:46
 msgid "Key to flip through windows in the switcher"
 msgstr "Tast for å bla gjennom vinduer i programveksleren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:49
+#: ../plugins/unityshell/unityshell.xml.in.h:47
 msgid "Flip through all the windows present in the switcher"
 msgstr "Bla gjennom alle vinduene som er i programveksleren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:50
+#: ../plugins/unityshell/unityshell.xml.in.h:48
 msgid "Key to flip through windows in the switcher backwards"
 msgstr "Tast for å bla baklengs gjennom vinduer i programveksleren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:51
+#: ../plugins/unityshell/unityshell.xml.in.h:49
 msgid ""
 "Flip through all the windows present in the switcher, in reverse order"
 msgstr "Bla baklengs gjennom alle vinduene som er i programveksleren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:52
+#: ../plugins/unityshell/unityshell.xml.in.h:50
 msgid "Show minimized windows in switcher"
 msgstr "Vis minimerte vinduer i programveksleren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:53
+#: ../plugins/unityshell/unityshell.xml.in.h:51
 msgid ""
 "Hack to enable minimized windows in switcher. Disable and report bugs if "
 "problems are caused"
 msgstr ""
+"Hack for å tillate minimerte vinduer i programveksleren. Slå av dette og "
+"rapporter feil hvis du opplever problemer"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:54
+#: ../plugins/unityshell/unityshell.xml.in.h:52
 msgid "Experimental"
 msgstr "Eksperimentelt"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:55
+#: ../plugins/unityshell/unityshell.xml.in.h:20
 msgid "Background Color"
 msgstr "Bakgrunnsfarge"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:56
+#: ../plugins/unityshell/unityshell.xml.in.h:54
 msgid "Background color override used for testing purposes"
 msgstr "Overstyring av bakgrunnsfarge til testformål"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:57
+#: ../plugins/unityshell/unityshell.xml.in.h:55
 msgid "Backlight Mode"
 msgstr "Baklysmodus"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:58
+#: ../plugins/unityshell/unityshell.xml.in.h:56
 msgid "Change how the icons are backlit"
 msgstr "Endre hvordan ikoner lyses opp bakfra"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:59
+#: ../plugins/unityshell/unityshell.xml.in.h:79
 msgid "Backlight Always On"
 msgstr "Alltid baklys"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:60
+#: ../plugins/unityshell/unityshell.xml.in.h:80
 msgid "Backlight Toggles"
 msgstr "Vekslende baklys"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:61
+#: ../plugins/unityshell/unityshell.xml.in.h:81
 msgid "Backlight Always Off"
 msgstr "Aldri baklys"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:62
+#: ../plugins/unityshell/unityshell.xml.in.h:82
 msgid "Edge Illumination Toggles"
 msgstr "Vekslende kantlys"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:63
+#: ../plugins/unityshell/unityshell.xml.in.h:83
 msgid "Backlight and Edge Illumination Toggles"
-msgstr "Vekslende baklys og kantlys"
+msgstr "Vekslende bak- og kantlys"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:64
+#: ../plugins/unityshell/unityshell.xml.in.h:62
 msgid "Launch Animation"
 msgstr "Oppstartsanimasjon"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:65
+#: ../plugins/unityshell/unityshell.xml.in.h:63
 msgid ""
 "Animation played when a launcher icon is in the process of spawning a process"
 msgstr "Animasjon som spilles når et program er i ferd med å starte"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:66
+#: ../plugins/unityshell/unityshell.xml.in.h:86
 msgid "None"
 msgstr "Ingen"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:67
+#: ../plugins/unityshell/unityshell.xml.in.h:87
 msgid "Pulse Until Running"
-msgstr "Pulser til programmet kjøres"
+msgstr "Pulsere til programmet kjøres"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:68
+#: ../plugins/unityshell/unityshell.xml.in.h:88
 msgid "Blink"
 msgstr "Blinke"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:69
+#: ../plugins/unityshell/unityshell.xml.in.h:67
 msgid "Urgent Animation"
 msgstr "Hasteanimasjon"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:70
+#: ../plugins/unityshell/unityshell.xml.in.h:68
 msgid "Animation played when a launcher icon is in the urgent state"
 msgstr "Animasjon som spilles når et program trenger oppmerksomhet"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:71
+#: ../plugins/unityshell/unityshell.xml.in.h:91
 msgid "Pulse"
-msgstr "Pulser"
+msgstr "Puls"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:72
+#: ../plugins/unityshell/unityshell.xml.in.h:92
 msgid "Wiggle"
 msgstr "Skjelv"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:73
+#: ../plugins/unityshell/unityshell.xml.in.h:16
 msgid "Panel Opacity"
 msgstr "Panelgjennomsiktighet"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:74
+#: ../plugins/unityshell/unityshell.xml.in.h:17
 msgid "The opacity of the Panel background."
 msgstr "Hvor gjennomsiktig panelbakgrunnen skal være."
 
-#: ../plugins/unityshell/unityshell.xml.in.h:75
+#: ../plugins/unityshell/unityshell.xml.in.h:73
 msgid "Panel Opacity for Maximized Windows Toggle."
 msgstr "Bryter for gjennomsiktighet i maksimerte vinduer."
 
-#: ../plugins/unityshell/unityshell.xml.in.h:76
+#: ../plugins/unityshell/unityshell.xml.in.h:74
 msgid ""
 "When a window is maximized and visible in the current viewport, the panel "
 "opacity is disabled"
@@ -815,27 +816,27 @@
 "Gjør panelet helt synlig når et vindu er maksimert på det aktive "
 "arbeidsområdet"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:77
+#: ../plugins/unityshell/unityshell.xml.in.h:42
 msgid "Launcher Opacity"
 msgstr "Starterens gjennomsiktighet"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:78
+#: ../plugins/unityshell/unityshell.xml.in.h:43
 msgid "The opacity of the Launcher background."
 msgstr "Gjennomsiktigheten til oppstarterens bakgrunn."
 
-#: ../plugins/unityshell/unityshell.xml.in.h:79
+#: ../plugins/unityshell/unityshell.xml.in.h:77
 msgid "Launcher icon size"
 msgstr "Ikonstørrelse i oppstarter"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:80
+#: ../plugins/unityshell/unityshell.xml.in.h:78
 msgid "The size of the launcher icons"
 msgstr "Størrelsen på ikonene i oppstarteren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:81
+#: ../plugins/unityshell/unityshell.xml.in.h:63
 msgid "Launcher Reveal Edge Responsiveness"
 msgstr "Følsomhet for visning av oppstarteren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:82
+#: ../plugins/unityshell/unityshell.xml.in.h:80
 msgid ""
 "A conglomerate setting that modifies the overall responsiveness of the "
 "launcher reveal"
@@ -843,90 +844,90 @@
 "En samleinnstilling som endrer den generelle følsomheten for visning av "
 "oppstarteren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:83
+#: ../plugins/unityshell/unityshell.xml.in.h:65
 msgid "Launcher Reveal Pressure"
 msgstr "Trykkfølsomhet for visning av oppstarteren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:84
+#: ../plugins/unityshell/unityshell.xml.in.h:82
 msgid "Amount of mouse pressure required to reveal launcher"
 msgstr ""
 "Hvor hardt og raskt musepekeren må flyttes i oppstarterens retning for at "
 "den skal vises"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:85
+#: ../plugins/unityshell/unityshell.xml.in.h:67
 msgid "Launcher Edge Stop Overcome Pressure"
 msgstr "Trykkfølsomhet for passering av oppstarteren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:86
+#: ../plugins/unityshell/unityshell.xml.in.h:84
 msgid "Amount of mouse pressure required to push into the next monitor"
 msgstr ""
 "Hvor hardt musepekeren må «trykkes» for å flyttes over til den neste skjermen"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:87
+#: ../plugins/unityshell/unityshell.xml.in.h:69
 msgid "Pressure Decay Rate"
 msgstr "Forfallshastighet for trykk"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:88
+#: ../plugins/unityshell/unityshell.xml.in.h:86
 msgid "The rate at which mouse pressure decays"
 msgstr "Hvor fort pekertrykket forfaller"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:89
+#: ../plugins/unityshell/unityshell.xml.in.h:71
 msgid "Edge Stop Velocity"
 msgstr "Makshastighet for kantsperre"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:90
+#: ../plugins/unityshell/unityshell.xml.in.h:88
 msgid "The maximum velocity at which the mouse will still be stopped"
 msgstr "Den maksimale hastigheten som vil stoppe musepekeren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:93
+#: ../plugins/unityshell/unityshell.xml.in.h:48
 msgid "Hide Animation"
 msgstr "Skjulingsanimasjon"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:94
+#: ../plugins/unityshell/unityshell.xml.in.h:90
 msgid "Animation played when the launcher is showing or hiding"
 msgstr "Animasjon som vises når oppstarter vises eller skjules"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:95
+#: ../plugins/unityshell/unityshell.xml.in.h:50
 msgid "Fade on bfb and Slide"
-msgstr ""
+msgstr "Uttoning ved bfb og forskyvning"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:96
+#: ../plugins/unityshell/unityshell.xml.in.h:51
 msgid "Slide only"
-msgstr "Kun forskyv"
+msgstr "Kun forskyvning"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:97
+#: ../plugins/unityshell/unityshell.xml.in.h:52
 msgid "Fade only"
 msgstr "Kun uttoning"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:98
+#: ../plugins/unityshell/unityshell.xml.in.h:53
 msgid "Fade and Slide"
 msgstr "Ton ut og forskyv"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:99
+#: ../plugins/unityshell/unityshell.xml.in.h:22
 msgid "Dash Blur"
 msgstr "Dashbordsløring"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:100
+#: ../plugins/unityshell/unityshell.xml.in.h:96
 msgid "Type of blur in the Dash"
 msgstr "Typen sløring på dashbordet"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:101
+#: ../plugins/unityshell/unityshell.xml.in.h:24
 msgid "No Blur"
 msgstr "Ingen sløring"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:102
+#: ../plugins/unityshell/unityshell.xml.in.h:25
 msgid "Static Blur"
 msgstr "Statisk sløring"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:103
+#: ../plugins/unityshell/unityshell.xml.in.h:26
 msgid "Active Blur"
 msgstr "Aktiv sløring"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:104
+#: ../plugins/unityshell/unityshell.xml.in.h:100
 msgid "Automaximize value"
 msgstr "Maksimer verdi automatisk"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:105
+#: ../plugins/unityshell/unityshell.xml.in.h:28
 msgid "The minimum value to trigger automaximize."
 msgstr "Minimumsverdi for å utløse automatisk maksimering."
 
@@ -946,7 +947,7 @@
 msgid "Always"
 msgstr "Alltid"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:106
+#: ../plugins/unityshell/unityshell.xml.in.h:29
 msgid "Enable Shortcut Hints Overlay"
 msgstr "Aktiver visning av hurtigtaster"
 
@@ -958,84 +959,84 @@
 msgid "Enable/Disable \"Show Desktop Icon\" in the launcher."
 msgstr "Aktiver/deaktiver «Visning av skrivebordsikon» i oppstarteren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:107
+#: ../plugins/unityshell/unityshell.xml.in.h:109
 msgid "Menus Fade-in duration"
 msgstr "Inntoningstid for menyer"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:108
+#: ../plugins/unityshell/unityshell.xml.in.h:95
 msgid ""
 "Duration (in milliseconds) of the menus fade-in animation, used when the "
 "mouse goes over the top-panel."
 msgstr ""
-"Varigheten (i millisekunder) av inntoningsanimasjonen for menyene, brukt når "
-"musepekeren går over menylinjen."
+"Varigheten (i millisekunder) av inntoningsanimasjonen for menyene. Brukes "
+"når musepekeren går over menylinjen."
 
-#: ../plugins/unityshell/unityshell.xml.in.h:109
+#: ../plugins/unityshell/unityshell.xml.in.h:111
 msgid "Menus fade-out duration"
 msgstr "Uttoningstid for menyer"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:110
+#: ../plugins/unityshell/unityshell.xml.in.h:97
 msgid ""
 "Duration (in milliseconds) of the menus fade-out animation, used when the "
 "mouse goes over the top-panel."
 msgstr ""
-"Varigheten (i millisekunder) av uttoningsanimasjonen for menyene, brukt når "
+"Varigheten (i millisekunder) av uttoningsanimasjonen for menyene. Brukes når "
 "musepekeren går over menylinjen."
 
-#: ../plugins/unityshell/unityshell.xml.in.h:111
+#: ../plugins/unityshell/unityshell.xml.in.h:113
 msgid "Menus discovery duration"
 msgstr "Oppdagelsestid for menyer"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:112
+#: ../plugins/unityshell/unityshell.xml.in.h:99
 msgid ""
 "How many seconds the menus should be shown when a new application has been "
 "launched."
 msgstr "Hvor mange sekunder menyene skal vises når et nytt program startes."
 
-#: ../plugins/unityshell/unityshell.xml.in.h:113
+#: ../plugins/unityshell/unityshell.xml.in.h:115
 msgid "Menus discovery fade-in duration"
 msgstr "Inntoningstid for oppdagelse av menyer"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:114
+#: ../plugins/unityshell/unityshell.xml.in.h:101
 msgid ""
 "Duration (in milliseconds) of the menus fade-in animation, used when the "
 "menus of a new launched application have been shown."
 msgstr ""
-"Varigheten (i millisekunder) av inntoningsanimasjonen for menyene, brukt når "
-"menyene til et nettopp startet program har blitt vist."
+"Varigheten (i millisekunder) av inntoningsanimasjonen for menyene. Brukes "
+"når menyene til et nylig startet program har blitt vist."
 
-#: ../plugins/unityshell/unityshell.xml.in.h:115
+#: ../plugins/unityshell/unityshell.xml.in.h:117
 msgid "Menus discovery fade-out duration"
 msgstr "Uttoningstid for oppdagelse av menyer"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:116
+#: ../plugins/unityshell/unityshell.xml.in.h:103
 msgid ""
 "Duration (in milliseconds) of the menus fade-out animation, used when the "
 "menus of a new launched application have been shown."
 msgstr ""
-"Varigheten (i millisekunder) av uttoningsanimasjonen for menyene, brukt når "
+"Varigheten (i millisekunder) av uttoningsanimasjonen for menyene. Brukes når "
 "menyene til et nettopp startet program har blitt vist."
 
-#: ../plugins/unityshell/unityshell.xml.in.h:117
+#: ../plugins/unityshell/unityshell.xml.in.h:57
 msgid "Launcher Monitors"
 msgstr "Skjermer med oppstarter"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:118
+#: ../plugins/unityshell/unityshell.xml.in.h:120
 msgid "Monitors on which launchers will be displayed"
 msgstr "Skjermer oppstarteren skal vises på"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:119
+#: ../plugins/unityshell/unityshell.xml.in.h:121
 msgid "All Desktops"
 msgstr "Alle skrivebord"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:120
+#: ../plugins/unityshell/unityshell.xml.in.h:122
 msgid "Primary Desktop"
 msgstr "Hovedskrivebord"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:121
+#: ../plugins/unityshell/unityshell.xml.in.h:61
 msgid "Launcher Capture Mouse"
-msgstr ""
+msgstr "Oppstarteren fanger musepekeren"
 
-#: ../plugins/unityshell/unityshell.xml.in.h:122
+#: ../plugins/unityshell/unityshell.xml.in.h:124
 msgid "Determines if the launcher edges should capture the mouse"
 msgstr "Avgjør om kanten på oppstarteren skal fange musa"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/update-notifier.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/update-notifier.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/update-notifier.po	2013-01-29 09:34:07.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/update-notifier.po	2014-01-07 06:37:09.000000000 +0000
@@ -9,14 +9,14 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-04-10 12:15+0100\n"
 "PO-Revision-Date: 2011-08-22 20:51+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
+"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:14+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:28+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../data/apt_check.py:27
 #, python-format
@@ -44,7 +44,7 @@
 
 #: ../data/apt_check.py:111
 msgid "Error: BrokenCount > 0"
-msgstr "Feil: Ødelagt teller > 0"
+msgstr "Feil: Ødelagt-teller > 0"
 
 #: ../data/apt_check.py:118
 #, python-format
@@ -57,7 +57,7 @@
 
 #: ../data/apt_check.py:187
 msgid "Show human readable output on stdout"
-msgstr "Vis menneskeleselig utskrift på standard ut"
+msgstr "Vis menneskeleselig utskrift på standard utkanal"
 
 #: ../data/apt_check.py:191
 msgid ""
@@ -73,7 +73,7 @@
 
 #: ../src/crash.c:46
 msgid "Do you want to report the problem now?"
-msgstr "Ønsker du å rapportere problemet nå?"
+msgstr "Vil du rapportere problemet nå?"
 
 #: ../src/crash.c:56
 msgid "Report problem…"
@@ -223,11 +223,11 @@
 
 #: ../src/reboot.c:104
 msgid "Reboot failed"
-msgstr "Omstart feilet"
+msgstr "Omstart mislyktes"
 
 #: ../src/reboot.c:105
 msgid "Failed to request reboot, please shutdown manually"
-msgstr "Omstart mislyktes, vennligst slå av manuelt"
+msgstr "Omstart mislyktes. Vennligst skru av manuelt"
 
 #: ../src/update.c:27
 msgid "Show updates"
@@ -245,8 +245,8 @@
 #, c-format
 msgid "There is %i update available"
 msgid_plural "There are %i updates available"
-msgstr[0] "Det er %i oppdatering tilgjengelig"
-msgstr[1] "Det er %i oppdateringer tilgjengelig"
+msgstr[0] "%i oppdatering er tilgjengelig"
+msgstr[1] "%i oppdateringer er tilgjengelig"
 
 #: ../src/update.c:149
 msgid "Show notifications"
@@ -266,11 +266,9 @@
 "There are %i updates available. Click on the notification icon to show the "
 "available updates."
 msgstr[0] ""
-"Det er %i oppdatering tilgjengelig. Klikk på ikon oppdateringsikonet for å "
-"vise hvilke er som tilgjengelige."
+"%i oppdatering er tilgjengelig. Klikk på oppdateringsikonet for å vise den."
 msgstr[1] ""
-"Det er %i oppdateringer tilgjengelig. Klikk på oppdateringsikonet for å vise "
-"hvilke er som tilgjengelige."
+"%i oppdateringer er tilgjengelig. Klikk på oppdateringsikonet for å vise dem."
 
 #: ../src/update.c:251
 msgid "Software updates available"
@@ -316,7 +314,7 @@
 
 #: ../src/update.c:606
 msgid "A problem occurred when checking for the updates."
-msgstr "Ett problem oppstod mens det ble undersøkt etter oppdateringer."
+msgstr "Det oppstod et problem ved sjekk etter oppdateringer."
 
 #: ../src/update-notifier.c:402
 msgid "Internal error"
@@ -360,8 +358,8 @@
 "The computer needs to restart to finish installing updates. Please save your "
 "work before continuing."
 msgstr ""
-"Datamaskinen må startes på nytt for å ferdiggjøre installeringen av "
-"oppdateringene. Vennligst lagre arbeidet før du fortsetter."
+"Datamaskinen må startes på nytt for å fullføre oppdateringene. Vennligst "
+"lagre arbeidet ditt før du fortsetter."
 
 #: ../data/update-notifier.desktop.in.h:2
 msgid "Update Notifier"
@@ -374,7 +372,7 @@
 #. Name
 #: ../data/package-data-downloads-failed.in:1
 msgid "Failure to download extra data files"
-msgstr ""
+msgstr "Klarte ikke å laste ned ekstra datafiler"
 
 #. Description
 #: ../data/package-data-downloads-failed.in:5
@@ -383,12 +381,15 @@
 "The following packages requested additional data downloads after package "
 "installation, but the data could not be downloaded or could not be processed."
 msgstr ""
+"Følgende pakker etterspurte nedlasting av tilleggsinformasjon etter "
+"pakkeinstallasjonen, men dette ble ikke lastet ned eller kunne ikke "
+"håndteres."
 
 #. Description
 #: ../data/package-data-downloads-failed.in:5
 #: ../data/package-data-downloads-failed-permanently.in:3
 msgid "  $packages"
-msgstr ""
+msgstr "  $packages"
 
 #. Description
 #: ../data/package-data-downloads-failed.in:5
@@ -396,11 +397,13 @@
 "The download will be attempted again later, or you can try the download "
 "again now.  Running this command requires an active Internet connection."
 msgstr ""
+"Nedlastingen blir forsøkt gjenopptatt senere. Du kan prøve på nytt nå hvis "
+"du har en fungerende internett-tilkobling."
 
 #. Name
 #: ../data/package-data-downloads-failed-permanently.in:1
 msgid "Data files for some packages could not be downloaded"
-msgstr ""
+msgstr "Datafiler for enkelte pakker ble ikke lastet ned"
 
 #. Description
 #: ../data/package-data-downloads-failed-permanently.in:3
@@ -409,3 +412,6 @@
 "system.  You may need to fix your Internet connection, then remove and "
 "reinstall the packages to fix this problem."
 msgstr ""
+"Dette er en permanent feil som gjør disse pakkene ubrukelige på systemet "
+"ditt. For å løse dette problemet, bør du ordne internett-tilkoblingen din og "
+"deretter installere pakkene på nytt."
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/vim.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/vim.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/vim.po	2013-01-29 09:34:02.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/vim.po	2014-01-07 06:37:09.000000000 +0000
@@ -33,8 +33,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:15+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:28+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: blowfish.c:431
 msgid "E831: bf_key_init() called with empty password"
@@ -56,187 +56,187 @@
 msgid "E819: Blowfish test failed"
 msgstr ""
 
-#: buffer.c:64
+#: buffer.c:63
 msgid "[Location List]"
 msgstr "[Plassliste]"
 
-#: buffer.c:65
+#: buffer.c:64
 msgid "[Quickfix List]"
 msgstr ""
 
-#: buffer.c:112
+#: buffer.c:114
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: Kan ikke reservere plass til noen buffere, avslutter ..."
 
-#: buffer.c:115
+#: buffer.c:117
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: Kan ikke reservere plass til buffer, bruker en annen ..."
 
-#: buffer.c:932
+#: buffer.c:951
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Ingen buffere ble lastet ut"
 
-#: buffer.c:934
+#: buffer.c:953
 msgid "E516: No buffers were deleted"
 msgstr "E516: Ingen buffere ble slettet"
 
-#: buffer.c:936
+#: buffer.c:955
 msgid "E517: No buffers were wiped out"
 msgstr "E517: Ingen buffere ble visket ut"
 
-#: buffer.c:944
+#: buffer.c:963
 msgid "1 buffer unloaded"
 msgstr "1 buffer ble lastet ut"
 
-#: buffer.c:946
+#: buffer.c:965
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d buffere ble lastet ut"
 
-#: buffer.c:951
+#: buffer.c:970
 msgid "1 buffer deleted"
 msgstr "1 buffer ble slettet"
 
-#: buffer.c:953
+#: buffer.c:972
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d buffere ble slettet"
 
-#: buffer.c:958
+#: buffer.c:977
 msgid "1 buffer wiped out"
 msgstr "1 buffer ble visket ut"
 
-#: buffer.c:960
+#: buffer.c:979
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "%d buffere ble visket ut"
 
-#: buffer.c:1018
+#: buffer.c:1041
 msgid "E84: No modified buffer found"
 msgstr "E84: Fant ingen modifisert buffer"
 
 #. back where we started, didn't find anything.
-#: buffer.c:1057
+#: buffer.c:1080
 msgid "E85: There is no listed buffer"
 msgstr "E85: Det finnes ingen listede buffere"
 
-#: buffer.c:1069
+#: buffer.c:1092
 #, c-format
 msgid "E86: Buffer %ld does not exist"
 msgstr "E86: Bufferen %ld finnes ikke"
 
-#: buffer.c:1072
+#: buffer.c:1095
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Kan ikke gå forbi siste buffer"
 
-#: buffer.c:1074
+#: buffer.c:1097
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: Kan ikke gå forbi første buffer"
 
-#: buffer.c:1116
+#: buffer.c:1139
 #, c-format
 msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr ""
 "E89: Ikke lagret siden forrige forandring av bufferen %ld (legg til ! for å "
 "overstyre)"
 
-#: buffer.c:1133
+#: buffer.c:1156
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Kan ikke laste ut siste buffer"
 
-#: buffer.c:1720
+#: buffer.c:1783
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Advarsel: Listen med filnavn er overfylt"
 
-#: buffer.c:1919 quickfix.c:3791
+#: buffer.c:1979 quickfix.c:3866
 #, c-format
 msgid "E92: Buffer %ld not found"
 msgstr "E92: Fant ikke bufferen %ld"
 
-#: buffer.c:2192
+#: buffer.c:2271
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: Mer enn ett treff for %s"
 
-#: buffer.c:2194
+#: buffer.c:2273
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: Ingen samsvarende buffer for %s"
 
-#: buffer.c:2649
+#: buffer.c:2723
 #, c-format
 msgid "line %ld"
 msgstr "linje %ld"
 
-#: buffer.c:2736
+#: buffer.c:2810
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: En buffer med dette navnet finnes allerede"
 
-#: buffer.c:3062
+#: buffer.c:3136
 msgid " [Modified]"
 msgstr " [Modifisert]"
 
-#: buffer.c:3067
+#: buffer.c:3141
 msgid "[Not edited]"
 msgstr "[Uredigert]"
 
-#: buffer.c:3072
+#: buffer.c:3146
 msgid "[New file]"
 msgstr "[Ny fil]"
 
-#: buffer.c:3073
+#: buffer.c:3147
 msgid "[Read errors]"
 msgstr "[Lesefeil]"
 
-#: buffer.c:3075 fileio.c:2447 netbeans.c:3871
+#: buffer.c:3149 fileio.c:2427 netbeans.c:3871
 msgid "[readonly]"
 msgstr "[skrivebeskyttet]"
 
-#: buffer.c:3096
+#: buffer.c:3170
 #, c-format
 msgid "1 line --%d%%--"
 msgstr "1 linje --%d%%--"
 
-#: buffer.c:3098
+#: buffer.c:3172
 #, c-format
 msgid "%ld lines --%d%%--"
 msgstr "%ld linjer --%d%%--"
 
-#: buffer.c:3105
+#: buffer.c:3179
 #, c-format
 msgid "line %ld of %ld --%d%%-- col "
 msgstr "linje %ld av %ld --%d%%-- kol "
 
-#: buffer.c:3226 buffer.c:5257 memline.c:2068
+#: buffer.c:3303 buffer.c:5343 memline.c:2066
 msgid "[No Name]"
 msgstr "[Uten navn]"
 
 #. must be a help buffer
-#: buffer.c:3264
+#: buffer.c:3341
 msgid "help"
 msgstr "hjelp"
 
-#: buffer.c:3906 screen.c:6209
+#: buffer.c:3993 screen.c:6429
 msgid "[Help]"
 msgstr "[Hjelp]"
 
-#: buffer.c:3940 screen.c:6215
+#: buffer.c:4027 screen.c:6435
 msgid "[Preview]"
 msgstr "[Forhåndsvisning]"
 
-#: buffer.c:4269
+#: buffer.c:4356
 msgid "All"
 msgstr "Alt"
 
-#: buffer.c:4269
+#: buffer.c:4356
 msgid "Bot"
 msgstr "Bunn"
 
-#: buffer.c:4272
+#: buffer.c:4359
 msgid "Top"
 msgstr "Topp"
 
-#: buffer.c:5193
+#: buffer.c:5283
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -244,11 +244,11 @@
 "\n"
 "# Bufferliste:\n"
 
-#: buffer.c:5253
+#: buffer.c:5339
 msgid "[Scratch]"
 msgstr ""
 
-#: buffer.c:5570
+#: buffer.c:5678
 msgid ""
 "\n"
 "--- Signs ---"
@@ -256,12 +256,12 @@
 "\n"
 "--- Skilt ---"
 
-#: buffer.c:5580
+#: buffer.c:5688
 #, c-format
 msgid "Signs for %s:"
 msgstr "Skilt for %s:"
 
-#: buffer.c:5586
+#: buffer.c:5694
 #, c-format
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    linje=%ld  id=%d  navn=%s"
@@ -271,54 +271,54 @@
 msgid "E96: Can not diff more than %ld buffers"
 msgstr "E96: Kan ikke sammenligne flere enn %ld buffere"
 
-#: diff.c:777
+#: diff.c:779
 msgid "E810: Cannot read or write temp files"
 msgstr ""
 
-#: diff.c:778
+#: diff.c:780
 msgid "E97: Cannot create diffs"
 msgstr "E97: Kan ikke lage differansefiler"
 
-#: diff.c:910
+#: diff.c:912
 msgid "Patch file"
 msgstr "Patch fil"
 
-#: diff.c:1014
+#: diff.c:1016
 msgid "E816: Cannot read patch output"
 msgstr ""
 
-#: diff.c:1247
+#: diff.c:1298
 msgid "E98: Cannot read diff output"
 msgstr "E98: Kan ikke lese differanse-utdata"
 
-#: diff.c:2106
+#: diff.c:2157
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: Nåværende buffer er ikke i differansemodus"
 
-#: diff.c:2125
+#: diff.c:2176
 msgid "E793: No other buffer in diff mode is modifiable"
 msgstr "E793: Ingen annen buffer i differansemodus er redigerbar"
 
-#: diff.c:2127
+#: diff.c:2178
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: Ingen annen buffer i differansemodus"
 
-#: diff.c:2137
+#: diff.c:2188
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr ""
 "E101: Mer enn to buffere i differansemodus, vet ikke hvilken som skal brukes"
 
-#: diff.c:2160
+#: diff.c:2211
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: Kan ikke finne buffer \"%s\""
 
-#: diff.c:2168
+#: diff.c:2219
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: Bufferen \"%s\" er ikke i differansemodus"
 
-#: diff.c:2212
+#: diff.c:2263
 msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: Uventet forandring i buffer"
 
@@ -407,37 +407,37 @@
 msgid "E840: Completion function deleted text"
 msgstr ""
 
-#: edit.c:2156
+#: edit.c:2194
 msgid "'dictionary' option is empty"
 msgstr "'dictionary'-valget er tomt"
 
-#: edit.c:2157
+#: edit.c:2195
 msgid "'thesaurus' option is empty"
 msgstr "'thesaurus'-valget er tomt"
 
-#: edit.c:3124
+#: edit.c:3162
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "Leter gjennom ordliste: %s"
 
-#: edit.c:3613
+#: edit.c:3660
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (sett inn) Rulling (^E/^Y)"
 
-#: edit.c:3615
+#: edit.c:3662
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (erstatt) Rulling (^E/^Y)"
 
-#: edit.c:4182
+#: edit.c:4240
 #, c-format
 msgid "Scanning: %s"
 msgstr "Leter: %s"
 
-#: edit.c:4217
+#: edit.c:4275
 msgid "Scanning tags."
 msgstr "Leter gjennom tagger."
 
-#: edit.c:5269
+#: edit.c:5333
 msgid " Adding"
 msgstr " Legger til"
 
@@ -445,28 +445,28 @@
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #. 
-#: edit.c:5320
+#: edit.c:5384
 msgid "-- Searching..."
 msgstr "-- Søker ..."
 
-#: edit.c:5380
+#: edit.c:5444
 msgid "Back at original"
 msgstr "Tilbake i originalen"
 
-#: edit.c:5385
+#: edit.c:5449
 msgid "Word from other line"
 msgstr "Ord fra annen linje"
 
-#: edit.c:5390
+#: edit.c:5454
 msgid "The only match"
 msgstr "Det eneste treffet"
 
-#: edit.c:5455
+#: edit.c:5519
 #, c-format
 msgid "match %d of %d"
 msgstr "treff %d av %d"
 
-#: edit.c:5459
+#: edit.c:5523
 #, c-format
 msgid "match %d"
 msgstr "treff %d"
@@ -554,198 +554,198 @@
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Ugyldig variabelnavn: %s"
 
-#: eval.c:1955
+#: eval.c:1952
 msgid "E687: Less targets than List items"
 msgstr "E687: Færre mål enn listeelementer"
 
-#: eval.c:1960
+#: eval.c:1957
 msgid "E688: More targets than List items"
 msgstr "E688: Flere mål enn listeelementer"
 
-#: eval.c:2046
+#: eval.c:2043
 msgid "Double ; in list of variables"
 msgstr "Dobbel ; i variabelliste"
 
-#: eval.c:2265
+#: eval.c:2262
 #, c-format
 msgid "E738: Can't list variables for %s"
 msgstr "E738: Kan ikke liste variabler for %s"
 
-#: eval.c:2611
+#: eval.c:2608
 msgid "E689: Can only index a List or Dictionary"
 msgstr "E689: Kan bare indeksere en liste eller ordliste"
 
-#: eval.c:2617
+#: eval.c:2614
 msgid "E708: [:] must come last"
 msgstr "E708: [:] må komme sist"
 
-#: eval.c:2669
+#: eval.c:2666
 msgid "E709: [:] requires a List value"
 msgstr "E709: [:] krever en listeverdi"
 
-#: eval.c:2938
+#: eval.c:2949
 msgid "E710: List value has more items than target"
 msgstr "E710: Listeverdien har flere elementer enn mål"
 
-#: eval.c:2942
+#: eval.c:2953
 msgid "E711: List value has not enough items"
 msgstr "E711: Listeverdien har ikke nok elementer"
 
-#: eval.c:3177
+#: eval.c:3188
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: Mangler \"in\" etter :for"
 
-#: eval.c:3422
+#: eval.c:3433
 #, c-format
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: Mangler parenteser: %s"
 
-#: eval.c:3664
+#: eval.c:3675
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Variabelen finnes ikke: \"%s\""
 
-#: eval.c:3751
+#: eval.c:3762
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: Variabel nøstet for dypt for (un)lock"
 
-#: eval.c:4099
+#: eval.c:4110
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: Mangler ':' etter '?'"
 
-#: eval.c:4401
+#: eval.c:4412
 msgid "E691: Can only compare List with List"
 msgstr "E691: Kan bare sammenligne liste med liste"
 
-#: eval.c:4403
+#: eval.c:4414
 msgid "E692: Invalid operation for Lists"
 msgstr "E692: Ugyldig operasjon for lister"
 
-#: eval.c:4431
+#: eval.c:4442
 msgid "E735: Can only compare Dictionary with Dictionary"
 msgstr "E735: Kan bare sammenligne ordliste med ordliste"
 
-#: eval.c:4433
+#: eval.c:4444
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Ugyldig operasjon for ordliste"
 
-#: eval.c:4454
+#: eval.c:4465
 msgid "E693: Can only compare Funcref with Funcref"
 msgstr "E693: Kan bare sammenligne funksjonsreferanse med funksjonsreferanse"
 
-#: eval.c:4456
+#: eval.c:4467
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Ugyldig operasjon for funksjonsreferanser"
 
-#: eval.c:4891
+#: eval.c:4902
 msgid "E804: Cannot use '%' with Float"
 msgstr ""
 
-#: eval.c:5111
+#: eval.c:5122
 msgid "E110: Missing ')'"
 msgstr "E110: Mangler ')'"
 
-#: eval.c:5261
+#: eval.c:5278
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: Kan ikke indeksere en funksjonsreferanse"
 
-#: eval.c:5518
+#: eval.c:5543
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: Navn på valg mangler: %s"
 
-#: eval.c:5536
+#: eval.c:5561
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: Ukjent valg: %s"
 
-#: eval.c:5602
+#: eval.c:5627
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: Mangler anførselstegn (\"): %s"
 
-#: eval.c:5738
+#: eval.c:5763
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: Mangler apostrof ('): %s"
 
-#: eval.c:5817
+#: eval.c:5842
 #, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Mangler komma i liste: %s"
 
-#: eval.c:5825
+#: eval.c:5850
 #, c-format
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: Mangler slutt på liste ']': %s"
 
-#: eval.c:7455
+#: eval.c:7493
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: Mangler kolon i ordliste: %s"
 
-#: eval.c:7484
+#: eval.c:7522
 #, c-format
 msgid "E721: Duplicate key in Dictionary: \"%s\""
 msgstr "E721: Duplisert nøkkel i ordliste: \"%s\""
 
-#: eval.c:7504
+#: eval.c:7542
 #, c-format
 msgid "E722: Missing comma in Dictionary: %s"
 msgstr "E722: Mangler komma i ordliste: %s"
 
-#: eval.c:7512
+#: eval.c:7550
 #, c-format
 msgid "E723: Missing end of Dictionary '}': %s"
 msgstr "E723: Mangler slutt på ordliste '}': %s"
 
-#: eval.c:7550
+#: eval.c:7588
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: Variabel nøstet for dypt for visning"
 
-#: eval.c:8296
+#: eval.c:8349
 #, c-format
 msgid "E740: Too many arguments for function %s"
 msgstr ""
 
-#: eval.c:8298
+#: eval.c:8351
 #, c-format
 msgid "E116: Invalid arguments for function %s"
 msgstr "E116: Ugyldige parametere til funksjon %s"
 
-#: eval.c:8507
+#: eval.c:8560
 #, c-format
 msgid "E117: Unknown function: %s"
 msgstr "E117: Ukjent funksjon: %s"
 
-#: eval.c:8513
+#: eval.c:8566
 #, c-format
 msgid "E119: Not enough arguments for function: %s"
 msgstr "E119: Ikke nok parametere til funksjonen: %s"
 
-#: eval.c:8517
+#: eval.c:8570
 #, c-format
 msgid "E120: Using <SID> not in a script context: %s"
 msgstr "E120: Bruk av \"<SID>\" utenfor skript-sammenheng: %s"
 
-#: eval.c:8521
+#: eval.c:8574
 #, c-format
 msgid "E725: Calling dict function without Dictionary: %s"
 msgstr "E725: Kaller ordlistefunksjon uten ordliste: %s"
 
-#: eval.c:8594
+#: eval.c:8647
 msgid "E808: Number or Float required"
 msgstr ""
 
-#: eval.c:8658
+#: eval.c:8711
 msgid "add() argument"
 msgstr ""
 
-#: eval.c:9198
+#: eval.c:9233
 msgid "E699: Too many arguments"
 msgstr "E699: For mange parametere"
 
-#: eval.c:9367
+#: eval.c:9453
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() kan bare brukes i innsettingsmodus"
 
@@ -754,38 +754,38 @@
 #. * this way has the compelling advantage that translations need not to
 #. * be touched at all.  See below what 'ok' and 'ync' are used for.
 #. 
-#: eval.c:9467 gui.c:5042 gui_gtk.c:1186 os_mswin.c:596
+#: eval.c:9553 gui.c:5079 gui_gtk.c:1236 os_mswin.c:718
 msgid "&Ok"
 msgstr "&Ok"
 
-#: eval.c:10101
+#: eval.c:10243
 msgid "extend() argument"
 msgstr ""
 
-#: eval.c:10191
+#: eval.c:10222
 #, c-format
 msgid "E737: Key already exists: %s"
 msgstr "E737: Nøkkelen finnes allerede: %s"
 
-#: eval.c:10394
+#: eval.c:10507
 msgid "map() argument"
 msgstr ""
 
-#: eval.c:10395
+#: eval.c:10508
 msgid "filter() argument"
 msgstr ""
 
-#: eval.c:10786
+#: eval.c:10899
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld linjer: "
 
-#: eval.c:10874
+#: eval.c:10987
 #, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Ukjent funksjon: %s"
 
-#: eval.c:12953
+#: eval.c:13120
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -793,237 +793,237 @@
 "&OK\n"
 "&Avbryt"
 
-#: eval.c:13035
+#: eval.c:13202
 msgid "called inputrestore() more often than inputsave()"
 msgstr "kalte inputrestore() oftere enn inputsave()"
 
-#: eval.c:13091
+#: eval.c:13258
 msgid "insert() argument"
 msgstr ""
 
-#: eval.c:13180
+#: eval.c:13347
 msgid "E786: Range not allowed"
 msgstr "E786: Område ikke tillatt"
 
-#: eval.c:13380
+#: eval.c:13547
 msgid "E701: Invalid type for len()"
 msgstr "E701: Ugyldig type for len()"
 
-#: eval.c:14457
+#: eval.c:14693
 msgid "E726: Stride is zero"
 msgstr "E726: Økning er null"
 
-#: eval.c:14459
+#: eval.c:14695
 msgid "E727: Start past end"
 msgstr "E727: Starten er bak slutten"
 
-#: eval.c:14509 eval.c:18609
+#: eval.c:14745 eval.c:18988
 msgid "<empty>"
 msgstr "<tom>"
 
-#: eval.c:14809
+#: eval.c:15045
 msgid "E240: No connection to Vim server"
 msgstr "E240: Ingen forbindelse med Vim-tjeneren"
 
-#: eval.c:14857
+#: eval.c:15093
 #, c-format
 msgid "E241: Unable to send to %s"
 msgstr "E241: Klarer ikke sende til %s"
 
-#: eval.c:15004
+#: eval.c:15240
 msgid "E277: Unable to read a server reply"
 msgstr "E277: Klarer ikke lese svar fra tjeneren"
 
-#: eval.c:15042
+#: eval.c:15278
 msgid "remove() argument"
 msgstr ""
 
-#: eval.c:15264
+#: eval.c:15500
 msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: For mange symbolske linker (runddans?)"
 
-#: eval.c:15413
+#: eval.c:15649
 msgid "reverse() argument"
 msgstr ""
 
-#: eval.c:15986
+#: eval.c:16309
 msgid "E258: Unable to send to client"
 msgstr "E258: Klarer ikke sende til klienten"
 
-#: eval.c:16713
+#: eval.c:17074
 msgid "sort() argument"
 msgstr ""
 
-#: eval.c:16769
+#: eval.c:17130
 msgid "E702: Sort compare function failed"
 msgstr "E702: Funksjon for sorteringssammenligning feilet"
 
-#: eval.c:17094
+#: eval.c:17455
 msgid "(Invalid)"
 msgstr "(Ugyldig)"
 
-#: eval.c:17696
+#: eval.c:18057
 msgid "E677: Error writing temp file"
 msgstr "E677: Feil under skriving til midlertidig fil"
 
-#: eval.c:19647
+#: eval.c:20026
 msgid "E805: Using a Float as a Number"
 msgstr ""
 
-#: eval.c:19651
+#: eval.c:20030
 msgid "E703: Using a Funcref as a Number"
 msgstr "E703: Bruker en funksjonsreferanse som et nummer"
 
-#: eval.c:19659
+#: eval.c:20038
 msgid "E745: Using a List as a Number"
 msgstr "E745: Bruker en liste som et nummer"
 
-#: eval.c:19662
+#: eval.c:20041
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: Bruker en ordliste som et nummer"
 
-#: eval.c:19765
+#: eval.c:20144
 msgid "E729: using Funcref as a String"
 msgstr "E729: Bruker en funksjonsreferanse som en streng"
 
-#: eval.c:19768
+#: eval.c:20147
 msgid "E730: using List as a String"
 msgstr "E730: Bruker en liste som en streng"
 
-#: eval.c:19771
+#: eval.c:20150
 msgid "E731: using Dictionary as a String"
 msgstr "E731: Bruker en ordliste som en streng"
 
-#: eval.c:19775
+#: eval.c:116
 msgid "E806: using Float as a String"
 msgstr ""
 
-#: eval.c:20165
+#: eval.c:20561
 #, c-format
 msgid "E706: Variable type mismatch for: %s"
 msgstr "E706: Variabeltype samsvarer ikke med: %s"
 
-#: eval.c:20269
+#: eval.c:20665
 #, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: Kan ikke slette variabel %s"
 
-#: eval.c:20288
+#: eval.c:20684
 #, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
 msgstr "E704: Variabelnavn for funksjonsreferanse må ha stor forbokstav: %s"
 
-#: eval.c:20297
+#: eval.c:20693
 #, c-format
 msgid "E705: Variable name conflicts with existing function: %s"
 msgstr "E705: Variabelnavn er i konflikt med en eksisterende funksjon: %s"
 
-#: eval.c:20335
+#: eval.c:20731
 #, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: Verdi er låst: %s"
 
-#: eval.c:20336 eval.c:20342 message.c:2199 os_mswin.c:2260
+#: eval.c:20732 eval.c:20738 message.c:2218 os_mswin.c:1675
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: eval.c:20341
+#: eval.c:20737
 #, c-format
 msgid "E742: Cannot change value of %s"
 msgstr "E742: Kan ikke forandre verdi for %s"
 
-#: eval.c:20426
+#: eval.c:20822
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: Variabel nøstet for dypt til å lage en kopi"
 
-#: eval.c:20906
+#: eval.c:21303
 #, c-format
 msgid "E123: Undefined function: %s"
 msgstr "E123: Udefinert funksjon: %s"
 
-#: eval.c:20919
+#: eval.c:21316
 #, c-format
 msgid "E124: Missing '(': %s"
 msgstr "E124: Mangler '(': %s"
 
-#: eval.c:20975
+#: eval.c:21375
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: Ugyldig parameter: %s"
 
-#: eval.c:20990
+#: eval.c:21390
 #, c-format
 msgid "E853: Duplicate argument name: %s"
 msgstr ""
 
-#: eval.c:21095
+#: eval.c:21498
 msgid "E126: Missing :endfunction"
 msgstr "E126: Mangler :endfunction"
 
-#: eval.c:21234
+#: eval.c:21637
 #, c-format
 msgid "E707: Function name conflicts with variable: %s"
 msgstr ""
 
-#: eval.c:21249
+#: eval.c:21652
 #, c-format
 msgid "E127: Cannot redefine function %s: It is in use"
 msgstr "E127: Kan ikke omdefinere funksjonen %s: Den er i bruk"
 
-#: eval.c:21314
+#: eval.c:21717
 #, c-format
 msgid "E746: Function name does not match script file name: %s"
 msgstr "E746: Funksjonsnavn samsvarer ikke med skriptfilnavn: %s"
 
-#: eval.c:21432
+#: eval.c:21836
 msgid "E129: Function name required"
 msgstr "E129: Funksjonsnavn nødvendig"
 
-#: eval.c:21552
+#: eval.c:21956
 #, c-format
 msgid "E128: Function name must start with a capital or contain a colon: %s"
 msgstr ""
 "E128: Funksjonsnavn må ha stor forbokstav eller inneholde et kolon: %s"
 
-#: eval.c:22094
+#: eval.c:22526
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
 msgstr "E131: Kan ikke slette funksjonen %s: Den er i bruk"
 
-#: eval.c:22214
+#: eval.c:22646
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
 msgstr "E132: Funksjonskalldybden er større enn 'maxfuncdepth'"
 
-#: eval.c:22353
+#: eval.c:22785
 #, c-format
 msgid "calling %s"
 msgstr "kaller %s"
 
-#: eval.c:22449
+#: eval.c:22881
 #, c-format
 msgid "%s aborted"
 msgstr "%s avbrutt"
 
-#: eval.c:22451
+#: eval.c:22883
 #, c-format
 msgid "%s returning #%ld"
 msgstr "%s returnerer #%ld"
 
-#: eval.c:22471
+#: eval.c:22903
 #, c-format
 msgid "%s returning %s"
 msgstr "%s returnerer %s"
 
-#: eval.c:22495 ex_cmds2.c:3283
+#: eval.c:22927 ex_cmds2.c:3329
 #, c-format
 msgid "continuing in %s"
 msgstr "fortsetter i %s"
 
-#: eval.c:22614
+#: eval.c:23046
 msgid "E133: :return not inside a function"
 msgstr "E133: :return er ikke innenfor en funksjon"
 
-#: eval.c:23049
+#: eval.c:23481
 msgid ""
 "\n"
 "# global variables:\n"
@@ -1031,7 +1031,7 @@
 "\n"
 "# globale variabler:\n"
 
-#: eval.c:23168
+#: eval.c:23600
 msgid ""
 "\n"
 "\tLast set from "
@@ -1039,7 +1039,7 @@
 "\n"
 "\tSist satt fra "
 
-#: eval.c:23188
+#: eval.c:23620
 msgid "No old files"
 msgstr ""
 
@@ -1058,85 +1058,85 @@
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, Hex %08x, Oktal %o"
 
-#: ex_cmds.c:739
+#: ex_cmds.c:746
 msgid "E134: Move lines into themselves"
 msgstr "E134: Flytting av linjer inn i seg selv"
 
-#: ex_cmds.c:808
+#: ex_cmds.c:817
 msgid "1 line moved"
 msgstr "1 linje flyttet"
 
-#: ex_cmds.c:810
+#: ex_cmds.c:819
 #, c-format
 msgid "%ld lines moved"
 msgstr "%ld linjer flyttet"
 
-#: ex_cmds.c:1304
+#: ex_cmds.c:1313
 #, c-format
 msgid "%ld lines filtered"
 msgstr "%ld linjer filtrert"
 
-#: ex_cmds.c:1328
+#: ex_cmds.c:1337
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* Autokommandoer må ikke forandre nåværende buffer"
 
-#: ex_cmds.c:1413
+#: ex_cmds.c:1422
 msgid "[No write since last change]\n"
 msgstr "[Ikke lagret siden forrige forandring]\n"
 
-#: ex_cmds.c:1658
+#: ex_cmds.c:1671
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s i linje: "
 
-#: ex_cmds.c:1666
+#: ex_cmds.c:1679
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: For mange feil, hopper over resten av filen"
 
-#: ex_cmds.c:1695
+#: ex_cmds.c:1708
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "Leser viminfo-fil \"%s\"%s%s%s"
 
-#: ex_cmds.c:1697
+#: ex_cmds.c:1710
 msgid " info"
 msgstr " info"
 
-#: ex_cmds.c:1698
+#: ex_cmds.c:1711
 msgid " marks"
 msgstr " merker"
 
-#: ex_cmds.c:1699
+#: ex_cmds.c:1712
 msgid " oldfiles"
 msgstr ""
 
-#: ex_cmds.c:1700
+#: ex_cmds.c:1713
 msgid " FAILED"
 msgstr " FEILET"
 
 #. avoid a wait_return for this message, it's annoying
-#: ex_cmds.c:1796
+#: ex_cmds.c:1809
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: Viminfo-fil er ikke skrivbar: %s"
 
-#: ex_cmds.c:1945
+#: ex_cmds.c:1958
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: Kan ikke lagre viminfo-fil %s!"
 
-#: ex_cmds.c:1955
+#: ex_cmds.c:1968
 #, c-format
 msgid "Writing viminfo file \"%s\""
 msgstr "Lagrer viminfo-fil \"%s\""
 
 #. Write the info:
-#: ex_cmds.c:2063
+#: ex_cmds.c:2080
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# Denne viminfo-filen ble generert av Vim %s.\n"
 
-#: ex_cmds.c:2065
+#: ex_cmds.c:2082
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -1144,52 +1144,52 @@
 "# Du kan redigere den hvis du er forsiktig!\n"
 "\n"
 
-#: ex_cmds.c:2067
+#: ex_cmds.c:2084
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# Verdien av 'encoding' når denne filen ble skrevet\n"
 
-#: ex_cmds.c:2167
+#: ex_cmds.c:2184
 msgid "Illegal starting char"
 msgstr "Ulovlig starttegn"
 
-#: ex_cmds.c:2533 ex_cmds2.c:1468
+#: ex_cmds.c:2560 ex_cmds2.c:1503
 msgid "Save As"
 msgstr "Lagre som"
 
-#: ex_cmds.c:2610
+#: ex_cmds.c:2637
 msgid "Write partial file?"
 msgstr "Skrive delvis fil?"
 
-#: ex_cmds.c:2617
+#: ex_cmds.c:2644
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: Bruk ! for å skrive delvis buffer"
 
-#: ex_cmds.c:2763
+#: ex_cmds.c:2790
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
 msgstr "Overskrive eksisterende fil \"%s\"?"
 
-#: ex_cmds.c:2815
+#: ex_cmds.c:2842
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
 msgstr "Swapfilen \"%s\" finnes, overskriv likevel?"
 
-#: ex_cmds.c:2828
+#: ex_cmds.c:2855
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Swapfilen finnes: %s (:silent! overstyrer)"
 
-#: ex_cmds.c:2896
+#: ex_cmds.c:2923
 #, c-format
 msgid "E141: No file name for buffer %ld"
 msgstr "E141: Mangler filnavn for buffer %ld"
 
-#: ex_cmds.c:2935
+#: ex_cmds.c:2962
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr ""
 "E142: Filen ble ikke lagret: Lagring er deaktivert med 'write'-valget"
 
-#: ex_cmds.c:2965
+#: ex_cmds.c:2992
 #, c-format
 msgid ""
 "'readonly' option is set for \"%s\".\n"
@@ -1198,7 +1198,7 @@
 "'readonly'-valget er satt for \"%s\".\n"
 "Vil du lagre likevel?"
 
-#: ex_cmds.c:2968
+#: ex_cmds.c:2995
 #, c-format
 msgid ""
 "File permissions of \"%s\" are read-only.\n"
@@ -1206,82 +1206,82 @@
 "Do you wish to try?"
 msgstr ""
 
-#: ex_cmds.c:2985
+#: ex_cmds.c:3012
 #, c-format
 msgid "E505: \"%s\" is read-only (add ! to override)"
 msgstr ""
 
-#: ex_cmds.c:3173
+#: ex_cmds.c:3200
 msgid "Edit File"
 msgstr "Rediger fil"
 
-#: ex_cmds.c:3872
+#: ex_cmds.c:3905
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: Autokommandoer slettet uventet den nye bufferen %s"
 
-#: ex_cmds.c:4088
+#: ex_cmds.c:4121
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: Ikke-numerisk parameter til :z"
 
-#: ex_cmds.c:4187
+#: ex_cmds.c:4220
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: Skallkommandoer er ikke tillatt i rvim"
 
-#: ex_cmds.c:4288
+#: ex_cmds.c:4324
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Regulære uttrykk kan ikke bli adskilt av bokstaver"
 
-#: ex_cmds.c:4756
+#: ex_cmds.c:4839
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "Erstatt med %s (y/n/a/q/l/^E/^Y)?"
 
-#: ex_cmds.c:5201
+#: ex_cmds.c:5307
 msgid "(Interrupted) "
 msgstr "(Avbrutt) "
 
-#: ex_cmds.c:5206
+#: ex_cmds.c:5312
 msgid "1 match"
 msgstr "1 treff"
 
-#: ex_cmds.c:5206
+#: ex_cmds.c:5312
 msgid "1 substitution"
 msgstr "1 erstatning"
 
-#: ex_cmds.c:5209
+#: ex_cmds.c:5315
 #, c-format
 msgid "%ld matches"
 msgstr "%ld treff"
 
-#: ex_cmds.c:5209
+#: ex_cmds.c:5315
 #, c-format
 msgid "%ld substitutions"
 msgstr "%ld erstatninger"
 
-#: ex_cmds.c:5213
+#: ex_cmds.c:5319
 msgid " on 1 line"
 msgstr " i 1 linje"
 
-#: ex_cmds.c:5216
+#: ex_cmds.c:5322
 #, c-format
 msgid " on %ld lines"
 msgstr " i %ld linjer"
 
-#: ex_cmds.c:5263
+#: ex_cmds.c:5369
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Kan ikke gjøre :global rekursiv"
 
-#: ex_cmds.c:5296
+#: ex_cmds.c:5402
 msgid "E148: Regular expression missing from global"
 msgstr "E148: Regulært uttrykk mangler i global kommando"
 
-#: ex_cmds.c:5345
+#: ex_cmds.c:5451
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "Søkestreng funnet i alle linjene: %s"
 
-#: ex_cmds.c:5435
+#: ex_cmds.c:5541
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -1291,96 +1291,96 @@
 "# Siste erstatningstekst:\n"
 "$"
 
-#: ex_cmds.c:5550
+#: ex_cmds.c:5656
 msgid "E478: Don't panic!"
 msgstr "E478: Ingen panikk!"
 
-#: ex_cmds.c:5596
+#: ex_cmds.c:5702
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: Dessverre ingen '%s' hjelp for %s"
 
-#: ex_cmds.c:5599
+#: ex_cmds.c:5705
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: Dessverre ingen hjelp for %s"
 
-#: ex_cmds.c:5641
+#: ex_cmds.c:5747
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "Fant ikke hjelpefilen \"%s\""
 
-#: ex_cmds.c:6312
+#: ex_cmds.c:6423
 #, c-format
 msgid "E150: Not a directory: %s"
 msgstr "E150: Er ikke en katalog: %s"
 
-#: ex_cmds.c:6455
+#: ex_cmds.c:6567
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: Kan ikke åpne %s for skriving"
 
-#: ex_cmds.c:6492
+#: ex_cmds.c:6604
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: Kan ikke åpne %s for lesing"
 
-#: ex_cmds.c:6528
+#: ex_cmds.c:6640
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: Tegnsettblanding i hjelpefilen innenfor samme språk: %s"
 
-#: ex_cmds.c:6609
+#: ex_cmds.c:6721
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
 msgstr "E154: Duplikat-tag \"%s\" i filen %s/%s"
 
-#: ex_cmds.c:6744
+#: ex_cmds.c:6856
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: Ukjent skiltkommando: %s"
 
-#: ex_cmds.c:6761
+#: ex_cmds.c:6873
 msgid "E156: Missing sign name"
 msgstr "E156: Mangler skiltnavn"
 
-#: ex_cmds.c:6805
+#: ex_cmds.c:6917
 msgid "E612: Too many signs defined"
 msgstr "E612: For mange skilt definert"
 
-#: ex_cmds.c:6886
+#: ex_cmds.c:6998
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: Ugyldig skilttekst: %s"
 
-#: ex_cmds.c:6917 ex_cmds.c:7094
+#: ex_cmds.c:7029 ex_cmds.c:7222
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: Ukjent skilt: %s"
 
-#: ex_cmds.c:6950
+#: ex_cmds.c:7062
 msgid "E159: Missing sign number"
 msgstr "E159: Mangler skiltnummer"
 
-#: ex_cmds.c:7034
+#: ex_cmds.c:7156
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Ugyldig buffernavn: %s"
 
-#: ex_cmds.c:7073
+#: ex_cmds.c:7195
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: Ulovlig skilt-ID: %ld"
 
-#: ex_cmds.c:7143
+#: ex_cmds.c:7271
 msgid " (NOT FOUND)"
 msgstr " (IKKE FUNNET)"
 
-#: ex_cmds.c:7145
+#: ex_cmds.c:7273
 msgid " (not supported)"
 msgstr " (ikke støttet)"
 
-#: ex_cmds.c:7269
+#: ex_cmds.c:7397
 msgid "[Deleted]"
 msgstr "[Slettet]"
 
@@ -1388,7 +1388,7 @@
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Går inn i debuggingsmodus. Skriv \"cont\" for å fortsette."
 
-#: ex_cmds2.c:138 ex_docmd.c:1107
+#: ex_cmds2.c:138 ex_docmd.c:1112
 #, c-format
 msgid "line %ld: %s"
 msgstr "linje %ld: %s"
@@ -1403,226 +1403,226 @@
 msgid "Breakpoint in \"%s%s\" line %ld"
 msgstr "Stoppunkt i \"%s%s\" linje %ld"
 
-#: ex_cmds2.c:644
+#: ex_cmds2.c:649
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: Fant ikke stoppunkt: %s"
 
-#: ex_cmds2.c:680
+#: ex_cmds2.c:685
 msgid "No breakpoints defined"
 msgstr "Ingen stoppunkt definert"
 
-#: ex_cmds2.c:687
+#: ex_cmds2.c:692
 #, c-format
 msgid "%3d  %s %s  line %ld"
 msgstr "%3d  %s %s  linje %ld"
 
-#: ex_cmds2.c:1085
+#: ex_cmds2.c:1120
 msgid "E750: First use \":profile start {fname}\""
 msgstr ""
 
-#: ex_cmds2.c:1494
+#: ex_cmds2.c:1529
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "Lagre forandringer til \"%s\"?"
 
-#: ex_cmds2.c:1496 ex_docmd.c:11047
+#: ex_cmds2.c:1531 ex_docmd.c:11194
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: ex_cmds2.c:1685
+#: ex_cmds2.c:1720
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: Ikke lagret siden siste forandringer i bufferen \"%s\""
 
-#: ex_cmds2.c:1761
+#: ex_cmds2.c:1795
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "Advarsel: Gikk uventet inn i en annen buffer (sjekk autokommandoer)"
 
-#: ex_cmds2.c:2205
+#: ex_cmds2.c:2241
 msgid "E163: There is only one file to edit"
 msgstr "E163: Det er bare en fil å redigere"
 
-#: ex_cmds2.c:2207
+#: ex_cmds2.c:2243
 msgid "E164: Cannot go before first file"
 msgstr "E164: Kan ikke gå forbi første fil"
 
-#: ex_cmds2.c:2209
+#: ex_cmds2.c:2245
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: Kan ikke gå forbi siste fil"
 
-#: ex_cmds2.c:2637
+#: ex_cmds2.c:2673
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: Kompilatoren er ikke støttet: %s"
 
-#: ex_cmds2.c:2738
+#: ex_cmds2.c:2778
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "Søker etter \"%s\" i \"%s\""
 
-#: ex_cmds2.c:2765
+#: ex_cmds2.c:2811
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "Søker etter \"%s\""
 
-#: ex_cmds2.c:2791
+#: ex_cmds2.c:2837
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
 msgstr "ikke funnet i 'runtimepath': \"%s\""
 
-#: ex_cmds2.c:2826
+#: ex_cmds2.c:2872
 msgid "Source Vim script"
 msgstr "Kjør Vim-skript"
 
-#: ex_cmds2.c:3012
+#: ex_cmds2.c:3058
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "Kan ikke kjøre en katalog: \"%s\""
 
-#: ex_cmds2.c:3069
+#: ex_cmds2.c:3115
 #, c-format
 msgid "could not source \"%s\""
 msgstr "kunne ikke kjøre \"%s\""
 
-#: ex_cmds2.c:3071
+#: ex_cmds2.c:3117
 #, c-format
 msgid "line %ld: could not source \"%s\""
 msgstr "linje %ld: Kunne ikke kjøre \"%s\""
 
-#: ex_cmds2.c:3087
+#: ex_cmds2.c:3133
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "kjører \"%s\""
 
-#: ex_cmds2.c:3089
+#: ex_cmds2.c:3135
 #, c-format
 msgid "line %ld: sourcing \"%s\""
 msgstr "linje %ld: kjører \"%s\""
 
-#: ex_cmds2.c:3281
+#: ex_cmds2.c:3327
 #, c-format
 msgid "finished sourcing %s"
 msgstr "ferdig med kjøring av %s"
 
-#: ex_cmds2.c:3369
+#: ex_cmds2.c:3415
 msgid "modeline"
 msgstr ""
 
-#: ex_cmds2.c:3371
+#: ex_cmds2.c:3417
 msgid "--cmd argument"
 msgstr ""
 
-#: ex_cmds2.c:3373
+#: ex_cmds2.c:3419
 msgid "-c argument"
 msgstr ""
 
-#: ex_cmds2.c:3375
+#: ex_cmds2.c:3421
 msgid "environment variable"
 msgstr "miljøvariabel"
 
-#: ex_cmds2.c:3377
+#: ex_cmds2.c:3423
 msgid "error handler"
 msgstr "feilbehandler"
 
-#: ex_cmds2.c:3690
+#: ex_cmds2.c:3736
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: Advarsel: Feil linjeseparator, det er mulig ^M mangler"
 
-#: ex_cmds2.c:3823
+#: ex_cmds2.c:3869
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding brukt utenfor en kjørt fil"
 
-#: ex_cmds2.c:3856
+#: ex_cmds2.c:3902
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish brukt utenfor en kjørt fil"
 
-#: ex_cmds2.c:4179
+#: ex_cmds2.c:4225
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "Nåværende %sspråk: \"%s\""
 
-#: ex_cmds2.c:4196
+#: ex_cmds2.c:4242
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: Kan ikke sette språk til \"%s\""
 
-#: ex_docmd.c:651
+#: ex_docmd.c:656
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Går inn i Ex-modus. Skriv \"visual\" for å gå til normalmodus."
 
-#: ex_docmd.c:706
+#: ex_docmd.c:711
 msgid "E501: At end-of-file"
 msgstr "E501: Ved slutten av filen"
 
-#: ex_docmd.c:805
+#: ex_docmd.c:810
 msgid "E169: Command too recursive"
 msgstr "E169: Kommando altfor rekursiv"
 
-#: ex_docmd.c:1385
+#: ex_docmd.c:1398
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: Unntak ikke fanget opp: %s"
 
-#: ex_docmd.c:1473
+#: ex_docmd.c:1486
 msgid "End of sourced file"
 msgstr "Slutt på kjørt fil"
 
-#: ex_docmd.c:1474
+#: ex_docmd.c:1487
 msgid "End of function"
 msgstr "Slutt på funksjon"
 
-#: ex_docmd.c:2122
+#: ex_docmd.c:2141
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: Flertydig bruk av brukerdefinert kommando"
 
-#: ex_docmd.c:2136
+#: ex_docmd.c:2155
 msgid "E492: Not an editor command"
 msgstr "E492: Er ikke en editorkommando"
 
-#: ex_docmd.c:2265
+#: ex_docmd.c:2285
 msgid "E493: Backwards range given"
 msgstr "E493: Område bakover er angitt"
 
-#: ex_docmd.c:2269
+#: ex_docmd.c:2289
 msgid "Backwards range given, OK to swap"
 msgstr "Område bakover er angitt, OK å swappe"
 
-#: ex_docmd.c:2332
+#: ex_docmd.c:2352
 msgid "E494: Use w or w>>"
 msgstr "E494: Bruk w eller w>>"
 
-#: ex_docmd.c:4201
+#: ex_docmd.c:4273
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: Kommandoen er ikke tilgjengelig i denne versjonen"
 
-#: ex_docmd.c:4550
+#: ex_docmd.c:4622
 msgid "E172: Only one file name allowed"
 msgstr "E172: Bare ett filnavn tillatt"
 
-#: ex_docmd.c:5167
+#: ex_docmd.c:5239
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "1 annen fil å redigere. Avslutt likevel?"
 
-#: ex_docmd.c:5171
+#: ex_docmd.c:5243
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "%d andre filer å redigere. Avslutt likevel?"
 
-#: ex_docmd.c:5178
+#: ex_docmd.c:5250
 msgid "E173: 1 more file to edit"
 msgstr "E173: 1 annen fil å redigere"
 
-#: ex_docmd.c:5180
+#: ex_docmd.c:5252
 #, c-format
 msgid "E173: %ld more files to edit"
 msgstr "E173: %ld andre filer å redigere"
 
-#: ex_docmd.c:5274
+#: ex_docmd.c:5346
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Kommandoen finnes allerede: Legg til ! for å erstatte den"
 
-#: ex_docmd.c:5409
+#: ex_docmd.c:5489
 msgid ""
 "\n"
 "    Name        Args Range Complete  Definition"
@@ -1630,66 +1630,66 @@
 "\n"
 "    Navn        Prm. Områd Fullfør   Definering"
 
-#: ex_docmd.c:5502
+#: ex_docmd.c:5582
 msgid "No user-defined commands found"
 msgstr "Ingen brukerdefinerte kommandoer funnet"
 
-#: ex_docmd.c:5534
+#: ex_docmd.c:5614
 msgid "E175: No attribute specified"
 msgstr "E175: Ingen attributt spesifisert"
 
-#: ex_docmd.c:5586
+#: ex_docmd.c:5666
 msgid "E176: Invalid number of arguments"
 msgstr "E176: Ugyldig antall parametere"
 
-#: ex_docmd.c:5601
+#: ex_docmd.c:5681
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: Antall repeteringer kan ikke bli spesifisert to ganger"
 
-#: ex_docmd.c:5611
+#: ex_docmd.c:5691
 msgid "E178: Invalid default value for count"
 msgstr "E178: Ugyldig standardverdi for antall repeteringer"
 
-#: ex_docmd.c:5639
+#: ex_docmd.c:5719
 msgid "E179: argument required for -complete"
 msgstr "E179: Trenger parameter til -complete"
 
-#: ex_docmd.c:5651
+#: ex_docmd.c:5731
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: Ugyldig attributt: %s"
 
-#: ex_docmd.c:5698
+#: ex_docmd.c:5778
 msgid "E182: Invalid command name"
 msgstr "E182: Ugyldig kommandonavn"
 
-#: ex_docmd.c:5714
+#: ex_docmd.c:5794
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: Brukerdefinerte kommandoer må ha stor forbokstav"
 
-#: ex_docmd.c:5721
+#: ex_docmd.c:5801
 msgid "E841: Reserved name, cannot be used for user defined command"
 msgstr ""
 
-#: ex_docmd.c:5789
+#: ex_docmd.c:5869
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: Brukerdefinert kommando finnes ikke: %s"
 
-#: ex_docmd.c:6357
+#: ex_docmd.c:6447
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: Ugyldig \"complete\"-verdi: %s"
 
-#: ex_docmd.c:6368
+#: ex_docmd.c:6458
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr "E468: Fullføringsparameter er bare tillatt for tilpasset fullføring"
 
-#: ex_docmd.c:6376
+#: ex_docmd.c:6466
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: Tilpassede fullføringer trenger et funksjonsparameter"
 
-#: ex_docmd.c:6412
+#: ex_docmd.c:6502
 msgid "unknown"
 msgstr ""
 
@@ -1698,154 +1698,154 @@
 msgid "E185: Cannot find color scheme %s"
 msgstr "E185: Kan ikke finne fargeoppsettet %s"
 
-#: ex_docmd.c:6424
+#: ex_docmd.c:6514
 msgid "Greetings, Vim user!"
 msgstr "Vær hilset, Vim-bruker!"
 
-#: ex_docmd.c:6645
+#: ex_docmd.c:6738
 msgid "E784: Cannot close last tab page"
 msgstr ""
 
-#: ex_docmd.c:6687
+#: ex_docmd.c:6780
 msgid "Already only one tab page"
 msgstr ""
 
-#: ex_docmd.c:7372
+#: ex_docmd.c:7468
 msgid "Edit File in new window"
 msgstr "Rediger fil i nytt vindu"
 
-#: ex_docmd.c:7500
+#: ex_docmd.c:7631
 #, c-format
 msgid "Tab page %d"
 msgstr ""
 
-#: ex_docmd.c:7892
+#: ex_docmd.c:8023
 msgid "No swap file"
 msgstr "Ingen swapfil"
 
-#: ex_docmd.c:7997
+#: ex_docmd.c:8128
 msgid "Append File"
 msgstr "Legg til fil"
 
-#: ex_docmd.c:8096
+#: ex_docmd.c:8258
 msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
 msgstr ""
 "E747: Kan ikke skifte katalog, bufferen er forandret (legg til ! for å "
 "overstyre)"
 
-#: ex_docmd.c:8105
+#: ex_docmd.c:8267
 msgid "E186: No previous directory"
 msgstr "E186: Ingen tidligere katalog"
 
-#: ex_docmd.c:8186
+#: ex_docmd.c:8328
 msgid "E187: Unknown"
 msgstr "E187: Ukjent"
 
-#: ex_docmd.c:8287
+#: ex_docmd.c:8429
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: :winsize trenger to numeriske parametere"
 
-#: ex_docmd.c:8349
+#: ex_docmd.c:8491
 #, c-format
 msgid "Window position: X %d, Y %d"
 msgstr "Vindusposisjon: X %d, Y %d"
 
-#: ex_docmd.c:8354
+#: ex_docmd.c:8496
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr ""
 "E188: Lesing av vindusposisjon er ikke implementert på denne plattformen"
 
-#: ex_docmd.c:8364
+#: ex_docmd.c:8506
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos trenger to numeriske parametere"
 
-#: ex_docmd.c:8728
+#: ex_docmd.c:8872
 msgid "Save Redirection"
 msgstr "Lagre omdirigering"
 
-#: ex_docmd.c:8959
+#: ex_docmd.c:9106
 msgid "Save View"
 msgstr "Lagre utseende"
 
-#: ex_docmd.c:8960
+#: ex_docmd.c:9107
 msgid "Save Session"
 msgstr "Lagre økt"
 
-#: ex_docmd.c:8962
+#: ex_docmd.c:9109
 msgid "Save Setup"
 msgstr "Lagre oppsett"
 
-#: ex_docmd.c:9130
+#: ex_docmd.c:9277
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: Kan ikke lage katalog: %s"
 
-#: ex_docmd.c:9159
+#: ex_docmd.c:9306
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" finnes (legg til ! for å overstyre)"
 
-#: ex_docmd.c:9164
+#: ex_docmd.c:9311
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: Kan ikke åpne \"%s\" for skriving"
 
 #. set mark
-#: ex_docmd.c:9188
+#: ex_docmd.c:9335
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: Parameter må være en bokstav eller vanlig/baklengs apostrof"
 
-#: ex_docmd.c:9235
+#: ex_docmd.c:9382
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: Rekursiv bruk av :normal er for dyp"
 
-#: ex_docmd.c:9831
+#: ex_docmd.c:9978
 msgid "E809: #< is not available without the +eval feature"
 msgstr ""
 
-#: ex_docmd.c:9840
+#: ex_docmd.c:9987
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: Ingen alternative filnavn tilgjengelig som erstatning for '#'"
 
-#: ex_docmd.c:9881
+#: ex_docmd.c:10028
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr ""
 "E495: Ingen autokommandofilnavn tilgjengelig som erstatning for \"<afile>\""
 
-#: ex_docmd.c:9890
+#: ex_docmd.c:10037
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr ""
 "E496: Ingen buffernummer tilgjengelig som erstatning for \"<abuf>\" i "
 "autokommando"
 
-#: ex_docmd.c:9901
+#: ex_docmd.c:10048
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr ""
 "E497: Ingen autokommandonavn tilgjengelig som erstatning for \"<amatch>\""
 
-#: ex_docmd.c:9911
+#: ex_docmd.c:10058
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr ""
 "E498: Ingen ':source'-filnavn tilgjengelig som erstatning for \"<sfile>\""
 
-#: ex_docmd.c:9918
+#: ex_docmd.c:10065
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr ""
 
-#: ex_docmd.c:9958
+#: ex_docmd.c:10105
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr "E499: Tomt filnavn for '%' eller '#', virker bare med \":p:h\""
 
-#: ex_docmd.c:9960
+#: ex_docmd.c:10107
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: Resulterer i en tom streng"
 
-#: ex_docmd.c:11027
+#: ex_docmd.c:11174
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: Kan ikke åpne viminfo-fil for lesing"
 
-#: ex_docmd.c:11215
+#: ex_docmd.c:11362
 msgid "E196: No digraphs in this version"
 msgstr "E196: Ingen spesialtegn i denne versjonen"
 
@@ -1903,7 +1903,7 @@
 msgid "Error and interrupt"
 msgstr "Feil og avbrudd"
 
-#: ex_eval.c:779 gui.c:5041 gui_xmdlg.c:689 gui_xmdlg.c:808 os_mswin.c:595
+#: ex_eval.c:779 gui.c:5078 gui_xmdlg.c:689 gui_xmdlg.c:808 os_mswin.c:717
 msgid "Error"
 msgstr "Feil"
 
@@ -1987,27 +1987,27 @@
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: :endfunction er ikke innenfor en funksjon"
 
-#: ex_getln.c:2041
+#: ex_getln.c:2053
 msgid "E788: Not allowed to edit another buffer now"
 msgstr "E788: Ikke tillatt å redigere en annen buffer nå"
 
-#: ex_getln.c:2056
+#: ex_getln.c:2068
 msgid "E811: Not allowed to change buffer information now"
 msgstr ""
 
-#: ex_getln.c:4008
+#: ex_getln.c:4024
 msgid "tagname"
 msgstr "navn på tag"
 
-#: ex_getln.c:4011
+#: ex_getln.c:4027
 msgid " kind file\n"
 msgstr ""
 
-#: ex_getln.c:5905
+#: ex_getln.c:5926
 msgid "'history' option is zero"
 msgstr "'history'-valget er null"
 
-#: ex_getln.c:6178
+#: ex_getln.c:6217
 #, c-format
 msgid ""
 "\n"
@@ -2016,27 +2016,27 @@
 "\n"
 "# %s-historie (nyeste til eldste):\n"
 
-#: ex_getln.c:6179
+#: ex_getln.c:6218
 msgid "Command Line"
 msgstr "Kommandolinje"
 
-#: ex_getln.c:6180
+#: ex_getln.c:6219
 msgid "Search String"
 msgstr "Søkestreng"
 
-#: ex_getln.c:6181
+#: ex_getln.c:6220
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: ex_getln.c:6182
+#: ex_getln.c:6221
 msgid "Input Line"
 msgstr "Inndatalinje"
 
-#: ex_getln.c:6220
+#: ex_getln.c:6300
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar utenfor kommandolengden"
 
-#: ex_getln.c:6419
+#: ex_getln.c:6499
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Aktivt vindu eller buffer slettet"
 
@@ -2048,7 +2048,7 @@
 msgid "Illegal file name"
 msgstr "Ulovlig filnavn"
 
-#: fileio.c:453 fileio.c:599 fileio.c:3558 fileio.c:3609
+#: fileio.c:453 fileio.c:583 fileio.c:3590 fileio.c:3641
 msgid "is a directory"
 msgstr "er en katalog"
 
@@ -2060,262 +2060,262 @@
 msgid "is a device (disabled with 'opendevice' option)"
 msgstr "er en enhet (frakoblet med 'opendevice'-valg)"
 
-#: fileio.c:640 fileio.c:4871
+#: fileio.c:624 fileio.c:4913
 msgid "[New File]"
 msgstr "[Ny fil]"
 
-#: fileio.c:643
+#: fileio.c:627
 msgid "[New DIRECTORY]"
 msgstr "[Ny KATALOG]"
 
-#: fileio.c:677 fileio.c:680
+#: fileio.c:655 fileio.c:658
 msgid "[File too big]"
 msgstr "[Filen er for stor]"
 
-#: fileio.c:682
+#: fileio.c:660
 msgid "[Permission Denied]"
 msgstr "[Tilgang nektet]"
 
-#: fileio.c:815
+#: fileio.c:793
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: \"*ReadPre\"-autokommandoer gjorde filen uleselig"
 
-#: fileio.c:817
+#: fileio.c:795
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: \"*ReadPre\"-autokommandoer må ikke forandre nåværende buffer"
 
-#: fileio.c:838
+#: fileio.c:816
 msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: Leser fra stdin ...\n"
 
-#: fileio.c:844
+#: fileio.c:822
 msgid "Reading from stdin..."
 msgstr "Leser fra stdin ..."
 
 #. Re-opening the original file failed!
-#: fileio.c:1150
+#: fileio.c:1128
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: Konverteringen gjorde filen uleselig!"
 
-#: fileio.c:2418
+#: fileio.c:2398
 msgid "[fifo/socket]"
 msgstr "[fifo/socket]"
 
-#: fileio.c:2425
+#: fileio.c:2405
 msgid "[fifo]"
 msgstr "[fifo]"
 
-#: fileio.c:2432
+#: fileio.c:2412
 msgid "[socket]"
 msgstr "[socket]"
 
-#: fileio.c:2440
+#: fileio.c:2420
 msgid "[character special]"
 msgstr ""
 
-#: fileio.c:2447 netbeans.c:3871
+#: buffer.c:3148 buffer.c:3985 fileio.c:2427 netbeans.c:3871 screen.c:6446
 msgid "[RO]"
 msgstr "[SB]"
 
-#: fileio.c:2457
+#: fileio.c:2437
 msgid "[CR missing]"
 msgstr "[CR mangler]"
 
-#: fileio.c:2462
+#: fileio.c:2442
 msgid "[long lines split]"
 msgstr "[lange linjer splittes]"
 
-#: fileio.c:2468 fileio.c:4855
+#: fileio.c:2448 fileio.c:4897
 msgid "[NOT converted]"
 msgstr "[IKKE konvertert]"
 
-#: fileio.c:2473 fileio.c:4860
+#: fileio.c:2453 fileio.c:4902
 msgid "[converted]"
 msgstr "[konvertert]"
 
-#: fileio.c:2481 fileio.c:4886
+#: fileio.c:2461 fileio.c:4928
 msgid "[blowfish]"
 msgstr ""
 
-#: fileio.c:2483 fileio.c:4888
+#: fileio.c:2463 fileio.c:4930
 msgid "[crypted]"
 msgstr "[kryptert]"
 
-#: fileio.c:2491
+#: fileio.c:2471
 #, c-format
 msgid "[CONVERSION ERROR in line %ld]"
 msgstr "[KONVERTERINGSFEIL i linje %ld]"
 
-#: fileio.c:2497
+#: fileio.c:2477
 #, c-format
 msgid "[ILLEGAL BYTE in line %ld]"
 msgstr "[ULOVLIG BYTE i linje %ld]"
 
-#: fileio.c:2504
+#: fileio.c:2484
 msgid "[READ ERRORS]"
 msgstr "[LESEFEIL]"
 
-#: fileio.c:2804
+#: fileio.c:2829
 msgid "Can't find temp file for conversion"
 msgstr "Kan ikke finne midlertidig fil for konvertering"
 
-#: fileio.c:2811
+#: fileio.c:2836
 msgid "Conversion with 'charconvert' failed"
 msgstr "Konvertering med 'charconvert' feilet"
 
-#: fileio.c:2814
+#: fileio.c:2839
 msgid "can't read output of 'charconvert'"
 msgstr "Kan ikke lese utdata fra 'charconvert'"
 
-#: fileio.c:2881
+#: fileio.c:2906
 msgid "E821: File is encrypted with unknown method"
 msgstr ""
 
-#: fileio.c:3403
+#: fileio.c:3435
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: Ingen samsvarende autokommandoer for 'acwrite'-buffer"
 
-#: fileio.c:3438
+#: fileio.c:3470
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr ""
 "E203: Autokommandoer slettet eller lastet ut buffer som skulle lagres"
 
-#: fileio.c:3461
+#: fileio.c:3493
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: Autokommando forandret linjeantall på en uventet måte"
 
-#: fileio.c:3501
+#: fileio.c:3533
 msgid "NetBeans disallows writes of unmodified buffers"
 msgstr "NetBeans forbyr lagring av buffere som ikke er forandret"
 
-#: fileio.c:3509
+#: fileio.c:3541
 msgid "Partial writes disallowed for NetBeans buffers"
 msgstr "Delvis lagring ikke tillatt for NetBeans-buffere"
 
-#: fileio.c:3564 fileio.c:3582
+#: fileio.c:3596 fileio.c:3614
 msgid "is not a file or writable device"
 msgstr "er ikke en fil eller skrivbar enhet"
 
-#: fileio.c:3593
+#: fileio.c:3625
 msgid "writing to device disabled with 'opendevice' option"
 msgstr "skriving til enhet er slått av med 'opendevice'-valg"
 
-#: fileio.c:3635
+#: fileio.c:3667
 msgid "is read-only (add ! to override)"
 msgstr "er skrivebeskyttet (legg til ! for å overstyre)"
 
-#: fileio.c:4009
+#: fileio.c:4051
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr "E506: Kan ikke skrive til backupfil (legg til ! for å overstyre)"
 
-#: fileio.c:4021
+#: fileio.c:4063
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr "E507: Feil under lukking av backupfil (legg til ! for å overstyre)"
 
-#: fileio.c:4023
+#: fileio.c:4065
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr "E508: Kan ikke lese fil for backup (legg til ! for å overstyre)"
 
-#: fileio.c:4042
+#: fileio.c:4084
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr "E509: Kan ikke lese backupfil (legg til ! for å overstyre)"
 
-#: fileio.c:4144
+#: fileio.c:4186
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: Kan ikke lage backupfil (legg til ! for å overstyre)"
 
-#: fileio.c:4206
+#: fileio.c:4248
 msgid "E460: The resource fork would be lost (add ! to override)"
 msgstr ""
 "E460: Ressursforgreningen ville gått tapt (legg til ! for å overstyre)"
 
-#: fileio.c:4315
+#: fileio.c:4357
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: Kan ikke finne midlertidig fil for skriving"
 
-#: fileio.c:4333
+#: fileio.c:4375
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: Kan ikke konvertere (legg til ! for å lagre uten konvertering)"
 
-#: fileio.c:4368
+#: fileio.c:4410
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: Kan ikke åpne lenket fil for skriving"
 
-#: fileio.c:4372
+#: fileio.c:4414
 msgid "E212: Can't open file for writing"
 msgstr "E212: Kan ikke åpne fil for skriving"
 
-#: fileio.c:4674
+#: fileio.c:4716
 msgid "E667: Fsync failed"
 msgstr "E667: Fsync feilet"
 
-#: fileio.c:4713
+#: fileio.c:4755
 msgid "E512: Close failed"
 msgstr "E512: Lukking feilet"
 
-#: fileio.c:4765
+#: fileio.c:4807
 msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
 msgstr ""
 "E513: Feil under skriving, konvertering feilet (gjør 'fenc' tom for å "
 "overstyre)"
 
-#: fileio.c:4770
+#: fileio.c:4812
 #, c-format
 msgid ""
 "E513: write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
 msgstr ""
 
-#: fileio.c:4779
+#: fileio.c:4821
 msgid "E514: write error (file system full?)"
 msgstr "E514: Feil under lagring (full disk?)"
 
-#: fileio.c:4847
+#: fileio.c:4889
 msgid " CONVERSION ERROR"
 msgstr " KONVERTERINGSFEIL"
 
-#: fileio.c:4850
+#: fileio.c:4892
 #, c-format
 msgid " in line %ld;"
 msgstr ""
 
-#: fileio.c:4866
+#: fileio.c:4908
 msgid "[Device]"
 msgstr "[Enhet]"
 
-#: fileio.c:4871
+#: fileio.c:4913
 msgid "[New]"
 msgstr "[Ny]"
 
-#: fileio.c:4896
+#: fileio.c:4938
 msgid " [a]"
 msgstr " [l]"
 
-#: fileio.c:4896
+#: fileio.c:4938
 msgid " appended"
 msgstr " lagt til"
 
-#: fileio.c:4898
+#: fileio.c:4940
 msgid " [w]"
 msgstr " [s]"
 
-#: fileio.c:4898
+#: fileio.c:4940
 msgid " written"
 msgstr " skrevet"
 
-#: fileio.c:4954
+#: fileio.c:4996
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: Patchmode: Kan ikke lagre originalfil"
 
-#: fileio.c:4977
+#: fileio.c:5019
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: patchmode: Kan ikke oppdatere tom originalfil"
 
-#: fileio.c:4992
+#: fileio.c:5034
 msgid "E207: Can't delete backup file"
 msgstr "E207: Kan ikke slette backupfil"
 
-#: fileio.c:5058
+#: fileio.c:5100
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -2323,102 +2323,102 @@
 "\n"
 "ADVARSEL: Originalfilen kan bli tapt eller ødelagt\n"
 
-#: fileio.c:5060
+#: fileio.c:5102
 msgid "don't quit the editor until the file is successfully written!"
 msgstr "ikke avslutt editoren før filen er skikkelig lagret!"
 
-#: fileio.c:5216
+#: fileio.c:5258
 msgid "[dos]"
 msgstr "[dos]"
 
-#: fileio.c:5216
+#: fileio.c:5258
 msgid "[dos format]"
 msgstr "[dos-format]"
 
-#: fileio.c:5223
+#: fileio.c:5265
 msgid "[mac]"
 msgstr "[mac]"
 
-#: fileio.c:5223
+#: fileio.c:5265
 msgid "[mac format]"
 msgstr "[mac-format]"
 
-#: fileio.c:5230
+#: fileio.c:5272
 msgid "[unix]"
 msgstr "[unix]"
 
-#: fileio.c:5230
+#: fileio.c:5272
 msgid "[unix format]"
 msgstr "[unix-format]"
 
-#: fileio.c:5264
+#: fileio.c:5306
 msgid "1 line, "
 msgstr "1 linje, "
 
-#: fileio.c:5266
+#: fileio.c:5308
 #, c-format
 msgid "%ld lines, "
 msgstr "%ld linjer, "
 
-#: fileio.c:5269
+#: fileio.c:5311
 msgid "1 character"
 msgstr "1 tegn"
 
-#: fileio.c:5273
+#: fileio.c:5315
 #, c-format
 msgid "%lld characters"
 msgstr ""
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
-#: fileio.c:5276
+#: fileio.c:5318
 #, c-format
 msgid "%ld characters"
 msgstr "%ld tegn"
 
-#: fileio.c:5288 netbeans.c:3876
+#: fileio.c:5330 netbeans.c:3876
 msgid "[noeol]"
 msgstr "[ingenlinjeslutt]"
 
-#: fileio.c:5288 netbeans.c:3877
+#: fileio.c:5330 netbeans.c:3877
 msgid "[Incomplete last line]"
 msgstr "[Ufullstendig sistelinje]"
 
 #. don't overwrite messages here
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
-#: fileio.c:5307
+#: fileio.c:5349
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "ADVARSEL: Filen er blitt forandret siden den ble lest!!!"
 
-#: fileio.c:5309
+#: fileio.c:5351
 msgid "Do you really want to write to it"
 msgstr "Vil du virkelig skrive til den"
 
-#: fileio.c:6654
+#: fileio.c:6690
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: Feil under skriving til \"%s\""
 
-#: fileio.c:6661
+#: fileio.c:6697
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: Feil under lukking av \"%s\""
 
-#: fileio.c:6664
+#: fileio.c:6700
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: Feil under lesing av \"%s\""
 
-#: fileio.c:6926
+#: fileio.c:6962
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: Autokommandoen \"FileChangedShell\" slettet buffer"
 
-#: fileio.c:6941
+#: fileio.c:6977
 #, c-format
 msgid "E211: File \"%s\" no longer available"
 msgstr "E211: Filen \"%s\" er ikke lenger tilgjengelig"
 
-#: fileio.c:6956
+#: fileio.c:6992
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
@@ -2426,41 +2426,41 @@
 msgstr ""
 "W12: Advarsel: Filen \"%s\" er forandret og bufferen var også forandret i Vim"
 
-#: fileio.c:6957
+#: fileio.c:6993
 msgid "See \":help W12\" for more info."
 msgstr "Se \":help W12\" for mer informasjon."
 
-#: fileio.c:6961
+#: fileio.c:6997
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: Advarsel: Filen \"%s\" er forandret siden redigeringen startet"
 
-#: fileio.c:6962
+#: fileio.c:6998
 msgid "See \":help W11\" for more info."
 msgstr "Se \":help W11\" for mer informasjon."
 
-#: fileio.c:6966
+#: fileio.c:7002
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr ""
 "W16: Advarsel: Rettighetene til filen \"%s\" er forandret siden redigeringen "
 "startet"
 
-#: fileio.c:6967
+#: fileio.c:7003
 msgid "See \":help W16\" for more info."
 msgstr "Se \":help W16\" for mer informasjon."
 
-#: fileio.c:6982
+#: fileio.c:7018
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr ""
 "W13: Advarsel: Filen \"%s\" er blitt opprettet etter at redigeringen startet"
 
-#: fileio.c:7012
+#: fileio.c:7048
 msgid "Warning"
 msgstr "Advarsel"
 
-#: fileio.c:7013
+#: fileio.c:7049
 msgid ""
 "&OK\n"
 "&Load File"
@@ -2468,48 +2468,48 @@
 "&OK\n"
 "&Åpne fil"
 
-#: fileio.c:7146
+#: fileio.c:7197
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: Kunne ikke forberede for relasting \"%s\""
 
-#: fileio.c:7165
+#: fileio.c:7216
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Kunne ikke laste \"%s\" på nytt"
 
-#: fileio.c:7795
+#: fileio.c:7851
 msgid "--Deleted--"
 msgstr "--Slettet--"
 
-#: fileio.c:7948
+#: fileio.c:8004
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "fjerner autokommando automatisk: %s <buffer=%d>"
 
 #. the group doesn't exist
-#: fileio.c:7994
+#: fileio.c:8050
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Gruppen finnes ikke: \"%s\""
 
-#: fileio.c:8141
+#: fileio.c:8197
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Ulovlig tegn etter *: %s"
 
-#: fileio.c:8153
+#: fileio.c:8209
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: Handlingen finnes ikke: %s"
 
-#: fileio.c:8155
+#: fileio.c:8211
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: Gruppen eller handlingen finnes ikke: %s"
 
 #. Highlight title
-#: fileio.c:8366
+#: fileio.c:8422
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -2517,43 +2517,43 @@
 "\n"
 "--- Autokommandoer ---"
 
-#: fileio.c:8602
+#: fileio.c:8658
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <buffer=%d>: Ugyldig buffernummer "
 
-#: fileio.c:8699
+#: fileio.c:8755
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: Kan ikke utføre autokommandoer for ALLE hendelser"
 
-#: fileio.c:8722
+#: fileio.c:8778
 msgid "No matching autocommands"
 msgstr "Ingen samsvarende autokommandoer"
 
-#: fileio.c:9211
+#: fileio.c:9297
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: Nøsting av autokommandoer for dyp"
 
-#: fileio.c:9564
+#: fileio.c:9656
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "%s Autokommandoer for \"%s\""
 
-#: fileio.c:9574
+#: fileio.c:9666
 #, c-format
 msgid "Executing %s"
 msgstr "Utfører %s"
 
-#: fileio.c:9643
+#: fileio.c:9735
 #, c-format
 msgid "autocommand %s"
 msgstr "autokommando %s"
 
-#: fileio.c:10327
+#: fileio.c:10425
 msgid "E219: Missing {."
 msgstr "E219: Mangler {."
 
-#: fileio.c:10329
+#: fileio.c:10427
 msgid "E220: Missing }."
 msgstr "E220: Mangler }."
 
@@ -2569,7 +2569,7 @@
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: Kan ikke slette fold med nåværende 'foldmethod'"
 
-#: fold.c:2001
+#: fold.c:2028
 #, c-format
 msgid "+--%3ld lines folded "
 msgstr "+--%3ld linjer foldet "
@@ -2578,51 +2578,51 @@
 msgid "E222: Add to read buffer"
 msgstr "E222: Legger til allerede lest buffer"
 
-#: getchar.c:2443
+#: getchar.c:2457
 msgid "E223: recursive mapping"
 msgstr "E223: Rekursiv mapping"
 
-#: getchar.c:3428
+#: getchar.c:3454
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: Global forkortelse finnes allerede for %s"
 
-#: getchar.c:3431
+#: getchar.c:3457
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: Global mapping finnes allerede for %s"
 
-#: getchar.c:3563
+#: getchar.c:3589
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: Forkortelse finnes allerede for %s"
 
-#: getchar.c:3566
+#: getchar.c:3592
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: Mappingen finnes allerede for %s"
 
-#: getchar.c:3636
+#: getchar.c:3663
 msgid "No abbreviation found"
 msgstr "Ingen forkortelse funnet"
 
-#: getchar.c:3638
+#: getchar.c:3665
 msgid "No mapping found"
 msgstr "Ingen mapping funnet"
 
-#: getchar.c:4791
+#: getchar.c:4838
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: Ulovlig modus"
 
-#: gui.c:229
+#: gui.c:222
 msgid "E851: Failed to create a new process for the GUI"
 msgstr ""
 
-#: gui.c:253
+#: gui.c:246
 msgid "E852: The child process failed to start the GUI"
 msgstr ""
 
-#: gui.c:379
+#: gui.c:371
 msgid "E229: Cannot start the GUI"
 msgstr "E229: Kan ikke starte grafisk brukergrensesnitt (GUI)"
 
@@ -2631,25 +2631,25 @@
 msgid "E230: Cannot read from \"%s\""
 msgstr "E230: Kan ikke lese fra \"%s\""
 
-#: gui.c:650
+#: gui.c:658
 msgid "E665: Cannot start GUI, no valid font found"
 msgstr ""
 "E665: Kan ikke starte grafisk brukergrensesnitt, fant ingen gyldig font"
 
-#: gui.c:655
+#: gui.c:663
 msgid "E231: 'guifontwide' invalid"
 msgstr "E231: 'guifontwide' ugyldig"
 
-#: gui.c:761
+#: gui.c:769
 msgid "E599: Value of 'imactivatekey' is invalid"
 msgstr "E599: Verdien for 'imactivatekey' er ugyldig"
 
-#: gui.c:4694
+#: gui.c:4731
 #, c-format
 msgid "E254: Cannot allocate color %s"
 msgstr "E254: Kan ikke reservere farge %s"
 
-#: gui.c:5319
+#: gui.c:5356
 msgid "No match at cursor, finding next"
 msgstr "Ingen treff ved markøren, finner neste"
 
@@ -2690,11 +2690,11 @@
 msgid "Vim dialog"
 msgstr "Dialogvindu for Vim"
 
-#: gui_beval.c:199 gui_w32.c:4707
+#: gui_beval.c:199 gui_w32.c:4756
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: Kan ikke lage BalloonEval med både melding og tilbakekall"
 
-#: gui_gtk.c:1187 message.c:3697
+#: gui_gtk.c:1237 message.c:3716
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2704,81 +2704,81 @@
 "&Nei\n"
 "&Avbryt"
 
-#: gui_gtk.c:1389
+#: gui_gtk.c:1439
 msgid "Input _Methods"
 msgstr "Inndata-_metoder"
 
-#: gui_gtk.c:1618 gui_motif.c:3744
+#: gui_gtk.c:1668 gui_motif.c:3744
 msgid "VIM - Search and Replace..."
 msgstr "VIM - Søk og erstatt ..."
 
-#: gui_gtk.c:1623 gui_motif.c:3746
+#: gui_gtk.c:1673 gui_motif.c:3746
 msgid "VIM - Search..."
 msgstr "VIM - Søk ..."
 
-#: gui_gtk.c:1637 gui_motif.c:3855
+#: gui_gtk.c:1687 gui_motif.c:3855
 msgid "Find what:"
 msgstr "Finn hva:"
 
-#: gui_gtk.c:1655 gui_motif.c:3888
+#: gui_gtk.c:1705 gui_motif.c:3888
 msgid "Replace with:"
 msgstr "Erstatt med:"
 
 #. whole word only button
-#: gui_gtk.c:1687 gui_motif.c:4009
+#: gui_gtk.c:1737 gui_motif.c:4009
 msgid "Match whole word only"
 msgstr "Finn kun hele ord"
 
 #. match case button
-#: gui_gtk.c:1698 gui_motif.c:4021
+#: gui_gtk.c:1748 gui_motif.c:4021
 msgid "Match case"
 msgstr "Forskjell på store/små bokstaver"
 
-#: gui_gtk.c:1708 gui_motif.c:3960
+#: gui_gtk.c:1758 gui_motif.c:3960
 msgid "Direction"
 msgstr "Retning"
 
 #. 'Up' and 'Down' buttons
-#: gui_gtk.c:1720 gui_motif.c:3973
+#: gui_gtk.c:1770 gui_motif.c:3973
 msgid "Up"
 msgstr "Opp"
 
-#: gui_gtk.c:1724 gui_motif.c:3982
+#: gui_gtk.c:1774 gui_motif.c:3982
 msgid "Down"
 msgstr "Ned"
 
 #. 'Find Next' button
-#: gui_gtk.c:1735
+#: gui_gtk.c:1785
 msgid "Find Next"
 msgstr "Finn neste"
 
 #. 'Replace' button
-#: gui_gtk.c:1750
+#: gui_gtk.c:1800
 msgid "Replace"
 msgstr "Erstatt"
 
 #. 'Replace All' button
-#: gui_gtk.c:1759
+#: gui_gtk.c:1809
 msgid "Replace All"
 msgstr "Erstatt alle"
 
-#: gui_gtk_x11.c:2172
+#: gui_gtk_x11.c:2177
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: Mottok \"dø\"-forespørsel fra øktbehandleren\n"
 
-#: gui_gtk_x11.c:2867
+#: gui_gtk_x11.c:2872
 msgid "Close"
 msgstr "Lukk"
 
-#: gui_gtk_x11.c:2868 gui_w48.c:2380
+#: gui_gtk_x11.c:2873 gui_w48.c:2394
 msgid "New tab"
 msgstr ""
 
-#: gui_gtk_x11.c:2869
+#: gui_gtk_x11.c:2874
 msgid "Open Tab..."
 msgstr ""
 
-#: gui_gtk_x11.c:3598
+#: gui_gtk_x11.c:3611
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr "Vim: Uventet ødeleggelse av hovedvinduet\n"
 
@@ -2830,43 +2830,43 @@
 msgid "&Undo"
 msgstr "&Angre"
 
-#: gui_w32.c:1155
+#: gui_w32.c:1165
 #, c-format
 msgid "E671: Cannot find window title \"%s\""
 msgstr "E671: Fant ikke vindutittel \"%s\""
 
-#: gui_w32.c:1168
+#: gui_w32.c:1178
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: Parameter ikke støttet: \"-%s\"; Bruk OLE-versjonen."
 
-#: gui_w32.c:1429
+#: gui_w32.c:1439
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: Klarer ikke åpne vindu inne i MDI-applikasjon"
 
-#: gui_w48.c:2379
+#: gui_w48.c:2393
 msgid "Close tab"
 msgstr ""
 
-#: gui_w48.c:2382
+#: gui_w48.c:2396
 msgid "Open tab..."
 msgstr ""
 
-#: gui_w48.c:2638
+#: gui_w48.c:2664
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "Finn streng (bruk '\\\\' for å finne en '\\')"
 
-#: gui_w48.c:2674
+#: gui_w48.c:2700
 msgid "Find & Replace (use '\\\\' to find  a '\\')"
 msgstr "Søk og erstatt (bruk '\\\\' for å finne en '\\')"
 
 #. We fake this: Use a filter that doesn't select anything and a default
 #. * file name that won't be used.
-#: gui_w48.c:3461
+#: gui_w48.c:3560
 msgid "Not Used"
 msgstr "Ikke brukt"
 
-#: gui_w48.c:3462
+#: gui_w48.c:3561
 msgid "Directory\t*.nothing\n"
 msgstr "Katalog\t*.ingenting\n"
 
@@ -3139,73 +3139,73 @@
 msgid "E563: stat error"
 msgstr "E563: \"stat\"-feil"
 
-#: if_cscope.c:616
+#: if_cscope.c:631
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s er ikke en katalog eller gyldig cscope-database"
 
-#: if_cscope.c:634
+#: if_cscope.c:649
 #, c-format
 msgid "Added cscope database %s"
 msgstr "La til cscope-database %s"
 
-#: if_cscope.c:689
+#: if_cscope.c:704
 #, c-format
 msgid "E262: error reading cscope connection %ld"
 msgstr "E262: Feil under lesing av cscope-forbindelse %ld"
 
-#: if_cscope.c:796
+#: if_cscope.c:811
 msgid "E561: unknown cscope search type"
 msgstr "E561: Ukjent cscope-søketype"
 
-#: if_cscope.c:860 if_cscope.c:899
+#: if_cscope.c:875 if_cscope.c:914
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: Kunne ikke lage cscope-rør (\"pipe\")"
 
-#: if_cscope.c:876
+#: if_cscope.c:891
 msgid "E622: Could not fork for cscope"
 msgstr "E622: Klarte ikke lage tvillingprosess for cscope"
 
-#: if_cscope.c:986 if_cscope.c:1023
+#: if_cscope.c:1010 if_cscope.c:1047
 msgid "cs_create_connection exec failed"
 msgstr "Utføring av cs_create_connection feilet"
 
-#: if_cscope.c:996 if_cscope.c:1036
+#: if_cscope.c:1020 if_cscope.c:1060
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: fdopen for to_fp feilet"
 
-#: if_cscope.c:998 if_cscope.c:1040
+#: if_cscope.c:1022 if_cscope.c:1064
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection: fdopen for fr_fp feilet"
 
-#: if_cscope.c:1024
+#: if_cscope.c:1048
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: Klarte ikke starte cscope-prosess"
 
-#: if_cscope.c:1069
+#: if_cscope.c:1093
 msgid "E567: no cscope connections"
 msgstr "E567: Ingen cscope-forbindelse"
 
-#: if_cscope.c:1159
+#: if_cscope.c:1183
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: Ugyldig \"cscopequickfix\"-flagg %c for %c"
 
-#: if_cscope.c:1222
+#: if_cscope.c:1245
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: Ingen treff funnet for cscope-forespørsel %s av %s"
 
-#: if_cscope.c:1326
+#: if_cscope.c:1349
 msgid "cscope commands:\n"
 msgstr "cscope-kommandoer:\n"
 
-#: if_cscope.c:1335
+#: if_cscope.c:1358
 #, c-format
 msgid "%-5s: %s%*s (Usage: %s)"
 msgstr ""
 
-#: if_cscope.c:1340
+#: if_cscope.c:1363
 msgid ""
 "\n"
 "       c: Find functions calling this function\n"
@@ -3218,40 +3218,40 @@
 "       t: Find this text string\n"
 msgstr ""
 
-#: if_cscope.c:1426
+#: if_cscope.c:1449
 #, c-format
 msgid "E625: cannot open cscope database: %s"
 msgstr "E625: Kan ikke åpne cscope-database: %s"
 
-#: if_cscope.c:1442
+#: if_cscope.c:1465
 msgid "E626: cannot get cscope database information"
 msgstr "E626: Kan ikke hente informasjon om cscope-database"
 
-#: if_cscope.c:1466
+#: if_cscope.c:1489
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: Duplisert cscope-database ikke lagt til"
 
-#: if_cscope.c:1611
+#: if_cscope.c:1634
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: cscope-forbindelse %s ikke funnet"
 
-#: if_cscope.c:1645
+#: if_cscope.c:1668
 #, c-format
 msgid "cscope connection %s closed"
 msgstr "cscope-forbindelsen %s stengt"
 
 #. should not reach here
-#: if_cscope.c:1785
+#: if_cscope.c:1808
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: Kritisk feil i cs_manage_matches"
 
-#: if_cscope.c:2047
+#: if_cscope.c:2070
 #, c-format
 msgid "Cscope tag: %s"
 msgstr "Cscope-tag: %s"
 
-#: if_cscope.c:2069
+#: if_cscope.c:2092
 msgid ""
 "\n"
 "   #   line"
@@ -3259,182 +3259,178 @@
 "\n"
 "   #   linje"
 
-#: if_cscope.c:2071
+#: if_cscope.c:2094
 msgid "filename / context / line\n"
 msgstr "filnavn / kontekst / linje\n"
 
-#: if_cscope.c:2183
+#: if_cscope.c:2206
 #, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: Cscope-feil: %s"
 
-#: if_cscope.c:2456
+#: if_cscope.c:2479
 msgid "All cscope databases reset"
 msgstr "Alle cscope-databaser resatt"
 
-#: if_cscope.c:2542
+#: if_cscope.c:2567
 msgid "no cscope connections\n"
 msgstr "ingen cscope-forbindelser\n"
 
-#: if_cscope.c:2546
+#: if_cscope.c:2571
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    databasenavn                        legg til sti\n"
 
-#: if_lua.c:1782
+#: if_lua.c:1642
 msgid "Lua library cannot be loaded."
 msgstr ""
 
-#: if_lua.c:1832 if_mzsch.c:2131 if_mzsch.c:2161 if_mzsch.c:2258
-#: if_mzsch.c:2322 if_mzsch.c:2443 if_mzsch.c:2500 if_tcl.c:653 if_tcl.c:698
-#: if_tcl.c:772 if_tcl.c:844 if_tcl.c:1981 if_py_both.h:853 if_py_both.h:887
-#: if_py_both.h:946 if_py_both.h:1013 if_py_both.h:1135 if_py_both.h:1187
+#: if_lua.c:1692 if_mzsch.c:2285 if_mzsch.c:2315 if_mzsch.c:2412
+#: if_mzsch.c:2476 if_mzsch.c:2597 if_mzsch.c:2654 if_tcl.c:656 if_tcl.c:701
+#: if_tcl.c:775 if_tcl.c:847 if_tcl.c:1984 if_py_both.h:45 if_py_both.h:5050
 msgid "cannot save undo information"
 msgstr "kan ikke lagre angre-informasjon"
 
-#: if_mzsch.c:1046
+#: if_mzsch.c:1129
 msgid ""
 "E815: Sorry, this command is disabled, the MzScheme libraries could not be "
 "loaded."
 msgstr ""
 
-#: if_mzsch.c:1433 if_tcl.c:1373 if_py_both.h:419
+#: if_mzsch.c:1533 if_tcl.c:1376 if_py_both.h:796 if_py_both.h:847
 msgid "invalid expression"
 msgstr "ugyldig uttrykk"
 
-#: if_mzsch.c:1441 if_tcl.c:1378 if_py_both.h:438
+#: if_mzsch.c:1542 if_tcl.c:1381
 msgid "expressions disabled at compile time"
 msgstr "uttrykk deaktivert på kompileringsstadiet"
 
-#: if_mzsch.c:1530
+#: if_mzsch.c:1639
 msgid "hidden option"
 msgstr "skjult valg"
 
-#: if_mzsch.c:1532 if_tcl.c:470
+#: if_mzsch.c:1642 if_tcl.c:473
 msgid "unknown option"
 msgstr "ukjent valg"
 
-#: if_mzsch.c:1691
+#: if_mzsch.c:1818
 msgid "window index is out of range"
 msgstr "indeks for vindu er utenfor område"
 
-#: if_mzsch.c:1851
+#: if_mzsch.c:1987
 msgid "couldn't open buffer"
 msgstr "klarte ikke å åpne buffer"
 
-#: if_mzsch.c:2136 if_mzsch.c:2266 if_mzsch.c:2336 if_py_both.h:855
-#: if_py_both.h:953 if_py_both.h:1024
+#: if_mzsch.c:2290 if_mzsch.c:2420 if_mzsch.c:2490 if_py_both.h:46
 msgid "cannot delete line"
 msgstr "kan ikke slette linje"
 
-#: if_mzsch.c:2167 if_mzsch.c:2351 if_tcl.c:659 if_tcl.c:2008 if_py_both.h:892
-#: if_py_both.h:1040
+#: if_mzsch.c:2321 if_mzsch.c:2505 if_tcl.c:662 if_tcl.c:2011 if_py_both.h:48
 msgid "cannot replace line"
 msgstr "kan ikke erstatte linje"
 
-#: if_mzsch.c:2366 if_mzsch.c:2449 if_mzsch.c:2510 if_py_both.h:1058
-#: if_py_both.h:1137 if_py_both.h:1195
+#: if_mzsch.c:2520 if_mzsch.c:2603 if_mzsch.c:2664 if_py_both.h:47
 msgid "cannot insert line"
 msgstr "kan ikke sette inn linje"
 
-#: if_mzsch.c:2601 if_py_both.h:716
+#: if_mzsch.c:2755 if_py_both.h:3589
 msgid "string cannot contain newlines"
 msgstr "streng kan ikke inneholde linjeskift"
 
-#: if_mzsch.c:3041
+#: if_mzsch.c:3323
 msgid "Vim error: ~a"
 msgstr "Vim-feil: ~a"
 
-#: if_mzsch.c:3074
+#: if_mzsch.c:3356
 msgid "Vim error"
 msgstr "Vim-feil"
 
-#: if_mzsch.c:3140
+#: if_mzsch.c:3426
 msgid "buffer is invalid"
 msgstr "buffer er ugyldig"
 
-#: if_mzsch.c:3149
+#: if_mzsch.c:3435
 msgid "window is invalid"
 msgstr "vindu er ugyldig"
 
-#: if_mzsch.c:3169
+#: if_mzsch.c:3455
 msgid "linenr out of range"
 msgstr "linjenummer utenfor område"
 
-#: if_mzsch.c:3320 if_mzsch.c:3362
+#: if_mzsch.c:3606 if_mzsch.c:3648
 msgid "not allowed in the Vim sandbox"
 msgstr "ikke tillatt i Vim-sandkassen"
 
-#: if_python.c:380
+#: if_python.c:662
 msgid "E836: This Vim cannot execute :python after using :py3"
 msgstr ""
 
-#: if_python.c:563 if_python3.c:574
+#: if_python.c:897 if_python3.c:833
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
 msgstr ""
 "E263: Denne kommandoen er deaktivert, Python-biblioteket kunne ikke lastes."
 
-#: if_python.c:635
+#: if_python.c:985
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Kan ikke starte Python rekursivt"
 
-#: if_python.c:777 if_python3.c:813
+#: if_py_both.h:336
 msgid "can't delete OutputObject attributes"
 msgstr "Kan ikke slette \"OutputObject\"-attributter"
 
-#: if_python.c:784 if_python3.c:820
+#: if_py_both.h:87
 msgid "softspace must be an integer"
 msgstr "\"softspace\" må være et heltall"
 
-#: if_python.c:792 if_python3.c:828
+#: if_py_both.h:95
 msgid "invalid attribute"
 msgstr "ugyldig attributt"
 
-#: if_python.c:961 if_python3.c:991
+#: if_py_both.h:2579
 #, c-format
 msgid "<buffer object (deleted) at %p>"
 msgstr ""
 
-#: if_python3.c:378
+#: if_python3.c:598
 msgid "E837: This Vim cannot execute :py3 after using :python"
 msgstr ""
 
-#: if_ruby.c:601
+#: if_ruby.c:687
 msgid "E265: $_ must be an instance of String"
 msgstr ""
 
-#: if_ruby.c:682
+#: if_ruby.c:768
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr ""
 "E266: Denne kommandoen er deaktivert, Ruby-biblioteket kunne ikke lastes."
 
-#: if_ruby.c:714
+#: if_ruby.c:800
 msgid "E267: unexpected return"
 msgstr "E267: Uventet return"
 
-#: if_ruby.c:717
+#: if_ruby.c:803
 msgid "E268: unexpected next"
 msgstr "E268: Uvented next"
 
-#: if_ruby.c:720
+#: if_ruby.c:806
 msgid "E269: unexpected break"
 msgstr "E269: Uventet break"
 
-#: if_ruby.c:723
+#: if_ruby.c:809
 msgid "E270: unexpected redo"
 msgstr "E270: Uventet redo"
 
-#: if_ruby.c:726
+#: if_ruby.c:812
 msgid "E271: retry outside of rescue clause"
 msgstr ""
 
-#: if_ruby.c:738
+#: if_ruby.c:824
 msgid "E272: unhandled exception"
 msgstr "E272: Ubehandlet unntak"
 
-#: if_ruby.c:753
+#: if_ruby.c:839
 #, c-format
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: Ukjent longjmp-status %d"
@@ -3556,68 +3552,68 @@
 msgid "Sniff: Error during write. Disconnected"
 msgstr "Sniff: Feil under skriving. Frakoblet"
 
-#: if_tcl.c:388
+#: if_tcl.c:391
 msgid "invalid buffer number"
 msgstr "ugyldig buffernummer"
 
-#: if_tcl.c:434 if_tcl.c:904 if_tcl.c:1084
+#: if_tcl.c:437 if_tcl.c:907 if_tcl.c:1087
 msgid "not implemented yet"
 msgstr "ikke implementert enda"
 
 #. ???
-#: if_tcl.c:743
+#: if_tcl.c:746
 msgid "cannot set line(s)"
 msgstr "kan ikke sette linje(r)"
 
-#: if_tcl.c:805 if_py_both.h:1444
+#: if_tcl.c:808 if_py_both.h:4675
 msgid "invalid mark name"
 msgstr "ugyldig merkenavn"
 
-#: if_tcl.c:814
+#: if_tcl.c:817
 msgid "mark not set"
 msgstr "merke ikke satt"
 
-#: if_tcl.c:821 if_tcl.c:1040
+#: if_tcl.c:824 if_tcl.c:1043
 #, c-format
 msgid "row %d column %d"
 msgstr "rad %d kolonne %d"
 
-#: if_tcl.c:853
+#: if_tcl.c:856
 msgid "cannot insert/append line"
 msgstr "kan ikke sette inn/legge til linje"
 
-#: if_tcl.c:1185 if_py_both.h:1257 if_py_both.h:1298 if_py_both.h:1364
+#: if_tcl.c:1188 if_py_both.h:4198 if_py_both.h:4254 if_py_both.h:4338
 msgid "line number out of range"
 msgstr "linjenummer utenfor område"
 
-#: if_tcl.c:1239
+#: if_tcl.c:1242
 msgid "unknown flag: "
 msgstr "ukjent flagg: "
 
-#: if_tcl.c:1309
+#: if_tcl.c:1312
 msgid "unknown vimOption"
 msgstr "ukjent vimOption"
 
-#: if_tcl.c:1394
+#: if_tcl.c:1397
 msgid "keyboard interrupt"
 msgstr "tastaturavbrudd"
 
-#: if_tcl.c:1399
+#: if_tcl.c:1402
 msgid "vim error"
 msgstr "vim-feil"
 
-#: if_tcl.c:1443
+#: if_tcl.c:1446
 msgid "cannot create buffer/window command: object is being deleted"
 msgstr "kan ikke opprette buffer/vindukommando: Objektet slettes"
 
-#: if_tcl.c:1512
+#: if_tcl.c:1515
 msgid ""
 "cannot register callback command: buffer/window is already being deleted"
 msgstr ""
 "kan ikke registrere callback-kommando: Buffer/vindu er allerede slettet"
 
 #. This should never happen.  Famous last word?
-#: if_tcl.c:1531
+#: if_tcl.c:1534
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
 "dev@vim.org"
@@ -3625,12 +3621,12 @@
 "E280: TCL KRITISK FEIL: reflist skadet!? Vennligst rapporter dette til vim-"
 "dev@vim.org"
 
-#: if_tcl.c:1532
+#: if_tcl.c:1535
 msgid "cannot register callback command: buffer/window reference not found"
 msgstr ""
 "kan ikke registrere callback-kommando: Buffer/vindureferanse ikke funnet"
 
-#: if_tcl.c:1706
+#: if_tcl.c:1709
 msgid ""
 "E571: Sorry, this command is disabled: the Tcl library could not be loaded."
 msgstr ""
@@ -3643,12 +3639,12 @@
 "E281: TCL-FEIL: Avslutningskode er ikke int!? Vennligst rapporter dette til "
 "vim-dev@vim.org"
 
-#: if_tcl.c:1874
+#: if_tcl.c:1877
 #, c-format
 msgid "E572: exit code %d"
 msgstr "E572: Avslutningskode %d"
 
-#: if_tcl.c:1989
+#: if_tcl.c:1992
 msgid "cannot get line"
 msgstr "kan ikke hente linje"
 
@@ -3660,12 +3656,12 @@
 msgid "E248: Failed to send command to the destination program"
 msgstr "E248: Klarte ikke sende kommando til destinasjonsprogrammet"
 
-#: if_xcmdsrv.c:750
+#: if_xcmdsrv.c:743
 #, c-format
 msgid "E573: Invalid server id used: %s"
 msgstr "E573: Ugyldig tjener-id brukt: %s"
 
-#: if_xcmdsrv.c:1131
+#: if_xcmdsrv.c:1124
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr ""
 "E251: Registry-egenskapen for VIM-oppføringen er ikke korrekt. Slettet!"
@@ -3695,58 +3691,58 @@
 msgid "Invalid argument for"
 msgstr "Ugyldig parameter for"
 
-#: main.c:519
+#: main.c:526
 #, c-format
 msgid "%d files to edit\n"
 msgstr "%d filer å redigere\n"
 
-#: main.c:986
+#: main.c:1008
 msgid "netbeans is not supported with this GUI\n"
 msgstr ""
 
-#: main.c:1623
+#: main.c:1661
 msgid "This Vim was not compiled with the diff feature."
 msgstr "Denne Vim-versjonen er kompilert uten differansefunksjonen."
 
-#: main.c:1725
+#: main.c:1763
 msgid "'-nb' cannot be used: not enabled at compile time\n"
 msgstr ""
 
-#: main.c:2257
+#: main.c:2295
 msgid "Attempt to open script file again: \""
 msgstr "Forsøk på å åpne skriptfilen igjen: \""
 
-#: main.c:2266
+#: main.c:2304
 msgid "Cannot open for reading: \""
 msgstr "Kan ikke åpne for lesing: \""
 
-#: main.c:2320
+#: main.c:2358
 msgid "Cannot open for script output: \""
 msgstr "Kan ikke åpne for skript-utdata: \""
 
-#: main.c:2486
+#: main.c:2524
 msgid "Vim: Error: Failure to start gvim from NetBeans\n"
 msgstr "Vim: Feil: Feil under start av gvim fra NetBeans\n"
 
-#: main.c:2491
+#: main.c:2529
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: Advarsel: Utdata går ikke til en terminal\n"
 
-#: main.c:2493
+#: main.c:2531
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: Advarsel: Inndata kommer ikke fra en terminal\n"
 
 #. just in case..
-#: main.c:2812
+#: main.c:2867
 msgid "pre-vimrc command line"
 msgstr "pre-vimrc kommandolinje"
 
-#: main.c:2909
+#: main.c:2964
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: Kan ikke lese fra \"%s\""
 
-#: main.c:3133
+#: main.c:3192
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
@@ -3754,23 +3750,23 @@
 "\n"
 "Mer info med: \"vim -h\"\n"
 
-#: main.c:3167
+#: main.c:3226
 msgid "[file ..]       edit specified file(s)"
 msgstr "[file ..]       rediger spesifisert(e) fil(er)"
 
-#: main.c:3168
+#: main.c:3227
 msgid "-               read text from stdin"
 msgstr "-               les tekst fra stdin"
 
-#: main.c:3169
+#: main.c:3228
 msgid "-t tag          edit file where tag is defined"
 msgstr "-t tag          rediger fil hvor en tag er definert"
 
-#: main.c:3171
+#: main.c:3230
 msgid "-q [errorfile]  edit file with first error"
 msgstr "-q [feilfil]    rediger fil med første feil"
 
-#: main.c:3180
+#: main.c:3239
 msgid ""
 "\n"
 "\n"
@@ -3780,11 +3776,11 @@
 "\n"
 "bruk:"
 
-#: main.c:3183
+#: main.c:3242
 msgid " vim [arguments] "
 msgstr " vim [parametere] "
 
-#: main.c:3187
+#: main.c:3246
 msgid ""
 "\n"
 "   or:"
@@ -3792,13 +3788,13 @@
 "\n"
 "   eller:"
 
-#: main.c:3190
+#: main.c:3249
 msgid ""
 "\n"
 "Where case is ignored prepend / to make flag upper case"
 msgstr ""
 
-#: main.c:3193
+#: main.c:3252
 msgid ""
 "\n"
 "\n"
@@ -3808,258 +3804,258 @@
 "\n"
 "Parametere:\n"
 
-#: main.c:3194
+#: main.c:3253
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\t\tBare filnavn etter dette"
 
-#: main.c:3196
+#: main.c:3255
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\tIkke utvid jokertegn"
 
-#: main.c:3199
+#: main.c:3258
 msgid "-register\t\tRegister this gvim for OLE"
 msgstr "-register\t\tRegistrer gvim for OLE"
 
-#: main.c:3200
+#: main.c:3259
 msgid "-unregister\t\tUnregister gvim for OLE"
 msgstr "-unregister\t\tFjern OLE-registrering for gvim"
 
-#: main.c:3203
+#: main.c:3262
 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
 msgstr "-g\t\t\tKjør med GUI (som \"gvim\")"
 
-#: main.c:3204
+#: main.c:3263
 msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
 msgstr "-f  eller  --nofork\tForgrunn: Ikke fork når GUI-et startes"
 
-#: main.c:3206
+#: main.c:3265
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi-modus (som \"vi\")"
 
-#: main.c:3207
+#: main.c:3266
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tEx-modus (som \"ex\")"
 
-#: main.c:3209
+#: main.c:3268
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\t\tStille (batch) modus (bare for \"ex\")"
 
-#: main.c:3211
+#: main.c:3270
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\tDifferanse-modus (som \"vimdiff\")"
 
-#: main.c:3213
+#: main.c:3272
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
 msgstr "-y\t\t\tLett modus (som \"evim\", uten modus)"
 
-#: main.c:3214
+#: main.c:3273
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\tSkrivebeskyttet modus (som \"view\")"
 
-#: main.c:3215
+#: main.c:3274
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\tBegrenset modus (som \"rvim\")"
 
-#: main.c:3216
+#: main.c:3275
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\tModifisering (lagring av filer) ikke tillatt"
 
-#: main.c:3217
+#: main.c:3276
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\tModifiseringer i teksten ikke tillatt"
 
-#: main.c:3218
+#: main.c:3277
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\tBinærmodus"
 
-#: main.c:3220
+#: main.c:3279
 msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tLisp-modus"
 
-#: main.c:3222
+#: main.c:3281
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\tKompatibel med Vi: 'compatible'"
 
-#: main.c:3223
+#: main.c:3282
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\tIkke helt Vi-kompatibel: 'nocompatible'"
 
-#: main.c:3224
+#: main.c:3283
 msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
 msgstr ""
 
-#: main.c:3226
+#: main.c:3285
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\tDebuggingsmodus"
 
-#: main.c:3228
+#: main.c:3287
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\tIngen swapfil, bruk bare hukommelsen"
 
-#: main.c:3229
+#: main.c:3288
 msgid "-r\t\t\tList swap files and exit"
 msgstr "-r\t\t\tList swapfiler og avslutt"
 
-#: main.c:3230
+#: main.c:3289
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (med filnavn)\tGjenopprett kræsjet økt"
 
-#: main.c:3231
+#: main.c:3290
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\tSamme som -r"
 
-#: main.c:3233
+#: main.c:3292
 msgid "-f\t\t\tDon't use newcli to open window"
 msgstr "-f\t\t\tIkke bruk newcli for å åpne vindu"
 
-#: main.c:3234
+#: main.c:3293
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <enhet>\t\tBruk <enhet> for I/U"
 
-#: main.c:3237
+#: main.c:3296
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\t\tStart i arabisk modus"
 
-#: main.c:3240
+#: main.c:3299
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\tStart i hebraisk modus"
 
-#: main.c:3243
+#: main.c:3302
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\tStart i persisk (Farsi) modus"
 
-#: main.c:3245
+#: main.c:3304
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\tSett terminaltypen til <terminal>"
 
-#: main.c:3246
+#: main.c:3305
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\tBruk <vimrc> istedenfor eventuell .vimrc"
 
-#: main.c:3248
+#: main.c:3307
 msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
 msgstr "-U <gvimrc>\t\tBruk <gvimrc> istedenfor eventuell .gvimrc"
 
-#: main.c:3250
+#: main.c:3309
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\tIkke last plugin-skripts"
 
-#: main.c:3252
+#: main.c:3311
 msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
 msgstr ""
 
-#: main.c:3253
+#: main.c:3312
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tÅpne N vinduer (standard: Ett for hver fil)"
 
-#: main.c:3254
+#: main.c:3313
 msgid "-O[N]\t\tLike -o but split vertically"
 msgstr "-O[N]\t\tSom -o men splitt loddrett"
 
-#: main.c:3256
+#: main.c:3315
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\t\tStart på slutten av filen"
 
-#: main.c:3257
+#: main.c:3316
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<lnr>\t\tStart på linje <lnr>"
 
-#: main.c:3258
+#: main.c:3317
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
 msgstr "--cmd <kommando>\tKjør <kommando> før lasting av vimrc-filer"
 
-#: main.c:3259
+#: main.c:3318
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <kommando>\tKjør <kommando> etter lasting av første fil"
 
-#: main.c:3260
+#: main.c:3319
 msgid "-S <session>\t\tSource file <session> after loading the first file"
 msgstr "-S <økt>\t\tKjør filen <økt> etter lasting av første fil"
 
-#: main.c:3261
+#: main.c:3320
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
 msgstr "-s <innskript>\tLes normalmodus-kommandoer fra filen <innskript>"
 
-#: main.c:3262
+#: main.c:3321
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr "-w <utskript>\tLegg alle skrevne kommandoer til filen <utskript>"
 
-#: main.c:3263
+#: main.c:3322
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <utskript>\tSkriv alle skrevne kommandoer til filen <utskript>"
 
-#: main.c:3265
+#: main.c:3324
 msgid "-x\t\t\tEdit encrypted files"
 msgstr "-x\t\t\tRediger krypterte filer"
 
-#: main.c:3269
+#: main.c:3328
 msgid "-display <display>\tConnect vim to this particular X-server"
 msgstr "-display <display>\tKoble vim til denne spesielle X-tjeneren"
 
-#: main.c:3271
+#: main.c:3330
 msgid "-X\t\t\tDo not connect to X server"
 msgstr "-X\t\t\tUnngå oppkobling til X-tjener"
 
-#: main.c:3274
+#: main.c:3333
 msgid "--remote <files>\tEdit <files> in a Vim server if possible"
 msgstr "--remote <filer>\tRediger <filer> på en Vim-tjener hvis mulig"
 
-#: main.c:3275
+#: main.c:3334
 msgid "--remote-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-silent <filer>  Samme, ikke klag hvis tjeneren mangler"
 
-#: main.c:3276
+#: main.c:3335
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
 msgstr ""
 "--remote-wait <filer>  Som --remote men vent på filer som blir redigert"
 
-#: main.c:3277
+#: main.c:3336
 msgid ""
 "--remote-wait-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-wait-silent <files>  Samme, ikke klag hvis tjeneren mangler"
 
-#: main.c:3279
+#: main.c:3338
 msgid ""
 "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per file"
 msgstr ""
 
-#: main.c:3281
+#: main.c:3340
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr "--remote-send <nøkler>\tSend <nøkler> til en Vim-tjener og avslutt"
 
-#: main.c:3282
+#: main.c:3341
 msgid ""
 "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
 msgstr ""
 "--remote-expr <uttrykk>\tEvaluer <uttrykk> på en Vim-tjener og skriv "
 "resultatet"
 
-#: main.c:3283
+#: main.c:3342
 msgid "--serverlist\t\tList available Vim server names and exit"
 msgstr "--serverlist\t\tList navn på tilgjengelige Vim-tjenere og avslutt"
 
-#: main.c:3284
+#: main.c:3343
 msgid "--servername <name>\tSend to/become the Vim server <name>"
 msgstr "--servername <navn>\tSend til/bli Vim-tjeneren <navn>"
 
-#: main.c:3287
+#: main.c:3346
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
 msgstr ""
 
-#: main.c:3290
+#: main.c:3349
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\tBruk <viminfo> istedenfor .viminfo"
 
-#: main.c:3292
+#: main.c:3351
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h  eller  --help\tSkriv hjelpen (denne teksten) og avslutt"
 
-#: main.c:3293
+#: main.c:3352
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\tSkriv versjonsinformasjon og avslutt"
 
-#: main.c:3297
+#: main.c:3356
 msgid ""
 "\n"
 "Arguments recognised by gvim (Motif version):\n"
@@ -4067,7 +4063,7 @@
 "\n"
 "Parametere gjenkjent av gvim (Motif-versjon):\n"
 
-#: main.c:3301
+#: main.c:3360
 msgid ""
 "\n"
 "Arguments recognised by gvim (neXtaw version):\n"
@@ -4075,7 +4071,7 @@
 "\n"
 "Parametere gjenkjent av gvim (neXtaw-versjon):\n"
 
-#: main.c:3303
+#: main.c:3362
 msgid ""
 "\n"
 "Arguments recognised by gvim (Athena version):\n"
@@ -4083,68 +4079,68 @@
 "\n"
 "Parametere gjenkjent av gvim (Athena-versjon):\n"
 
-#: main.c:3307
+#: main.c:3366
 msgid "-display <display>\tRun vim on <display>"
 msgstr "-display <display>\tKjør vim på <display>"
 
-#: main.c:3308
+#: main.c:3367
 msgid "-iconic\t\tStart vim iconified"
 msgstr "-iconic\t\tStart vim som ikon"
 
-#: main.c:3309
+#: main.c:3368
 msgid "-background <color>\tUse <color> for the background (also: -bg)"
 msgstr "-background <farge>\tBruk <farge> på bakgrunnen (også: -bg)"
 
-#: main.c:3310
+#: main.c:3369
 msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
 msgstr "-foreground <farge>\tBruk <farge> på normal tekst (også: -fg)"
 
-#: main.c:3311 main.c:3326
+#: main.c:3370 main.c:3385
 msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
 msgstr "-font <skrifttype>\t\tBruk <skrifttype> på normal tekst (også: -fn)"
 
-#: main.c:3312
+#: main.c:3371
 msgid "-boldfont <font>\tUse <font> for bold text"
 msgstr "-boldfont <skrifttype>\tBruk <skrifttype> på fet skrift"
 
-#: main.c:3313
+#: main.c:3372
 msgid "-italicfont <font>\tUse <font> for italic text"
 msgstr "-italicfont <skrifttype>\tBruk <skrifttype> på skrå tekst"
 
-#: main.c:3314 main.c:3327
+#: main.c:3373 main.c:3386
 msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
 msgstr ""
 "-geometry <geom>\tBruk <geom> for innledende vindusplassering (også: -geom)"
 
-#: main.c:3315
+#: main.c:3374
 msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
 msgstr ""
 "-borderwidth <bredde>\tBruk en rammebredde tilsvarende <bredde> (også: -bw)"
 
-#: main.c:3316
+#: main.c:3375
 msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
 msgstr ""
 "-scrollbarwidth <bredde>  Bruk en rullefeltbredde tilsvarende <bredde> "
 "(også: -sw)"
 
-#: main.c:3318
+#: main.c:3377
 msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
 msgstr ""
 "-menuheight <høyde>\tBruk en menyblokkhøyde tilsvarende <høyde> (også: -mh)"
 
-#: main.c:3320 main.c:3328
+#: main.c:3379 main.c:3387
 msgid "-reverse\t\tUse reverse video (also: -rv)"
 msgstr "-reverse\t\tBruk invers video (også: -rv)"
 
-#: main.c:3321
+#: main.c:3380
 msgid "+reverse\t\tDon't use reverse video (also: +rv)"
 msgstr "+reverse\t\tIkke bruk invers video (også: +rv)"
 
-#: main.c:3322
+#: main.c:3381
 msgid "-xrm <resource>\tSet the specified resource"
 msgstr "-xrm <ressurs>\tSett den spesifiserte ressursen"
 
-#: main.c:3325
+#: main.c:3384
 msgid ""
 "\n"
 "Arguments recognised by gvim (GTK+ version):\n"
@@ -4152,64 +4148,64 @@
 "\n"
 "Parametere gjenkjent av gvim (GTK+-versjon):\n"
 
-#: main.c:3329
+#: main.c:3388
 msgid "-display <display>\tRun vim on <display> (also: --display)"
 msgstr "-display <display>\tKjør vim på <display> (også: --display)"
 
-#: main.c:3330
+#: main.c:3389
 msgid "--role <role>\tSet a unique role to identify the main window"
 msgstr "--role <role>\tSett en unik \"role\" for å identifisere hovedvinduet"
 
-#: main.c:3331
+#: main.c:3390
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\tÅpne Vim innenfor et annet GTK-skjermelement"
 
-#: main.c:3335
+#: main.c:3394
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <foreldretittel>\tStart Vim innenfor et foreldreprogram"
 
-#: main.c:3336
+#: main.c:3395
 msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
 msgstr ""
 
-#: main.c:3685
+#: main.c:3744
 msgid "No display"
 msgstr "Ingen display"
 
 #. Failed to send, abort.
-#: main.c:3700
+#: main.c:3759
 msgid ": Send failed.\n"
 msgstr ": Send feilet.\n"
 
 #. Let vim start normally.
-#: main.c:3706
+#: main.c:3765
 msgid ": Send failed. Trying to execute locally\n"
 msgstr ": Send feilet. Prøver å utføre lokalt\n"
 
-#: main.c:3744 main.c:3765
+#: main.c:3803 main.c:3824
 #, c-format
 msgid "%d of %d edited"
 msgstr "%d av %d redigert"
 
-#: main.c:3787
+#: main.c:3846
 msgid "No display: Send expression failed.\n"
 msgstr "Ingen display: Sending av uttrykk feilet.\n"
 
-#: main.c:3799
+#: main.c:3858
 msgid ": Send expression failed.\n"
 msgstr ": Sending av uttrykk feilet.\n"
 
-#: mark.c:761
+#: mark.c:785
 msgid "No marks set"
 msgstr "Ingen merker satt"
 
-#: mark.c:763
+#: mark.c:787
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: Ingen merker samsvarer med \"%s\""
 
 #. Highlight title
-#: mark.c:774
+#: mark.c:798
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -4218,7 +4214,7 @@
 "merk linje kol fil/tekst"
 
 #. Highlight title
-#: mark.c:896
+#: mark.c:920
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -4227,7 +4223,7 @@
 " hopp linje kol fil/tekst"
 
 #. Highlight title
-#: mark.c:943
+#: mark.c:967
 msgid ""
 "\n"
 "change line  col text"
@@ -4235,7 +4231,7 @@
 "\n"
 "forand linje kol tekst"
 
-#: mark.c:1437
+#: mark.c:1467
 msgid ""
 "\n"
 "# File marks:\n"
@@ -4244,7 +4240,7 @@
 "# Filmerker:\n"
 
 #. Write the jumplist with -'
-#: mark.c:1472
+#: mark.c:1502
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -4252,7 +4248,7 @@
 "\n"
 "# Hoppliste (nyeste først):\n"
 
-#: mark.c:1573
+#: mark.c:1603
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -4260,7 +4256,7 @@
 "\n"
 "# Historie for merker inne i filer (yngst til eldst):\n"
 
-#: mark.c:1677
+#: mark.c:1707
 msgid "Missing '>'"
 msgstr "Mangler '>'"
 
@@ -4268,28 +4264,28 @@
 msgid "E543: Not a valid codepage"
 msgstr "E543: Er ikke en gyldig codepage"
 
-#: mbyte.c:5358
+#: mbyte.c:5419
 msgid "E284: Cannot set IC values"
 msgstr "E284: Kan ikke sette IC-verdier (\"Input Context\")"
 
-#: mbyte.c:5364
+#: mbyte.c:5425
 msgid "E285: Failed to create input context"
 msgstr "E285: Klarte ikke opprette inndatakontekst"
 
-#: mbyte.c:5522
+#: mbyte.c:5583
 msgid "E286: Failed to open input method"
 msgstr "E286: Klarte ikke åpne inndatametode"
 
-#: mbyte.c:5535
+#: mbyte.c:5596
 msgid "E287: Warning: Could not set destroy callback to IM"
 msgstr ""
 "E287: Advarsel: Klarte ikke sette \"destroy callback\" til inndatametode"
 
-#: mbyte.c:5541
+#: mbyte.c:5602
 msgid "E288: input method doesn't support any style"
 msgstr "E288: Inndatametode støtter ikke enhver stil"
 
-#: mbyte.c:5600
+#: mbyte.c:5661
 msgid "E289: input method doesn't support my preedit type"
 msgstr "E289: Inndatametode støtter ikke min \"preedit\" type"
 
@@ -4347,29 +4343,29 @@
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr "E303: Klarte ikke åpne swapfil for \"%s\", gjenoppretting umulig"
 
-#: memline.c:909
+#: memline.c:907
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): Hentet ikke blokk 0??"
 
-#: memline.c:1130
+#: memline.c:1128
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: Ingen swapfil funnet for %s"
 
-#: memline.c:1140
+#: memline.c:1138
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "Skriv nummeret på swapfil som skal brukes (0 for å avslutte): "
 
-#: memline.c:1187
+#: memline.c:1185
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: Kan ikke åpne %s"
 
-#: memline.c:1209
+#: memline.c:1207
 msgid "Unable to read block 0 from "
 msgstr "Klarte ikke lese blokk 0 fra "
 
-#: memline.c:1211
+#: memline.c:1209
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -4378,28 +4374,28 @@
 "Det er mulig ingen forandringer ble gjort, eller Vim oppdaterte ikke "
 "swapfilen."
 
-#: memline.c:1221 memline.c:1238
+#: memline.c:1219 memline.c:1236
 msgid " cannot be used with this version of Vim.\n"
 msgstr " kan ikke brukes med denne Vim-versjonen.\n"
 
-#: memline.c:1223
+#: memline.c:1221
 msgid "Use Vim version 3.0.\n"
 msgstr "Bruk Vim versjon 3.0.\n"
 
-#: memline.c:1229
+#: memline.c:1227
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s ser ikke ut som en Vim-swapfil"
 
-#: memline.c:1242
+#: memline.c:1240
 msgid " cannot be used on this computer.\n"
 msgstr " kan ikke brukes på denne maskinen.\n"
 
-#: memline.c:1244
+#: memline.c:1242
 msgid "The file was created on "
 msgstr "Filen ble laget på "
 
-#: memline.c:1248
+#: memline.c:1246
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -4407,120 +4403,120 @@
 ",\n"
 "eller filen er blitt ødelagt."
 
-#: memline.c:1265
+#: memline.c:1263
 #, c-format
 msgid ""
 "E833: %s is encrypted and this version of Vim does not support encryption"
 msgstr ""
 
-#: memline.c:1283
+#: memline.c:1281
 msgid " has been damaged (page size is smaller than minimum value).\n"
 msgstr ""
 
-#: memline.c:1315
+#: memline.c:1313
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "Bruker swapfilen \"%s\""
 
-#: memline.c:1321
+#: memline.c:1319
 #, c-format
 msgid "Original file \"%s\""
 msgstr "Originalfil \"%s\""
 
-#: memline.c:1334
+#: memline.c:1332
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: Advarsel: Originalfilen kan ha blitt forandret"
 
-#: memline.c:1380
+#: memline.c:1378
 #, c-format
 msgid "Swap file is encrypted: \"%s\""
 msgstr ""
 
-#: memline.c:1381
+#: memline.c:1379
 msgid ""
 "\n"
 "If you entered a new crypt key but did not write the text file,"
 msgstr ""
 
-#: memline.c:1382
+#: memline.c:1380
 msgid ""
 "\n"
 "enter the new crypt key."
 msgstr ""
 
-#: memline.c:1383
+#: memline.c:1381
 msgid ""
 "\n"
 "If you wrote the text file after changing the crypt key press enter"
 msgstr ""
 
-#: memline.c:1384
+#: memline.c:1382
 msgid ""
 "\n"
 "to use the same key for text file and swap file"
 msgstr ""
 
-#: memline.c:1439
+#: memline.c:1437
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: Klarte ikke lese blokk 1 fra %s"
 
-#: memline.c:1443
+#: memline.c:1441
 msgid "???MANY LINES MISSING"
 msgstr "???MANGE LINJER MANGLER"
 
-#: memline.c:1459
+#: memline.c:1457
 msgid "???LINE COUNT WRONG"
 msgstr "???FEIL LINJEANTALL"
 
-#: memline.c:1466
+#: memline.c:1464
 msgid "???EMPTY BLOCK"
 msgstr "???TOM BLOKK"
 
-#: memline.c:1492
+#: memline.c:1490
 msgid "???LINES MISSING"
 msgstr "???LINJER MANGLER"
 
-#: memline.c:1525
+#: memline.c:1523
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: ID til blokk 1 er feil (%s ikke en \".swp\"-fil?)"
 
-#: memline.c:1530
+#: memline.c:1528
 msgid "???BLOCK MISSING"
 msgstr "???BLOKK MANGLER"
 
-#: memline.c:1546
+#: memline.c:1544
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? Herfra til ???SLUTT kan linjer være rotet til"
 
-#: memline.c:1562
+#: memline.c:1560
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? Herfra til ???SLUTT kan linjer ha blitt lagt til eller slettet"
 
-#: memline.c:1582
+#: memline.c:1580
 msgid "???END"
 msgstr "???SLUTT"
 
-#: memline.c:1645
+#: memline.c:1643
 msgid "E311: Recovery Interrupted"
 msgstr "E311: Gjenoppretting avbrutt"
 
-#: memline.c:1650
+#: memline.c:1648
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr ""
 "E312: Feil oppdaget under gjenoppretting; se etter linjer som starter med ???"
 
-#: memline.c:1652
+#: memline.c:1650
 msgid "See \":help E312\" for more information."
 msgstr "Se \":help E312\" for mer informasjon."
 
-#: memline.c:1659
+#: memline.c:1657
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "Gjenoppretting komplett. Du bør sjekke at alt er i orden."
 
-#: memline.c:1660
+#: memline.c:1658
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -4528,71 +4524,71 @@
 "\n"
 "(Du vil kanskje lagre denne filen under et annet navn\n"
 
-#: memline.c:1661
+#: memline.c:1659
 msgid "and run diff with the original file to check for changes)"
 msgstr ""
 
-#: memline.c:1664
+#: memline.c:1662
 msgid "Recovery completed. Buffer contents equals file contents."
 msgstr ""
 
-#: memline.c:1665
+#: memline.c:1663
 msgid ""
 "\n"
 "You may want to delete the .swp file now.\n"
 "\n"
 msgstr ""
 
-#: memline.c:1671
+#: memline.c:1669
 msgid "Using crypt key from swap file for the text file.\n"
 msgstr ""
 
 #. use msg() to start the scrolling properly
-#: memline.c:1755
+#: memline.c:1753
 msgid "Swap files found:"
 msgstr "Swapfiler funnet:"
 
-#: memline.c:1934
+#: memline.c:1932
 msgid "   In current directory:\n"
 msgstr "   I nåværende katalog:\n"
 
-#: memline.c:1936
+#: memline.c:1934
 msgid "   Using specified name:\n"
 msgstr "   Bruker spesifisert navn:\n"
 
-#: memline.c:1940
+#: memline.c:1938
 msgid "   In directory "
 msgstr "   I katalog "
 
-#: memline.c:1958
+#: memline.c:1956
 msgid "      -- none --\n"
 msgstr "      -- ingen --\n"
 
-#: memline.c:2033
+#: memline.c:2031
 msgid "          owned by: "
 msgstr "          eies av: "
 
-#: memline.c:2035
+#: memline.c:2033
 msgid "   dated: "
 msgstr "   datert: "
 
-#: memline.c:2039 memline.c:4047
+#: memline.c:2037 memline.c:4045
 msgid "             dated: "
 msgstr "             datert: "
 
-#: memline.c:2058
+#: memline.c:2056
 msgid "         [from Vim version 3.0]"
 msgstr "         [fra Vim versjon 3.0]"
 
-#: memline.c:2062
+#: memline.c:2060
 msgid "         [does not look like a Vim swap file]"
 msgstr "         [ser ikke ut som en Vim-swapfil]"
 
-#: memline.c:2066
+#: memline.c:2064
 msgid "         file name: "
 msgstr "         filnavn: "
 
-#: memline.c:2072
+#: memline.c:2070
 msgid ""
 "\n"
 "          modified: "
@@ -4600,15 +4596,15 @@
 "\n"
 "          modifisert: "
 
-#: memline.c:2073
+#: memline.c:2071
 msgid "YES"
 msgstr "JA"
 
-#: memline.c:2073
+#: memline.c:2071
 msgid "no"
 msgstr "nei"
 
-#: memline.c:2077
+#: memline.c:2075
 msgid ""
 "\n"
 "         user name: "
@@ -4616,11 +4612,11 @@
 "\n"
 "         brukernavn: "
 
-#: memline.c:2084
+#: memline.c:2082
 msgid "   host name: "
 msgstr "   vertsnavn: "
 
-#: memline.c:2086
+#: memline.c:2084
 msgid ""
 "\n"
 "         host name: "
@@ -4628,7 +4624,7 @@
 "\n"
 "         vertsnavn: "
 
-#: memline.c:2092
+#: memline.c:2090
 msgid ""
 "\n"
 "        process ID: "
@@ -4636,11 +4632,11 @@
 "\n"
 "        prosess-ID: "
 
-#: memline.c:2098
+#: memline.c:2096
 msgid " (still running)"
 msgstr " (kjører fortsatt)"
 
-#: memline.c:2110
+#: memline.c:2108
 msgid ""
 "\n"
 "         [not usable with this version of Vim]"
@@ -4648,7 +4644,7 @@
 "\n"
 "         [ikke brukbar med denne Vim-versjonen]"
 
-#: memline.c:2113
+#: memline.c:2111
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -4656,97 +4652,97 @@
 "\n"
 "         [ikke brukbar på denne maskinen]"
 
-#: memline.c:2118
+#: memline.c:2116
 msgid "         [cannot be read]"
 msgstr "         [kan ikke leses]"
 
-#: memline.c:2122
+#: memline.c:2120
 msgid "         [cannot be opened]"
 msgstr "         [kan ikke åpnes]"
 
-#: memline.c:2304
+#: memline.c:2302
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: Kan ikke bevare, swapfil mangler"
 
-#: memline.c:2357
+#: memline.c:2355
 msgid "File preserved"
 msgstr "Fil bevart"
 
-#: memline.c:2359
+#: memline.c:2357
 msgid "E314: Preserve failed"
 msgstr "E314: Bevaring feilet"
 
-#: memline.c:2436
+#: memline.c:2434
 #, c-format
 msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get: Ugyldig lnum: %ld"
 
-#: memline.c:2471
+#: memline.c:2469
 #, c-format
 msgid "E316: ml_get: cannot find line %ld"
 msgstr "E316: ml_get: Kan ikke finne linje %ld"
 
-#: memline.c:2885
+#: memline.c:2883
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: Pekerblokk-id feil 3"
 
-#: memline.c:2965
+#: memline.c:2963
 msgid "stack_idx should be 0"
 msgstr "stack_idx skulle være 0"
 
-#: memline.c:3027
+#: memline.c:3025
 msgid "E318: Updated too many blocks?"
 msgstr "E318: Oppdaterte for mange blokker?"
 
-#: memline.c:3208
+#: memline.c:3206
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: Pekerblokk-id feil 4"
 
-#: memline.c:3235
+#: memline.c:3233
 msgid "deleted block 1?"
 msgstr "slettet blokk 1?"
 
-#: memline.c:3422
+#: memline.c:3420
 #, c-format
 msgid "E320: Cannot find line %ld"
 msgstr "E320: Kan ikke finne linje %ld"
 
-#: memline.c:3671
+#: memline.c:3669
 msgid "E317: pointer block id wrong"
 msgstr "E317: Pekerblokk-id feil"
 
-#: memline.c:3687
+#: memline.c:3685
 msgid "pe_line_count is zero"
 msgstr "pe_line_count er null"
 
-#: memline.c:3716
+#: memline.c:3714
 #, c-format
 msgid "E322: line number out of range: %ld past the end"
 msgstr "E322: Linjenummer utenfor område: %ld forbi slutten"
 
-#: memline.c:3720
+#: memline.c:3718
 #, c-format
 msgid "E323: line count wrong in block %ld"
 msgstr "E323: Linjeantall feil i blokk %ld"
 
-#: memline.c:3769
+#: memline.c:3767
 msgid "Stack size increases"
 msgstr "Stackstørrelse øker"
 
-#: memline.c:3816
+#: memline.c:3814
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: Pekerblokk-id feil 2"
 
-#: memline.c:3853
+#: memline.c:3851
 #, c-format
 msgid "E773: Symlink loop for \"%s\""
 msgstr "E773: Symlenkesløyfe for \"%s\""
 
-#: memline.c:4037
+#: memline.c:4035
 msgid "E325: ATTENTION"
 msgstr "E325: VIKTIG"
 
-#: memline.c:4038
+#: memline.c:4036
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -4754,17 +4750,17 @@
 "\n"
 "Fant en swapfil ved navn \""
 
-#: memline.c:4042
+#: memline.c:4040
 msgid "While opening file \""
 msgstr "Under åpning av filen \""
 
-#: memline.c:4055
+#: memline.c:4053
 msgid "      NEWER than swap file!\n"
 msgstr "      NYERE enn swapfil!\n"
 
 #. Some of these messages are long to allow translation to
 #. * other languages.
-#: memline.c:4059
+#: memline.c:4057
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
@@ -4772,19 +4768,19 @@
 "    file when making changes."
 msgstr ""
 
-#: memline.c:4060
+#: memline.c:4058
 msgid "  Quit, or continue with caution.\n"
 msgstr ""
 
-#: memline.c:4061
+#: memline.c:4059
 msgid "(2) An edit session for this file crashed.\n"
 msgstr ""
 
-#: memline.c:4062
+#: memline.c:4060
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    Hvis det er tilfelle, bruk \":recover\" eller \"vim -r "
 
-#: memline.c:4064
+#: memline.c:4062
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
@@ -4792,11 +4788,11 @@
 "\"\n"
 "    for å gjenopprette forandringene (se \":help recovery\").\n"
 
-#: memline.c:4065
+#: memline.c:4063
 msgid "    If you did this already, delete the swap file \""
 msgstr "    Hvis du har gjort dette allerede, slett swapfilen \""
 
-#: memline.c:4067
+#: memline.c:4065
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -4804,23 +4800,23 @@
 "\"\n"
 "    for å unngå denne meldingen.\n"
 
-#: memline.c:4481 memline.c:4485
+#: memline.c:4479 memline.c:4483
 msgid "Swap file \""
 msgstr "Swapfilen \""
 
-#: memline.c:4482 memline.c:4488
+#: memline.c:4480 memline.c:4486
 msgid "\" already exists!"
 msgstr "\" finnes allerede!"
 
-#: memline.c:4491
+#: memline.c:4489
 msgid "VIM - ATTENTION"
 msgstr "VIM - VIKTIG"
 
-#: memline.c:4493
+#: memline.c:4491
 msgid "Swap file already exists!"
 msgstr "Swapfilen eksisterer allerede!"
 
-#: memline.c:4497
+#: memline.c:4495
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4834,7 +4830,7 @@
 "&Avslutt\n"
 "Av&bryt"
 
-#: memline.c:4499
+#: memline.c:4497
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4850,7 +4846,7 @@
 "&Avslutt\n"
 "Av&bryt"
 
-#: memline.c:4570
+#: memline.c:4568
 msgid "E326: Too many swap files found"
 msgstr "E326: For mange swapfiler funnet"
 
@@ -4940,32 +4936,32 @@
 msgstr ""
 "Vedlikeholder for norsk oversettelse: Øyvind A. Holm <sunny@sunbase.org>"
 
-#: message.c:1109
+#: message.c:1128
 msgid "Interrupt: "
 msgstr "Avbryt: "
 
-#: message.c:1111
+#: message.c:1130
 msgid "Press ENTER or type command to continue"
 msgstr "Trykk ENTER eller skriv kommando for å fortsette"
 
-#: message.c:2206
+#: message.c:2225
 #, c-format
 msgid "%s line %ld"
 msgstr "%s linje %ld"
 
-#: message.c:2916
+#: message.c:2935
 msgid "-- More --"
 msgstr "-- Mer --"
 
-#: message.c:2922
+#: message.c:2941
 msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
 msgstr " MELLOMROM/d/j: Skjerm/side/linje ned, b/u/k: Opp, q: Avslutt "
 
-#: message.c:3680 message.c:3695
+#: message.c:3699 message.c:3714
 msgid "Question"
 msgstr "Spørsmål"
 
-#: message.c:3682
+#: message.c:3701
 msgid ""
 "&Yes\n"
 "&No"
@@ -4973,7 +4969,7 @@
 "&Ja\n"
 "&Nei"
 
-#: message.c:3715
+#: message.c:3734
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4987,79 +4983,79 @@
 "&Forkast alle\n"
 "&Avbryt"
 
-#: message.c:3756
+#: message.c:3775
 msgid "Select Directory dialog"
 msgstr "\"Velge katalog\"-dialogvindu"
 
-#: message.c:3758
+#: message.c:3777
 msgid "Save File dialog"
 msgstr "\"Lagre fil\"-dialogvindu"
 
-#: message.c:3760
+#: message.c:3779
 msgid "Open File dialog"
 msgstr "\"Åpne fil\"-dialogvindu"
 
 #. TODO: non-GUI file selector here
-#: message.c:3860
+#: message.c:3879
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: Dessverre ingen filbehandler i konsollmodus"
 
-#: message.c:3891
+#: message.c:3910
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: Ikke nok parametre for printf()"
 
-#: message.c:3967
+#: message.c:3986
 msgid "E807: Expected Float argument for printf()"
 msgstr ""
 
-#: message.c:4896
+#: message.c:4935
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: For mange parametere for printf()"
 
-#: misc1.c:3155
+#: misc1.c:3206
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: Advarsel: Forandrer en skrivebeskyttet fil"
 
-#: misc1.c:3479
+#: misc1.c:3543
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr ""
 
-#: misc1.c:3481
+#: misc1.c:3545
 msgid "Type number and <Enter> (empty cancels): "
 msgstr ""
 
-#: misc1.c:3533
+#: misc1.c:3597
 msgid "1 more line"
 msgstr "1 linje lagt til"
 
-#: misc1.c:3536
+#: misc1.c:3600
 msgid "1 line less"
 msgstr "1 linje fjernet"
 
-#: misc1.c:3543
+#: misc1.c:3607
 #, c-format
 msgid "%ld more lines"
 msgstr "%ld linjer lagt til"
 
-#: misc1.c:3546
+#: misc1.c:3610
 #, c-format
 msgid "%ld fewer lines"
 msgstr "%ld linjer fjernet"
 
-#: misc1.c:3549
+#: misc1.c:3613
 msgid " (Interrupted)"
 msgstr " (Avbrutt)"
 
-#: misc1.c:3614
+#: misc1.c:3678
 msgid "Beep!"
 msgstr "Pip!"
 
-#: misc1.c:8978
+#: misc1.c:9199
 msgid "Vim: preserving files...\n"
 msgstr "Vim: Bevarer filer ...\n"
 
 #. close all memfiles, without deleting
-#: misc1.c:8988
+#: misc1.c:9209
 msgid "Vim: Finished.\n"
 msgstr "Vim: Ferdig.\n"
 
@@ -5085,62 +5081,62 @@
 "[kall] totale \"re/malloc()\"-er %lu, totale \"free()\"-er %lu\n"
 "\n"
 
-#: misc2.c:857
+#: misc2.c:858
 msgid "E340: Line is becoming too long"
 msgstr "E340: Linjen blir for lang"
 
-#: misc2.c:901
+#: misc2.c:902
 #, c-format
 msgid "E341: Internal error: lalloc(%ld, )"
 msgstr "E341: Intern feil: lalloc(%ld, )"
 
-#: misc2.c:1020
+#: misc2.c:1021
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
 msgstr "E342: Ikke mer ledig hukommelse! (Reserverer %lu bytes)"
 
-#: misc2.c:3193
+#: misc2.c:3200
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "Kaller skall for å utføre \"%s\""
 
-#: misc2.c:3476
+#: misc2.c:3483
 msgid "E545: Missing colon"
 msgstr "E545: Mangler kolon"
 
-#: misc2.c:3478 misc2.c:3505
+#: misc2.c:3485 misc2.c:3512
 msgid "E546: Illegal mode"
 msgstr "E546: Ulovlig modus"
 
-#: misc2.c:3544
+#: misc2.c:3551
 msgid "E547: Illegal mouseshape"
 msgstr "E547: Ulovlig utseende på musepekeren"
 
-#: misc2.c:3584
+#: misc2.c:3591
 msgid "E548: digit expected"
 msgstr "E548: Siffer forventet"
 
-#: misc2.c:3589
+#: misc2.c:3596
 msgid "E549: Illegal percentage"
 msgstr "E549: Ulovlig prosent"
 
-#: misc2.c:4072
+#: misc2.c:4079
 msgid "Enter encryption key: "
 msgstr "Skriv krypteringsnøkkel: "
 
-#: misc2.c:4073
+#: misc2.c:4080
 msgid "Enter same key again: "
 msgstr "Gjenta krypteringsnøkkelen: "
 
-#: misc2.c:4084
+#: misc2.c:4091
 msgid "Keys don't match!"
 msgstr "Krypteringsnøklene stemmer ikke overens!"
 
-#: misc2.c:4319
+#: misc2.c:4326
 msgid "E854: path too long for completion"
 msgstr ""
 
-#: misc2.c:4638
+#: misc2.c:4645
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
@@ -5149,22 +5145,22 @@
 "E343: Ugyldig sti: '**[nummer]' må være på slutten av stien eller bli "
 "etterfulgt av '%s'."
 
-#: misc2.c:5945
+#: misc2.c:6000
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: Kan ikke finne katalogen \"%s\" i \"cdpath\""
 
-#: misc2.c:5948
+#: misc2.c:6003
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: Kan ikke finne filen \"%s\" i stien"
 
-#: misc2.c:5954
+#: misc2.c:6009
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: Ingen flere katalog-\"%s\" funnet i \"cdpath\""
 
-#: misc2.c:5957
+#: misc2.c:6012
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: Ingen flere fil-\"%s\" funnet i stien"
@@ -5205,128 +5201,128 @@
 msgid "E505: %s is read-only (add ! to override)"
 msgstr ""
 
-#: normal.c:189
+#: normal.c:190
 msgid "E349: No identifier under cursor"
 msgstr "E349: Ingen identifikator under markør"
 
-#: normal.c:2285
+#: normal.c:2310
 msgid "E774: 'operatorfunc' is empty"
 msgstr "E774: 'operatorfunc' er tomt"
 
-#: normal.c:2311
+#: normal.c:2340
 msgid "E775: Eval feature not available"
 msgstr "E775: Eval-funksjonaliteten er ikke tilgjengelig"
 
-#: normal.c:3341
+#: normal.c:3394
 msgid "Warning: terminal cannot highlight"
 msgstr "Advarsel: Terminalen kan ikke utheve"
 
-#: normal.c:3636
+#: normal.c:3689
 msgid "E348: No string under cursor"
 msgstr "E348: Ingen streng under markør"
 
-#: normal.c:5046
+#: normal.c:5098
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: Kan ikke slette folder med nåværende 'foldmethod'"
 
-#: normal.c:7579
+#: normal.c:7649
 msgid "E664: changelist is empty"
 msgstr "E664: Forandringslisten er tom"
 
-#: normal.c:7581
+#: normal.c:7651
 msgid "E662: At start of changelist"
 msgstr "E662: Ved starten av forandringsliste"
 
-#: normal.c:7583
+#: normal.c:7653
 msgid "E663: At end of changelist"
 msgstr "E663: Ved slutten av forandringsliste"
 
-#: normal.c:8980
+#: normal.c:9073
 msgid "Type  :quit<Enter>  to exit Vim"
 msgstr "Skriv  :quit<Enter>  for å avslutte Vim"
 
-#: ops.c:296
+#: ops.c:300
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "1 linje \"%s\"-et 1 gang"
 
-#: ops.c:298
+#: ops.c:302
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "1 linje \"%s\"-et %d ganger"
 
-#: ops.c:303
+#: ops.c:307
 #, c-format
 msgid "%ld lines %sed 1 time"
 msgstr "%ld linjer \"%s\"-et 1 gang"
 
-#: ops.c:306
+#: ops.c:310
 #, c-format
 msgid "%ld lines %sed %d times"
 msgstr "%ld linjer \"%s\"-et %d ganger"
 
-#: ops.c:694
+#: ops.c:698
 #, c-format
 msgid "%ld lines to indent... "
 msgstr "%ld linjer å rykke inn ... "
 
-#: ops.c:745
+#: ops.c:749
 msgid "1 line indented "
 msgstr "1 linje rykket inn "
 
-#: ops.c:747
+#: ops.c:751
 #, c-format
 msgid "%ld lines indented "
 msgstr "%ld linjer rykket inn "
 
-#: ops.c:1173
+#: ops.c:1196
 msgid "E748: No previously used register"
 msgstr "E748: Register ikke tidligere brukt"
 
 #. must display the prompt
-#: ops.c:1754
+#: ops.c:1780
 msgid "cannot yank; delete anyway"
 msgstr "kan ikke kopiere til utklippstavle; slett likevel"
 
-#: ops.c:2379
+#: ops.c:2406
 msgid "1 line changed"
 msgstr "1 linje forandret"
 
-#: ops.c:2381
+#: ops.c:2408
 #, c-format
 msgid "%ld lines changed"
 msgstr "%ld linjer forandret"
 
-#: ops.c:2838
+#: ops.c:2870
 #, c-format
 msgid "freeing %ld lines"
 msgstr "frigjør %ld linjer"
 
-#: ops.c:3126
+#: ops.c:3158
 msgid "block of 1 line yanked"
 msgstr "blokk med 1 linje kopiert til utklippstavlen"
 
-#: ops.c:3129
+#: ops.c:3161
 msgid "1 line yanked"
 msgstr "1 linje kopiert til utklippstavlen"
 
-#: ops.c:3133
+#: ops.c:3165
 #, c-format
 msgid "block of %ld lines yanked"
 msgstr "blokk med %ld linjer kopiert til utklippstavlen"
 
-#: ops.c:3136
+#: ops.c:3168
 #, c-format
 msgid "%ld lines yanked"
 msgstr "%ld linjer kopiert til utklippstavlen"
 
-#: ops.c:3441
+#: ops.c:3480
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: Ingenting i register %s"
 
 #. Highlight title
-#: ops.c:4033
+#: ops.c:4092
 msgid ""
 "\n"
 "--- Registers ---"
@@ -5334,11 +5330,11 @@
 "\n"
 "--- Registere ---"
 
-#: ops.c:5542
+#: ops.c:5644
 msgid "Illegal register name"
 msgstr "Ulovlig registernavn"
 
-#: ops.c:5638
+#: ops.c:5740
 msgid ""
 "\n"
 "# Registers:\n"
@@ -5346,22 +5342,22 @@
 "\n"
 "# Registere:\n"
 
-#: ops.c:5695
+#: ops.c:5797
 #, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: Ukjent registertype %d"
 
-#: ops.c:6642
+#: ops.c:6761
 #, c-format
 msgid "%ld Cols; "
 msgstr "%ld Kol; "
 
-#: ops.c:6651
+#: ops.c:6770
 #, c-format
 msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
 msgstr "Valgte %s%ld av %ld linjer; %ld av %ld ord; %ld av %ld bytes"
 
-#: ops.c:6658
+#: ops.c:6777
 #, c-format
 msgid ""
 "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
@@ -5369,12 +5365,12 @@
 msgstr ""
 "Valgte %s%ld av %ld linjer; %ld av %ld ord; %ld av %ld tegn; %ld av %ld bytes"
 
-#: ops.c:6677
+#: ops.c:6796
 #, c-format
 msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
 msgstr "Kol %s av %s; Linje %ld av %ld; Ord %ld av %ld; Byte %ld av %ld"
 
-#: ops.c:6685
+#: ops.c:6804
 #, c-format
 msgid ""
 "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
@@ -5383,170 +5379,170 @@
 "Kol %s av %s; linje %ld av %ld; ord %ld av %ld; tegn %ld av %ld; byte %ld av "
 "%ld"
 
-#: ops.c:6697
+#: ops.c:6816
 #, c-format
 msgid "(+%ld for BOM)"
 msgstr "(+%ld for BOM)"
 
-#: option.c:2006
+#: option.c:2033
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Side %N"
 
-#: option.c:2589
+#: option.c:2619
 msgid "Thanks for flying Vim"
 msgstr "Takk for at du fløy Vim"
 
-#: option.c:4253
+#: option.c:4284
 msgid "E518: Unknown option"
 msgstr "E518: Ukjent valg"
 
-#: option.c:4266
+#: option.c:4297
 msgid "E519: Option not supported"
 msgstr "E519: Valget er ikke støttet"
 
-#: option.c:4304
+#: option.c:4335
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: Ikke tillatt i moduslinje"
 
-#: option.c:4397
+#: option.c:4428
 msgid "E846: Key code not set"
 msgstr ""
 
-#: option.c:4523
+#: option.c:4554
 msgid "E521: Number required after ="
 msgstr "E521: Nummer nødvendig etter ="
 
-#: option.c:4873 option.c:5679
+#: option.c:4904 option.c:5714
 msgid "E522: Not found in termcap"
 msgstr "E522: Ikke funnet i termcap"
 
-#: option.c:4990
+#: option.c:5021
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: Ulovlig tegn <%s>"
 
-#: option.c:5671
+#: option.c:5706
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: Kan ikke sette 'term' til tom streng"
 
-#: option.c:5674
+#: option.c:5709
 msgid "E530: Cannot change term in GUI"
 msgstr "E530: Kan ikke forandre \"term\" i grafisk brukergrensesnitt"
 
-#: option.c:5676
+#: option.c:5711
 msgid "E531: Use \":gui\" to start the GUI"
 msgstr "E531: Bruk \":gui\" for å starte med grafisk brukergrensesnitt"
 
-#: option.c:5705
+#: option.c:5740
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' og 'patchmode' er like"
 
-#: option.c:5816
+#: option.c:5851
 msgid "E834: Conflicts with value of 'listchars'"
 msgstr ""
 
-#: option.c:5819
+#: option.c:5854
 msgid "E835: Conflicts with value of 'fillchars'"
 msgstr ""
 
-#: option.c:5945
+#: option.c:5980
 msgid "E617: Cannot be changed in the GTK+ 2 GUI"
 msgstr "E617: Kan ikke forandres i GTK+ 2 GUI"
 
-#: option.c:6182
+#: option.c:6247
 msgid "E524: Missing colon"
 msgstr "E524: Mangler kolon"
 
-#: option.c:6184
+#: option.c:6249
 msgid "E525: Zero length string"
 msgstr "E525: Tom streng"
 
-#: option.c:6267
+#: option.c:6332
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: Mangler nummer etter <%s>"
 
-#: option.c:6281
+#: option.c:6346
 msgid "E527: Missing comma"
 msgstr "E527: Mangler komma"
 
-#: option.c:6288
+#: option.c:6353
 msgid "E528: Must specify a ' value"
 msgstr "E528: Må spesifisere en \"'\"-verdi"
 
-#: option.c:6337
+#: option.c:6402
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: Inneholder uskrivelige eller brede tegn"
 
-#: option.c:6381
+#: option.c:6446
 msgid "E596: Invalid font(s)"
 msgstr "E596: Ugyldig(e) skrifttype(r)"
 
-#: option.c:6390
+#: option.c:6455
 msgid "E597: can't select fontset"
 msgstr "E597: Kan ikke velge skrifttypesett"
 
-#: option.c:6392
+#: option.c:6457
 msgid "E598: Invalid fontset"
 msgstr "E598: Ugyldig skrifttypesett"
 
-#: option.c:6400
+#: option.c:6465
 msgid "E533: can't select wide font"
 msgstr "E533: Kan ikke velge bred skrifttype"
 
-#: option.c:6402
+#: option.c:6467
 msgid "E534: Invalid wide font"
 msgstr "E534: Ugyldig bred skrifttype"
 
-#: option.c:6731
+#: option.c:6796
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: Ulovlig tegn etter <%c>"
 
-#: option.c:6855
+#: option.c:6920
 msgid "E536: comma required"
 msgstr "E536: Komma nødvendig"
 
-#: option.c:6865
+#: option.c:6930
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' må være tom eller inneholde %s"
 
-#: option.c:6950
+#: option.c:7015
 msgid "E538: No mouse support"
 msgstr "E538: Ingen støtte for mus"
 
-#: option.c:7361
+#: option.c:7426
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: Uttrykkssekvens som ikke er lukket"
 
-#: option.c:7365
+#: option.c:7430
 msgid "E541: too many items"
 msgstr "E541: For mange elementer"
 
-#: option.c:7367
+#: option.c:7432
 msgid "E542: unbalanced groups"
 msgstr "E542: Ubalanserte grupper"
 
-#: option.c:7754
+#: option.c:7823
 msgid "E590: A preview window already exists"
 msgstr "E590: Det finnes allerede et forhåndsvisningsvindu"
 
-#: option.c:8011
+#: option.c:8080
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr "W17: Arabisk trenger UTF-8, utfør ':set encoding=utf-8'"
 
-#: option.c:8450
+#: option.c:8519
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: Trenger minst %d linjer"
 
-#: option.c:8460
+#: option.c:8529
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: Trenger minst %d kolonner"
 
-#: option.c:8775
+#: option.c:8980
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: Ukjent valg: %s"
@@ -5554,12 +5550,12 @@
 #. There's another character after zeros or the string
 #. * is empty.  In both cases, we are trying to set a
 #. * num option using a string.
-#: option.c:8807
+#: option.c:9012
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr ""
 
-#: option.c:8931
+#: option.c:9137
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -5567,7 +5563,7 @@
 "\n"
 "--- Terminalkoder ---"
 
-#: option.c:8933
+#: option.c:9139
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -5575,7 +5571,7 @@
 "\n"
 "--- Globale valgverdier ---"
 
-#: option.c:8935
+#: option.c:9141
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -5583,7 +5579,7 @@
 "\n"
 "--- Lokale valgverdier ---"
 
-#: option.c:8937
+#: option.c:9143
 msgid ""
 "\n"
 "--- Options ---"
@@ -5591,145 +5587,145 @@
 "\n"
 "--- Valg ---"
 
-#: option.c:9773
+#: option.c:10058
 msgid "E356: get_varp ERROR"
 msgstr "E356: \"get_varp\"-FEIL"
 
-#: option.c:10908
+#: option.c:11206
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': Samsvarende tegn mangler for %s"
 
-#: option.c:10932
+#: option.c:11230
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': Ekstra tegn etter semikolon: %s"
 
-#: os_amiga.c:278
+#: os_amiga.c:283
 msgid "cannot open "
 msgstr "kan ikke åpne "
 
-#: os_amiga.c:313
+#: os_amiga.c:320
 msgid "VIM: Can't open window!\n"
 msgstr "VIM: Kan ikke åpne vindu!\n"
 
-#: os_amiga.c:340
+#: os_amiga.c:347
 msgid "Need Amigados version 2.04 or later\n"
 msgstr "Trenger Amigados versjon 2.04 eller nyere\n"
 
-#: os_amiga.c:346
+#: os_amiga.c:353
 #, c-format
 msgid "Need %s version %ld\n"
 msgstr "Trenger %s versjon %ld\n"
 
-#: os_amiga.c:419
+#: os_amiga.c:426
 msgid "Cannot open NIL:\n"
 msgstr "Kan ikke åpne NIL:\n"
 
-#: os_amiga.c:437
+#: os_amiga.c:444
 msgid "Cannot create "
 msgstr "Kan ikke opprette "
 
-#: os_amiga.c:943
+#: os_amiga.c:950
 #, c-format
 msgid "Vim exiting with %d\n"
 msgstr "Vim avslutter med %d\n"
 
-#: os_amiga.c:979
+#: os_amiga.c:986
 msgid "cannot change console mode ?!\n"
 msgstr "kan ikke forandre konsollmodus ?!\n"
 
-#: os_amiga.c:1057
+#: os_amiga.c:1066
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize: Ikke et konsoll??\n"
 
 #. if Vim opened a window: Executing a shell may cause crashes
-#: os_amiga.c:1212
+#: os_amiga.c:1223
 msgid "E360: Cannot execute shell with -f option"
 msgstr "E360: Kan ikke kjøre skall med \"-f\"-valg"
 
-#: os_amiga.c:1253 os_amiga.c:1343
+#: os_amiga.c:1264 os_amiga.c:1354
 msgid "Cannot execute "
 msgstr "Kan ikke utføre "
 
-#: os_amiga.c:1256 os_amiga.c:1353
+#: os_amiga.c:1267 os_amiga.c:1364
 msgid "shell "
 msgstr "skall "
 
-#: os_amiga.c:1276 os_amiga.c:1378
+#: os_amiga.c:1287 os_amiga.c:1389
 msgid " returned\n"
 msgstr " returnerte\n"
 
-#: os_amiga.c:1540
+#: os_amiga.c:1551
 msgid "ANCHOR_BUF_SIZE too small."
 msgstr "ANCHOR_BUF_SIZE for liten."
 
-#: os_amiga.c:1544
+#: os_amiga.c:1555
 msgid "I/O ERROR"
 msgstr "I/U-FEIL"
 
-#: os_mswin.c:593
+#: os_mswin.c:715
 msgid "Message"
 msgstr "Melding"
 
-#: os_mswin.c:708
+#: os_mswin.c:830
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' er ikke 80, kan ikke utføre eksterne kommandoer"
 
-#: os_mswin.c:2145
+#: os_mswin.c:1560
 msgid "E237: Printer selection failed"
 msgstr "E237: Valg av skriver feilet"
 
-#: os_mswin.c:2185
+#: os_mswin.c:1600
 #, c-format
 msgid "to %s on %s"
 msgstr "til %s på %s"
 
-#: os_mswin.c:2200
+#: os_mswin.c:1615
 #, c-format
 msgid "E613: Unknown printer font: %s"
 msgstr "E613: Ukjent skrifttype for skriver: %s"
 
-#: os_mswin.c:2249 os_mswin.c:2259
+#: os_mswin.c:1664 os_mswin.c:1674
 #, c-format
 msgid "E238: Print error: %s"
 msgstr "E238: Feil under utskrift: %s"
 
-#: os_mswin.c:2287
+#: os_mswin.c:1702
 #, c-format
 msgid "Printing '%s'"
 msgstr "Skriver ut '%s'"
 
-#: os_mswin.c:3463
+#: os_mswin.c:2964
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
 msgstr "E244: Ulovlig navn på tegnsett \"%s\" i skrifttypenavn \"%s\""
 
-#: os_mswin.c:3473
+#: os_mswin.c:2974
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: Ulovlig tegn '%c' i skrifttypenavn \"%s\""
 
-#: os_unix.c:1086
+#: os_unix.c:1093
 msgid "Vim: Double signal, exiting\n"
 msgstr "Vim: Dobbelt signal, avslutter\n"
 
-#: os_unix.c:1092
+#: os_unix.c:1099
 #, c-format
 msgid "Vim: Caught deadly signal %s\n"
 msgstr "Vim: Mottok dødelig signal %s\n"
 
-#: os_unix.c:1095
+#: os_unix.c:1102
 #, c-format
 msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Mottok dødelig signal\n"
 
-#: os_unix.c:1445
+#: os_unix.c:1507
 #, c-format
 msgid "Opening the X display took %ld msec"
 msgstr "Åpning av X-display tok %ld millisekunder"
 
-#: os_unix.c:1472
+#: os_unix.c:1534
 msgid ""
 "\n"
 "Vim: Got X error\n"
@@ -5737,27 +5733,27 @@
 "\n"
 "Vim: Mottok X-feil\n"
 
-#: os_unix.c:1583
+#: os_unix.c:1645
 msgid "Testing the X display failed"
 msgstr "Test av X-display feilet"
 
-#: os_unix.c:1723
+#: os_unix.c:1785
 msgid "Opening the X display timed out"
 msgstr "Tidsavbrudd for åpning av X-display"
 
-#: os_unix.c:2709 os_unix.c:2716
+#: os_unix.c:2771 os_unix.c:2778
 msgid ""
 "\n"
 "Could not get security context for "
 msgstr ""
 
-#: os_unix.c:2726
+#: os_unix.c:2788
 msgid ""
 "\n"
 "Could not set security context for "
 msgstr ""
 
-#: os_unix.c:3816 os_unix.c:4771
+#: os_unix.c:3914 os_unix.c:4912
 msgid ""
 "\n"
 "Cannot execute shell "
@@ -5765,7 +5761,7 @@
 "\n"
 "Kan ikke kjøre skall "
 
-#: os_unix.c:3864
+#: os_unix.c:3962
 msgid ""
 "\n"
 "Cannot execute shell sh\n"
@@ -5773,7 +5769,7 @@
 "\n"
 "Kan ikke kjøre skallet sh\n"
 
-#: os_unix.c:3868 os_unix.c:4777
+#: os_unix.c:3966 os_unix.c:4918
 msgid ""
 "\n"
 "shell returned "
@@ -5781,7 +5777,7 @@
 "\n"
 "skallet returnerte "
 
-#: os_unix.c:4058 os_win32.c:3606
+#: os_unix.c:4155 os_win32.c:4150
 msgid ""
 "\n"
 "Cannot create pipes\n"
@@ -5789,7 +5785,7 @@
 "\n"
 "Kan ikke opprette rør (\"pipe\")\n"
 
-#: os_unix.c:4072 os_unix.c:4335
+#: os_unix.c:4169 os_unix.c:4432
 msgid ""
 "\n"
 "Cannot fork\n"
@@ -5797,7 +5793,7 @@
 "\n"
 "Kan ikke opprette tvillingprosess (\"fork\")\n"
 
-#: os_unix.c:4784
+#: os_unix.c:4925
 msgid ""
 "\n"
 "Command terminated\n"
@@ -5805,32 +5801,32 @@
 "\n"
 "Kommando avsluttet\n"
 
-#: os_unix.c:5087 os_unix.c:5268 os_unix.c:7000
+#: os_unix.c:5228 os_unix.c:5413 os_unix.c:7159
 msgid "XSMP lost ICE connection"
 msgstr "XSMP mistet ICE-forbindelsen"
 
-#: os_unix.c:6399 os_unix.c:6502
+#: os_unix.c:6543 os_unix.c:6646
 #, c-format
 msgid "dlerror = \"%s\""
 msgstr "dlerror = \"%s\""
 
-#: os_unix.c:6584
+#: os_unix.c:6728
 msgid "Opening the X display failed"
 msgstr "Åpning av X-display feilet"
 
-#: os_unix.c:6909
+#: os_unix.c:7068
 msgid "XSMP handling save-yourself request"
 msgstr "XSMP håndterer \"redd-deg-selv\"-forespørsel"
 
-#: os_unix.c:7023
+#: os_unix.c:7182
 msgid "XSMP opening connection"
 msgstr "XSMP åpner forbindelse"
 
-#: os_unix.c:7042
+#: os_unix.c:7201
 msgid "XSMP ICE connection watch failed"
 msgstr "Overvåkning av XSMP ICE-forbindelse feilet"
 
-#: os_unix.c:7066
+#: os_unix.c:7225
 #, c-format
 msgid "XSMP SmcOpenConnection failed: %s"
 msgstr "XSMP SmcOpenConnection feilet: %s"
@@ -5851,33 +5847,33 @@
 msgid "Could not fix up function pointers to the DLL!"
 msgstr "Klarte ikke ordne opp i funksjonspekere til DLL-en!"
 
-#: os_win16.c:338 os_win32.c:4118
+#: os_win16.c:345 os_win32.c:4662
 #, c-format
 msgid "shell returned %d"
 msgstr "skallet returnerte %d"
 
-#: os_win32.c:3010
+#: os_win32.c:3552
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: Mottok \"%s\"-hendelse\n"
 
-#: os_win32.c:3012
+#: os_win32.c:3554
 msgid "close"
 msgstr "lukk"
 
-#: os_win32.c:3014
+#: os_win32.c:3556
 msgid "logoff"
 msgstr "logg av"
 
-#: os_win32.c:3015
+#: os_win32.c:3557
 msgid "shutdown"
 msgstr "kjør ned"
 
-#: os_win32.c:4051
+#: os_win32.c:4595
 msgid "E371: Command not found"
 msgstr "E371: Kommando ikke funnet"
 
-#: os_win32.c:4082
+#: os_win32.c:4626
 msgid ""
 "VIMRUN.EXE not found in your $PATH.\n"
 "External commands will not pause after completion.\n"
@@ -5887,7 +5883,7 @@
 "Eksterne kommandoer kommer ikke til å vente etter fullføring.\n"
 "Se \":help win32-vimrun\" for mer informasjon."
 
-#: os_win32.c:4085
+#: os_win32.c:4629
 msgid "Vim Warning"
 msgstr "Vim-advarsel"
 
@@ -5928,242 +5924,242 @@
 msgid "E379: Missing or empty directory name"
 msgstr "E379: Manglende eller tomt katalognavn"
 
-#: quickfix.c:1440
+#: quickfix.c:1443
 msgid "E553: No more items"
 msgstr "E553: Ingen flere elementer"
 
-#: quickfix.c:1862
+#: quickfix.c:1878
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d av %d)%s%s: "
 
-#: quickfix.c:1864
+#: quickfix.c:1880
 msgid " (line deleted)"
 msgstr " (linjen slettet)"
 
-#: quickfix.c:2087
+#: quickfix.c:2103
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: På bunnen av quickfix-stack"
 
-#: quickfix.c:2096
+#: quickfix.c:2112
 msgid "E381: At top of quickfix stack"
 msgstr "E381: På toppen av quickfix-stack"
 
-#: quickfix.c:2110
+#: quickfix.c:2125
 #, c-format
 msgid "error list %d of %d; %d errors"
 msgstr "feilliste %d av %d; %d feil"
 
-#: quickfix.c:2721
+#: quickfix.c:2748
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: Kan ikke lagre, 'buftype'-valget er satt"
 
-#: quickfix.c:3036
+#: quickfix.c:3063
 msgid "Error file"
 msgstr ""
 
-#: quickfix.c:3176
+#: quickfix.c:3219
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: Filnavn mangler eller ugyldig søkestreng"
 
-#: quickfix.c:3267
+#: quickfix.c:3338
 #, c-format
 msgid "Cannot open file \"%s\""
 msgstr "Kan ikke åpne filen \"%s\""
 
-#: quickfix.c:3868
+#: quickfix.c:3943
 msgid "E681: Buffer is not loaded"
 msgstr "E681: Bufferen er ikke lastet"
 
-#: quickfix.c:3939
+#: quickfix.c:4014
 msgid "E777: String or List expected"
 msgstr "E777: Streng eller liste forventet"
 
-#: regexp.c:331
+#: regexp.c:345
 #, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: Ugyldig element i %s%%[]"
 
-#: regexp.c:1290 regexp.c:1308
+#: regexp.c:1352 regexp.c:1370
 msgid "E339: Pattern too long"
 msgstr "E339: Søkestrengen er for lang"
 
-#: regexp.c:1465
+#: regexp.c:1539
 msgid "E50: Too many \\z("
 msgstr "E50: For mange \\z("
 
-#: regexp.c:1476
+#: regexp.c:1550
 #, c-format
 msgid "E51: Too many %s("
 msgstr "E51: For mange %s("
 
-#: regexp.c:1533
+#: regexp.c:1607
 msgid "E52: Unmatched \\z("
 msgstr "E52: Usamsvarende \\z("
 
-#: regexp.c:1537
+#: regexp.c:361
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: Usamsvarende %s%%("
 
-#: regexp.c:1539
+#: regexp.c:362
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: Usamsvarende %s("
 
-#: regexp.c:1544
+#: regexp.c:363
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: Usamsvarende %s)"
 
-#: regexp.c:1762
+#: regexp.c:1838
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: Ugyldig tegn etter %s@"
 
-#: regexp.c:1796
+#: regexp.c:1879
 #, c-format
 msgid "E60: Too many complex %s{...}s"
 msgstr "E60: For mange komplekse %s{...}s"
 
-#: regexp.c:1812
+#: regexp.c:1895
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61: Nøstede %s*"
 
-#: regexp.c:1815
+#: regexp.c:1898
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62: Nøstede %s%c"
 
-#: regexp.c:1935
+#: regexp.c:2017
 msgid "E63: invalid use of \\_"
 msgstr "E63: Ugyldig bruk av \\_"
 
-#: regexp.c:1991
+#: regexp.c:2073
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64: %s%c etterfølger ingenting"
 
-#: regexp.c:2047
+#: regexp.c:2129
 msgid "E65: Illegal back reference"
 msgstr "E65: Ulovlig tilbakereferanse"
 
-#: regexp.c:2060
+#: regexp.c:365
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( ikke tillatt her"
 
-#: regexp.c:2079
+#: regexp.c:366
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: \\z1 med venner er ikke tillatt her"
 
-#: regexp.c:2091
+#: regexp.c:2173
 msgid "E68: Invalid character after \\z"
 msgstr "E68: Ugyldig tegn etter \\z"
 
-#: regexp.c:2143
+#: regexp.c:368
 #, c-format
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: Mangler ] etter %s%%["
 
-#: regexp.c:2159
+#: regexp.c:369
 #, c-format
 msgid "E70: Empty %s%%[]"
 msgstr "E70: Tom %s%%[]"
 
-#: regexp.c:2204
+#: regexp.c:2286 regexp_nfa.c:1384
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: Ugyldig tegn etter %s%%[dxouU]"
 
-#: regexp.c:2275
+#: regexp.c:2357
 #, c-format
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: Ugyldig tegn etter %s%%"
 
-#: regexp.c:2568
+#: regexp.c:360
 #, c-format
 msgid "E769: Missing ] after %s["
 msgstr "E769: Mangler ] etter %s["
 
-#: regexp.c:3266
+#: regexp.c:3420
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: Syntaksfeil i %s{...}"
 
-#: regexp.c:4110
+#: regexp.c:4349
 msgid "External submatches:\n"
 msgstr "Eksterne deltreff:\n"
 
-#: screen.c:9521
+#: screen.c:9741
 msgid " VREPLACE"
 msgstr " V-ERSTATT"
 
-#: screen.c:9525
+#: screen.c:9745
 msgid " REPLACE"
 msgstr " ERSTATT"
 
-#: screen.c:9530
+#: screen.c:9750
 msgid " REVERSE"
 msgstr " OMVENDT"
 
-#: screen.c:9532
+#: screen.c:9752
 msgid " INSERT"
 msgstr " SETT INN"
 
-#: screen.c:9535
+#: screen.c:9755
 msgid " (insert)"
 msgstr " (sett inn)"
 
-#: screen.c:9537
+#: screen.c:9757
 msgid " (replace)"
 msgstr " (erstatt)"
 
-#: screen.c:9539
+#: screen.c:9759
 msgid " (vreplace)"
 msgstr " (v-erstatt)"
 
-#: screen.c:9542
+#: screen.c:9762
 msgid " Hebrew"
 msgstr " hebraisk"
 
-#: screen.c:9553
+#: screen.c:9773
 msgid " Arabic"
 msgstr " arabisk"
 
-#: screen.c:9556
+#: screen.c:9776
 msgid " (lang)"
 msgstr " (lang)"
 
-#: screen.c:9560
+#: screen.c:9780
 msgid " (paste)"
 msgstr " (lim inn)"
 
-#: screen.c:9573
+#: screen.c:9793
 msgid " VISUAL"
 msgstr " VISUELL"
 
-#: screen.c:9574
+#: screen.c:9794
 msgid " VISUAL LINE"
 msgstr " VISUELL LINJE"
 
-#: screen.c:9575
+#: screen.c:9795
 msgid " VISUAL BLOCK"
 msgstr " VISUELL BLOKK"
 
-#: screen.c:9576
+#: screen.c:9796
 msgid " SELECT"
 msgstr " VELG"
 
-#: screen.c:9577
+#: screen.c:9797
 msgid " SELECT LINE"
 msgstr " VELG LINJE"
 
-#: screen.c:9578
+#: screen.c:9798
 msgid " SELECT BLOCK"
 msgstr " VELG BLOKK"
 
-#: screen.c:9594 screen.c:9660
+#: screen.c:9814 screen.c:9880
 msgid "recording"
 msgstr "spiller inn"
 
@@ -6172,80 +6168,80 @@
 msgid "E383: Invalid search string: %s"
 msgstr "E383: Ugyldig søkestreng: %s"
 
-#: search.c:985
+#: search.c:988
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: Søket kom til TOPPEN uten treff på: %s"
 
-#: search.c:988
+#: search.c:991
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: Søket kom til BUNNEN uten treff på: %s"
 
-#: search.c:1425
+#: search.c:1428
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: Forventet '?' eller '/' etter ';'"
 
-#: search.c:4692
+#: search.c:4857
 msgid " (includes previously listed match)"
 msgstr " (inkluderer tidligere utlistede treff)"
 
 #. cursor at status line
-#: search.c:4712
+#: search.c:4877
 msgid "--- Included files "
 msgstr "--- Inkluderte filer "
 
-#: search.c:4714
+#: search.c:4879
 msgid "not found "
 msgstr "ikke funnet "
 
-#: search.c:4715
+#: search.c:4880
 msgid "in path ---\n"
 msgstr "i sti ---\n"
 
-#: search.c:4772
+#: search.c:4953
 msgid "  (Already listed)"
 msgstr "  (Allerede listet)"
 
-#: search.c:4774
+#: search.c:4955
 msgid "  NOT FOUND"
 msgstr "  IKKE FUNNET"
 
-#: search.c:4828
+#: search.c:5009
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "Leter gjennom inkludert fil: %s"
 
-#: search.c:4837
+#: search.c:5018
 #, c-format
 msgid "Searching included file %s"
 msgstr "Leter gjennom inkludert fil %s"
 
-#: search.c:5060
+#: search.c:5241
 msgid "E387: Match is on current line"
 msgstr "E387: Treffet er på nåværende linje"
 
-#: search.c:5202
+#: search.c:5391
 msgid "All included files were found"
 msgstr "Alle inkluderte filer ble funnet"
 
-#: search.c:5204
+#: search.c:5393
 msgid "No included files"
 msgstr "Ingen inkluderte filer"
 
-#: search.c:5220
+#: search.c:5409
 msgid "E388: Couldn't find definition"
 msgstr "E388: Fant ikke definisjonen"
 
-#: search.c:5222
+#: search.c:5411
 msgid "E389: Couldn't find pattern"
 msgstr "E389: Fant ikke søketeksten"
 
-#: search.c:5395
+#: search.c:5584
 msgid "Substitute "
 msgstr ""
 
-#: search.c:5408
+#: search.c:5597
 #, c-format
 msgid ""
 "\n"
@@ -6605,148 +6601,148 @@
 msgid "Writing suggestion file %s ..."
 msgstr "Skriver forslagsfil %s ..."
 
-#: spell.c:9031 spell.c:9300
+#: spell.c:9031 spell.c:9303
 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
 msgstr "Anslått hukommelsesbruk under kjøring: %d bytes"
 
-#: spell.c:9167
+#: spell.c:9170
 msgid "E751: Output file name must not have region name"
 msgstr "E751: Utdatafilnavn må ikke ha regionnavn"
 
-#: spell.c:9169
+#: spell.c:9172
 msgid "E754: Only up to 8 regions supported"
 msgstr "E754: Kun opp til 8 regioner er støttet"
 
-#: spell.c:9203
+#: spell.c:9206
 #, c-format
 msgid "E755: Invalid region in %s"
 msgstr "E755: Ugyldig region i %s"
 
-#: spell.c:9274
+#: spell.c:9277
 msgid "Warning: both compounding and NOBREAK specified"
 msgstr ""
 
-#: spell.c:9293
+#: spell.c:9296
 #, c-format
 msgid "Writing spell file %s ..."
 msgstr "Lagrer stavefil %s ..."
 
-#: spell.c:9298
+#: spell.c:9301
 msgid "Done!"
 msgstr "Ferdig!"
 
-#: spell.c:9432
+#: spell.c:9435
 #, c-format
 msgid "E765: 'spellfile' does not have %ld entries"
 msgstr "E765: 'spellfile' har ikke %ld poster"
 
-#: spell.c:9479
+#: spell.c:9482
 #, c-format
 msgid "Word removed from %s"
 msgstr "Ord fjernet fra %s"
 
-#: spell.c:9525
+#: spell.c:9528
 #, c-format
 msgid "Word added to %s"
 msgstr "Ord lagt til %s"
 
-#: spell.c:9854
+#: spell.c:9858
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: Tegn i ord varierer mellom stavefiler"
 
-#: spell.c:10226
+#: spell.c:10230
 msgid "Sorry, no suggestions"
 msgstr "Dessverre, ingen forslag"
 
-#: spell.c:10230
+#: spell.c:10234
 #, c-format
 msgid "Sorry, only %ld suggestions"
 msgstr "Dessverre bare %ld forslag"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
-#: spell.c:10251
+#: spell.c:10255
 #, c-format
 msgid "Change \"%.*s\" to:"
 msgstr "Forandre \"%.*s\" til:"
 
-#: spell.c:10291
+#: spell.c:10295
 #, c-format
 msgid " < \"%.*s\""
 msgstr " < \"%.*s\""
 
-#: spell.c:10469
+#: spell.c:10473
 msgid "E752: No previous spell replacement"
 msgstr "E752: Ingen tidligere staveerstatninger"
 
-#: spell.c:10519
+#: spell.c:10523
 #, c-format
 msgid "E753: Not found: %s"
 msgstr "E753: Ikke funnet: %s"
 
-#: spell.c:10939
+#: spell.c:10943
 #, c-format
 msgid "E778: This does not look like a .sug file: %s"
 msgstr "E778: Dette ser ikke ut som en .sug-fil: %s"
 
-#: spell.c:10946
+#: spell.c:10950
 #, c-format
 msgid "E779: Old .sug file, needs to be updated: %s"
 msgstr "E779: Gammel .sug-fil, trenger oppdatering: %s"
 
-#: spell.c:10952
+#: spell.c:10956
 #, c-format
 msgid "E780: .sug file is for newer version of Vim: %s"
 msgstr "E780: .sug-fila er for en nyere versjon av Vim: %s"
 
-#: spell.c:10962
+#: spell.c:10966
 #, c-format
 msgid "E781: .sug file doesn't match .spl file: %s"
 msgstr "E781: .sug-fil samsvarer ikke med .spl-fil: %s"
 
-#: spell.c:10975
+#: spell.c:10979
 #, c-format
 msgid "E782: error while reading .sug file: %s"
 msgstr "E782: Feil under lesing av .sug-fil: %s"
 
 #. This should have been checked when generating the .spl
 #. * file.
-#: spell.c:13672
+#: spell.c:13676
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: Duplisert tegn i MAP-oppføring"
 
-#: syntax.c:3360 syntax.c:3385 syntax.c:3411
+#: syntax.c:3409 syntax.c:3434 syntax.c:3460
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Ulovlig parameter: %s"
 
-#: syntax.c:3613
+#: syntax.c:3662
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: Syntaksklyngen finnes ikke: %s"
 
-#: syntax.c:3772
+#: syntax.c:275
 msgid "No Syntax items defined for this buffer"
 msgstr "Ingen syntakselementer er definert for denne bufferen"
 
-#: syntax.c:3780
+#: syntax.c:3829
 msgid "syncing on C-style comments"
 msgstr "synkroniserer C-lignende kommentarer"
 
-#: syntax.c:3788
+#: syntax.c:3837
 msgid "no syncing"
 msgstr "ingen synkronisering"
 
-#: syntax.c:3791
+#: syntax.c:3840
 msgid "syncing starts "
 msgstr "synkronisering starter "
 
-#: syntax.c:3793 syntax.c:3869
+#: syntax.c:3842 syntax.c:3918
 msgid " lines before top line"
 msgstr " linjer før topplinje"
 
-#: syntax.c:3798
+#: syntax.c:3847
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -6754,7 +6750,7 @@
 "\n"
 "--- \"Syntax sync\"-elementer ---"
 
-#: syntax.c:3803
+#: syntax.c:3852
 msgid ""
 "\n"
 "syncing on items"
@@ -6762,7 +6758,7 @@
 "\n"
 "synkroniserer på elementer"
 
-#: syntax.c:3809
+#: syntax.c:3858
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -6770,204 +6766,204 @@
 "\n"
 "--- Syntakselementer ---"
 
-#: syntax.c:3832
+#: syntax.c:3881
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: Syntaksklyngen finnes ikke: %s"
 
-#: syntax.c:3859
+#: syntax.c:3908
 msgid "minimal "
 msgstr "minimal "
 
-#: syntax.c:3866
+#: syntax.c:3915
 msgid "maximal "
 msgstr "maksimal "
 
-#: syntax.c:3878
+#: syntax.c:3927
 msgid "; match "
 msgstr "; samsvarer med "
 
-#: syntax.c:3880
+#: syntax.c:3929
 msgid " line breaks"
 msgstr " linjeskift"
 
-#: syntax.c:4522
+#: syntax.c:4571
 msgid "E395: contains argument not accepted here"
 msgstr "E395: \"contains\"-parameter aksepteres ikke her"
 
-#: syntax.c:4561
+#: syntax.c:4610
 msgid "E844: invalid cchar value"
 msgstr ""
 
-#: syntax.c:4577
+#: syntax.c:4626
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: \"group[t]here\" aksepteres ikke her"
 
-#: syntax.c:4601
+#: syntax.c:4650
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: Fant ikke regionelement for %s"
 
-#: syntax.c:4678
+#: syntax.c:4727
 msgid "E397: Filename required"
 msgstr "E397: Trenger filnavn"
 
-#: syntax.c:4714
+#: syntax.c:4763
 msgid "E847: Too many syntax includes"
 msgstr ""
 
-#: syntax.c:4808
+#: syntax.c:4857
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: Mangler ']': %s"
 
-#: syntax.c:5053
+#: syntax.c:5102
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: Mangler '=': %s"
 
-#: syntax.c:5216
+#: syntax.c:5265
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: Ikke nok parametere: syntax region %s"
 
-#: syntax.c:5458
+#: syntax.c:5507
 msgid "E848: Too many syntax clusters"
 msgstr ""
 
-#: syntax.c:5559
+#: syntax.c:5608
 msgid "E400: No cluster specified"
 msgstr "E400: Ingen klynge er spesifisert"
 
-#: syntax.c:5596
+#: syntax.c:5645
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: Skilletegn for søketekst ble ikke funnet: %s"
 
-#: syntax.c:5671
+#: syntax.c:5723
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: Søppel etter søketekst: %s"
 
-#: syntax.c:5760
+#: syntax.c:5812
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr ""
 "E403: syntax sync: Søkestreng for linjefortsettelser er spesifisert to ganger"
 
-#: syntax.c:5817
+#: syntax.c:5872
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: Ulovlige parametere: %s"
 
-#: syntax.c:5867
+#: syntax.c:5922
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: Mangler \"er lik\"-tegn: %s"
 
-#: syntax.c:5873
+#: syntax.c:5928
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: Tomt parameter: %s"
 
-#: syntax.c:5899
+#: syntax.c:5954
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s er ikke tillatt her"
 
-#: syntax.c:5906
+#: syntax.c:5961
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s må være først i \"contains\"-liste"
 
-#: syntax.c:5976
+#: syntax.c:6031
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: Ukjent gruppenavn: %s"
 
-#: syntax.c:6212
+#: syntax.c:6267
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Ugyldig \":syntax\"-delkommando: %s"
 
-#: syntax.c:6784
+#: syntax.c:7037
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: Rekursiv løkke laster syncolor.vim"
 
-#: syntax.c:6911
+#: syntax.c:7164
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: Fant ikke uthevingsgruppe: %s"
 
-#: syntax.c:6935
+#: syntax.c:7188
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: Ikke nok parametere: \":highlight link %s\""
 
-#: syntax.c:6942
+#: syntax.c:7195
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
 msgstr "E413: For mange parametere: \":highlight link %s\""
 
-#: syntax.c:6962
+#: syntax.c:7215
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: Syntaxgruppen har oppsett, uthevingslenke ignoreres"
 
-#: syntax.c:7094
+#: syntax.c:7347
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: Uventet \"er lik\"-tegn: %s"
 
-#: syntax.c:7130
+#: syntax.c:7383
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: Mangler \"er lik\"-tegn: %s"
 
-#: syntax.c:7158
+#: syntax.c:7411
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: Mangler parameter: %s"
 
-#: syntax.c:7195
+#: syntax.c:7448
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: Ulovlig verdi: %s"
 
-#: syntax.c:7314
+#: syntax.c:7565
 msgid "E419: FG color unknown"
 msgstr "E419: Ukjent forgrunnsfarge"
 
-#: syntax.c:7325
+#: syntax.c:7576
 msgid "E420: BG color unknown"
 msgstr "E420: Ukjent bakgrunnsfarge"
 
-#: syntax.c:7386
+#: syntax.c:7637
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: Kjenner ikke til fargenavnet eller -nummeret: %s"
 
-#: syntax.c:7633
+#: syntax.c:7884
 #, c-format
 msgid "E422: terminal code too long: %s"
 msgstr "E422: Terminalkoden er for lang: %s"
 
-#: syntax.c:7680
+#: syntax.c:7931
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: Ulovlig parameter: %s"
 
-#: syntax.c:8243
+#: syntax.c:8501
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: For mange forskjellige uthevingsattributter i bruk"
 
-#: syntax.c:8992
+#: syntax.c:9250
 msgid "E669: Unprintable character in group name"
 msgstr "E669: Ikke-skrivbart tegn i gruppenavn"
 
-#: syntax.c:9001
+#: syntax.c:9259
 msgid "W18: Invalid character in group name"
 msgstr "W18: Ugyldig tegn i gruppenavn"
 
-#: syntax.c:9017
+#: syntax.c:9275
 msgid "E849: Too many highlight and syntax groups"
 msgstr ""
 
@@ -7037,84 +7033,84 @@
 "\n"
 "  # TIL tag        FRA  linje i fil/tekst"
 
-#: tag.c:1549
+#: tag.c:1551
 #, c-format
 msgid "Searching tags file %s"
 msgstr "Leter i tagfil %s"
 
-#: tag.c:1770
+#: tag.c:1772
 #, c-format
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: Sti til tagfil kuttet for %s\n"
 
-#: tag.c:1921 tag.c:2765
+#: tag.c:1932 tag.c:2776
 msgid "Ignoring long line in tags file"
 msgstr ""
 
-#: tag.c:2412
+#: tag.c:2423
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Formatfeil i tagfil \"%s\""
 
-#: tag.c:2416
+#: tag.c:2427
 #, c-format
 msgid "Before byte %ld"
 msgstr "Før byte %ld"
 
-#: tag.c:2442
+#: tag.c:2453
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: Tagfil ikke sortert: %s"
 
 #. never opened any tags file
-#: tag.c:2486
+#: tag.c:2497
 msgid "E433: No tags file"
 msgstr "E433: Ingen tagfil"
 
-#: tag.c:3272
+#: tag.c:3283
 msgid "E434: Can't find tag pattern"
 msgstr "E434: Kan ikke finne tagsøkestreng"
 
-#: tag.c:3283
+#: tag.c:3294
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: Kunne ikke finne tag, bare gjetter!"
 
-#: tag.c:3809
+#: tag.c:3820
 #, c-format
 msgid "Duplicate field name: %s"
 msgstr ""
 
-#: term.c:1724
+#: term.c:1740
 msgid "' not known. Available builtin terminals are:"
 msgstr "' ikke kjent. Tilgjengelige innebygde terminaler er:"
 
-#: term.c:1748
+#: term.c:1764
 msgid "defaulting to '"
 msgstr "faller tilbake på '"
 
-#: term.c:2114
+#: term.c:2149
 msgid "E557: Cannot open termcap file"
 msgstr "E557: Kan ikke åpne termcap-fil"
 
-#: term.c:2118
+#: term.c:2153
 msgid "E558: Terminal entry not found in terminfo"
 msgstr "E558: Fant ikke terminaloppføring i terminfo"
 
-#: term.c:2120
+#: term.c:2155
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: Fant ikke terminaloppføring i termcap"
 
-#: term.c:2279
+#: term.c:2314
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: Ingen \"%s\"-oppføring i termcap"
 
-#: term.c:2756
+#: term.c:2791
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: Terminalfunksjonen \"cm\" nødvendig"
 
 #. Highlight title
-#: term.c:5332
+#: term.c:5587
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -7122,197 +7118,197 @@
 "\n"
 "--- Terminaltaster ---"
 
-#: ui.c:284
+#: ui.c:290
 msgid "new shell started\n"
 msgstr "nytt skall startet\n"
 
-#: ui.c:1836
+#: ui.c:1877
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: Feil under lesing av inndata, avslutter ...\n"
 
-#: ui.c:2461
+#: ui.c:2527
 msgid "Used CUT_BUFFER0 instead of empty selection"
 msgstr "Brukte CUT_BUFFER0 istedenfor tomt valg"
 
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-#: undo.c:398
+#: undo.c:400
 msgid "E834: Line count changed unexpectedly"
 msgstr ""
 
 #. must display the prompt
-#: undo.c:681
+#: undo.c:683
 msgid "No undo possible; continue anyway"
 msgstr "Ingen angremuligheter; fortsett likevel"
 
-#: undo.c:708
+#: undo.c:710
 #, c-format
 msgid "E828: Cannot open undo file for writing: %s"
 msgstr ""
 
-#: undo.c:817
+#: undo.c:819
 #, c-format
 msgid "E825: Corrupted undo file (%s): %s"
 msgstr ""
 
-#: undo.c:1325
+#: undo.c:1327
 msgid "Cannot write undo file in any directory in 'undodir'"
 msgstr ""
 
-#: undo.c:1373
+#: undo.c:1375
 #, c-format
 msgid "Will not overwrite with undo file, cannot read: %s"
 msgstr ""
 
-#: undo.c:1395
+#: undo.c:1397
 #, c-format
 msgid "Will not overwrite, this is not an undo file: %s"
 msgstr ""
 
-#: undo.c:1412
+#: undo.c:1414
 msgid "Skipping undo file write, nothing to undo"
 msgstr ""
 
-#: undo.c:1427
+#: undo.c:1429
 #, c-format
 msgid "Writing undo file: %s"
 msgstr ""
 
-#: undo.c:1522
+#: undo.c:1526
 #, c-format
 msgid "E829: write error in undo file: %s"
 msgstr ""
 
-#: undo.c:1611
+#: undo.c:1616
 #, c-format
 msgid "Not reading undo file, owner differs: %s"
 msgstr ""
 
-#: undo.c:1625
+#: undo.c:1630
 #, c-format
 msgid "Reading undo file: %s"
 msgstr ""
 
-#: undo.c:1633
+#: undo.c:1638
 #, c-format
 msgid "E822: Cannot open undo file for reading: %s"
 msgstr ""
 
-#: undo.c:1643
+#: undo.c:1648
 #, c-format
 msgid "E823: Not an undo file: %s"
 msgstr ""
 
-#: undo.c:1652
+#: undo.c:1657
 #, c-format
 msgid "E832: Non-encrypted file has encrypted undo file: %s"
 msgstr ""
 
-#: undo.c:1658
+#: undo.c:1663
 #, c-format
 msgid "E826: Undo file decryption failed: %s"
 msgstr ""
 
-#: undo.c:1663
+#: undo.c:1668
 #, c-format
 msgid "E827: Undo file is encrypted: %s"
 msgstr ""
 
-#: undo.c:1669
+#: undo.c:1674
 #, c-format
 msgid "E824: Incompatible undo file: %s"
 msgstr ""
 
-#: undo.c:1687
+#: undo.c:1692
 msgid "File contents changed, cannot use undo info"
 msgstr ""
 
-#: undo.c:1875
+#: undo.c:1880
 #, c-format
 msgid "Finished reading undo file %s"
 msgstr ""
 
-#: undo.c:1981 undo.c:2239
+#: undo.c:1986 undo.c:2244
 msgid "Already at oldest change"
 msgstr "Allerede ved eldste forandring"
 
-#: undo.c:1996 undo.c:2241
+#: undo.c:2001 undo.c:2246
 msgid "Already at newest change"
 msgstr "Allerede ved nyeste forandring"
 
-#: undo.c:2232
+#: undo.c:2237
 #, c-format
 msgid "E830: Undo number %ld not found"
 msgstr ""
 
-#: undo.c:2424
+#: undo.c:2429
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: Gale linjenummer"
 
-#: undo.c:2678
+#: undo.c:2683
 msgid "more line"
 msgstr "linje lagt til"
 
-#: undo.c:2680
+#: undo.c:2685
 msgid "more lines"
 msgstr "linjer lagt til"
 
-#: undo.c:2682
+#: undo.c:2687
 msgid "line less"
 msgstr "linje fjernet"
 
-#: undo.c:2684
+#: undo.c:2689
 msgid "fewer lines"
 msgstr "linjer fjernet"
 
-#: undo.c:2689
+#: undo.c:2694
 msgid "change"
 msgstr "forandring"
 
-#: undo.c:2691
+#: undo.c:2696
 msgid "changes"
 msgstr "forandringer"
 
-#: undo.c:2727
+#: undo.c:2732
 #, c-format
 msgid "%ld %s; %s #%ld  %s"
 msgstr "%ld %s; %s #%ld  %s"
 
-#: undo.c:2730
+#: undo.c:2735
 msgid "before"
 msgstr "før"
 
-#: undo.c:2730
+#: undo.c:2735
 msgid "after"
 msgstr "etter"
 
-#: undo.c:2844
+#: undo.c:2849
 msgid "Nothing to undo"
 msgstr "Ingenting å angre"
 
-#: undo.c:2850
+#: undo.c:2855
 msgid "number changes  when               saved"
 msgstr ""
 
-#: undo.c:2892
+#: undo.c:2894
 #, c-format
 msgid "%ld seconds ago"
 msgstr "%ld sekunder siden"
 
-#: undo.c:2907
+#: undo.c:2909
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin er ikke tillatt etter undo"
 
-#: undo.c:3014
+#: undo.c:3016
 msgid "E439: undo list corrupt"
 msgstr "E439: Angrelisten er skadet"
 
-#: undo.c:3046
+#: undo.c:3048
 msgid "E440: undo line missing"
 msgstr "E440: Angrelisten mangler"
 
 #. Only MS VC 4.1 and earlier can do Win32s
-#: version.c:1887
+#: version.c:991
 msgid ""
 "\n"
 "MS-Windows 16/32-bit GUI version"
@@ -7320,7 +7316,7 @@
 "\n"
 "MS Windows 16/32-bits grafisk versjon"
 
-#: version.c:1890
+#: version.c:994
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
@@ -7328,7 +7324,7 @@
 "\n"
 "MS Windows 64-bits grafisk versjon"
 
-#: version.c:1892
+#: version.c:996
 msgid ""
 "\n"
 "MS-Windows 32-bit GUI version"
@@ -7336,21 +7332,21 @@
 "\n"
 "MS-Windows 32-bits GUI-versjon"
 
-#: version.c:1896
+#: version.c:1000
 msgid " in Win32s mode"
 msgstr " i Win32s-modus"
 
-#: version.c:1898
+#: version.c:1002
 msgid " with OLE support"
 msgstr " med OLE-støtte"
 
-#: version.c:1902
+#: version.c:1006
 msgid ""
 "\n"
 "MS-Windows 64-bit console version"
 msgstr ""
 
-#: version.c:1904
+#: version.c:1008
 msgid ""
 "\n"
 "MS-Windows 32-bit console version"
@@ -7358,7 +7354,7 @@
 "\n"
 "MS-Windows 32-bits konsollversjon"
 
-#: version.c:1909
+#: version.c:1013
 msgid ""
 "\n"
 "MS-Windows 16-bit version"
@@ -7366,7 +7362,7 @@
 "\n"
 "MS-Windows 16-bits versjon"
 
-#: version.c:1913
+#: version.c:1017
 msgid ""
 "\n"
 "32-bit MS-DOS version"
@@ -7374,7 +7370,7 @@
 "\n"
 "32-bits MS-DOS-versjon"
 
-#: version.c:1915
+#: version.c:1019
 msgid ""
 "\n"
 "16-bit MS-DOS version"
@@ -7382,7 +7378,7 @@
 "\n"
 "16-bits MS-DOS-versjon"
 
-#: version.c:1921
+#: version.c:1025
 msgid ""
 "\n"
 "MacOS X (unix) version"
@@ -7390,7 +7386,7 @@
 "\n"
 "MacOS X (unix)-versjon"
 
-#: version.c:1923
+#: version.c:1027
 msgid ""
 "\n"
 "MacOS X version"
@@ -7398,7 +7394,7 @@
 "\n"
 "MacOS X-versjon"
 
-#: version.c:1926
+#: version.c:1030
 msgid ""
 "\n"
 "MacOS version"
@@ -7406,13 +7402,13 @@
 "\n"
 "MacOS-versjon"
 
-#: version.c:1931
+#: version.c:1035
 msgid ""
 "\n"
 "OpenVMS version"
 msgstr ""
 
-#: version.c:1946
+#: version.c:1050
 msgid ""
 "\n"
 "Included patches: "
@@ -7420,17 +7416,17 @@
 "\n"
 "Inkluderte patcher: "
 
-#: version.c:1973
+#: version.c:1077
 msgid ""
 "\n"
 "Extra patches: "
 msgstr ""
 
-#: version.c:1985 version.c:2341
+#: version.c:1089 version.c:1453
 msgid "Modified by "
 msgstr "Modifisert av "
 
-#: version.c:1992
+#: version.c:1096
 msgid ""
 "\n"
 "Compiled "
@@ -7438,11 +7434,11 @@
 "\n"
 "Kompilert "
 
-#: version.c:1995
+#: version.c:1099
 msgid "by "
 msgstr "av "
 
-#: version.c:2007
+#: version.c:1111
 msgid ""
 "\n"
 "Huge version "
@@ -7450,7 +7446,7 @@
 "\n"
 "Diger (\"huge\") versjon "
 
-#: version.c:2010
+#: version.c:1114
 msgid ""
 "\n"
 "Big version "
@@ -7458,7 +7454,7 @@
 "\n"
 "Stor (\"big\") versjon "
 
-#: version.c:2013
+#: version.c:1117
 msgid ""
 "\n"
 "Normal version "
@@ -7466,7 +7462,7 @@
 "\n"
 "Normal versjon "
 
-#: version.c:2016
+#: version.c:1120
 msgid ""
 "\n"
 "Small version "
@@ -7474,7 +7470,7 @@
 "\n"
 "Liten (\"small\") versjon "
 
-#: version.c:2018
+#: version.c:1122
 msgid ""
 "\n"
 "Tiny version "
@@ -7482,274 +7478,274 @@
 "\n"
 "Spinkel (\"tiny\") versjon "
 
-#: version.c:2024
+#: version.c:1128
 msgid "without GUI."
 msgstr "uten GUI."
 
-#: version.c:2028
+#: version.c:1132
 msgid "with GTK2-GNOME GUI."
 msgstr "med GTK2-GNOME GUI."
 
-#: version.c:2030
+#: version.c:1134
 msgid "with GTK2 GUI."
 msgstr "med GTK2 GUI."
 
-#: version.c:2034
+#: version.c:1138
 msgid "with X11-Motif GUI."
 msgstr "med X11-Motif GUI."
 
-#: version.c:2038
+#: version.c:1142
 msgid "with X11-neXtaw GUI."
 msgstr "med X11-neXtaw GUI."
 
-#: version.c:2040
+#: version.c:1144
 msgid "with X11-Athena GUI."
 msgstr "med X11-Athena GUI."
 
-#: version.c:2044
+#: version.c:1148
 msgid "with Photon GUI."
 msgstr "med Photon GUI."
 
-#: version.c:2047
+#: version.c:1151
 msgid "with GUI."
 msgstr "med GUI."
 
-#: version.c:2050
+#: version.c:1154
 msgid "with Carbon GUI."
 msgstr "med Carbon GUI."
 
-#: version.c:2053
+#: version.c:1157
 msgid "with Cocoa GUI."
 msgstr "med Cocoa GUI."
 
-#: version.c:2056
+#: version.c:1160
 msgid "with (classic) GUI."
 msgstr "med (klassisk) GUI."
 
-#: version.c:2066
+#: version.c:1170
 msgid "  Features included (+) or not (-):\n"
 msgstr "  Funksjoner inkludert (+) eller ikke (-):\n"
 
-#: version.c:2078
+#: version.c:1175
 msgid "   system vimrc file: \""
 msgstr "   vimrc-fil på systemet: \""
 
-#: version.c:2083
+#: version.c:1180
 msgid "     user vimrc file: \""
 msgstr "     vimrc-fil for brukere: \""
 
-#: version.c:2088
+#: version.c:1185
 msgid " 2nd user vimrc file: \""
 msgstr " vimrc-fil nr. 2 for brukere: \""
 
-#: version.c:2093
+#: version.c:1190
 msgid " 3rd user vimrc file: \""
 msgstr " vimrc-fil nr. 3 for brukere: \""
 
-#: version.c:2098
+#: version.c:1195
 msgid "      user exrc file: \""
 msgstr "      exrc-fil for brukere: \""
 
-#: version.c:2103
+#: version.c:1200
 msgid "  2nd user exrc file: \""
 msgstr "  exrc-fil nr. 2 for brukere: \""
 
-#: version.c:2109
+#: version.c:1206
 msgid "  system gvimrc file: \""
 msgstr "  gvimrc-fil på systemet: \""
 
-#: version.c:2113
+#: version.c:1210
 msgid "    user gvimrc file: \""
 msgstr "    gvimrc-fil for brukere: \""
 
-#: version.c:2117
+#: version.c:1214
 msgid "2nd user gvimrc file: \""
 msgstr "gvimrc-fil nr. 2 for brukere: \""
 
-#: version.c:2122
+#: version.c:1219
 msgid "3rd user gvimrc file: \""
 msgstr "gvimrc-fil nr. 3 for brukere: \""
 
-#: version.c:2129
+#: version.c:1226
 msgid "    system menu file: \""
 msgstr "    menyfil på systemet: \""
 
-#: version.c:2137
+#: version.c:1234
 msgid "  fall-back for $VIM: \""
 msgstr "  $VIM faller tilbake på: \""
 
-#: version.c:2143
+#: version.c:1240
 msgid " f-b for $VIMRUNTIME: \""
 msgstr " $VIMRUNTIME faller tilbake på: \""
 
-#: version.c:2147
+#: version.c:1244
 msgid "Compilation: "
 msgstr "Kompilering: "
 
-#: version.c:2153
+#: version.c:1250
 msgid "Compiler: "
 msgstr "Kompilator: "
 
-#: version.c:2158
+#: version.c:1255
 msgid "Linking: "
 msgstr "Linking: "
 
-#: version.c:2163
+#: version.c:1260
 msgid "  DEBUG BUILD"
 msgstr "  DEBUGGINGSVERSJON"
 
-#: version.c:2202
+#: version.c:1314
 msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved - Forbedret Vi"
 
-#: version.c:2204
+#: version.c:1316
 msgid "version "
 msgstr "versjon "
 
-#: version.c:2205
+#: version.c:1317
 msgid "by Bram Moolenaar et al."
 msgstr "av Bram Moolenaar med flere"
 
-#: version.c:2209
+#: version.c:1321
 msgid "Vim is open source and freely distributable"
 msgstr "Vim er åpen kildekode og kan fritt distribueres"
 
-#: version.c:2211
+#: version.c:1323
 msgid "Help poor children in Uganda!"
 msgstr "Hjelp fattige barn i Uganda!"
 
-#: version.c:2212
+#: version.c:1324
 msgid "type  :help iccf<Enter>       for information "
 msgstr "skriv  :help iccf<Enter>          for informasjon "
 
-#: version.c:2214
+#: version.c:1326
 msgid "type  :q<Enter>               to exit         "
 msgstr "skriv  :q<Enter>                  for å avslutte         "
 
-#: version.c:2215
+#: version.c:1327
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "skriv  :help<Enter>  eller  <F1>  for on-line hjelp"
 
-#: version.c:2216
+#: version.c:1328
 msgid "type  :help version7<Enter>   for version info"
 msgstr "skriv  :help version7<Enter>      for versjonsinfo"
 
-#: version.c:2219
+#: version.c:1331
 msgid "Running in Vi compatible mode"
 msgstr "Kjører i Vi-kompatibel modus"
 
-#: version.c:2220
+#: version.c:1332
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr "skriv  :set nocp<Enter>           for standard Vim"
 
-#: version.c:2221
+#: version.c:1333
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "skriv  :help cp-default<Enter>    for informasjon"
 
-#: version.c:2236
+#: version.c:1348
 msgid "menu  Help->Orphans           for information    "
 msgstr "meny:  Hjelp->Foreldreløse        for informasjon    "
 
-#: version.c:2238
+#: version.c:1350
 msgid "Running modeless, typed text is inserted"
 msgstr "Kjører uten modus, tastetrykk blir lagt inn i teksten"
 
-#: version.c:2239
+#: version.c:1351
 msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
 msgstr "meny:  Rediger->Globale innstillinger->Innsettingsmodus av/på  "
 
-#: version.c:2240
+#: version.c:1352
 msgid "                              for two modes      "
 msgstr "                              for to moduser      "
 
-#: version.c:2244
+#: version.c:1356
 msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
 msgstr "meny:  Rediger->Globale innstillinger->Vi-kompatibilitet av/på"
 
-#: version.c:2245
+#: version.c:1357
 msgid "                              for Vim defaults   "
 msgstr "                              for standard Vim   "
 
-#: version.c:2292
+#: version.c:1404
 msgid "Sponsor Vim development!"
 msgstr "Støtt utviklingen av Vim!"
 
-#: version.c:2293
+#: version.c:1405
 msgid "Become a registered Vim user!"
 msgstr "Bli registrert bruker av Vim!"
 
-#: version.c:2296
+#: version.c:1408
 msgid "type  :help sponsor<Enter>    for information "
 msgstr "skriv  :help sponsor<Enter>       for informasjon "
 
-#: version.c:2297
+#: version.c:1409
 msgid "type  :help register<Enter>   for information "
 msgstr "skriv  :help register<Enter>      for informasjon "
 
-#: version.c:2299
+#: version.c:1411
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "meny:  Hjelp->Støtte/Registrering  for informasjon    "
 
-#: version.c:2309
+#: version.c:1421
 msgid "WARNING: Windows 95/98/ME detected"
 msgstr "ADVARSEL: Windows 95/98/ME oppdaget"
 
-#: version.c:2312
+#: version.c:1424
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr "skriv  :help windows95<Enter>     for informasjon"
 
-#: window.c:89
+#: window.c:92
 msgid "Already only one window"
 msgstr "Allerede bare ett vindu"
 
-#: window.c:238
+#: window.c:241
 msgid "E441: There is no preview window"
 msgstr "E441: Vindu for forhåndsvisning finnes ikke"
 
-#: window.c:671
+#: window.c:674
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: Kan ikke splitte \"topleft\" og \"botright\" på en gang"
 
-#: window.c:1501
+#: window.c:1504
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: Kan ikke rotere når et annet vindu er splittet"
 
-#: window.c:2174
+#: window.c:2193
 msgid "E444: Cannot close last window"
 msgstr "E444: Kan ikke lukke det siste vinduet"
 
-#: window.c:2183
+#: window.c:2202
 msgid "E813: Cannot close autocmd window"
 msgstr ""
 
-#: window.c:2188
+#: window.c:2207
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr ""
 
-#: window.c:3269
+#: window.c:3300
 msgid "E445: Other window contains changes"
 msgstr "E445: Annet vindu inneholder forandringer"
 
-#: window.c:5989
+#: window.c:6106
 msgid "E446: No file name under cursor"
 msgstr "E446: Ingen filnavn under markøren"
 
-#: window.c:6126
+#: window.c:6243
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: Kan ikke finne filen \"%s\" i stien"
 
-#: if_perl.xs:474 globals.h:1436
+#: if_perl.xs:515 globals.h:1447
 #, c-format
 msgid "E370: Could not load library %s"
 msgstr "E370: Klarte ikke laste bibliotek %s"
 
-#: if_perl.xs:725
+#: if_perl.xs:766
 msgid ""
 "Sorry, this command is disabled: the Perl library could not be loaded."
 msgstr "Denne kommandoen er deaktivert, Perl-biblioteket kunne ikke lastes."
 
-#: if_perl.xs:782
+#: if_perl.xs:823
 msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
 msgstr ""
 "E299: Evaluering av Perl er ikke tillatt i sandkassen uten \"Safe\"-modulen"
@@ -7791,7 +7787,7 @@
 msgid "Path length too long!"
 msgstr "Lengden på stien er for lang!"
 
-#: globals.h:1181
+#: globals.h:1192
 msgid "--No lines in buffer--"
 msgstr "--Ingen linjer i bufferen--"
 
@@ -7799,498 +7795,498 @@
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #. 
-#: globals.h:1385
+#: globals.h:1396
 msgid "E470: Command aborted"
 msgstr "E470: Kommandoen avbrutt"
 
-#: globals.h:1386
+#: globals.h:1397
 msgid "E471: Argument required"
 msgstr "E471: Parameter nødvendig"
 
-#: globals.h:1387
+#: globals.h:1398
 msgid "E10: \\ should be followed by /, ? or &"
 msgstr "E10: \\ skulle ha vært fulgt av /, ? eller &"
 
-#: globals.h:1389
+#: globals.h:1400
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
 msgstr "E11: Ugyldig i kommandolinjevindu; <ENTER> utfører, CTRL-C avslutter"
 
-#: globals.h:1391
+#: globals.h:1402
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
 "E12: Kommandoen er ikke tillatt fra exrc/vimrc i nåværende katalog eller "
 "tagsøk"
 
-#: globals.h:1393
+#: globals.h:1404
 msgid "E171: Missing :endif"
 msgstr "E171: Mangler :endif"
 
-#: globals.h:1394
+#: globals.h:1405
 msgid "E600: Missing :endtry"
 msgstr "E600: Mangler :endtry"
 
-#: globals.h:1395
+#: globals.h:1406
 msgid "E170: Missing :endwhile"
 msgstr "E170: Mangler :endwhile"
 
-#: globals.h:1396
+#: globals.h:1407
 msgid "E170: Missing :endfor"
 msgstr "E170: Mangler :endfor"
 
-#: globals.h:1397
+#: globals.h:1408
 msgid "E588: :endwhile without :while"
 msgstr "E588: :endwhile uten :while"
 
-#: globals.h:1398
+#: globals.h:1409
 msgid "E588: :endfor without :for"
 msgstr "E588: :endfor uten :for"
 
-#: globals.h:1400
+#: globals.h:1411
 msgid "E13: File exists (add ! to override)"
 msgstr "E13: Filen finnes (legg til ! for å overstyre)"
 
-#: globals.h:1401
+#: globals.h:1412
 msgid "E472: Command failed"
 msgstr "E472: Kommandoen feilet"
 
-#: globals.h:1403
+#: globals.h:1414
 #, c-format
 msgid "E234: Unknown fontset: %s"
 msgstr "E234: Ukjent skrifttypesett: %s"
 
-#: globals.h:1407
+#: globals.h:1418
 #, c-format
 msgid "E235: Unknown font: %s"
 msgstr "E235: Ukjent skrifttype: %s"
 
-#: globals.h:1410
+#: globals.h:1421
 #, c-format
 msgid "E236: Font \"%s\" is not fixed-width"
 msgstr "E236: Skrifttypen \"%s\" har ikke fast bredde"
 
-#: globals.h:1412
+#: globals.h:1423
 msgid "E473: Internal error"
 msgstr "E473: Intern feil"
 
-#: globals.h:1413
+#: globals.h:1424
 msgid "Interrupted"
 msgstr "Avbrutt"
 
-#: globals.h:1414
+#: globals.h:1425
 msgid "E14: Invalid address"
 msgstr "E14: Ugyldig adresse"
 
-#: globals.h:1415
+#: globals.h:1426
 msgid "E474: Invalid argument"
 msgstr "E474: Ugyldig parameter"
 
-#: globals.h:1416
+#: globals.h:1427
 #, c-format
 msgid "E475: Invalid argument: %s"
 msgstr "E475: Ugyldig paramter: %s"
 
-#: globals.h:1418
+#: globals.h:1429
 #, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: Ugyldig uttrykk: %s"
 
-#: globals.h:1420
+#: globals.h:1431
 msgid "E16: Invalid range"
 msgstr "E16: Ugyldig område"
 
-#: globals.h:1421
+#: globals.h:1432
 msgid "E476: Invalid command"
 msgstr "E476: Ugyldig kommando"
 
-#: globals.h:1423
+#: globals.h:1434
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: \"%s\" er en katalog"
 
-#: globals.h:1426
+#: globals.h:1437
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: Bibliotek-kall feilet for \"%s()\""
 
-#: globals.h:1437
+#: globals.h:1448
 #, c-format
 msgid "E448: Could not load library function %s"
 msgstr "E448: Klarte ikke laste biblioteksfunksjon %s"
 
-#: globals.h:1439
+#: globals.h:1450
 msgid "E19: Mark has invalid line number"
 msgstr "E19: Merket har et ugyldig linjenummer"
 
-#: globals.h:1440
+#: globals.h:1451
 msgid "E20: Mark not set"
 msgstr "E20: Merket ble ikke satt"
 
-#: globals.h:1441
+#: globals.h:1452
 msgid "E21: Cannot make changes, 'modifiable' is off"
 msgstr "E21: Kan ikke gjøre forandringer, 'modifiable' er av"
 
-#: globals.h:1442
+#: globals.h:1453
 msgid "E22: Scripts nested too deep"
 msgstr "E22: Skripts nøstet for dypt"
 
-#: globals.h:1443
+#: globals.h:1454
 msgid "E23: No alternate file"
 msgstr "E23: Ingen alternativ fil"
 
-#: globals.h:1444
+#: globals.h:1455
 msgid "E24: No such abbreviation"
 msgstr "E24: Forkortelsen finnes ikke"
 
-#: globals.h:1445
+#: globals.h:1456
 msgid "E477: No ! allowed"
 msgstr "E477: Ingen ! tillatt"
 
-#: globals.h:1447
+#: globals.h:1458
 msgid "E25: GUI cannot be used: Not enabled at compile time"
 msgstr "E25: GUI kan ikke brukes: Ikke slått på under kompilering"
 
-#: globals.h:1450
+#: globals.h:1461
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: Hebraisk kan ikke brukes: Ikke slått på under kompilering\n"
 
-#: globals.h:1453
+#: globals.h:1464
 msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
 msgstr ""
 "E27: Persisk (Farsi) kan ikke brukes: Ikke slått på under kompilering\n"
 
-#: globals.h:1456
+#: globals.h:1467
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: Arabisk kan ikke brukes: Ikke slått på under kompilering\n"
 
-#: globals.h:1459
+#: globals.h:1470
 #, c-format
 msgid "E28: No such highlight group name: %s"
 msgstr "E28: Uthevingsgruppe finnes ikke: %s"
 
-#: globals.h:1461
+#: globals.h:1472
 msgid "E29: No inserted text yet"
 msgstr "E29: Ingen innlagt tekst enda"
 
-#: globals.h:1462
+#: globals.h:1473
 msgid "E30: No previous command line"
 msgstr "E30: Ingen tidligere kommandolinje"
 
-#: globals.h:1463
+#: globals.h:1474
 msgid "E31: No such mapping"
 msgstr "E31: Mappingen finnes ikke"
 
-#: globals.h:1464
+#: globals.h:1475
 msgid "E479: No match"
 msgstr "E479: Ingen treff"
 
-#: globals.h:1465
+#: globals.h:1476
 #, c-format
 msgid "E480: No match: %s"
 msgstr "E480: Ingen treff: %s"
 
-#: globals.h:1466
+#: globals.h:1477
 msgid "E32: No file name"
 msgstr "E32: Mangler filnavn"
 
-#: globals.h:1467
+#: globals.h:1478
 msgid "E33: No previous substitute regular expression"
 msgstr "E33: Ingen tidligere erstatninger med regulære uttrykk"
 
-#: globals.h:1468
+#: globals.h:1479
 msgid "E34: No previous command"
 msgstr "E34: Ingen tidligere kommando"
 
-#: globals.h:1469
+#: globals.h:1480
 msgid "E35: No previous regular expression"
 msgstr "E35: Ingen tidligere regulære uttrykk"
 
-#: globals.h:1470
+#: globals.h:1481
 msgid "E481: No range allowed"
 msgstr "E481: Område er ikke tillatt"
 
-#: globals.h:1472
+#: globals.h:1483
 msgid "E36: Not enough room"
 msgstr "E36: Ikke nok plass"
 
-#: globals.h:1475
+#: globals.h:1486
 #, c-format
 msgid "E247: no registered server named \"%s\""
 msgstr "E247: Ingen registrert tjener kalt \"%s\""
 
-#: globals.h:1477
+#: globals.h:1488
 #, c-format
 msgid "E482: Can't create file %s"
 msgstr "E482: Kan ikke opprette filen %s"
 
-#: globals.h:1478
+#: globals.h:1489
 msgid "E483: Can't get temp file name"
 msgstr "E483: Kan ikke hente navn på midlertidig fil"
 
-#: globals.h:1479
+#: globals.h:1490
 #, c-format
 msgid "E484: Can't open file %s"
 msgstr "E484: Kan ikke åpne filen %s"
 
-#: globals.h:1480
+#: globals.h:1491
 #, c-format
 msgid "E485: Can't read file %s"
 msgstr "E485: Kan ikke lese filen %s"
 
-#: globals.h:1481
+#: globals.h:1492
 msgid "E37: No write since last change (add ! to override)"
 msgstr ""
 "E37: Ikke lagret siden forrige forandring (legg til ! for å overstyre)"
 
-#: globals.h:1482
+#: globals.h:1493
 msgid "E38: Null argument"
 msgstr "E38: Nullparameter"
 
-#: globals.h:1484
+#: globals.h:1495
 msgid "E39: Number expected"
 msgstr "E39: Nummer forventet"
 
-#: globals.h:1487
+#: globals.h:1498
 #, c-format
 msgid "E40: Can't open errorfile %s"
 msgstr "E40: Kan ikke åpne feilfilen %s"
 
-#: globals.h:1490
+#: globals.h:1501
 msgid "E233: cannot open display"
 msgstr "E233: Kan ikke åpne display"
 
-#: globals.h:1492
+#: globals.h:1503
 msgid "E41: Out of memory!"
 msgstr "E41: Ikke mer ledig hukommelse!"
 
-#: globals.h:1494
+#: globals.h:1505
 msgid "Pattern not found"
 msgstr "Fant ikke søketeksten"
 
-#: globals.h:1496
+#: globals.h:1507
 #, c-format
 msgid "E486: Pattern not found: %s"
 msgstr "E486: Fant ikke søketeksten: %s"
 
-#: globals.h:1497
+#: globals.h:1508
 msgid "E487: Argument must be positive"
 msgstr "E487: Parameteret må være positivt"
 
-#: globals.h:1499
+#: globals.h:1510
 msgid "E459: Cannot go back to previous directory"
 msgstr "E459: Kan ikke gå tilbake til tidligere katalog"
 
-#: globals.h:1503
+#: globals.h:1514
 msgid "E42: No Errors"
 msgstr "E42: Ingen feil"
 
-#: globals.h:1504
+#: globals.h:1515
 msgid "E776: No location list"
 msgstr "E776: Ingen plassliste"
 
-#: globals.h:1506
+#: globals.h:1517
 msgid "E43: Damaged match string"
 msgstr "E43: Ødelagt søkestreng"
 
-#: globals.h:1507
+#: globals.h:1518
 msgid "E44: Corrupted regexp program"
 msgstr "E44: Skadet program med regulært uttrykk"
 
-#: globals.h:1508
+#: globals.h:1519
 msgid "E45: 'readonly' option is set (add ! to override)"
 msgstr "E45: 'readonly'-valget er satt (legg til ! for å overstyre)"
 
-#: globals.h:1510
+#: globals.h:1521
 #, c-format
 msgid "E46: Cannot change read-only variable \"%s\""
 msgstr "E46: Kan ikke forandre skrivebeskyttet variabel \"%s\""
 
-#: globals.h:1511
+#: globals.h:1522
 #, c-format
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr "E794: Kan ikke sette variabel i sandkassen: \"%s\""
 
-#: globals.h:1514
+#: globals.h:1525
 msgid "E47: Error while reading errorfile"
 msgstr "E47: Feil under lesing av feilfilen"
 
-#: globals.h:1517
+#: globals.h:1528
 msgid "E48: Not allowed in sandbox"
 msgstr "E48: Ikke tillatt i sandkassen"
 
-#: globals.h:1519
+#: globals.h:1530
 msgid "E523: Not allowed here"
 msgstr "E523: Ikke tillatt her"
 
-#: globals.h:1522
+#: globals.h:1533
 msgid "E359: Screen mode setting not supported"
 msgstr "E359: Forandring av skjermmodus er ikke støttet"
 
-#: globals.h:1524
+#: globals.h:1535
 msgid "E49: Invalid scroll size"
 msgstr "E49: Ugyldig \"scroll\"-verdi"
 
-#: globals.h:1525
+#: globals.h:1536
 msgid "E91: 'shell' option is empty"
 msgstr "E91: 'shell'-valget er tomt"
 
-#: globals.h:1527
+#: globals.h:1538
 msgid "E255: Couldn't read in sign data!"
 msgstr "E255: Kunne ikke lese inn skiltdata!"
 
-#: globals.h:1529
+#: globals.h:1540
 msgid "E72: Close error on swap file"
 msgstr "E72: Feil under lukking av swapfil"
 
-#: globals.h:1530
+#: globals.h:1541
 msgid "E73: tag stack empty"
 msgstr "E73: Tag-stack tom"
 
-#: globals.h:1531
+#: globals.h:1542
 msgid "E74: Command too complex"
 msgstr "E74: Kommandoen er for kompleks"
 
-#: globals.h:1532
+#: globals.h:1543
 msgid "E75: Name too long"
 msgstr "E75: Navnet er for langt"
 
-#: globals.h:1533
+#: globals.h:1544
 msgid "E76: Too many ["
 msgstr "E76: For mange ["
 
-#: globals.h:1534
+#: globals.h:1545
 msgid "E77: Too many file names"
 msgstr "E77: For mange filnavn"
 
-#: globals.h:1535
+#: globals.h:1546
 msgid "E488: Trailing characters"
 msgstr "E488: Etterfølgende tegn"
 
-#: globals.h:1536
+#: globals.h:1547
 msgid "E78: Unknown mark"
 msgstr "E78: Ukjent merke"
 
-#: globals.h:1537
+#: globals.h:1548
 msgid "E79: Cannot expand wildcards"
 msgstr "E79: Klarte ikke utvide jokertegn"
 
-#: globals.h:1539
+#: globals.h:1550
 msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
 msgstr "E591: 'winheight' kan ikke være mindre enn 'winminheight'"
 
-#: globals.h:1541
+#: globals.h:1552
 msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
 msgstr "E592: 'winwidth' kan ikke være mindre enn 'winminwidth'"
 
-#: globals.h:1544
+#: globals.h:1555
 msgid "E80: Error while writing"
 msgstr "E80: Feil under skriving"
 
-#: globals.h:1545
+#: globals.h:1556
 msgid "Zero count"
 msgstr "Antall repeteringer er null"
 
-#: globals.h:1547
+#: globals.h:1558
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: Bruker <SID> utenom skript-kontekst"
 
-#: globals.h:1550
+#: globals.h:1561
 msgid "E449: Invalid expression received"
 msgstr "E449: Ugyldig uttrykk mottatt"
 
-#: globals.h:1553
+#: globals.h:1564
 msgid "E463: Region is guarded, cannot modify"
 msgstr "E463: Regionen er beskyttet og kan ikke modifiseres"
 
-#: globals.h:1554
+#: globals.h:1565
 msgid "E744: NetBeans does not allow changes in read-only files"
 msgstr "E744: NetBeans tillater ikke forandringer i skrivebeskyttede filer"
 
-#: globals.h:1556
+#: globals.h:1567
 #, c-format
 msgid "E685: Internal error: %s"
 msgstr "E685: Intern feil: %s"
 
-#: globals.h:1557
+#: globals.h:1568
 msgid "E363: pattern uses more memory than 'maxmempattern'"
 msgstr "E363: Søkestrengen bruker mer hukommelse enn 'maxmempattern'"
 
-#: globals.h:1558
+#: globals.h:1569
 msgid "E749: empty buffer"
 msgstr "E749: Tom buffer"
 
-#: globals.h:1561
+#: globals.h:1572
 msgid "E682: Invalid search pattern or delimiter"
 msgstr "E682: Ugyldig søkestreng eller skilletegn"
 
-#: globals.h:1563
+#: globals.h:1574
 msgid "E139: File is loaded in another buffer"
 msgstr "E139: Filen er lastet i en annen buffer"
 
-#: globals.h:1566
+#: globals.h:1577
 #, c-format
 msgid "E764: Option '%s' is not set"
 msgstr "E764: Valget '%s' er ikke satt"
 
-#: globals.h:1569
+#: globals.h:1580
 msgid "E850: Invalid register name"
 msgstr ""
 
-#: globals.h:1576
+#: globals.h:1587
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "Søket traff TOPPEN, fortsetter fra BUNNEN"
 
-#: globals.h:1577
+#: globals.h:1588
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "Søket traff BUNNEN, fortsetter fra TOPPEN"
 
-#: globals.h:1580
+#: globals.h:1591
 #, c-format
 msgid "Need encryption key for \"%s\""
 msgstr ""
 
-#: if_py_both.h:104 if_py_both.h:118
+#: if_py_both.h:134 if_py_both.h:149
 msgid "writelines() requires list of strings"
 msgstr "writelines() krever en liste av strenger"
 
-#: if_py_both.h:221
+#: if_py_both.h:504
 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: Python: Feil under initialisering av I/U-objekter"
 
-#: if_py_both.h:493
+#: if_py_both.h:579
 msgid "no such buffer"
 msgstr "bufferen finnes ikke"
 
-#: if_py_both.h:510
+#: if_py_both.h:3180
 msgid "attempt to refer to deleted window"
 msgstr "forsøk på å referere til slettet vindu"
 
-#: if_py_both.h:530
+#: if_py_both.h:1568
 msgid "readonly attribute"
 msgstr "skrivebeskyttet attributt"
 
-#: if_py_both.h:543
+#: if_py_both.h:3359
 msgid "cursor position outside buffer"
 msgstr "markørposisjon utenfor buffer"
 
-#: if_py_both.h:623
+#: if_py_both.h:1661
 #, c-format
 msgid "<window object (deleted) at %p>"
 msgstr ""
 
-#: if_py_both.h:635
+#: if_py_both.h:1673
 #, c-format
 msgid "<window object (unknown) at %p>"
 msgstr ""
 
-#: if_py_both.h:638
+#: if_py_both.h:1676
 #, c-format
 msgid "<window %d>"
 msgstr "<vindu %d>"
 
-#: if_py_both.h:671
+#: if_py_both.h:3522
 msgid "no such window"
 msgstr "vinduet finnes ikke"
 
-#: if_py_both.h:1242
+#: if_py_both.h:4177
 msgid "attempt to refer to deleted buffer"
 msgstr "forsøk på å referere til slettet buffer"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/vino.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/vino.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/vino.po	2013-01-29 09:34:08.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/vino.po	2014-01-07 06:37:09.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:16+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:29+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../capplet/vino-message-box.c:55
@@ -247,7 +247,7 @@
 "Sett denne til true for å bruke UPNP-protokollen til å videresende porten "
 "som brukes av vino automatisk i ruteren."
 
-#: ../common/org.gnome.Vino.gschema.xml.h:34
+#: ../common/org.gnome.Vino.gschema.xml.h:35
 msgid "Whether we should disable the XDamage extension of X.org"
 msgstr "Om XDamage-utvidelsen for X.org skal slås av"
 
@@ -263,7 +263,7 @@
 "brukes. Hvis du slå dette av vil vino fungere på disse systemene, men dog "
 "med tregere grafikk."
 
-#: ../common/org.gnome.Vino.gschema.xml.h:36
+#: ../common/org.gnome.Vino.gschema.xml.h:37
 msgid "Notify on connect"
 msgstr "Varsle ved tilkobling"
 
@@ -493,15 +493,15 @@
 msgid "Do you want to allow them to do so?"
 msgstr "Vil du la dem gjøre dette?"
 
-#: ../server/vino-prompt.ui.h:5 ../server/vino-util.c:90
+#: ../server/vino-util.c:90
 msgid "_Refuse"
 msgstr "_Nekt"
 
-#: ../server/vino-prompt.ui.h:6 ../server/vino-util.c:89
+#: ../server/vino-util.c:89
 msgid "_Allow"
 msgstr "Till_at"
 
-#: ../server/vino-server.c:165 ../server/vino-server.c:188
+#: ../server/vino-server.c:169 ../server/vino-server.c:192
 #, c-format
 msgid "Failed to open connection to bus: %s\n"
 msgstr "Kunne ikke åpne tilkobling til buss: %s\n"
@@ -510,32 +510,32 @@
 msgid "GNOME Desktop Sharing Server"
 msgstr "Tjener for deling av skrivebord for GNOME"
 
-#: ../server/vino-status-icon.c:103 ../server/vino-app-indicator.c:117
+#: ../server/vino-status-icon.c:97 ../server/vino-app-indicator.c:117
 #: ../server/vino-tube-app-indicator.c:115
-#: ../server/vino-status-tube-icon.c:96
+#: ../server/vino-status-tube-icon.c:90
 msgid "Desktop sharing is enabled"
 msgstr "Deling av skrivebord er aktivert"
 
-#: ../server/vino-status-icon.c:111
+#: ../server/vino-status-icon.c:105
 #, c-format
 msgid "One person is viewing your desktop"
 msgid_plural "%d people are viewing your desktop"
 msgstr[0] "En bruker ser på ditt skrivebord"
 msgstr[1] "%d brukere ser på ditt skrivebord"
 
-#: ../server/vino-status-icon.c:212 ../server/vino-app-indicator.c:234
+#: ../server/vino-status-icon.c:208 ../server/vino-app-indicator.c:234
 #: ../server/vino-tube-app-indicator.c:269
-#: ../server/vino-status-tube-icon.c:180
+#: ../server/vino-status-tube-icon.c:172
 msgid "Error displaying preferences"
 msgstr "Det oppsto en feil under visning av brukervalg"
 
-#: ../server/vino-status-icon.c:234 ../server/vino-app-indicator.c:256
+#: ../server/vino-status-icon.c:230 ../server/vino-app-indicator.c:256
 #: ../server/vino-tube-app-indicator.c:289
-#: ../server/vino-status-tube-icon.c:200
+#: ../server/vino-status-tube-icon.c:192
 msgid "Error displaying help"
 msgstr "Det oppsto en feil under visning av hjelp"
 
-#: ../server/vino-status-icon.c:267 ../server/vino-app-indicator.c:283
+#: ../server/vino-status-icon.c:263 ../server/vino-app-indicator.c:283
 msgid ""
 "Licensed under the GNU General Public License Version 2\n"
 "\n"
@@ -572,7 +572,7 @@
 "Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.\n"
 
 #. Translators comment: put your own name here to appear in the about dialog.
-#: ../server/vino-status-icon.c:282 ../server/vino-app-indicator.c:298
+#: ../server/vino-status-icon.c:278 ../server/vino-app-indicator.c:298
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas@gnome.org>\n"
@@ -581,97 +581,97 @@
 "  Espen Stefansen https://launchpad.net/~espenas\n"
 "  Kjartan Maraas https://launchpad.net/~kmaraas"
 
-#: ../server/vino-status-icon.c:288 ../server/vino-app-indicator.c:304
+#: ../server/vino-status-icon.c:284 ../server/vino-app-indicator.c:304
 msgid "Share your desktop with other users"
 msgstr "Del ditt skrivebord med andre brukere"
 
-#: ../server/vino-status-icon.c:355 ../server/vino-app-indicator.c:369
+#: ../server/vino-status-icon.c:351 ../server/vino-app-indicator.c:369
 #: ../server/vino-tube-app-indicator.c:321
-#: ../server/vino-status-tube-icon.c:232
+#: ../server/vino-status-tube-icon.c:224
 #, c-format
 msgid "Are you sure you want to disconnect '%s'?"
 msgstr "Er du sikker på at du ønsker å koble fra «%s»?"
 
-#: ../server/vino-status-icon.c:358 ../server/vino-app-indicator.c:372
+#: ../server/vino-status-icon.c:354 ../server/vino-app-indicator.c:372
 #, c-format
 msgid "The remote user from '%s' will be disconnected. Are you sure?"
 msgstr "Ekstern bruker fra «%s» vil bli frakoblet. Er du sikker?"
 
-#: ../server/vino-status-icon.c:364 ../server/vino-app-indicator.c:378
+#: ../server/vino-status-icon.c:360 ../server/vino-app-indicator.c:378
 msgid "Are you sure you want to disconnect all clients?"
 msgstr "Er du sikker på at du ønsker å koble fra alle klienter?"
 
-#: ../server/vino-status-icon.c:366 ../server/vino-app-indicator.c:380
+#: ../server/vino-status-icon.c:362 ../server/vino-app-indicator.c:380
 msgid "All remote users will be disconnected. Are you sure?"
 msgstr "Alle eksterne brukere vil bli frakoblet. Er du sikker?"
 
-#: ../server/vino-status-icon.c:378 ../server/vino-app-indicator.c:392
+#: ../server/vino-status-icon.c:374 ../server/vino-app-indicator.c:392
 #: ../server/vino-tube-app-indicator.c:162
 #: ../server/vino-tube-app-indicator.c:335
-#: ../server/vino-status-tube-icon.c:246
+#: ../server/vino-status-tube-icon.c:238
 #, c-format
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../server/vino-status-icon.c:404 ../server/vino-app-indicator.c:440
+#: ../server/vino-status-icon.c:400 ../server/vino-app-indicator.c:440
 #: ../server/vino-tube-app-indicator.c:145
-#: ../server/vino-status-tube-icon.c:271
+#: ../server/vino-status-tube-icon.c:263
 msgid "_Preferences"
 msgstr "_Brukervalg"
 
-#: ../server/vino-status-icon.c:419 ../server/vino-app-indicator.c:455
+#: ../server/vino-status-icon.c:415 ../server/vino-app-indicator.c:455
 msgid "Disconnect all"
 msgstr "Koble fra alle"
 
 #. Translators: %s is a hostname
 #. Translators: %s is the alias of the telepathy contact
-#: ../server/vino-status-icon.c:443 ../server/vino-app-indicator.c:479
+#: ../server/vino-status-icon.c:439 ../server/vino-app-indicator.c:479
 #: ../server/vino-tube-app-indicator.c:159
-#: ../server/vino-status-tube-icon.c:284
+#: ../server/vino-status-tube-icon.c:276
 #, c-format
 msgid "Disconnect %s"
 msgstr "Koble fra %s"
 
-#: ../server/vino-status-icon.c:464 ../server/vino-app-indicator.c:500
+#: ../server/vino-status-icon.c:460 ../server/vino-app-indicator.c:500
 #: ../server/vino-tube-app-indicator.c:181
-#: ../server/vino-status-tube-icon.c:303
+#: ../server/vino-status-tube-icon.c:295
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../server/vino-status-icon.c:472 ../server/vino-app-indicator.c:508
+#: ../server/vino-status-icon.c:468 ../server/vino-app-indicator.c:508
 msgid "_About"
 msgstr "_Om"
 
-#: ../server/vino-status-icon.c:605 ../server/vino-app-indicator.c:626
+#: ../server/vino-status-icon.c:598 ../server/vino-app-indicator.c:626
 #: ../server/vino-tube-app-indicator.c:423
-#: ../server/vino-status-tube-icon.c:400
+#: ../server/vino-status-tube-icon.c:389
 #, c-format
 msgid "Error initializing libnotify\n"
 msgstr "Feil ved initiering av libnotify\n"
 
 #. Translators: %s is a hostname
-#: ../server/vino-status-icon.c:626 ../server/vino-app-indicator.c:647
+#: ../server/vino-status-icon.c:619 ../server/vino-app-indicator.c:647
 msgid "Another user is viewing your desktop"
 msgstr "En annen bruker ser på ditt skrivebord"
 
-#: ../server/vino-status-icon.c:628 ../server/vino-app-indicator.c:649
+#: ../server/vino-status-icon.c:621 ../server/vino-app-indicator.c:649
 #, c-format
 msgid "A user on the computer '%s' is remotely viewing your desktop."
 msgstr "En bruker på datamaskin «%s» ser på ditt skrivebord."
 
 #. Translators: %s is a hostname
-#: ../server/vino-status-icon.c:634 ../server/vino-app-indicator.c:655
+#: ../server/vino-status-icon.c:627 ../server/vino-app-indicator.c:655
 msgid "Another user is controlling your desktop"
 msgstr "En annen bruker kontrollerer ditt skrivebord"
 
-#: ../server/vino-status-icon.c:636 ../server/vino-app-indicator.c:657
+#: ../server/vino-status-icon.c:629 ../server/vino-app-indicator.c:657
 #, c-format
 msgid "A user on the computer '%s' is remotely controlling your desktop."
 msgstr "En bruker på datamaskin «%s» kontrollerer ditt skrivebord."
 
-#: ../server/vino-status-icon.c:664 ../server/vino-app-indicator.c:679
+#: ../server/vino-status-icon.c:651 ../server/vino-app-indicator.c:679
 #: ../server/vino-tube-app-indicator.c:453
-#: ../server/vino-status-tube-icon.c:437
+#: ../server/vino-status-tube-icon.c:423
 #, c-format
 msgid "Error while displaying notification bubble: %s\n"
 msgstr "Feil under visning av meldingsboble: %s\n"
@@ -684,7 +684,7 @@
 msgstr[1] "%d personer er koblet til"
 
 #: ../server/vino-tube-app-indicator.c:324
-#: ../server/vino-status-tube-icon.c:235
+#: ../server/vino-status-tube-icon.c:227
 #, c-format
 msgid "The remote user '%s' will be disconnected. Are you sure?"
 msgstr "Ekstern bruker «%s» vil bli frakoblet. Er du sikker?"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/vte-2.90.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/vte-2.90.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/vte-2.90.po	2013-01-29 09:33:56.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/vte-2.90.po	2014-01-07 06:37:52.000000000 +0000
@@ -14,11 +14,11 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 19:46+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 21:18+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../src/iso2022.c:795 ../src/iso2022.c:803 ../src/iso2022.c:834
-#: ../src/vte.c:2296
+#: ../src/vte.c:2294
 #, c-format
 msgid "Unable to convert characters from %s to %s."
 msgstr "Kan ikke konvertere tegn fra %s til %s."
@@ -52,32 +52,32 @@
 msgid "Could not parse the geometry spec passed to --geometry"
 msgstr "Kunne ikke tolke geometri oppgitt med --geometry"
 
-#: ../src/vte.c:1318
+#: ../src/vte.c:1316
 #, c-format
 msgid "Error compiling regular expression \"%s\"."
 msgstr "Feil under sammensetting av regulært uttrykk «%s»."
 
 #. Translators: %s is replaced with error message returned by strerror().
-#: ../src/vte.c:4627
+#: ../src/vte.c:4630
 #, c-format
 msgid "Error reading from child: %s."
 msgstr "Feil under lesing fra underprosess: %s."
 
-#: ../src/vte.c:4754
+#: ../src/vte.c:4757
 msgid "Unable to send data to child, invalid charset convertor"
 msgstr "Kan ikke sende data til barn. Ugyldig konvertering av tegnsett"
 
-#: ../src/vte.c:4765 ../src/vte.c:5812
+#: ../src/vte.c:4768 ../src/vte.c:5815
 #, c-format
 msgid "Error (%s) converting data for child, dropping."
 msgstr "Feil (%s) ved konvertering av data for underprosess. Hopper over."
 
-#: ../src/vte.c:8017
+#: ../src/vte.c:8026
 #, c-format
 msgid "Error reading PTY size, using defaults: %s\n"
 msgstr "Feil under lesing av PTY-størrelse. Bruker forvalg: %s\n"
 
 #. Aaargh.  We're screwed.
-#: ../src/vte.c:13858
+#: ../src/vte.c:13938
 msgid "_vte_conv_open() failed setting word characters"
 msgstr "_vte_conv_open() feilet ved setting av ord-tegn"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/vte.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/vte.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/vte.po	2013-01-29 09:33:48.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/vte.po	2014-01-07 06:37:07.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:01+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:13+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: ../src/iso2022.c:791 ../src/iso2022.c:799 ../src/iso2022.c:830
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/webkit-2.0.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/webkit-2.0.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/webkit-2.0.po	2013-01-29 09:33:53.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/webkit-2.0.po	2014-01-07 06:37:30.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:17+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 15:57+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:616
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/xchat-gnome.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/xchat-gnome.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/xchat-gnome.po	2013-01-29 09:33:48.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/xchat-gnome.po	2014-01-07 06:37:23.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 13:59+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 14:27+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../data/channel-list.glade.h:1
 msgid "Join channel:"
@@ -4062,7 +4062,7 @@
 msgid "Incoming File Transfer"
 msgstr "Innkommende filoverføring"
 
-#: ../src/fe-gnome/dcc-window.c:220 ../src/fe-gnome/fe-gnome.c:542
+#: ../src/fe-gnome/dcc-window.c:220 ../src/fe-gnome/fe-gnome.c:534
 msgid "_Accept"
 msgstr "_Godta"
 
@@ -4140,51 +4140,51 @@
 msgid "Send File..."
 msgstr "Send fil..."
 
-#: ../src/fe-gnome/fe-gnome.c:67
+#: ../src/fe-gnome/fe-gnome.c:65
 msgid "Full-screen the window"
 msgstr ""
 
-#: ../src/fe-gnome/fe-gnome.c:68
+#: ../src/fe-gnome/fe-gnome.c:66
 msgid "Use directory instead of the default config dir"
 msgstr "Bruk mappe istedenfor standard mappe fra innstillinger"
 
-#: ../src/fe-gnome/fe-gnome.c:69
+#: ../src/fe-gnome/fe-gnome.c:67
 msgid "Don't auto-connect to servers"
 msgstr "Ikke koble til tjenere automatisk"
 
-#: ../src/fe-gnome/fe-gnome.c:70
+#: ../src/fe-gnome/fe-gnome.c:68
 msgid "Don't auto-load plugins"
 msgstr "Ikke last tilleggsmoduler automatisk"
 
-#: ../src/fe-gnome/fe-gnome.c:71
+#: ../src/fe-gnome/fe-gnome.c:69
 msgid "Open an irc:// url"
 msgstr "Åpne en irc://-URL"
 
-#: ../src/fe-gnome/fe-gnome.c:72
+#: ../src/fe-gnome/fe-gnome.c:70
 msgid "Open URL in an existing XChat-GNOME instance"
 msgstr "Åpne URL i et eksisterende XChat-GNOME vindu"
 
-#: ../src/fe-gnome/fe-gnome.c:73
+#: ../src/fe-gnome/fe-gnome.c:71
 msgid "Show version information"
 msgstr "Vis versjonsinformasjon"
 
-#: ../src/fe-gnome/fe-gnome.c:142
+#: ../src/fe-gnome/fe-gnome.c:135
 #, c-format
 msgid "Failed to parse arguments: %s\n"
 msgstr ""
 
-#: ../src/fe-gnome/fe-gnome.c:540
+#: ../src/fe-gnome/fe-gnome.c:532
 msgid "Incoming DCC Chat"
 msgstr "Innkommende DCC-samtale"
 
-#: ../src/fe-gnome/fe-gnome.c:545
+#: ../src/fe-gnome/fe-gnome.c:537
 #, c-format
 msgid ""
 "%s is attempting to create a direct chat. Do you wish to accept the "
 "connection?"
 msgstr "%s prøver å starte en DCC-samtale. Vil du godta tilkoblingen?"
 
-#: ../src/fe-gnome/fe-gnome.c:980
+#: ../src/fe-gnome/fe-gnome.c:972
 #, c-format
 msgid "Unable to show '%s'"
 msgstr "Klarer ikke å vise \"%s\""
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/xdg-user-dirs-gtk.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/xdg-user-dirs-gtk.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/xdg-user-dirs-gtk.po	2013-01-29 09:33:49.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/xdg-user-dirs-gtk.po	2014-01-07 06:37:30.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:13+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 15:53+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: ../update.c:159
 msgid "Update standard folders to current language?"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/xdg-user-dirs.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/xdg-user-dirs.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/xdg-user-dirs.po	2013-01-29 09:33:54.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/xdg-user-dirs.po	2014-01-07 06:37:30.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 15:13+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 15:53+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 
 #: translate.c:2
 msgid "Applications"
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/yelp.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/yelp.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/yelp.po	2013-01-29 09:33:50.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/yelp.po	2014-01-07 06:37:09.000000000 +0000
@@ -14,8 +14,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:19+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:34+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: \n"
 
 #: yelp.xml:2(msg/msgstr)
@@ -32,26 +32,26 @@
 msgid "Not enough memory"
 msgstr "Ikke nok minne"
 
-#: ../libyelp/yelp-docbook-document.c:282 ../libyelp/yelp-info-document.c:238
-#: ../libyelp/yelp-mallard-document.c:306
-#: ../libyelp/yelp-mallard-document.c:458 ../libyelp/yelp-man-document.c:282
+#: ../libyelp/yelp-docbook-document.c:264 ../libyelp/yelp-info-document.c:239
+#: ../libyelp/yelp-mallard-document.c:307
+#: ../libyelp/yelp-mallard-document.c:458 ../libyelp/yelp-man-document.c:283
 #, c-format
 msgid "The page ‘%s’ was not found in the document ‘%s’."
 msgstr "Siden «%s» ble ikke funnet i dokumentet «%s»."
 
-#: ../libyelp/yelp-docbook-document.c:317 ../libyelp/yelp-info-document.c:372
-#: ../libyelp/yelp-man-document.c:417
+#: ../libyelp/yelp-docbook-document.c:299 ../libyelp/yelp-info-document.c:373
+#: ../libyelp/yelp-man-document.c:418
 #, c-format
 msgid "The file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: ../libyelp/yelp-docbook-document.c:327 ../libyelp/yelp-info-document.c:382
-#: ../libyelp/yelp-man-document.c:427
+#: ../libyelp/yelp-docbook-document.c:309 ../libyelp/yelp-info-document.c:383
+#: ../libyelp/yelp-man-document.c:428
 #, c-format
 msgid "The file ‘%s’ does not exist."
 msgstr "Filen «%s» eksisterer ikke."
 
-#: ../libyelp/yelp-docbook-document.c:342
+#: ../libyelp/yelp-docbook-document.c:324
 #, c-format
 msgid ""
 "The file ‘%s’ could not be parsed because it is not a well-formed XML "
@@ -60,7 +60,7 @@
 "Filen «%s» kunne ikke leses fordi den ikke er et gyldig utformet XML-"
 "dokument."
 
-#: ../libyelp/yelp-docbook-document.c:355
+#: ../libyelp/yelp-docbook-document.c:337
 #, c-format
 msgid ""
 "The file ‘%s’ could not be parsed because one or more of its included files "
@@ -69,12 +69,12 @@
 "Filen «%s» kunne ikke tolkes fordi den eller en inkludert fil ikke er "
 "velformet XML."
 
-#: ../libyelp/yelp-docbook-document.c:765
+#: ../libyelp/yelp-docbook-document.c:724
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../libyelp/yelp-docbook-document.c:826 ../libyelp/yelp-info-document.c:315
-#: ../libyelp/yelp-man-document.c:359
+#: ../libyelp/yelp-docbook-document.c:785 ../libyelp/yelp-info-document.c:316
+#: ../libyelp/yelp-man-document.c:360
 #, c-format
 msgid "The requested page was not found in the document ‘%s’."
 msgstr "Etterspurt side ble ikke funnet i dokument «%s»."
@@ -114,11 +114,11 @@
 msgid "An unknown error occurred."
 msgstr "En ukjent feil oppsto."
 
-#: ../libyelp/yelp-help-list.c:478 ../libyelp/yelp-help-list.c:487
+#: ../libyelp/yelp-help-list.c:550 ../libyelp/yelp-help-list.c:559
 msgid "All Help Documents"
 msgstr "Alle hjelpdokumenter"
 
-#: ../libyelp/yelp-info-document.c:397
+#: ../libyelp/yelp-info-document.c:398
 #, c-format
 msgid ""
 "The file ‘%s’ could not be parsed because it is not a well-formed info page."
@@ -219,11 +219,11 @@
 msgid "Enable features useful to editors"
 msgstr "Slå på funksjoner som er nyttig ved redigering"
 
-#: ../libyelp/yelp-sqlite-storage.c:150
+#: ../libyelp/yelp-sqlite-storage.c:149
 msgid "Database filename"
 msgstr "Filnavn for database"
 
-#: ../libyelp/yelp-sqlite-storage.c:151
+#: ../libyelp/yelp-sqlite-storage.c:150
 msgid "The filename of the sqlite database"
 msgstr "Filnavn for sqlite-databasen"
 
@@ -235,16 +235,16 @@
 msgid "The location of the XSLT stylesheet"
 msgstr "Lokasjon for XSLT-stilark"
 
-#: ../libyelp/yelp-transform.c:379 ../libyelp/yelp-transform.c:394
+#: ../libyelp/yelp-transform.c:380 ../libyelp/yelp-transform.c:395
 #, c-format
 msgid "The XSLT stylesheet ‘%s’ is either missing or not valid."
 msgstr "XSLT-stilark «%s» mangler eller er ugyldig."
 
-#: ../libyelp/yelp-transform.c:528
+#: ../libyelp/yelp-transform.c:529
 msgid "No href attribute found on yelp:document\n"
 msgstr "Ingen href-attributt funnet på yelp:document\n"
 
-#: ../libyelp/yelp-transform.c:543
+#: ../libyelp/yelp-transform.c:544
 msgid "Out of memory"
 msgstr "Ikke mer minne"
 
@@ -330,105 +330,105 @@
 "Du har ikke installert PackageKit. Lenker for pakkeinstallasjon krever "
 "PackageKit."
 
-#: ../libyelp/yelp-view.c:1013
+#: ../libyelp/yelp-view.c:1014
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#: ../libyelp/yelp-view.c:1108
+#: ../libyelp/yelp-view.c:1109
 msgid "Save Code"
 msgstr "Lagre kode"
 
-#: ../libyelp/yelp-view.c:1271
+#: ../libyelp/yelp-view.c:1272
 #, c-format
 msgid "Send email to %s"
 msgstr "Send e-post til %s"
 
-#: ../libyelp/yelp-view.c:1286
+#: ../libyelp/yelp-view.c:1287
 msgid "_Install Packages"
 msgstr "_Installer pakker"
 
-#: ../libyelp/yelp-view.c:1294
+#: ../libyelp/yelp-view.c:1295
 msgid "_Open Link"
 msgstr "_Åpne lenke"
 
-#: ../libyelp/yelp-view.c:1301
+#: ../libyelp/yelp-view.c:1302
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon fra lenke"
 
-#: ../libyelp/yelp-view.c:1307
+#: ../libyelp/yelp-view.c:1308
 msgid "Open Link in New _Window"
 msgstr "Åpne lenke i nytt _vindu"
 
-#: ../libyelp/yelp-view.c:1359
+#: ../libyelp/yelp-view.c:1360
 msgid "_Save Image As..."
 msgstr "_Lagre bilde som …"
 
-#: ../libyelp/yelp-view.c:1361
+#: ../libyelp/yelp-view.c:1362
 msgid "_Save Video As..."
 msgstr "_Lagre video som …"
 
-#: ../libyelp/yelp-view.c:1368
+#: ../libyelp/yelp-view.c:1369
 msgid "S_end Image To..."
 msgstr "S_end bilde til …"
 
-#: ../libyelp/yelp-view.c:1370
+#: ../libyelp/yelp-view.c:1371
 msgid "S_end Video To..."
 msgstr "S_end video til …"
 
-#: ../libyelp/yelp-view.c:1381
+#: ../libyelp/yelp-view.c:1382
 msgid "_Copy Text"
 msgstr "_Kopier tekst"
 
-#: ../libyelp/yelp-view.c:1394
+#: ../libyelp/yelp-view.c:1395
 msgid "C_opy Code Block"
 msgstr "K_opier kodeblokk"
 
-#: ../libyelp/yelp-view.c:1399
+#: ../libyelp/yelp-view.c:1400
 msgid "Save Code _Block As..."
 msgstr "Lagre kode_blokk som …"
 
-#: ../libyelp/yelp-view.c:1505
+#: ../libyelp/yelp-view.c:1507
 #, c-format
 msgid "See all search results for “%s”"
 msgstr "Se alle søkeresultater for «%s»"
 
-#: ../libyelp/yelp-view.c:1626
+#: ../libyelp/yelp-view.c:1628
 #, c-format
 msgid "Could not load a document for ‘%s’"
 msgstr "Kunne ikke laste dokument for «%s»"
 
-#: ../libyelp/yelp-view.c:1632
+#: ../libyelp/yelp-view.c:1634
 #, c-format
 msgid "Could not load a document"
 msgstr "Kunne ikke laste et dokument"
 
-#: ../libyelp/yelp-view.c:1706
+#: ../libyelp/yelp-view.c:1709
 msgid "Document Not Found"
 msgstr "Dokumentet ble ikke funnet"
 
-#: ../libyelp/yelp-view.c:1708
+#: ../libyelp/yelp-view.c:1711
 msgid "Page Not Found"
 msgstr "Siden ble ikke funnet"
 
-#: ../libyelp/yelp-view.c:1711
+#: ../libyelp/yelp-view.c:1714
 msgid "Cannot Read"
 msgstr "Kan ikke lese"
 
-#: ../libyelp/yelp-view.c:1717
+#: ../libyelp/yelp-view.c:1720
 msgid "Unknown Error"
 msgstr "Ukjent feil"
 
-#: ../libyelp/yelp-view.c:1886
+#: ../libyelp/yelp-view.c:1888
 #, c-format
 msgid "The URI ‘%s’ does not point to a valid page."
 msgstr "URI «%s» peker ikke til en gyldig side."
 
-#: ../libyelp/yelp-view.c:1892
+#: ../libyelp/yelp-view.c:1894
 #, c-format
 msgid "The URI does not point to a valid page."
 msgstr "URIen peker ikke til en gyldig side."
 
-#: ../libyelp/yelp-view.c:1898
+#: ../libyelp/yelp-view.c:1900
 #, c-format
 msgid "The URI ‘%s’ could not be parsed."
 msgstr "URI «%s» kunne ikke tolkes."
diff -Nru language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/zenity.po language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/zenity.po
--- language-pack-gnome-nb-base-12.04+20130128/data/nb/LC_MESSAGES/zenity.po	2013-01-29 09:33:52.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/data/nb/LC_MESSAGES/zenity.po	2014-01-07 06:37:09.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-28 12:21+0000\n"
-"X-Generator: Launchpad (build 16451)\n"
+"X-Launchpad-Export-Date: 2014-01-06 12:34+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
 "Language: nb\n"
 
 #: ../src/about.c:64
@@ -74,12 +74,12 @@
 msgid "could not parse command from stdin\n"
 msgstr "kunne ikke lese kommando fra stdin\n"
 
-#: ../src/notification.c:122
+#: ../src/notification.c:241
 #, c-format
 msgid "Could not parse message from stdin\n"
 msgstr "kunne ikke lese melding fra stdin\n"
 
-#: ../src/notification.c:196
+#: ../src/notification.c:321
 msgid "Zenity notification"
 msgstr "Zenity-melding"
 
@@ -191,211 +191,211 @@
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/option.c:157
+#: ../src/option.c:158
 msgid "Set the dialog title"
 msgstr "Sett tittel for dialog"
 
-#: ../src/option.c:158
+#: ../src/option.c:159
 msgid "TITLE"
 msgstr "TITTEL"
 
-#: ../src/option.c:166
+#: ../src/option.c:167
 msgid "Set the window icon"
 msgstr "Sett ikon for vindu"
 
-#: ../src/option.c:167
+#: ../src/option.c:168
 msgid "ICONPATH"
 msgstr "IKONSTI"
 
-#: ../src/option.c:175
+#: ../src/option.c:176
 msgid "Set the width"
 msgstr "Sett bredden"
 
-#: ../src/option.c:176
+#: ../src/option.c:177
 msgid "WIDTH"
 msgstr "BREDDE"
 
-#: ../src/option.c:184
+#: ../src/option.c:185
 msgid "Set the height"
 msgstr "Sett høyden"
 
-#: ../src/option.c:185
+#: ../src/option.c:186
 msgid "HEIGHT"
 msgstr "HØYDE"
 
-#: ../src/option.c:193
+#: ../src/option.c:194
 msgid "Set dialog timeout in seconds"
 msgstr "Sett tidsavbrudd for dialog i sekunder"
 
 #. Timeout for closing the dialog
-#: ../src/option.c:195
+#: ../src/option.c:196
 msgid "TIMEOUT"
 msgstr "TIDSAVBRUDD"
 
-#: ../src/option.c:203
+#: ../src/option.c:204
 msgid "Sets the label of the Ok button"
 msgstr "Setter etiketten for Ok-knappen"
 
-#: ../src/option.c:204 ../src/option.c:213 ../src/option.c:246
-#: ../src/option.c:306 ../src/option.c:315 ../src/option.c:349
-#: ../src/option.c:399 ../src/option.c:528 ../src/option.c:644
-#: ../src/option.c:679 ../src/option.c:751 ../src/option.c:819
-#: ../src/option.c:828 ../src/option.c:872 ../src/option.c:922
-#: ../src/option.c:1073
+#: ../src/option.c:205 ../src/option.c:214 ../src/option.c:247
+#: ../src/option.c:307 ../src/option.c:316 ../src/option.c:350
+#: ../src/option.c:400 ../src/option.c:529 ../src/option.c:645
+#: ../src/option.c:663 ../src/option.c:689 ../src/option.c:761
+#: ../src/option.c:829 ../src/option.c:838 ../src/option.c:882
+#: ../src/option.c:932 ../src/option.c:1083
 msgid "TEXT"
 msgstr "TEKST"
 
-#: ../src/option.c:212
+#: ../src/option.c:213
 msgid "Sets the label of the Cancel button"
 msgstr "Setter etiketten for Avbryt-knappen"
 
-#: ../src/option.c:236
+#: ../src/option.c:237
 msgid "Display calendar dialog"
 msgstr "Vis kalenderdialog"
 
-#: ../src/option.c:245 ../src/option.c:305 ../src/option.c:348
-#: ../src/option.c:398 ../src/option.c:527 ../src/option.c:678
-#: ../src/option.c:750 ../src/option.c:871 ../src/option.c:921
-#: ../src/option.c:1072
+#: ../src/option.c:246 ../src/option.c:306 ../src/option.c:349
+#: ../src/option.c:399 ../src/option.c:528 ../src/option.c:688
+#: ../src/option.c:760 ../src/option.c:881 ../src/option.c:931
+#: ../src/option.c:1082
 msgid "Set the dialog text"
 msgstr "Sett teksten i dialogen"
 
-#: ../src/option.c:254
+#: ../src/option.c:255
 msgid "Set the calendar day"
 msgstr "Sett dag i kalenderen"
 
-#: ../src/option.c:255
+#: ../src/option.c:256
 msgid "DAY"
 msgstr "DAG"
 
-#: ../src/option.c:263
+#: ../src/option.c:264
 msgid "Set the calendar month"
 msgstr "Sett måned i kalenderen"
 
-#: ../src/option.c:264
+#: ../src/option.c:265
 msgid "MONTH"
 msgstr "MÅNED"
 
-#: ../src/option.c:272
+#: ../src/option.c:273
 msgid "Set the calendar year"
 msgstr "Sett år i kalenderen"
 
-#: ../src/option.c:273
+#: ../src/option.c:274
 msgid "YEAR"
 msgstr "ÅR"
 
-#: ../src/option.c:281 ../src/option.c:1090
+#: ../src/option.c:282 ../src/option.c:1100
 msgid "Set the format for the returned date"
 msgstr "Sett format for returnert dato"
 
-#: ../src/option.c:282 ../src/option.c:1091
+#: ../src/option.c:283 ../src/option.c:1101
 msgid "PATTERN"
 msgstr "MØNSTER"
 
-#: ../src/option.c:296
+#: ../src/option.c:297
 msgid "Display text entry dialog"
 msgstr "Vis tekstoppføringsdialog"
 
-#: ../src/option.c:314
+#: ../src/option.c:315
 msgid "Set the entry text"
 msgstr "Sett tekst i oppføringen"
 
-#: ../src/option.c:323
+#: ../src/option.c:324
 msgid "Hide the entry text"
 msgstr "Skjul tekst i oppføringen"
 
-#: ../src/option.c:339
+#: ../src/option.c:340
 msgid "Display error dialog"
 msgstr "Vis feildialog"
 
-#: ../src/option.c:366 ../src/option.c:416 ../src/option.c:768
-#: ../src/option.c:889
+#: ../src/option.c:367 ../src/option.c:417 ../src/option.c:778
+#: ../src/option.c:899
 msgid "Do not enable text wrapping"
 msgstr "Ikke aktiver tekstbryting"
 
-#: ../src/option.c:375 ../src/option.c:425 ../src/option.c:777
-#: ../src/option.c:898
+#: ../src/option.c:376 ../src/option.c:426 ../src/option.c:787
+#: ../src/option.c:908
 msgid "Do not enable pango markup"
 msgstr "Ikke aktiver tekstmerking med pango"
 
-#: ../src/option.c:389
+#: ../src/option.c:390
 msgid "Display info dialog"
 msgstr "Vis informasjonsdialog"
 
-#: ../src/option.c:439
+#: ../src/option.c:440
 msgid "Display file selection dialog"
 msgstr "Vis dialog for filvalg"
 
-#: ../src/option.c:448
+#: ../src/option.c:449
 msgid "Set the filename"
 msgstr "Sett filnavnet"
 
-#: ../src/option.c:449 ../src/option.c:801
+#: ../src/option.c:450 ../src/option.c:811
 msgid "FILENAME"
 msgstr "FILNAVN"
 
-#: ../src/option.c:457
+#: ../src/option.c:458
 msgid "Allow multiple files to be selected"
 msgstr "Tillat valg av flere filer"
 
-#: ../src/option.c:466
+#: ../src/option.c:467
 msgid "Activate directory-only selection"
 msgstr "Aktiver utvalg kun på katalog"
 
-#: ../src/option.c:475
+#: ../src/option.c:476
 msgid "Activate save mode"
 msgstr "Aktiver lagre-modus"
 
-#: ../src/option.c:484 ../src/option.c:572 ../src/option.c:1081
+#: ../src/option.c:485 ../src/option.c:573 ../src/option.c:1091
 msgid "Set output separator character"
 msgstr "Sett skilletegn for utdata"
 
-#: ../src/option.c:485 ../src/option.c:573 ../src/option.c:1082
+#: ../src/option.c:486 ../src/option.c:574 ../src/option.c:1092
 msgid "SEPARATOR"
 msgstr "SKILLETEGN"
 
-#: ../src/option.c:493
+#: ../src/option.c:494
 msgid "Confirm file selection if filename already exists"
 msgstr "Bekreft filutvalget hvis filnavnet allerede eksisterer"
 
-#: ../src/option.c:502
+#: ../src/option.c:503
 msgid "Sets a filename filter"
 msgstr "Setter et filter for filnavn"
 
 #. Help for file-filter argument (name and patterns for file selection)
-#: ../src/option.c:504
+#: ../src/option.c:505
 msgid "NAME | PATTERN1 PATTERN2 ..."
 msgstr "NAVN | MØNSTER1 MØNSTER2 …"
 
-#: ../src/option.c:518
+#: ../src/option.c:519
 msgid "Display list dialog"
 msgstr "Vis listedialog"
 
-#: ../src/option.c:536
+#: ../src/option.c:537
 msgid "Set the column header"
 msgstr "Sett kolonnetopptekst"
 
-#: ../src/option.c:537
+#: ../src/option.c:538
 msgid "COLUMN"
 msgstr "KOLONNE"
 
-#: ../src/option.c:545
+#: ../src/option.c:546
 msgid "Use check boxes for first column"
 msgstr "Bruk avkrysningsbokser for første kolonne"
 
-#: ../src/option.c:554
+#: ../src/option.c:555
 msgid "Use radio buttons for first column"
 msgstr "Bruk radioknapper for første kolonne"
 
-#: ../src/option.c:581
+#: ../src/option.c:582
 msgid "Allow multiple rows to be selected"
 msgstr "Tillat valg av flere rader"
 
-#: ../src/option.c:590 ../src/option.c:809
+#: ../src/option.c:591 ../src/option.c:819
 msgid "Allow changes to text"
 msgstr "Tillat endringer i tekst"
 
-#: ../src/option.c:599
+#: ../src/option.c:600
 msgid ""
 "Print a specific column (Default is 1. 'ALL' can be used to print all "
 "columns)"
@@ -404,344 +404,344 @@
 "alle kolonner)"
 
 #. Column index number to print out on a list dialog
-#: ../src/option.c:601 ../src/option.c:610
+#: ../src/option.c:602 ../src/option.c:611
 msgid "NUMBER"
 msgstr "TALL"
 
-#: ../src/option.c:609
+#: ../src/option.c:610
 msgid "Hide a specific column"
 msgstr "Skjul en bestemt kolonne"
 
-#: ../src/option.c:618
+#: ../src/option.c:619
 msgid "Hides the column headers"
 msgstr "Skjuler kolonnetopptekst"
 
-#: ../src/option.c:634
+#: ../src/option.c:635
 msgid "Display notification"
 msgstr "Vis melding"
 
-#: ../src/option.c:643
+#: ../src/option.c:644
 msgid "Set the notification text"
 msgstr "Sett meldingsteksten"
 
-#: ../src/option.c:652
+#: ../src/option.c:653
 msgid "Listen for commands on stdin"
 msgstr "Lytt etter kommandoer på stdin"
 
-#: ../src/option.c:669
+#: ../src/option.c:679
 msgid "Display progress indication dialog"
 msgstr "Vis dialog for indikering av fremgang"
 
-#: ../src/option.c:687
+#: ../src/option.c:697
 msgid "Set initial percentage"
 msgstr "Sett startprosent"
 
-#: ../src/option.c:688
+#: ../src/option.c:698
 msgid "PERCENTAGE"
 msgstr "PROSENT"
 
-#: ../src/option.c:696
+#: ../src/option.c:706
 msgid "Pulsate progress bar"
 msgstr "Pulserende fremgangslinje"
 
-#: ../src/option.c:706
+#: ../src/option.c:716
 #, no-c-format
 msgid "Dismiss the dialog when 100% has been reached"
 msgstr "Lukk dialogen når 100% er nådd"
 
-#: ../src/option.c:716
+#: ../src/option.c:726
 #, no-c-format
 msgid "Kill parent process if Cancel button is pressed"
 msgstr "Terminer opphavsprosess hvis Avbryt-knappen trykkes"
 
-#: ../src/option.c:726
+#: ../src/option.c:736
 #, no-c-format
 msgid "Hide Cancel button"
 msgstr "Skjul Avbryt-knapp"
 
-#: ../src/option.c:741
+#: ../src/option.c:751
 msgid "Display question dialog"
 msgstr "Vis spørsmålsdialog"
 
-#: ../src/option.c:791
+#: ../src/option.c:801
 msgid "Display text information dialog"
 msgstr "Vis dialog med tekstinformasjon"
 
-#: ../src/option.c:800
+#: ../src/option.c:810
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: ../src/option.c:818
+#: ../src/option.c:828
 msgid "Set the text font"
 msgstr "Sett skrift for tekst"
 
-#: ../src/option.c:827
+#: ../src/option.c:837
 msgid "Enable an I read and agree checkbox"
 msgstr "Slå på en avkryssingsboks for «Lest og godtatt»"
 
-#: ../src/option.c:837
+#: ../src/option.c:847
 msgid "Enable html support"
 msgstr "Slå på støtte for HTML"
 
-#: ../src/option.c:846
+#: ../src/option.c:856
 msgid "Sets an url instead of a file. Only works if you use --html option"
 msgstr ""
 "Setter en URL i stedet for en fil. Virker kun hvis du bruker flagget --html"
 
-#: ../src/option.c:847
+#: ../src/option.c:857
 msgid "URL"
 msgstr "URL"
 
-#: ../src/option.c:862
+#: ../src/option.c:872
 msgid "Display warning dialog"
 msgstr "Vis advarselsdialog"
 
-#: ../src/option.c:912
+#: ../src/option.c:922
 msgid "Display scale dialog"
 msgstr "Vis skaleringsdialog"
 
-#: ../src/option.c:930
+#: ../src/option.c:940
 msgid "Set initial value"
 msgstr "Sett startverdi"
 
-#: ../src/option.c:931 ../src/option.c:940 ../src/option.c:949
-#: ../src/option.c:958 ../src/option.c:1139
+#: ../src/option.c:941 ../src/option.c:950 ../src/option.c:959
+#: ../src/option.c:968 ../src/option.c:1149
 msgid "VALUE"
 msgstr "VERDI"
 
-#: ../src/option.c:939
+#: ../src/option.c:949
 msgid "Set minimum value"
 msgstr "Sett minste verdi"
 
-#: ../src/option.c:948
+#: ../src/option.c:958
 msgid "Set maximum value"
 msgstr "Set høyeste verdi"
 
-#: ../src/option.c:957
+#: ../src/option.c:967
 msgid "Set step size"
 msgstr "Sett størrelse på steg"
 
-#: ../src/option.c:966
+#: ../src/option.c:976
 msgid "Print partial values"
 msgstr "Skriv ut delverdier"
 
-#: ../src/option.c:975
+#: ../src/option.c:985
 msgid "Hide value"
 msgstr "Skjul verdi"
 
-#: ../src/option.c:990
+#: ../src/option.c:1000
 msgid "Display forms dialog"
 msgstr "Vis skjemadialog"
 
-#: ../src/option.c:999
+#: ../src/option.c:1009
 msgid "Add a new Entry in forms dialog"
 msgstr "Legg til en ny oppføring i skjemadialog"
 
-#: ../src/option.c:1000 ../src/option.c:1009
+#: ../src/option.c:1010 ../src/option.c:1019
 msgid "Field name"
 msgstr "Feltnavn"
 
-#: ../src/option.c:1008
+#: ../src/option.c:1018
 msgid "Add a new Password Entry in forms dialog"
 msgstr "Legg til en ny passordoppføring i skjemadialog"
 
-#: ../src/option.c:1017
+#: ../src/option.c:1027
 msgid "Add a new Calendar in forms dialog"
 msgstr "Legg til en ny kalender i skjemadialog"
 
-#: ../src/option.c:1018
+#: ../src/option.c:1028
 msgid "Calendar field name"
 msgstr "Feltnavn for kalender"
 
-#: ../src/option.c:1026
+#: ../src/option.c:1036
 msgid "Add a new List in forms dialog"
 msgstr "Legg til en ny liste i skjemadialog"
 
-#: ../src/option.c:1027
+#: ../src/option.c:1037
 msgid "List field and header name"
 msgstr "Felt i liste og navn på topptekst"
 
-#: ../src/option.c:1035
+#: ../src/option.c:1045
 msgid "List of values for List"
 msgstr "Liste med verdier for en liste"
 
-#: ../src/option.c:1036 ../src/option.c:1045
+#: ../src/option.c:1046 ../src/option.c:1055
 msgid "List of values separated by |"
 msgstr "Liste med verdier adskilt med |"
 
-#: ../src/option.c:1044
+#: ../src/option.c:1054
 msgid "List of values for columns"
 msgstr "Liste med verdier for kolonner"
 
-#: ../src/option.c:1063
+#: ../src/option.c:1073
 msgid "Show the columns header"
 msgstr "Vis kolonnetopptekst"
 
-#: ../src/option.c:1105
+#: ../src/option.c:1115
 msgid "Display password dialog"
 msgstr "Vis passorddialog"
 
-#: ../src/option.c:1114
+#: ../src/option.c:1124
 msgid "Display the username option"
 msgstr "Vis brukernavnalternativet"
 
-#: ../src/option.c:1129
+#: ../src/option.c:1139
 msgid "Display color selection dialog"
 msgstr "Vis dialog for fargevalg"
 
-#: ../src/option.c:1138
+#: ../src/option.c:1148
 msgid "Set the color"
 msgstr "Sett farge"
 
-#: ../src/option.c:1147
+#: ../src/option.c:1157
 msgid "Show the palette"
 msgstr "Vis palett"
 
-#: ../src/option.c:1162
+#: ../src/option.c:1172
 msgid "About zenity"
 msgstr "Om Zenity"
 
-#: ../src/option.c:1171
+#: ../src/option.c:1181
 msgid "Print version"
 msgstr "Skriv ut versjon"
 
-#: ../src/option.c:2059
+#: ../src/option.c:2075
 msgid "General options"
 msgstr "Generelle alternativer"
 
-#: ../src/option.c:2060
+#: ../src/option.c:2076
 msgid "Show general options"
 msgstr "Vis generelle alternativer"
 
-#: ../src/option.c:2070
+#: ../src/option.c:2086
 msgid "Calendar options"
 msgstr "Alternativer for kalender"
 
-#: ../src/option.c:2071
+#: ../src/option.c:2087
 msgid "Show calendar options"
 msgstr "Vis alternativer for kalender"
 
-#: ../src/option.c:2081
+#: ../src/option.c:2097
 msgid "Text entry options"
 msgstr "Alternativer for tekstoppføring"
 
-#: ../src/option.c:2082
+#: ../src/option.c:2098
 msgid "Show text entry options"
 msgstr "Vis alternativer for tekstoppføring"
 
-#: ../src/option.c:2092
+#: ../src/option.c:2108
 msgid "Error options"
 msgstr "Alternativer for feil"
 
-#: ../src/option.c:2093
+#: ../src/option.c:2109
 msgid "Show error options"
 msgstr "Vis alternativer for feil"
 
-#: ../src/option.c:2103
+#: ../src/option.c:2119
 msgid "Info options"
 msgstr "Alternativer for informasjon"
 
-#: ../src/option.c:2104
+#: ../src/option.c:2120
 msgid "Show info options"
 msgstr "Vis alternativer for infosider"
 
-#: ../src/option.c:2114
+#: ../src/option.c:2130
 msgid "File selection options"
 msgstr "Alternativer for filvalg"
 
-#: ../src/option.c:2115
+#: ../src/option.c:2131
 msgid "Show file selection options"
 msgstr "Vis alternativer for filvalg"
 
-#: ../src/option.c:2125
+#: ../src/option.c:2141
 msgid "List options"
 msgstr "Alternativer for liste"
 
-#: ../src/option.c:2126
+#: ../src/option.c:2142
 msgid "Show list options"
 msgstr "Vis alternativer for liste"
 
-#: ../src/option.c:2137
+#: ../src/option.c:2153
 msgid "Notification icon options"
 msgstr "Alternativer for varselikon"
 
-#: ../src/option.c:2138
+#: ../src/option.c:2154
 msgid "Show notification icon options"
 msgstr "Vis alternativer for varselikon"
 
-#: ../src/option.c:2149
+#: ../src/option.c:2165
 msgid "Progress options"
 msgstr "Alternativer for fremgang"
 
-#: ../src/option.c:2150
+#: ../src/option.c:2166
 msgid "Show progress options"
 msgstr "Vis alternativer for fremgang"
 
-#: ../src/option.c:2160
+#: ../src/option.c:2176
 msgid "Question options"
 msgstr "Alternativer for spørsmål"
 
-#: ../src/option.c:2161
+#: ../src/option.c:2177
 msgid "Show question options"
 msgstr "Vis alternativer for spørsmål"
 
-#: ../src/option.c:2171
+#: ../src/option.c:2187
 msgid "Warning options"
 msgstr "Alternativer for advarsel"
 
-#: ../src/option.c:2172
+#: ../src/option.c:2188
 msgid "Show warning options"
 msgstr "Vis alternativer for advarsel"
 
-#: ../src/option.c:2182
+#: ../src/option.c:2198
 msgid "Scale options"
 msgstr "Alternativer for skalering"
 
-#: ../src/option.c:2183
+#: ../src/option.c:2199
 msgid "Show scale options"
 msgstr "Vis alternativer for skalering"
 
-#: ../src/option.c:2193
+#: ../src/option.c:2209
 msgid "Text information options"
 msgstr "Alternativer for tekstinformasjon"
 
-#: ../src/option.c:2194
+#: ../src/option.c:2210
 msgid "Show text information options"
 msgstr "Vis alternativer for tekstinformasjon"
 
-#: ../src/option.c:2204
+#: ../src/option.c:2220
 msgid "Color selection options"
 msgstr "Alternativer for fargevalg"
 
-#: ../src/option.c:2205
+#: ../src/option.c:2221
 msgid "Show color selection options"
 msgstr "Vis alternativer for fargevalg"
 
-#: ../src/option.c:2215
+#: ../src/option.c:2231
 msgid "Password dialog options"
 msgstr "Alternativer for passorddialog"
 
-#: ../src/option.c:2216
+#: ../src/option.c:2232
 msgid "Show password dialog options"
 msgstr "Vis alternativer for passorddialog"
 
-#: ../src/option.c:2226
+#: ../src/option.c:2242
 msgid "Forms dialog options"
 msgstr "Alternativer for skjemadialog"
 
-#: ../src/option.c:2227
+#: ../src/option.c:2243
 msgid "Show forms dialog options"
 msgstr "Vis alternativer for skjemadialog"
 
-#: ../src/option.c:2237
+#: ../src/option.c:2253
 msgid "Miscellaneous options"
 msgstr "Forskjellige alternativer"
 
-#: ../src/option.c:2238
+#: ../src/option.c:2254
 msgid "Show miscellaneous options"
 msgstr "Vis forskjellige alternativer"
 
-#: ../src/option.c:2263
+#: ../src/option.c:2279
 #, c-format
 msgid ""
 "This option is not available. Please see --help for all possible usages.\n"
@@ -749,12 +749,12 @@
 "Dette flagget er ikke tilgjengelig. Vennligst bruk --help for å se mulige "
 "flagg.\n"
 
-#: ../src/option.c:2267
+#: ../src/option.c:2283
 #, c-format
 msgid "--%s is not supported for this dialog\n"
 msgstr "--%s er ikke støttet for denne dialogen\n"
 
-#: ../src/option.c:2271
+#: ../src/option.c:2287
 #, c-format
 msgid "Two or more dialog options specified\n"
 msgstr "To eller flere dialogflagg oppgitt\n"
Binary files /tmp/kkBTS2osA_/language-pack-gnome-nb-base-12.04+20130128/data/static.tar and /tmp/qiJHNvo8gZ/language-pack-gnome-nb-base-12.04+20140106/data/static.tar differ
diff -Nru language-pack-gnome-nb-base-12.04+20130128/debian/changelog language-pack-gnome-nb-base-12.04+20140106/debian/changelog
--- language-pack-gnome-nb-base-12.04+20130128/debian/changelog	2013-01-29 09:33:47.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/debian/changelog	2014-01-07 06:37:00.000000000 +0000
@@ -1,6 +1,6 @@
-language-pack-gnome-nb-base (1:12.04+20130128) precise-proposed; urgency=low
+language-pack-gnome-nb-base (1:12.04+20140106) precise-proposed; urgency=low
 
   * Initial Release.
 
- -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Tue, 29 Jan 2013 09:33:48 +0000
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Tue, 07 Jan 2014 06:37:00 +0000
 
diff -Nru language-pack-gnome-nb-base-12.04+20130128/debian/compat language-pack-gnome-nb-base-12.04+20140106/debian/compat
--- language-pack-gnome-nb-base-12.04+20130128/debian/compat	2013-01-29 09:33:47.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/debian/compat	2014-01-07 06:37:00.000000000 +0000
@@ -1 +1 @@
-6
+8
diff -Nru language-pack-gnome-nb-base-12.04+20130128/debian/control language-pack-gnome-nb-base-12.04+20140106/debian/control
--- language-pack-gnome-nb-base-12.04+20130128/debian/control	2013-01-29 09:33:47.000000000 +0000
+++ language-pack-gnome-nb-base-12.04+20140106/debian/control	2014-01-07 06:37:00.000000000 +0000
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Language pack maintainers <language-packs@ubuntu.com>
 Build-Depends-Indep: gettext
-Build-Depends: debhelper (>= 6)
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 8)
+Standards-Version: 3.9.4
 
 Package: language-pack-gnome-nb-base
 Architecture: all