[gnome-applets] Updated Norwegian bokmål translation .



commit dfa001b37451e4b361189c10712cf35b2dad16cf
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Fri Sep 26 17:23:08 2014 +0200

    Updated Norwegian bokmål translation.

 po/nb.po | 1383 +++++++++++++++++++++++++++-----------------------------------
 1 files changed, 611 insertions(+), 772 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index c41b6d3..92de7ec 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,15 +1,15 @@
 # Norwegian bokmål translation of gnome-applets.
 # Copyright (C) 1998-2004, 2005 Free Software Foundation, Inc.
 #
-# Kjartan Maraas <kmaraas gnome org>, 1998-2013.
+# Kjartan Maraas <kmaraas gnome org>, 1998-2014.
 # Terance Edward Sola <terance lyse net>, 2005.
 # Torstein Adolf Winterseth <kvikende fsfe org>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-applets 3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-14 15:14+0200\n"
-"PO-Revision-Date: 2013-05-14 15:15+0200\n"
+"POT-Creation-Date: 2014-09-26 17:20+0200\n"
+"PO-Revision-Date: 2014-09-26 17:23+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb lister ping uio no>\n"
 "Language: nb\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.1\n"
 
-#: ../accessx-status/applet.c:139
+#: ../accessx-status/applet.c:138
 msgid "Shows the state of AccessX features such as latched modifiers"
 msgstr ""
 "Viser status for funksjoner for tilgjengelighet slik som sammenkoblede "
@@ -29,90 +29,90 @@ msgstr ""
 #. about.set_documenters([])
 #. translators: These appear in the About dialog, usual format applies.
 #. "documenters",        documenters,
-#: ../accessx-status/applet.c:144 ../battstat/battstat_applet.c:1203
-#: ../charpick/charpick.c:612 ../cpufreq/src/cpufreq-applet.c:611
-#: ../drivemount/drivemount.c:106 ../geyes/geyes.c:153
+#: ../accessx-status/applet.c:143 ../battstat/battstat_applet.c:1204
+#: ../charpick/charpick.c:594 ../cpufreq/src/cpufreq-applet.c:609
+#: ../drivemount/drivemount.c:106 ../geyes/geyes.c:158
 #: ../gweather/gweather-about.c:55 ../invest-applet/invest/about.py:29
-#: ../mini-commander/src/about.c:53 ../mixer/applet.c:1424
-#: ../modemlights/modem-applet.c:1023 ../multiload/main.c:61
+#: ../mini-commander/src/about.c:53 ../mixer/applet.c:1403
+#: ../modemlights/modem-applet.c:993 ../multiload/main.c:59
 #: ../stickynotes/stickynotes_applet_callbacks.c:383
-#: ../trashapplet/src/trashapplet.c:431
+#: ../trashapplet/src/trashapplet.c:422
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas gnome org>\n"
 "Torstein Adolf Winterseth <kvikende fsfe org>"
 
-#: ../accessx-status/applet.c:169
+#: ../accessx-status/applet.c:168
 #, c-format
 msgid "There was an error launching the help viewer: %s"
 msgstr "Det oppsto en feil under start av visningsprogram for hjelp: %s"
 
-#: ../accessx-status/applet.c:201
+#: ../accessx-status/applet.c:200
 msgid "Open the keyboard preferences dialog"
 msgstr "Åpne brukervalg for tastatur"
 
-#: ../accessx-status/applet.c:219
+#: ../accessx-status/applet.c:218
 #, c-format
 msgid "There was an error launching the keyboard preferences dialog: %s"
 msgstr "Det oppsto en feil under oppstart av brukervalg for tastatur: %s"
 
-#: ../accessx-status/applet.c:238
+#: ../accessx-status/applet.c:237
 msgid "_Keyboard Accessibility Preferences"
 msgstr "Bru_kervalg for tilgjengelighet for tastatur"
 
-#: ../accessx-status/applet.c:241 ../battstat/battstat_applet.c:64
-#: ../charpick/charpick.c:719 ../cpufreq/src/cpufreq-applet.c:126
-#: ../drivemount/drivemount.c:144 ../geyes/geyes.c:318
-#: ../gweather/gweather-applet.c:124
-#: ../mini-commander/src/mini-commander_applet.c:56 ../mixer/applet.c:381
-#: ../modemlights/modem-applet.c:151 ../multiload/main.c:465
-#: ../stickynotes/stickynotes_applet.c:45 ../trashapplet/src/trashapplet.c:75
+#: ../accessx-status/applet.c:240 ../battstat/battstat_applet.c:61
+#: ../charpick/charpick.c:684 ../cpufreq/src/cpufreq-applet.c:125
+#: ../drivemount/drivemount.c:144 ../geyes/geyes.c:324 ../geyes/themes.c:282
+#: ../gweather/gweather-applet.c:118
+#: ../mini-commander/src/mini-commander_applet.c:56 ../mixer/applet.c:374
+#: ../multiload/main.c:466 ../stickynotes/stickynotes_applet.c:46
+#: ../trashapplet/src/trashapplet.c:74
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../accessx-status/applet.c:244 ../battstat/battstat_applet.c:67
-#: ../charpick/charpick.c:722 ../cpufreq/src/cpufreq-applet.c:129
-#: ../drivemount/drivemount.c:147 ../geyes/geyes.c:321
-#: ../gweather/gweather-applet.c:127
-#: ../mini-commander/src/mini-commander_applet.c:59 ../mixer/applet.c:384
-#: ../modemlights/modem-applet.c:154 ../multiload/main.c:468
-#: ../stickynotes/stickynotes_applet.c:48 ../trashapplet/src/trashapplet.c:78
+#: ../accessx-status/applet.c:243 ../battstat/battstat_applet.c:64
+#: ../charpick/charpick.c:687 ../cpufreq/src/cpufreq-applet.c:128
+#: ../drivemount/drivemount.c:147 ../geyes/geyes.c:327
+#: ../gweather/gweather-applet.c:121
+#: ../mini-commander/src/mini-commander_applet.c:59 ../mixer/applet.c:377
+#: ../modemlights/modem-applet.c:144 ../multiload/main.c:469
+#: ../stickynotes/stickynotes_applet.c:49 ../trashapplet/src/trashapplet.c:77
 msgid "_About"
 msgstr "_Om"
 
 #. Note to translators: the first letter of the alphabet, not the indefinite article
-#: ../accessx-status/applet.c:468 ../accessx-status/applet.c:508
+#: ../accessx-status/applet.c:467 ../accessx-status/applet.c:507
 msgid "a"
 msgstr "a"
 
-#: ../accessx-status/applet.c:981 ../accessx-status/applet.c:1055
-#: ../accessx-status/applet.c:1124 ../accessx-status/applet.c:1290
+#: ../accessx-status/applet.c:980 ../accessx-status/applet.c:1053
+#: ../accessx-status/applet.c:1121 ../accessx-status/applet.c:1299
 msgid "AccessX Status"
 msgstr "Status for tilgjengelighet"
 
-#: ../accessx-status/applet.c:982 ../accessx-status/applet.c:1125
+#: ../accessx-status/applet.c:981 ../accessx-status/applet.c:1122
 msgid "Shows keyboard status when accessibility features are used."
 msgstr "Viser tastaturstatus når tilgjengelighetsfunksjoner er i bruk."
 
-#: ../accessx-status/applet.c:1017
+#: ../accessx-status/applet.c:1016
 msgid "XKB Extension is not enabled"
 msgstr "XKB-tillegg er ikke aktivert"
 
-#: ../accessx-status/applet.c:1022
+#: ../accessx-status/applet.c:1021
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../accessx-status/applet.c:1030
+#: ../accessx-status/applet.c:1029
 #, c-format
 msgid "Error: %s"
 msgstr "Feil: %s"
 
-#: ../accessx-status/applet.c:1287
+#: ../accessx-status/applet.c:1296
 #: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:3
 msgid "Keyboard Accessibility Status"
 msgstr "Status for tilgjengelighet for tastaturet"
 
-#: ../accessx-status/applet.c:1292
+#: ../accessx-status/applet.c:1301
 msgid "Displays current state of keyboard accessibility features"
 msgstr ""
 "Viser nåværende tilstand for funksjoner for tilgjengelighet for tastatur"
@@ -129,59 +129,59 @@ msgstr "Fabrikk for panelprogram for tilgjengelighet for tastatur"
 msgid "Shows the status of keyboard accessibility features"
 msgstr "Viser status for tilgjengelighetsfunksjoner for tastaturet"
 
-#: ../battstat/battstat_applet.c:61 ../charpick/charpick.c:716
-#: ../cpufreq/src/cpufreq-applet.c:123 ../geyes/geyes.c:315
-#: ../gweather/gweather-applet.c:121
-#: ../mini-commander/src/mini-commander_applet.c:53 ../mixer/applet.c:387
-#: ../multiload/main.c:459 ../stickynotes/stickynotes_applet.c:42
+#: ../battstat/battstat_applet.c:58 ../charpick/charpick.c:681
+#: ../cpufreq/src/cpufreq-applet.c:122 ../geyes/geyes.c:321
+#: ../gweather/gweather-applet.c:115
+#: ../mini-commander/src/mini-commander_applet.c:53 ../mixer/applet.c:380
+#: ../multiload/main.c:460 ../stickynotes/stickynotes_applet.c:43
 msgid "_Preferences"
 msgstr "_Brukervalg"
 
-#: ../battstat/battstat_applet.c:72
+#: ../battstat/battstat_applet.c:69
 msgid "System is running on AC power"
 msgstr "Systemet kjører på nettstrøm"
 
-#: ../battstat/battstat_applet.c:73
+#: ../battstat/battstat_applet.c:70
 msgid "System is running on battery power"
 msgstr "Systemet kjører på batteristrøm"
 
-#: ../battstat/battstat_applet.c:339
+#: ../battstat/battstat_applet.c:336
 #, c-format
 msgid "Battery charged (%d%%)"
 msgstr "Batteriet er oppladet (%d%%)"
 
-#: ../battstat/battstat_applet.c:341
+#: ../battstat/battstat_applet.c:338
 #, c-format
 msgid "Unknown time (%d%%) remaining"
 msgstr "Ukjent tid gjenstår (%d%%)"
 
-#: ../battstat/battstat_applet.c:343
+#: ../battstat/battstat_applet.c:340
 #, c-format
 msgid "Unknown time (%d%%) until charged"
 msgstr "Ukjent tid før batteriet er oppladet (%d%%)"
 
-#: ../battstat/battstat_applet.c:348
+#: ../battstat/battstat_applet.c:345
 #, c-format
 msgid "%d minute (%d%%) remaining"
 msgid_plural "%d minutes (%d%%) remaining"
 msgstr[0] "%d minutt (%d%%) gjenstår"
 msgstr[1] "%d minutter (%d%%) gjenstår"
 
-#: ../battstat/battstat_applet.c:353
+#: ../battstat/battstat_applet.c:350
 #, c-format
 msgid "%d minute until charged (%d%%)"
 msgid_plural "%d minutes until charged (%d%%)"
 msgstr[0] "%d minutt før batteriet er oppladet (%d%%)"
 msgstr[1] "%d minutter før batteriet er oppladet (%d%%)"
 
-#: ../battstat/battstat_applet.c:359
+#: ../battstat/battstat_applet.c:356
 #, c-format
 msgid "%d hour (%d%%) remaining"
 msgid_plural "%d hours (%d%%) remaining"
 msgstr[0] "%d time (%d%%) gjenstår"
 msgstr[1] "%d timer (%d%%) gjenstår"
 
-#: ../battstat/battstat_applet.c:364
+#: ../battstat/battstat_applet.c:361
 #, c-format
 msgid "%d hour until charged (%d%%)"
 msgid_plural "%d hours until charged (%d%%)"
@@ -190,18 +190,18 @@ msgstr[1] "%d timer før batteriet er oppladet (%d%%)"
 
 #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
 #. * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:371
+#: ../battstat/battstat_applet.c:368
 #, c-format
 msgid "%d %s %d %s (%d%%) remaining"
 msgstr "%d %s %d %s (%d%%) gjenstår"
 
-#: ../battstat/battstat_applet.c:372 ../battstat/battstat_applet.c:379
+#: ../battstat/battstat_applet.c:369 ../battstat/battstat_applet.c:376
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: ../battstat/battstat_applet.c:373 ../battstat/battstat_applet.c:380
+#: ../battstat/battstat_applet.c:370 ../battstat/battstat_applet.c:377
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
@@ -209,30 +209,30 @@ msgstr[1] "minutter"
 
 #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
 #. * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:378
+#: ../battstat/battstat_applet.c:375
 #, c-format
 msgid "%d %s %d %s until charged (%d%%)"
 msgstr "%d %s %d %s før batteriet er oppladet (%d%%)"
 
-#: ../battstat/battstat_applet.c:392
+#: ../battstat/battstat_applet.c:389
 msgid "Battery Monitor"
 msgstr "Overvåking av batteri"
 
-#: ../battstat/battstat_applet.c:402 ../battstat/battstat_applet.c:461
+#: ../battstat/battstat_applet.c:399 ../battstat/battstat_applet.c:458
 msgid "Your battery is now fully recharged"
 msgstr "Batteriet er nå fullt oppladet"
 
-#: ../battstat/battstat_applet.c:438 ../battstat/battstat_applet.c:593
+#: ../battstat/battstat_applet.c:435 ../battstat/battstat_applet.c:590
 msgid "Battery Notice"
 msgstr "Melding om batteri"
 
 #. we don't know the remaining time
-#: ../battstat/battstat_applet.c:538
+#: ../battstat/battstat_applet.c:535
 #, c-format
 msgid "You have %d%% of your total battery capacity remaining."
 msgstr "%d%% av total batterikapasitet gjenstår."
 
-#: ../battstat/battstat_applet.c:544
+#: ../battstat/battstat_applet.c:541
 #, c-format
 msgid ""
 "You have %d minute of battery power remaining (%d%% of the total capacity)."
@@ -244,7 +244,7 @@ msgstr[1] "Du har %d minutter batteristrøm igjen (%d%% av total kapasitet)."
 #. TRANSLATORS: this is a list, it is left as a single string
 #. * to allow you to make it appear like a list would in your
 #. * locale.  This is if the laptop does not support suspend.
-#: ../battstat/battstat_applet.c:556
+#: ../battstat/battstat_applet.c:553
 msgid ""
 "To avoid losing your work:\n"
 " • plug your laptop into external power, or\n"
@@ -257,7 +257,7 @@ msgstr ""
 #. TRANSLATORS: this is a list, it is left as a single string
 #. * to allow you to make it appear like a list would in your
 #. * locale.  This is if the laptop supports suspend.
-#: ../battstat/battstat_applet.c:564
+#: ../battstat/battstat_applet.c:561
 msgid ""
 "To avoid losing your work:\n"
 " • suspend your laptop to save power,\n"
@@ -269,28 +269,28 @@ msgstr ""
 "- koble datamaskinen til ekstern strøm, eller\n"
 "- lagre åpne dokumenter og slå av datamaskinen."
 
-#: ../battstat/battstat_applet.c:572
+#: ../battstat/battstat_applet.c:569
 msgid "Your battery is running low"
 msgstr "Batteriet er i ferd med å lades ut"
 
-#: ../battstat/battstat_applet.c:667
+#: ../battstat/battstat_applet.c:664
 msgid "No battery present"
 msgstr "Batteri er ikke tilstede"
 
-#: ../battstat/battstat_applet.c:670
+#: ../battstat/battstat_applet.c:667
 msgid "Battery status unknown"
 msgstr "Ukjent batteristatus"
 
-#: ../battstat/battstat_applet.c:850
+#: ../battstat/battstat_applet.c:847
 msgid "N/A"
 msgstr "I/T"
 
 #: ../battstat/battstat_applet.c:1150 ../drivemount/drivemount.c:132
-#: ../geyes/geyes.c:303 ../geyes/themes.c:242 ../gweather/gweather-applet.c:70
-#: ../gweather/gweather-pref.c:617 ../mini-commander/src/preferences.c:366
+#: ../geyes/geyes.c:309 ../geyes/themes.c:220 ../gweather/gweather-applet.c:64
+#: ../gweather/gweather-pref.c:672 ../mini-commander/src/preferences.c:260
 #: ../stickynotes/stickynotes_applet_callbacks.c:349
-#: ../stickynotes/stickynotes_applet_callbacks.c:565
-#: ../trashapplet/src/trashapplet.c:398
+#: ../stickynotes/stickynotes_applet_callbacks.c:534
+#: ../trashapplet/src/trashapplet.c:389
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "Det oppsto en feil under visning av hjelp : %s"
@@ -301,20 +301,20 @@ msgstr "Dette verktøyet viser status for batteriet på din bærbare PC."
 
 #. true
 #: ../battstat/battstat_applet.c:1192
-msgid "HAL backend enabled."
-msgstr "HAL-støtte deaktivert"
+msgid "upower backend enabled."
+msgstr "upower-motor aktivert."
 
 #. false
 #: ../battstat/battstat_applet.c:1193
 msgid "Legacy (non-HAL) backend enabled."
 msgstr "Eldre (før HAL) motor aktivert."
 
-#: ../battstat/battstat_applet.c:1569 ../battstat/battstat_applet.c:1622
+#: ../battstat/battstat_applet.c:1567 ../battstat/battstat_applet.c:1619
 #: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:2
 msgid "Battery Charge Monitor"
 msgstr "Overvåking av batterilading"
 
-#: ../battstat/battstat_applet.c:1623
+#: ../battstat/battstat_applet.c:1620
 #: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:3
 msgid "Monitor a laptop's remaining power"
 msgstr "Overvåk gjenværende strøm på en bærbar"
@@ -368,28 +368,15 @@ msgstr "Ad_var når batterinivået gåe under:"
 msgid "_Notify when battery is fully recharged"
 msgstr "_Varsle når batteriet er fullt oppladet"
 
-#: ../battstat/battstat-hal.c:343 ../battstat/battstat-hal.c:368
-msgid "HAL error"
-msgstr "HAL-feil"
-
-#: ../battstat/battstat-hal.c:343
-msgid "Could not create libhal_ctx"
-msgstr "Kunne ikke opprette libhal_ctx"
-
-#: ../battstat/battstat-hal.c:368
-msgid "No batteries found"
-msgstr "Ingen batterier funnet"
-
-#: ../battstat/battstat-hal.c:417
-#, c-format
-msgid "Unable to initialise HAL: %s: %s"
-msgstr "Kan ikke initiere HAL: %s: %s"
+#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:1
+msgid "Battstat Factory"
+msgstr "Battstat-factory"
 
-#: ../battstat/battstat.schemas.in.h:1
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:1
 msgid "Red value level"
 msgstr "Verdinivå for rød"
 
-#: ../battstat/battstat.schemas.in.h:2
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:2
 msgid ""
 "The battery level below which the battery is displayed as red. Also the "
 "value at which the low battery warning is displayed."
@@ -397,47 +384,48 @@ msgstr ""
 "Batterinivå hvor batteriet vises som rødt. Dette er også verdien som utløser "
 "visning av varsel for lavt batterinivå."
 
-#: ../battstat/battstat.schemas.in.h:3
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:3
 msgid "Warn on low time rather than low percentage"
 msgstr "Advar ved kort gjenstående tid i stedet for prosent"
 
-#: ../battstat/battstat.schemas.in.h:4
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:4
+#, fuzzy
 msgid ""
-"Use the value defined in red_value as a time remaining to show the warning "
+"Use the value defined in red-value as a time remaining to show the warning "
 "dialog rather than a percentage."
 msgstr ""
 "Bruk verdien som er definert i red_value som tid før advarsel vises i stedet "
 "for prosent"
 
-#: ../battstat/battstat.schemas.in.h:5
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:5
 msgid "Low Battery Notification"
 msgstr "Varsling ved nær utladet batteri"
 
-#: ../battstat/battstat.schemas.in.h:6
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:6
 msgid "Notify user when the battery is low."
 msgstr "Gi beskjed til brukeren når strømstyrken er lav"
 
-#: ../battstat/battstat.schemas.in.h:7
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:7
 msgid "Full Battery Notification"
 msgstr "Varsling ved fullt batteri"
 
-#: ../battstat/battstat.schemas.in.h:8
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:8
 msgid "Notify user when the battery is full."
 msgstr "Gi brukeren beskjed når batteriet er fullt oppladet"
 
-#: ../battstat/battstat.schemas.in.h:9
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:9
 msgid "Beep for warnings"
 msgstr "Pip for advarsler"
 
-#: ../battstat/battstat.schemas.in.h:10
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:10
 msgid "Beep when displaying a warning."
 msgstr "Pip når en advarsel vises"
 
-#: ../battstat/battstat.schemas.in.h:11
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:11
 msgid "Drain from top"
 msgstr "Tøm fra toppen"
 
-#: ../battstat/battstat.schemas.in.h:12
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:12
 msgid ""
 "Show the battery meter draining from the top of the battery. Only "
 "implemented for traditional battery view."
@@ -445,39 +433,35 @@ msgstr ""
 "Vis batterimåler som tømmes fra toppen av batteriet. Kun implementert for "
 "den tradisjonelle batterivisningen."
 
-#: ../battstat/battstat.schemas.in.h:13
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:13
 msgid "Upright (small) battery"
 msgstr "Stående (lite) batteri"
 
-#: ../battstat/battstat.schemas.in.h:14
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:14
 msgid "Show the upright, smaller battery on the panel."
 msgstr "Vis et mindre, stående batteri på panelet"
 
-#: ../battstat/battstat.schemas.in.h:15
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:15
 msgid "Show the horizontal battery"
 msgstr "Vis batteriet horisontalt"
 
-#: ../battstat/battstat.schemas.in.h:16
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:16
 msgid "Show the traditional, horizontal battery on the panel."
 msgstr "Vis det vanlige horisontale batteriet på panelet"
 
-#: ../battstat/battstat.schemas.in.h:17
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:17
 msgid "Show the time/percent label"
 msgstr "Vis etikett for tid/prosent"
 
-#: ../battstat/battstat.schemas.in.h:18
+#: ../battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in.h:18
 msgid "0 for no label, 1 for percentage and 2 for time remaining."
 msgstr "0 for ingen etikett, 1 for prosent og 2 for gjenværende tid"
 
-#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:1
-msgid "Battstat Factory"
-msgstr "Battstat-factory"
-
 #. TRANSLATOR: this is a selectable item in a drop-down menu to end
 #. * this sentence:
 #. *   "Warn when battery charge drops to: [XX] percent".
 #.
-#: ../battstat/properties.c:314
+#: ../battstat/properties.c:273
 msgid "Percent"
 msgstr "Prosent"
 
@@ -485,7 +469,7 @@ msgstr "Prosent"
 #. * this sentence:
 #. *   "Warn when battery charge drops to: [XX] minutes remaining"
 #.
-#: ../battstat/properties.c:320
+#: ../battstat/properties.c:279
 msgid "Minutes Remaining"
 msgstr "Minutter gjenstår"
 
@@ -501,7 +485,7 @@ msgstr "Lav strømstyrke"
 msgid "Battery fully re-charged"
 msgstr "Batteriet er fullt oppladet"
 
-#: ../charpick/charpick.c:438
+#: ../charpick/charpick.c:419
 msgid "Available palettes"
 msgstr "Tilgjengelige paletter"
 
@@ -509,21 +493,21 @@ msgstr "Tilgjengelige paletter"
 #. *             hopefully, the name of the unicode character has already
 #. *             been translated.
 #.
-#: ../charpick/charpick.c:485
+#: ../charpick/charpick.c:466
 #, c-format
 msgid "Insert \"%s\""
 msgstr "Sett inn «%s»"
 
-#: ../charpick/charpick.c:488
+#: ../charpick/charpick.c:469
 msgid "Insert special character"
 msgstr "Sett inn spesialtegn"
 
-#: ../charpick/charpick.c:492
+#: ../charpick/charpick.c:473
 #, c-format
 msgid "insert special character %s"
 msgstr "sett inn spesialtegn %s"
 
-#: ../charpick/charpick.c:607
+#: ../charpick/charpick.c:589
 msgid ""
 "Gnome Panel applet for selecting strange characters that are not on my "
 "keyboard. Released under GNU General Public Licence."
@@ -531,26 +515,26 @@ msgstr ""
 "Gnome Panel applet for å velge rare tegn som ikke er på mitt tastatur. "
 "Utgitt under GNU General Puclic License."
 
-#: ../charpick/charpick.c:745 ../charpick/charpick.c:759
+#: ../charpick/charpick.c:710 ../charpick/charpick.c:724
 #: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:2
-#: ../charpick/properties.c:451
+#: ../charpick/properties.c:449
 msgid "Character Palette"
 msgstr "Tegnpalett"
 
-#: ../charpick/charpick.c:745
+#: ../charpick/charpick.c:710
 #: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:3
 msgid "Insert characters"
 msgstr "Sett inn tegn"
 
-#: ../charpick/charpick.schemas.in.h:1
-msgid "DEPRECATED - Characters shown on applet startup"
-msgstr "UTGÅTT - tegn som vises ved oppstart av programmet"
+#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1
+msgid "Charpicker Applet Factory"
+msgstr "Factory for tegnvelger"
 
-#: ../charpick/charpick.schemas.in.h:2
+#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:1
 msgid "Characters shown on applet startup"
 msgstr "Tegn som vises ved oppstart"
 
-#: ../charpick/charpick.schemas.in.h:3
+#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:2
 msgid ""
 "The string that the user had selected when the applet was last used. This "
 "string will be displayed when the user starts the applet."
@@ -558,18 +542,15 @@ msgstr ""
 "Strengen som brukeren valgte når programmet ble brukt sist. Denne strengen "
 "vil vises når brukeren starter programmet."
 
-#: ../charpick/charpick.schemas.in.h:4 ../charpick/properties.c:378
+#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:3
+#: ../charpick/properties.c:376
 msgid "List of available palettes"
 msgstr "Liste med tilgjengelige paletter"
 
-#: ../charpick/charpick.schemas.in.h:5
+#: ../charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in.h:4
 msgid "List of strings containing the available palettes."
 msgstr "Liste med strenger som inneholder de tilgjengelige paletttene"
 
-#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1
-msgid "Charpicker Applet Factory"
-msgstr "Factory for tegnvelger"
-
 #: ../charpick/properties.c:28
 msgid "_Edit"
 msgstr "R_ediger"
@@ -586,88 +567,50 @@ msgstr "Palettoppføring"
 msgid "Modify a palette by adding or removing characters"
 msgstr "Endre en palett ved å legge til eller fjerne tegn"
 
-#: ../charpick/properties.c:239
+#: ../charpick/properties.c:237
 msgid "Add Palette"
 msgstr "Legg til palett"
 
-#: ../charpick/properties.c:276
+#: ../charpick/properties.c:274
 msgid "Edit Palette"
 msgstr "Rediger palett"
 
-#: ../charpick/properties.c:377
+#: ../charpick/properties.c:375
 msgid "Palettes list"
 msgstr "Liste med paletter"
 
-#: ../charpick/properties.c:456
+#: ../charpick/properties.c:454
 msgid "_Palettes:"
 msgstr "_Paletter:"
 
-#: ../charpick/properties.c:472
+#: ../charpick/properties.c:470
 msgid "Add button"
 msgstr "Legg til knapp"
 
-#: ../charpick/properties.c:473
+#: ../charpick/properties.c:471
 msgid "Click to add a new palette"
 msgstr "Klikk for å legge til en ny palett"
 
-#: ../charpick/properties.c:480
+#: ../charpick/properties.c:478
 msgid "Edit button"
 msgstr "Rediger knapp"
 
-#: ../charpick/properties.c:481
+#: ../charpick/properties.c:479
 msgid "Click to edit the selected palette"
 msgstr "Klikk for å redigere valgt palett"
 
-#: ../charpick/properties.c:488
+#: ../charpick/properties.c:486
 msgid "Delete button"
 msgstr "Slett knapp"
 
-#: ../charpick/properties.c:489
+#: ../charpick/properties.c:487
 msgid "Click to delete the selected palette"
 msgstr "Klikk for å slette valgt palett"
 
-#: ../charpick/properties.c:540
+#: ../charpick/properties.c:538
 msgid "Character Palette Preferences"
 msgstr "Brukervalg for tegnpalett"
 
-#: ../cpufreq/cpufreq-applet.schemas.in.h:1
-msgid "CPU to Monitor"
-msgstr "CPU som skal overvåkes"
-
-#: ../cpufreq/cpufreq-applet.schemas.in.h:2
-msgid ""
-"Set the CPU to monitor. In a single processor system you don't have to "
-"change it."
-msgstr ""
-"Sett CPU som skall overvåkes. Du trenger ikke å endre dette hvis du bare har "
-"en CPU."
-
-#: ../cpufreq/cpufreq-applet.schemas.in.h:3
-msgid "Mode to show cpu usage"
-msgstr "Modus for visning av cpu-bruk"
-
-#: ../cpufreq/cpufreq-applet.schemas.in.h:4
-msgid ""
-"A 0 value means to show the applet in graphic mode (pixmap only), 1 to show "
-"the applet in text mode (not to show the pixmap) and 2 to show the applet in "
-"graphic and text mode."
-msgstr ""
-"Bruk verdien 0 for å vise panelprogrammet i grafisk modus (kun bilde), 1 for "
-"å vise programmet i tekstmodus (ikke vis bildet) og 2 for å vise både "
-"grafikk og tekst."
-
-#: ../cpufreq/cpufreq-applet.schemas.in.h:5
-msgid "The type of text to display (if the text is enabled)."
-msgstr "Type tekst som skal vises (hvis tekst er aktivert)."
-
-#: ../cpufreq/cpufreq-applet.schemas.in.h:6
-msgid ""
-"A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 "
-"to show percentage instead of frequency."
-msgstr ""
-"Bruk verdien for å vise cpu-frekvens, 1 vises frekvens og enheter og 2 for å "
-"vise prosent i stedet for frekvens."
-
 #: ../cpufreq/cpufreq-preferences.ui.h:1
 msgid "CPU Frequency Monitor Preferences"
 msgstr "Brukervalg for overvåking av CPU-frekvens"
@@ -701,7 +644,7 @@ msgid "Show CPU frequency as _percentage"
 msgstr "Vis CPU-frekvens som _prosent"
 
 #: ../cpufreq/org.gnome.applets.CPUFreqApplet.panel-applet.in.in.h:1
-#: ../cpufreq/src/cpufreq-applet.c:944 ../cpufreq/src/cpufreq-applet.c:1003
+#: ../cpufreq/src/cpufreq-applet.c:942 ../cpufreq/src/cpufreq-applet.c:997
 msgid "CPU Frequency Scaling Monitor"
 msgstr "Overvåking av CPU-frekvens"
 
@@ -709,27 +652,68 @@ msgstr "Overvåking av CPU-frekvens"
 msgid "Monitor the CPU Frequency Scaling"
 msgstr "Overvåk skalering av CPU-frekvens"
 
-#: ../cpufreq/src/cpufreq-applet.c:579 ../cpufreq/src/cpufreq-prefs.c:478
+#: ../cpufreq/org.gnome.gnome-applets.cpufreq.gschema.xml.in.in.h:1
+msgid "CPU to Monitor"
+msgstr "CPU som skal overvåkes"
+
+#: ../cpufreq/org.gnome.gnome-applets.cpufreq.gschema.xml.in.in.h:2
+msgid ""
+"Set the CPU to monitor. In a single processor system you don't have to "
+"change it."
+msgstr ""
+"Sett CPU som skall overvåkes. Du trenger ikke å endre dette hvis du bare har "
+"en CPU."
+
+#: ../cpufreq/org.gnome.gnome-applets.cpufreq.gschema.xml.in.in.h:3
+msgid "Mode to show cpu usage"
+msgstr "Modus for visning av cpu-bruk"
+
+#: ../cpufreq/org.gnome.gnome-applets.cpufreq.gschema.xml.in.in.h:4
+#, fuzzy
+msgid ""
+"A 'graphic' value means to show the applet in graphic mode (pixmap only), "
+"'text' to show the applet in text mode (not to show the pixmap) and 'both' "
+"to show the applet in graphic and text mode."
+msgstr ""
+"Bruk verdien 0 for å vise panelprogrammet i grafisk modus (kun bilde), 1 for "
+"å vise programmet i tekstmodus (ikke vis bildet) og 2 for å vise både "
+"grafikk og tekst."
+
+#: ../cpufreq/org.gnome.gnome-applets.cpufreq.gschema.xml.in.in.h:5
+msgid "The type of text to display (if the text is enabled)."
+msgstr "Type tekst som skal vises (hvis tekst er aktivert)."
+
+#: ../cpufreq/org.gnome.gnome-applets.cpufreq.gschema.xml.in.in.h:6
+#, fuzzy
+msgid ""
+"A 'frequency' value means to show cpu frequency, 'frequency-unit' to show "
+"frequency and units, and 'percentage' to show percentage instead of "
+"frequency."
+msgstr ""
+"Bruk verdien for å vise cpu-frekvens, 1 vises frekvens og enheter og 2 for å "
+"vise prosent i stedet for frekvens."
+
+#: ../cpufreq/src/cpufreq-applet.c:577 ../cpufreq/src/cpufreq-prefs.c:361
 msgid "Could not open help document"
 msgstr "Kunne ikke åpne hjelpdokument"
 
-#: ../cpufreq/src/cpufreq-applet.c:606
+#: ../cpufreq/src/cpufreq-applet.c:604
 msgid "This utility shows the current CPU Frequency Scaling."
 msgstr "Dette verktøyet viser status for frekvensskalering for CPU."
 
-#: ../cpufreq/src/cpufreq-applet.c:1004
+#: ../cpufreq/src/cpufreq-applet.c:998
 msgid "This utility shows the current CPU Frequency"
 msgstr "Dette verktøyet viser nåværende CPU-frekvens"
 
-#: ../cpufreq/src/cpufreq-prefs.c:613
+#: ../cpufreq/src/cpufreq-prefs.c:496
 msgid "Graphic"
 msgstr "Grafikk"
 
-#: ../cpufreq/src/cpufreq-prefs.c:618
+#: ../cpufreq/src/cpufreq-prefs.c:501
 msgid "Text"
 msgstr "Tekst"
 
-#: ../cpufreq/src/cpufreq-prefs.c:623
+#: ../cpufreq/src/cpufreq-prefs.c:506
 msgid "Graphic and Text"
 msgstr "Grafikk og tekst"
 
@@ -761,46 +745,46 @@ msgstr "Overvåk skalering av CPU-frekvens"
 msgid "Privileges are required to change the CPU Frequency scaling."
 msgstr "Rettigheter kreves for å overvåke skalering av CPU-frekvens."
 
-#: ../drivemount/drive-button.c:342 ../drivemount/drive-button.c:355
+#: ../drivemount/drive-button.c:339 ../drivemount/drive-button.c:352
 msgid "(mounted)"
 msgstr "(montert)"
 
-#: ../drivemount/drive-button.c:344
+#: ../drivemount/drive-button.c:341
 msgid "(not mounted)"
 msgstr "(ikke montert)"
 
-#: ../drivemount/drive-button.c:562
+#: ../drivemount/drive-button.c:559
 msgid "Cannot start Nautilus File Manager"
 msgstr "Kan ikke starte Nautilus filhåndterer"
 
-#: ../drivemount/drive-button.c:569
+#: ../drivemount/drive-button.c:566
 msgid "Could not find Nautilus"
 msgstr "Fant ikke Nautilus"
 
-#: ../drivemount/drive-button.c:893
+#: ../drivemount/drive-button.c:877
 msgid "_Play DVD"
 msgstr "S_pill av DVD"
 
-#: ../drivemount/drive-button.c:897
+#: ../drivemount/drive-button.c:881
 msgid "_Play CD"
 msgstr "S_pill av CD"
 
-#: ../drivemount/drive-button.c:900
+#: ../drivemount/drive-button.c:884
 #, c-format
 msgid "_Open %s"
 msgstr "_Åpne %s"
 
-#: ../drivemount/drive-button.c:908
+#: ../drivemount/drive-button.c:892
 #, c-format
 msgid "Un_mount %s"
 msgstr "A_vmonter %s"
 
-#: ../drivemount/drive-button.c:914
+#: ../drivemount/drive-button.c:898
 #, c-format
 msgid "_Mount %s"
 msgstr "_Monter %s"
 
-#: ../drivemount/drive-button.c:922
+#: ../drivemount/drive-button.c:906
 #, c-format
 msgid "_Eject %s"
 msgstr "_Løs ut %s"
@@ -809,19 +793,11 @@ msgstr "_Løs ut %s"
 msgid "Applet for mounting and unmounting block volumes."
 msgstr "Applet for montering og avmontering av blokkvolumer."
 
-#: ../drivemount/drivemount.c:164 ../drivemount/drivemount.c:201
+#: ../drivemount/drivemount.c:164 ../drivemount/drivemount.c:198
 #: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:3
 msgid "Disk Mounter"
 msgstr "Diskmontering"
 
-#: ../drivemount/drivemount.schemas.in.h:1
-msgid "Interval timeout to check mount point status"
-msgstr "Pauseintervall for å sjekke status for et monteringspunkt"
-
-#: ../drivemount/drivemount.schemas.in.h:2
-msgid "Time in seconds between status updates"
-msgstr "Tid i sekunder mellom statusoppdateringer"
-
 #: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:1
 msgid "Drive Mount Applet Factory"
 msgstr "Fabrikk for panelprogram for diskmontering"
@@ -834,23 +810,19 @@ msgstr "Fabrikk for panelprogram for diskmontering"
 msgid "Mount local disks and devices"
 msgstr "Monter lokale disker og enheter"
 
-#: ../geyes/geyes.c:148
+#: ../geyes/geyes.c:153
 msgid "A goofy set of eyes for the GNOME panel. They follow your mouse."
 msgstr "Et tullete sett med øyne for GNOME panelet. De følger etter pekeren."
 
-#: ../geyes/geyes.c:348 ../geyes/geyes.c:379 ../geyes/geyes.c:381
+#: ../geyes/geyes.c:354 ../geyes/geyes.c:385 ../geyes/geyes.c:387
 #: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:2
 msgid "Eyes"
 msgstr "Øyne"
 
-#: ../geyes/geyes.c:382
+#: ../geyes/geyes.c:388
 msgid "The eyes look in the direction of the mouse pointer"
 msgstr "Øynene følger muspekeren"
 
-#: ../geyes/geyes.schemas.in.h:1
-msgid "Directory in which the theme is located"
-msgstr "Katalog hvor tema er lokalisert"
-
 #: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:1
 msgid "Geyes Applet Factory"
 msgstr "Fabrikk for panelprogrammet geyes"
@@ -859,23 +831,31 @@ msgstr "Fabrikk for panelprogrammet geyes"
 msgid "A set of eyeballs for your panel"
 msgstr "Et sett øyne for ditt panel"
 
-#: ../geyes/themes.c:127
+#: ../geyes/org.gnome.gnome-applets.geyes.gschema.xml.in.in.h:1
+msgid "Directory in which the theme is located"
+msgstr "Katalog hvor tema er lokalisert"
+
+#: ../geyes/themes.c:125
 msgid "Can not launch the eyes applet."
 msgstr "Kan ikke starte panelprogrammet geyes."
 
-#: ../geyes/themes.c:128
+#: ../geyes/themes.c:126
 msgid "There was a fatal error while trying to load the theme."
 msgstr "Det oppsto en kritisk feil under lasting av tema."
 
-#: ../geyes/themes.c:301
+#: ../geyes/themes.c:279
 msgid "Geyes Preferences"
 msgstr "Brukervalg for Geyes"
 
-#: ../geyes/themes.c:334
+#: ../geyes/themes.c:281
+msgid "_Close"
+msgstr "_Lukk"
+
+#: ../geyes/themes.c:312
 msgid "Themes"
 msgstr "Tema"
 
-#: ../geyes/themes.c:355
+#: ../geyes/themes.c:333
 msgid "_Select a theme:"
 msgstr "_Velg et tema:"
 
@@ -887,28 +867,28 @@ msgstr "© 1999-2004 by S. Papadimitriou og andre"
 msgid "A panel application for monitoring local weather conditions."
 msgstr "Panelprogram for overvåking av lokal værtilstand."
 
-#: ../gweather/gweather-applet.c:115
+#: ../gweather/gweather-applet.c:109
 msgid "_Details"
 msgstr "_Detaljer"
 
-#: ../gweather/gweather-applet.c:118 ../gweather/gweather-dialog.c:157
+#: ../gweather/gweather-applet.c:112 ../gweather/gweather-dialog.c:155
 msgid "_Update"
 msgstr "_Oppdater"
 
-#: ../gweather/gweather-applet.c:318
+#: ../gweather/gweather-applet.c:333
 #: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:3
 msgid "Weather Report"
 msgstr "Værmelding"
 
-#: ../gweather/gweather-applet.c:336 ../gweather/gweather-applet.c:340
+#: ../gweather/gweather-applet.c:351 ../gweather/gweather-applet.c:355
 msgid "GNOME Weather"
 msgstr "GNOME Værmelding"
 
-#: ../gweather/gweather-applet.c:439
+#: ../gweather/gweather-applet.c:459
 msgid "Weather Forecast"
 msgstr "Værmelding"
 
-#: ../gweather/gweather-applet.c:451
+#: ../gweather/gweather-applet.c:471
 #, c-format
 msgid ""
 "City: %s\n"
@@ -919,100 +899,100 @@ msgstr ""
 "Himmel: %s\n"
 "Temperatur: %s"
 
-#: ../gweather/gweather-applet.c:500
+#: ../gweather/gweather-applet.c:525
 msgid "Updating..."
 msgstr "Oppdaterer …"
 
-#: ../gweather/gweather-dialog.c:155
+#: ../gweather/gweather-dialog.c:153
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../gweather/gweather-dialog.c:196
+#: ../gweather/gweather-dialog.c:194
 msgid "City:"
 msgstr "By:"
 
-#: ../gweather/gweather-dialog.c:204
+#: ../gweather/gweather-dialog.c:202
 msgid "Last update:"
 msgstr "Siste oppdatering:"
 
-#: ../gweather/gweather-dialog.c:212
+#: ../gweather/gweather-dialog.c:210
 msgid "Conditions:"
 msgstr "Forhold:"
 
-#: ../gweather/gweather-dialog.c:220
+#: ../gweather/gweather-dialog.c:218
 msgid "Sky:"
 msgstr "Himmel:"
 
-#: ../gweather/gweather-dialog.c:228
+#: ../gweather/gweather-dialog.c:226
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: ../gweather/gweather-dialog.c:236
+#: ../gweather/gweather-dialog.c:234
 msgid "Feels like:"
 msgstr "Føles som:"
 
-#: ../gweather/gweather-dialog.c:244
+#: ../gweather/gweather-dialog.c:242
 msgid "Dew point:"
 msgstr "Tåkepunkt:"
 
-#: ../gweather/gweather-dialog.c:252
+#: ../gweather/gweather-dialog.c:250
 msgid "Relative humidity:"
 msgstr "Relativ luftfuktighet:"
 
-#: ../gweather/gweather-dialog.c:260
+#: ../gweather/gweather-dialog.c:258
 msgid "Wind:"
 msgstr "Vind:"
 
-#: ../gweather/gweather-dialog.c:268
+#: ../gweather/gweather-dialog.c:266
 msgid "Pressure:"
 msgstr "Trykk:"
 
-#: ../gweather/gweather-dialog.c:276
+#: ../gweather/gweather-dialog.c:274
 msgid "Visibility:"
 msgstr "Sikt:"
 
-#: ../gweather/gweather-dialog.c:284
+#: ../gweather/gweather-dialog.c:282
 msgid "Sunrise:"
 msgstr "Soloppgang:"
 
-#: ../gweather/gweather-dialog.c:292
+#: ../gweather/gweather-dialog.c:290
 msgid "Sunset:"
 msgstr "Solnedgang:"
 
-#: ../gweather/gweather-dialog.c:426
+#: ../gweather/gweather-dialog.c:424
 msgid "Current Conditions"
 msgstr "Nåværende forhold"
 
-#: ../gweather/gweather-dialog.c:441
+#: ../gweather/gweather-dialog.c:439
 msgid "Forecast Report"
 msgstr "Værmelding"
 
-#: ../gweather/gweather-dialog.c:441
+#: ../gweather/gweather-dialog.c:439
 msgid "See the ForeCast Details"
 msgstr "Se detaljer fra værmelding"
 
-#: ../gweather/gweather-dialog.c:451
+#: ../gweather/gweather-dialog.c:449
 msgid "Forecast"
 msgstr "Værmelding"
 
-#: ../gweather/gweather-dialog.c:457
+#: ../gweather/gweather-dialog.c:455
 msgid "Radar Map"
 msgstr "Radarkart"
 
 #. XXX: weather.com? is this an advert?
-#: ../gweather/gweather-dialog.c:489
+#: ../gweather/gweather-dialog.c:487
 msgid "_Visit Weather.com"
 msgstr "_Besøk Weather.com"
 
-#: ../gweather/gweather-dialog.c:490
+#: ../gweather/gweather-dialog.c:488
 msgid "Visit Weather.com"
 msgstr "Besøk Weather.com"
 
-#: ../gweather/gweather-dialog.c:490
+#: ../gweather/gweather-dialog.c:488
 msgid "Click to Enter Weather.com"
 msgstr "Klikk for å gå til Weather.com"
 
-#: ../gweather/gweather-dialog.c:573
+#: ../gweather/gweather-dialog.c:566
 msgid "Forecast not currently available for this location."
 msgstr "Værmelding er ikke tilgjengelig for dette stedet."
 
@@ -1041,18 +1021,18 @@ msgstr "Adresseoppføring"
 msgid "Enter the URL"
 msgstr "Skriv inn URL"
 
-#: ../gweather/gweather-pref.c:298
+#: ../gweather/gweather-pref.c:367
 msgid ""
 "Failed to load the Locations XML database.  Please report this as a bug."
 msgstr ""
 "Kunne ikke laste XML-database over steder. Vennligst rapporter dette som en "
 "feil."
 
-#: ../gweather/gweather-pref.c:676
+#: ../gweather/gweather-pref.c:731
 msgid "Weather Preferences"
 msgstr "Brukervalg for værmelding"
 
-#: ../gweather/gweather-pref.c:707 ../gweather/gweather-pref.c:868
+#: ../gweather/gweather-pref.c:762 ../gweather/gweather-pref.c:927
 msgid "_Automatically update every:"
 msgstr "_Automatisk oppdatering hver(t):"
 
@@ -1060,193 +1040,202 @@ msgstr "_Automatisk oppdatering hver(t):"
 #. * Units settings page.
 #.
 #. Temperature Unit
-#: ../gweather/gweather-pref.c:718
+#: ../gweather/gweather-pref.c:773
 msgid "_Temperature unit:"
 msgstr "_Temperaturenhet:"
 
-#: ../gweather/gweather-pref.c:727
+#: ../gweather/gweather-pref.c:782 ../gweather/gweather-pref.c:799
+#: ../gweather/gweather-pref.c:822 ../gweather/gweather-pref.c:847
+msgid "Default"
+msgstr "Forvalgt"
+
+#: ../gweather/gweather-pref.c:783
 msgid "Kelvin"
 msgstr "Kelvin"
 
 #. TRANSLATORS: Celsius is sometimes referred Centigrade
-#: ../gweather/gweather-pref.c:729
+#: ../gweather/gweather-pref.c:785
 msgid "Celsius"
 msgstr "Celsius"
 
-#: ../gweather/gweather-pref.c:730
+#: ../gweather/gweather-pref.c:786
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
 #. Speed Unit
-#: ../gweather/gweather-pref.c:734
+#: ../gweather/gweather-pref.c:790
 msgid "_Wind speed unit:"
 msgstr "Enhet for _vindhastighet:"
 
 #. TRANSLATOR: The wind speed unit "meters per second"
-#: ../gweather/gweather-pref.c:744
+#: ../gweather/gweather-pref.c:801
 msgid "m/s"
 msgstr "m/s"
 
 #. TRANSLATOR: The wind speed unit "kilometers per hour"
-#: ../gweather/gweather-pref.c:746
+#: ../gweather/gweather-pref.c:803
 msgid "km/h"
 msgstr "km/t"
 
 #. TRANSLATOR: The wind speed unit "miles per hour"
-#: ../gweather/gweather-pref.c:748
+#: ../gweather/gweather-pref.c:805
 msgid "mph"
 msgstr "mph"
 
 #. TRANSLATOR: The wind speed unit "knots"
-#: ../gweather/gweather-pref.c:750
+#: ../gweather/gweather-pref.c:807
 msgid "knots"
 msgstr "knop"
 
-#: ../gweather/gweather-pref.c:752
+#: ../gweather/gweather-pref.c:809
 msgid "Beaufort scale"
 msgstr "Beaufort-skala"
 
 #. Pressure Unit
-#: ../gweather/gweather-pref.c:756
+#: ../gweather/gweather-pref.c:813
 msgid "_Pressure unit:"
 msgstr "Enhet for _trykk:"
 
 #. TRANSLATOR: The pressure unit "kiloPascals"
-#: ../gweather/gweather-pref.c:766
+#: ../gweather/gweather-pref.c:824
 msgid "kPa"
 msgstr "kPa"
 
 #. TRANSLATOR: The pressure unit "hectoPascals"
-#: ../gweather/gweather-pref.c:768
+#: ../gweather/gweather-pref.c:826
 msgid "hPa"
 msgstr "hPa"
 
 #. TRANSLATOR: The pressure unit "millibars"
-#: ../gweather/gweather-pref.c:770
+#: ../gweather/gweather-pref.c:828
 msgid "mb"
 msgstr "mb"
 
 #. TRANSLATOR: The pressure unit "millibars of mercury"
-#: ../gweather/gweather-pref.c:772
+#: ../gweather/gweather-pref.c:830
 msgid "mmHg"
 msgstr "mmHg"
 
 #. TRANSLATOR: The pressure unit "inches of mercury"
-#: ../gweather/gweather-pref.c:774
+#: ../gweather/gweather-pref.c:832
 msgid "inHg"
 msgstr "inHg"
 
 #. TRANSLATOR: The pressure unit "atmospheres"
-#: ../gweather/gweather-pref.c:776
+#: ../gweather/gweather-pref.c:834
 msgid "atm"
 msgstr "atm"
 
 #. Distance Unit
-#: ../gweather/gweather-pref.c:780
+#: ../gweather/gweather-pref.c:838
 msgid "_Visibility unit:"
 msgstr "En_het for sikt:"
 
 #. TRANSLATOR: The distance unit "meters"
-#: ../gweather/gweather-pref.c:790
+#: ../gweather/gweather-pref.c:849
 msgid "meters"
 msgstr "meter"
 
 #. TRANSLATOR: The distance unit "kilometers"
-#: ../gweather/gweather-pref.c:792
+#: ../gweather/gweather-pref.c:851
 msgid "km"
 msgstr "km"
 
 #. TRANSLATOR: The distance unit "miles"
-#: ../gweather/gweather-pref.c:794
+#: ../gweather/gweather-pref.c:853
 msgid "miles"
 msgstr "engelske mil"
 
-#: ../gweather/gweather-pref.c:825
+#: ../gweather/gweather-pref.c:884
 msgid "Enable _radar map"
 msgstr "Aktiver _radarkart"
 
-#: ../gweather/gweather-pref.c:837
+#: ../gweather/gweather-pref.c:896
 msgid "Use _custom address for radar map"
 msgstr "Bruk _egendefinert adresse for radarkart"
 
-#: ../gweather/gweather-pref.c:852
+#: ../gweather/gweather-pref.c:911
 msgid "A_ddress:"
 msgstr "A_dresse:"
 
-#: ../gweather/gweather-pref.c:864
+#: ../gweather/gweather-pref.c:923
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../gweather/gweather-pref.c:888
+#: ../gweather/gweather-pref.c:947
 msgid "minutes"
 msgstr "minutter"
 
-#: ../gweather/gweather-pref.c:900
+#: ../gweather/gweather-pref.c:959
 msgid "Display"
 msgstr "Vis"
 
-#: ../gweather/gweather-pref.c:915
+#: ../gweather/gweather-pref.c:974
 #: ../mini-commander/src/mini-commander.ui.h:12
 msgid "General"
 msgstr "Generelt"
 
-#: ../gweather/gweather-pref.c:928
+#: ../gweather/gweather-pref.c:987
 msgid "_Select a location:"
 msgstr "_Velg et sted:"
 
-#: ../gweather/gweather-pref.c:953
+#: ../gweather/gweather-pref.c:1012
 msgid "_Find:"
 msgstr "_Finn:"
 
-#: ../gweather/gweather-pref.c:960
+#: ../gweather/gweather-pref.c:1019
 msgid "Find _Next"
 msgstr "Finn _neste"
 
-#: ../gweather/gweather-pref.c:978
+#: ../gweather/gweather-pref.c:1037
 msgid "Location"
 msgstr "Sted"
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:1
+#: ../gweather/org.gnome.gnome-applets.gweather.gschema.xml.in.in.h:1
 msgid "Update the data automatically"
 msgstr "Oppdater data automatisk"
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:2
+#: ../gweather/org.gnome.gnome-applets.gweather.gschema.xml.in.in.h:2
 msgid ""
 "Determines whether the applet automatically updates its weather statistics "
 "or not."
-msgstr "Bestemmer om panelprogrammet automatisk oppdaterer værstatistikken eller ikke."
+msgstr ""
+"Bestemmer om panelprogrammet automatisk oppdaterer værstatistikken eller "
+"ikke."
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:3
+#: ../gweather/org.gnome.gnome-applets.gweather.gschema.xml.in.in.h:3
 msgid "Update interval"
 msgstr "Oppdateringsintervall"
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:4
+#: ../gweather/org.gnome.gnome-applets.gweather.gschema.xml.in.in.h:4
 msgid "The interval, in seconds, between automatic updates."
 msgstr "Tid i sekunder mellom automatiske oppdateringer."
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:5
+#: ../gweather/org.gnome.gnome-applets.gweather.gschema.xml.in.in.h:5
 msgid "Display radar map"
 msgstr "Vis radarkart"
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:6
+#: ../gweather/org.gnome.gnome-applets.gweather.gschema.xml.in.in.h:6
 msgid "Fetch a radar map on each update."
 msgstr "Hent et radarkart ved hver oppdatering."
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:7
+#: ../gweather/org.gnome.gnome-applets.gweather.gschema.xml.in.in.h:7
 msgid "Show notification"
 msgstr "Vis varsling"
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:8
+#: ../gweather/org.gnome.gnome-applets.gweather.gschema.xml.in.in.h:8
 msgid "Show notifications for critical weather conditions"
 msgstr "Vis varsling for kritiske værtilstander"
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:9
+#: ../gweather/org.gnome.gnome-applets.gweather.gschema.xml.in.in.h:9
 msgid "Show detailed forecast"
 msgstr "Vis detaljert værmelding"
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:10
+#: ../gweather/org.gnome.gnome-applets.gweather.gschema.xml.in.in.h:10
 msgid "If true, additional details about weather will be downloaded and shown."
-msgstr "Flere detaljer om vær vil bli lastet ned og vist hvis denne settes til «true»."
+msgstr ""
+"Flere detaljer om vær vil bli lastet ned og vist hvis denne settes til "
+"«true»."
 
 #: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:1
 msgid "Gweather Applet Factory"
@@ -1580,43 +1569,43 @@ msgstr "Graf lastet ned"
 msgid "Chart could not be downloaded"
 msgstr "Kunne ikke laste ned graf"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/preferences.py:45
 msgid "Symbol"
 msgstr "Symbol"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/preferences.py:45
 msgid "Label"
 msgstr "Etikett"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/preferences.py:45
 msgid "Amount"
 msgstr "Beløp"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/preferences.py:45
 msgid "Price"
 msgstr "Pris"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/preferences.py:45
 msgid "Commission"
 msgstr "Kommisjon"
 
-#: ../invest-applet/invest/preferences.py:44
+#: ../invest-applet/invest/preferences.py:45
 msgid "Currency Rate"
 msgstr "Valutarate"
 
-#: ../invest-applet/invest/preferences.py:244
+#: ../invest-applet/invest/preferences.py:245
 msgid "Stock Group"
 msgstr "Aksjegruppe"
 
 #. translators: Asks the user to confirm deletion of a group of stocks
-#: ../invest-applet/invest/preferences.py:269
+#: ../invest-applet/invest/preferences.py:270
 msgid "Delete entire stock group?"
 msgstr "Slett hele aksjegruppen?"
 
 #. translators: stocks can be grouped together into a "stock group".
 #. The user wants to delete a group, but the group still contains stocks.
 #. By deleting the group, also all stocks will be removed from configuration
-#: ../invest-applet/invest/preferences.py:277
+#: ../invest-applet/invest/preferences.py:278
 msgid ""
 "This removes all stocks contained in this stock group!\n"
 "Do you really want to remove this stock group?"
@@ -1624,23 +1613,23 @@ msgstr ""
 "Dette fjerner alle aksjer som finnes i denne aksjegruppen!\n"
 "Vil du virkelig fjerne denne aksjegruppen?"
 
-#: ../invest-applet/invest/quotes.py:284
+#: ../invest-applet/invest/quotes.py:285
 msgid "Invest could not connect to Yahoo! Finance"
 msgstr "Invest kunne ikke koble til Yahoo! Finance"
 
 #. Translators: This is share-market jargon. It is the average percentage change of all stock prices. The %s 
gets replaced with the string value of the change (localized), including the percent sign.
-#: ../invest-applet/invest/quotes.py:327
+#: ../invest-applet/invest/quotes.py:328
 #, python-format
 msgid "Average change: %s"
 msgstr "Gjennomsnittlig endring: %s"
 
 #. Translators: This is share-market jargon. It refers to the total difference between the current price and 
purchase price for all the shares put together for a particular currency. i.e. How much money would be earned 
if they were sold right now. The first string is the change value, the second the currency, and the third 
value is the percentage of the change, formatted using user's locale.
-#: ../invest-applet/invest/quotes.py:336
+#: ../invest-applet/invest/quotes.py:337
 #, python-format
 msgid "Positions balance: %s %s (%s)"
 msgstr "Total balanse: %s %s (%s)"
 
-#: ../invest-applet/invest/quotes.py:338
+#: ../invest-applet/invest/quotes.py:339
 #, python-format
 msgid "Updated at %s"
 msgstr "Oppdatert %s"
@@ -1673,14 +1662,6 @@ msgstr "Gevinst"
 msgid "Gain %"
 msgstr "Gevinst i %"
 
-#: ../mini-commander/GNOME_MiniCommanderApplet.server.in.h:1
-msgid "Deskbar (formerly Mini-Commander)"
-msgstr "Kommandolinje (tidligere Mini-Commander)"
-
-#: ../mini-commander/GNOME_MiniCommanderApplet.server.in.h:2
-msgid "Deskbar (transparent upgrade from Mini-Commander)"
-msgstr "Kommandolinje (oppgradering fra Mini-commander)"
-
 #: ../mini-commander/src/about.c:48
 msgid ""
 "This GNOME applet adds a command line to the panel. It features command "
@@ -1706,63 +1687,6 @@ msgstr "Kommandolinje"
 msgid "Type a command here and Gnome will execute it for you"
 msgstr "Skriv inn en kommando her og GNOME vil kjøre den for deg"
 
-#: ../mini-commander/src/mc-install-default-macros.c:80
-#, c-format
-msgid "Cannot get schema for %s: %s"
-msgstr "Kan ikke finne schema for %s: %s"
-
-#: ../mini-commander/src/mc-install-default-macros.c:111
-#, c-format
-msgid "Cannot set schema for %s: %s"
-msgstr "Kan ikke sette schema for %s: %s"
-
-#: ../mini-commander/src/mc-install-default-macros.c:117
-#, c-format
-msgid "Set default list value for %s\n"
-msgstr "Sett forvalgt listeverdi for %s\n"
-
-#: ../mini-commander/src/mc-install-default-macros.c:129
-#, c-format
-msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
-msgstr ""
-"GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL er ikke satt. Installerer ikke schema\n"
-
-#: ../mini-commander/src/mc-install-default-macros.c:137
-#, c-format
-msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
-msgstr "Du må sette GCONF_CONFIG_SOURCE miljøvariabelen\n"
-
-#: ../mini-commander/src/mc-install-default-macros.c:154
-#, c-format
-msgid "Failed to access configuration source(s): %s\n"
-msgstr "Feil ved aksessering av konfigurasjonskilde(r): %s\n"
-
-#: ../mini-commander/src/mc-install-default-macros.c:169
-#, c-format
-msgid "Error syncing config data: %s"
-msgstr "Feil under synkronisering av konfigurasjonsdata: %s"
-
-#: ../mini-commander/src/mini-commander-global.schemas.in.h:1
-#: ../mini-commander/src/mini-commander.schemas.in.h:26
-msgid "Macro pattern list"
-msgstr "Liste over makromønstre"
-
-#: ../mini-commander/src/mini-commander-global.schemas.in.h:2
-msgid "List of GConfValue entries containing strings for the macro patterns."
-msgstr ""
-"Liste over GConfValue-oppføringer som inneholder strenger for makromønstre."
-
-#: ../mini-commander/src/mini-commander-global.schemas.in.h:3
-#: ../mini-commander/src/mini-commander.schemas.in.h:28
-msgid "Macro command list"
-msgstr "Liste over makrokommandoer"
-
-#: ../mini-commander/src/mini-commander-global.schemas.in.h:4
-msgid "List of GConfValue entries containing strings for the macro commands."
-msgstr ""
-"Liste over GConfValue-oppføringer som inneholder strenger for "
-"makrokommandoer."
-
 #: ../mini-commander/src/mini-commander.ui.h:1
 msgid "Command Line Preferences"
 msgstr "Brukervalg for kommandolinje"
@@ -1784,11 +1708,11 @@ msgstr "Størrelse"
 msgid "_Width:"
 msgstr "_Bredde:"
 
-#: ../mini-commander/src/mini-commander.ui.h:6 ../multiload/properties.c:524
+#: ../mini-commander/src/mini-commander.ui.h:6 ../multiload/properties.c:480
 msgid "pixels"
 msgstr "piksler"
 
-#: ../mini-commander/src/mini-commander.ui.h:7 ../multiload/properties.c:569
+#: ../mini-commander/src/mini-commander.ui.h:7 ../multiload/properties.c:525
 msgid "Colors"
 msgstr "Farger"
 
@@ -1836,204 +1760,165 @@ msgstr "Mø_nster:"
 msgid "Co_mmand:"
 msgstr "Ko_mmando:"
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:1
+#: ../mini-commander/src/mini-commander_applet.c:244
+#: ../mini-commander/src/mini-commander_applet.c:248
+msgid "Browser"
+msgstr "Leser"
+
+#: ../mini-commander/src/mini-commander_applet.c:249
+msgid "Click this button to start the browser"
+msgstr "Klikk på denne knappen for å se «bla gjennom»-dialogen"
+
+#: ../mini-commander/src/mini-commander_applet.c:262
+#: ../mini-commander/src/mini-commander_applet.c:266
+msgid "History"
+msgstr "Historikk"
+
+#: ../mini-commander/src/mini-commander_applet.c:267
+msgid "Click this button for the list of previous commands"
+msgstr ""
+"Klikk på denne knappen for å se listen over tidligere utførte kommandoer"
+
+#: ../mini-commander/src/mini-commander_applet.c:354
+msgid "Command line has been disabled by your system administrator"
+msgstr "Kommandolinjen er deaktivert av systemadministrator"
+
+#: ../mini-commander/src/mini-commander_applet.c:369
+#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:2
+msgid "Command Line"
+msgstr "Kommandolinje"
+
+#: ../mini-commander/src/mini-commander_applet.c:416
+msgid "Mini-Commander applet"
+msgstr "Panelprogrammet Mini-Commander"
+
+#: ../mini-commander/src/mini-commander_applet.c:417
+msgid "This applet adds a command line to the panel"
+msgstr "Dette panelprogrammet gir deg en kommandolinje på panelet"
+
+#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:1
+msgid "MiniCommander Applet Factory"
+msgstr "Factory for mini-kommander-applet"
+
+#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:3
+msgid "Mini-Commander"
+msgstr "Mini-kommander"
+
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:1
+msgid "Macro pattern list"
+msgstr "Liste over makromønstre"
+
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:2
+msgid "List of entries containing strings for the macro patterns."
+msgstr "Liste over oppføringer som inneholder strenger for makromønstre."
+
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:3
+msgid "Macro command list"
+msgstr "Liste over makrokommandoer"
+
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:4
+msgid "List of entries containing strings for the macro commands."
+msgstr "Liste over oppføringer som inneholder strenger for makrokommandoer."
+
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:5
 msgid "Show handle"
 msgstr "Vis håndtak"
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:2
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:6
 msgid "Show a handle so the applet can be detached from the panel."
 msgstr "Vis et håndtak slik at programmet kan løsrives fra panelet."
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:3
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:7
 msgid "Show frame"
 msgstr "Vis ramme"
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:4
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:8
 msgid "Show a frame surrounding the applet."
 msgstr "Vis en ramme rundt panelprogrammet."
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:5
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:9
 msgid "Perform history autocompletion"
 msgstr " Aktiver historikkbasert autofullføring"
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:6
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:10
 msgid "Attempt to autocomplete a command from the history of commands entered."
 msgstr "Forsøk å fullføre kommando automatisk fra kommandohistorikken."
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:7
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:11
 msgid "Width"
 msgstr "Bredde"
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:8
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:12
 msgid "Width of the applet"
 msgstr "Programmets bredde"
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:9
-msgid "Not used anymore"
-msgstr "Ikke brukt lenger"
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:10
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:13
 msgid "Use the default theme colors"
 msgstr "Bruk farger fra forvalgt tema"
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:11
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:14
 msgid "Use theme colors instead of custom ones."
 msgstr "Bruk farger fra tema i stedet for egendefinerte."
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:12
-msgid "Foreground color, red component"
-msgstr "Forgrunnsfarge, rød komponent"
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:13
-msgid "The red component of the foreground color."
-msgstr "Rød bestanddel i forgrunnsfargen."
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:14
-msgid "Foreground color, green component"
-msgstr "Forgrunnsfarge, grønn komponent"
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:15
-msgid "The green component of the foreground color."
-msgstr "Grønn bestanddel av forgrunnsfargen."
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:15
+msgid "Foreground color"
+msgstr "Forgrunnsfarge"
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:16
-msgid "Foreground color, blue component"
-msgstr "Forgrunnsfarge, blå komponent"
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:16
+msgid "Background color"
+msgstr "Bakgrunnsfarge"
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:17
-msgid "The blue component of the foreground color."
-msgstr "Blå bestanddel i forgrunnsfargen."
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:18
-msgid "Background color, red component"
-msgstr "Bakgrunnsfarge, rød komponent"
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:19
-msgid "The red component of the background color."
-msgstr "Rød bestanddel i bakgrunnsfargen."
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:20
-msgid "Background color, green component"
-msgstr "Bakgrunnsfarge, grønn komponent"
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:21
-msgid "The green component of the background color."
-msgstr "Grønn bestanddel i bakgrunnsfargen."
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:22
-msgid "Background color, blue component"
-msgstr "Bakgrunnsfarge, blå komponent"
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:23
-msgid "The blue component of the background color."
-msgstr "Blå bestanddel i bakgrunnsfargen."
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:24
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:17
 msgid "History list"
 msgstr "Historikk"
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:25
-msgid "List of GConfValue entries containing strings for history entries."
-msgstr ""
-"Liste over GConfValue-oppføringer som inneholder strenger for oppføringer i "
-"historikken."
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:27
-msgid ""
-"This per-applet key is deprecated in favour of the global key, /schemas/apps/"
-"mini-commander-global/macro_patterns."
-msgstr ""
-"Denne nøkkelen er per instans og bør ikke brukes. I stedet bør den globale "
-"nøkkelen /schemas/apps/mini-commander-global/macro_patterns brukes."
-
-#: ../mini-commander/src/mini-commander_applet.c:242
-#: ../mini-commander/src/mini-commander_applet.c:246
-msgid "Browser"
-msgstr "Leser"
-
-#: ../mini-commander/src/mini-commander_applet.c:247
-msgid "Click this button to start the browser"
-msgstr "Klikk på denne knappen for å se «bla gjennom»-dialogen"
-
-#: ../mini-commander/src/mini-commander_applet.c:260
-#: ../mini-commander/src/mini-commander_applet.c:264
-msgid "History"
-msgstr "Historikk"
-
-#: ../mini-commander/src/mini-commander_applet.c:265
-msgid "Click this button for the list of previous commands"
-msgstr ""
-"Klikk på denne knappen for å se listen over tidligere utførte kommandoer"
-
-#: ../mini-commander/src/mini-commander_applet.c:346
-msgid "Command line has been disabled by your system administrator"
-msgstr "Kommandolinjen er deaktivert av systemadministrator"
-
-#: ../mini-commander/src/mini-commander_applet.c:360
-#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:2
-msgid "Command Line"
-msgstr "Kommandolinje"
-
-#: ../mini-commander/src/mini-commander_applet.c:406
-msgid "Mini-Commander applet"
-msgstr "Panelprogrammet Mini-Commander"
-
-#: ../mini-commander/src/mini-commander_applet.c:407
-msgid "This applet adds a command line to the panel"
-msgstr "Dette panelprogrammet gir deg en kommandolinje på panelet"
-
-#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:1
-msgid "MiniCommander Applet Factory"
-msgstr "Factory for mini-kommander-applet"
-
-#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:3
-msgid "Mini-Commander"
-msgstr "Mini-kommander"
+#: ../mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in.h:18
+msgid "List of entries containing strings for history entries."
+msgstr "Liste med oppføringer som inneholder strenger for oppføringer i historikken."
 
-#: ../mini-commander/src/preferences.c:401
+#: ../mini-commander/src/preferences.c:295
 msgid "You must specify a pattern"
 msgstr "Du må spesifisere et mønster"
 
-#: ../mini-commander/src/preferences.c:405
+#: ../mini-commander/src/preferences.c:299
 msgid "You must specify a pattern and a command"
 msgstr "Du må spesifisere et mønster og en kommando"
 
-#: ../mini-commander/src/preferences.c:406
+#: ../mini-commander/src/preferences.c:300
 msgid "You must specify a command"
 msgstr "Du må spesifisere en kommando"
 
-#: ../mini-commander/src/preferences.c:409
+#: ../mini-commander/src/preferences.c:303
 msgid "You may not specify duplicate patterns"
 msgstr "Du kan ikke spesifisere samme mønster flere ganger"
 
-#: ../mini-commander/src/preferences.c:779
+#: ../mini-commander/src/preferences.c:663
 msgid "Pattern"
 msgstr "Mønster"
 
-#: ../mini-commander/src/preferences.c:789
+#: ../mini-commander/src/preferences.c:673
 msgid "Command"
 msgstr "Kommando"
 
-#: ../mixer/applet.c:179
+#: ../mixer/applet.c:175
 msgid "Volume Applet"
 msgstr "Panelprogram for volum"
 
 #. tooltip over applet
-#: ../mixer/applet.c:195 ../mixer/applet.c:216
+#: ../mixer/applet.c:191 ../mixer/applet.c:209
 #: ../mixer/org.gnome.applets.MixerApplet.panel-applet.in.in.h:1
-#: ../null_applet/null_applet.c:55 ../null_applet/null_applet.c:57
 msgid "Volume Control"
 msgstr "Volumkontroll"
 
-#: ../mixer/applet.c:378
+#: ../mixer/applet.c:371
 msgid "_Open Volume Control"
 msgstr "_Åpne volumkontroll"
 
-#: ../mixer/applet.c:392
+#: ../mixer/applet.c:385
 msgid "Mu_te"
 msgstr "_Demp"
 
-#: ../mixer/applet.c:558
+#: ../mixer/applet.c:547
 msgid ""
 "The volume control did not find any elements and/or devices to control. This "
 "means either that you don't have the right GStreamer plugins installed, or "
@@ -2043,7 +1928,7 @@ msgstr ""
 "betyr at du enten ikke har korrekte tillegg installert for GStreamer, eller "
 "at du ikke har konfigurert et lydkort."
 
-#: ../mixer/applet.c:562
+#: ../mixer/applet.c:551
 msgid ""
 "You can remove the volume control from the panel by right-clicking the "
 "speaker icon on the panel and selecting \"Remove From Panel\" from the menu."
@@ -2051,12 +1936,12 @@ msgstr ""
 "Du kan fjerne volumkontroll fra panelet ved å høyreklikke på høyttaler-"
 "ikonet på panelet og velge «Fjern fra panelet» fra menyen."
 
-#: ../mixer/applet.c:745
+#: ../mixer/applet.c:734
 #, c-format
 msgid "Failed to start Volume Control: %s"
 msgstr "Klarte ikke å starte volumkontroll: %s"
 
-#: ../mixer/applet.c:1160
+#: ../mixer/applet.c:1149
 #, c-format
 msgid "%s: muted"
 msgstr "%s: dempet"
@@ -2065,29 +1950,29 @@ msgstr "%s: dempet"
 #. * to mark as a translation, but anyway. The string is a list of
 #. * selected tracks, the number is the volume in percent. You
 #. * most likely want to keep this as-is.
-#: ../mixer/applet.c:1166
+#: ../mixer/applet.c:1155
 #, c-format
 msgid "%s: %d%%"
 msgstr "%s: %d%%"
 
-#: ../mixer/applet.c:1402
+#: ../mixer/applet.c:1381
 #, c-format
 msgid "Failed to display help: %s"
 msgstr "Klarte ikke å vise hjelp : %s"
 
-#: ../mixer/applet.c:1415
+#: ../mixer/applet.c:1394
 msgid "Volume control for your GNOME Panel."
 msgstr "Volumkontroll for GNOME panelet."
 
-#: ../mixer/applet.c:1416
+#: ../mixer/applet.c:1395
 msgid "Using GStreamer 0.10."
 msgstr "Bruker GStreamer 0.10."
 
-#: ../mixer/dock.c:219
+#: ../mixer/dock.c:228
 msgid "Mute"
 msgstr "Demp"
 
-#: ../mixer/dock.c:225
+#: ../mixer/dock.c:234
 msgid "Volume Control..."
 msgstr "Volumkontroll …"
 
@@ -2096,81 +1981,68 @@ msgstr "Volumkontroll …"
 msgid "Unknown Volume Control %d"
 msgstr "Ukjent volumkontroll %d"
 
-#: ../mixer/mixer.schemas.in.h:1
-msgid "Channel controlled by applet. Only for OSS setups"
-msgstr ""
-"Kanal som kontrolleres av panelprogrammet. Kun for systemer som bruker OSS"
-
-#: ../mixer/mixer.schemas.in.h:2
-msgid "Saved mute state"
-msgstr "Lagret status for demping"
-
-#: ../mixer/mixer.schemas.in.h:3
-msgid "Saved volume to restore on startup"
-msgstr "Lagret volum som skal gjenopprettes ved oppstart"
-
 #: ../mixer/org.gnome.applets.MixerApplet.panel-applet.in.in.h:2
 msgid "Adjust the sound volume"
 msgstr "Justering av lydvolum"
 
 #. make window look cute
-#: ../mixer/preferences.c:90
+#: ../mixer/preferences.c:89
 msgid "Volume Control Preferences"
 msgstr "Brukervalg for volumkontroll"
 
-#: ../mixer/preferences.c:102
+#: ../mixer/preferences.c:101
 msgid "Select the device and track to control."
 msgstr "Velg enhet og spor som skal kontrolleres."
 
-#: ../modemlights/modem-applet.c:142
+#: ../modemlights/modem-applet.c:135
 msgid "_Activate"
 msgstr "_Aktiver"
 
-#: ../modemlights/modem-applet.c:145
+#: ../modemlights/modem-applet.c:138
 msgid "_Deactivate"
 msgstr "_Deaktiver"
 
-#: ../modemlights/modem-applet.c:148 ../stickynotes/stickynotes.ui.h:4
+#: ../modemlights/modem-applet.c:141 ../stickynotes/stickynotes.ui.h:4
 msgid "_Properties"
 msgstr "_Egenskaper"
 
-#: ../modemlights/modem-applet.c:184
+#: ../modemlights/modem-applet.c:166
 #: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:1
 msgid "Modem Monitor"
 msgstr "Modemovervåking"
 
-#: ../modemlights/modem-applet.c:710
+#: ../modemlights/modem-applet.c:671
 msgid "Connection active, but could not get connection time"
 msgstr "Tilkobling aktiv, men kunne ikke finne tid for tilkobling"
 
-#: ../modemlights/modem-applet.c:726
+#: ../modemlights/modem-applet.c:687
 #, c-format
 msgid "Time connected: %.1d:%.2d"
 msgstr "Tid tilkoblet: %.1d:%.2d"
 
-#: ../modemlights/modem-applet.c:730
+#: ../modemlights/modem-applet.c:691
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
 
-#: ../modemlights/modem-applet.c:752
+#: ../modemlights/modem-applet.c:713
 msgid ""
 "To connect to your Internet service provider, you need administrator "
 "privileges"
 msgstr ""
 "Du må ha administratorrettigheter for å koble til din internettleverandør"
 
-#: ../modemlights/modem-applet.c:753
+#: ../modemlights/modem-applet.c:714
 msgid ""
 "To disconnect from your Internet service provider, you need administrator "
 "privileges"
 msgstr ""
 "Du må ha administratorrettigheter for å koble fra din internettleverandør"
 
-#: ../modemlights/modem-applet.c:828
+#: ../modemlights/modem-applet.c:789
 msgid "The entered password is invalid"
 msgstr "Oppgitt passord er ugyldig"
 
-#: ../modemlights/modem-applet.c:830
+#: ../modemlights/modem-applet.c:791
 msgid ""
 "Check that you have typed it correctly and that you haven't activated the "
 "\"caps lock\" key"
@@ -2178,34 +2050,39 @@ msgstr ""
 "Sjekk at du har skrevet det riktig og at du ikke har aktivert «caps lock»-"
 "tasten"
 
-#: ../modemlights/modem-applet.c:932
+#: ../modemlights/modem-applet.c:902
 msgid "Do you want to connect?"
 msgstr "Vil du koble til?"
 
-#: ../modemlights/modem-applet.c:933
+#: ../modemlights/modem-applet.c:903
 msgid "Do you want to disconnect?"
 msgstr "Vil du koble fra?"
 
-#: ../modemlights/modem-applet.c:942
+#: ../modemlights/modem-applet.c:911 ../trashapplet/src/trashapplet.c:498
+#: ../trashapplet/src/trash-empty.c:341
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: ../modemlights/modem-applet.c:912
 msgid "C_onnect"
 msgstr "K_oble til"
 
-#: ../modemlights/modem-applet.c:942
+#: ../modemlights/modem-applet.c:912
 msgid "_Disconnect"
 msgstr "_Koble fra"
 
-#: ../modemlights/modem-applet.c:995
+#: ../modemlights/modem-applet.c:965
 msgid "Could not launch network configuration tool"
 msgstr "Kunne ikke starte verktøy for konfigurasjon av nettverk"
 
-#: ../modemlights/modem-applet.c:997
+#: ../modemlights/modem-applet.c:967
 msgid ""
 "Check that it's installed in the correct path and that it has the correct "
 "permissions"
 msgstr ""
 "Sjekk at det er installert på riktig sted og at det har riktige rettigheter"
 
-#: ../modemlights/modem-applet.c:1020
+#: ../modemlights/modem-applet.c:990
 msgid "Applet for activating and monitoring a dial-up network connection."
 msgstr ""
 "Panelprogram for å aktivere og overvåke oppringte nettverksforbindelser."
@@ -2230,7 +2107,7 @@ msgstr "Kobler til tjenestetilbyder for internett"
 msgid "Activate and monitor a dial-up network connection"
 msgstr "Aktiver og overvåk oppringte nettverksforbindelser"
 
-#: ../multiload/main.c:56
+#: ../multiload/main.c:54
 msgid ""
 "A system load monitor capable of displaying graphs for CPU, ram, and swap "
 "space use, plus network traffic."
@@ -2238,43 +2115,43 @@ msgstr ""
 "Systemmonitor som kan vise grafer for bruk av CPU, RAM og bruk av swap i "
 "tillegg til nettverkstrafikk."
 
-#: ../multiload/main.c:129
+#: ../multiload/main.c:127
 msgid "Start system-monitor"
 msgstr "Start systemmonitor"
 
-#: ../multiload/main.c:150
+#: ../multiload/main.c:148
 #, c-format
 msgid "There was an error executing '%s': %s"
 msgstr "Det oppsto en feil under kjøring av «%s» : %s"
 
-#: ../multiload/main.c:278 ../multiload/properties.c:594
+#: ../multiload/main.c:286 ../multiload/properties.c:550
 msgid "Processor"
 msgstr "Prosessor"
 
-#: ../multiload/main.c:280 ../multiload/properties.c:602
+#: ../multiload/main.c:288 ../multiload/properties.c:558
 msgid "Memory"
 msgstr "Minne"
 
-#: ../multiload/main.c:282 ../multiload/properties.c:610
+#: ../multiload/main.c:290 ../multiload/properties.c:566
 msgid "Network"
 msgstr "Nettverk"
 
-#: ../multiload/main.c:284 ../multiload/properties.c:617
+#: ../multiload/main.c:292 ../multiload/properties.c:573
 msgid "Swap Space"
 msgstr "Swap-område"
 
-#: ../multiload/main.c:286 ../multiload/main.c:365
+#: ../multiload/main.c:294 ../multiload/main.c:373
 msgid "Load Average"
 msgstr "Snittbelastning"
 
-#: ../multiload/main.c:288
+#: ../multiload/main.c:296
 msgid "Disk"
 msgstr "Disk"
 
 #. xgettext: use and cache are > 1 most of the time,
 #. please assume that they always are.
 #.
-#: ../multiload/main.c:304
+#: ../multiload/main.c:312
 #, c-format
 msgid ""
 "%s:\n"
@@ -2285,13 +2162,13 @@ msgstr ""
 "%u%% i bruk av programmer\n"
 "%u%% av dette er buffer"
 
-#: ../multiload/main.c:312
+#: ../multiload/main.c:320
 #, c-format
 msgid "The system load average is %0.02f"
 msgstr "Systemets snittbelastning er %0.02f"
 
 #. xgettext: same as in graphic tab of g-s-m
-#: ../multiload/main.c:320
+#: ../multiload/main.c:328
 #, c-format
 msgid ""
 "%s:\n"
@@ -2302,7 +2179,7 @@ msgstr ""
 "Mottar %s\n"
 "Sender %s"
 
-#: ../multiload/main.c:336
+#: ../multiload/main.c:344
 #, c-format
 msgid ""
 "%s:\n"
@@ -2317,68 +2194,77 @@ msgstr[1] ""
 "%s:\n"
 "%u%% i bruk"
 
-#: ../multiload/main.c:361
+#: ../multiload/main.c:369
 msgid "CPU Load"
 msgstr "Prosessorlast"
 
-#: ../multiload/main.c:362
+#: ../multiload/main.c:370
 msgid "Memory Load"
 msgstr "Minnelast"
 
-#: ../multiload/main.c:363
+#: ../multiload/main.c:371
 msgid "Net Load"
 msgstr "Nettbelastning"
 
-#: ../multiload/main.c:364
+#: ../multiload/main.c:372
 msgid "Swap Load"
 msgstr "Belastning på swap"
 
-#: ../multiload/main.c:366
+#: ../multiload/main.c:374
 msgid "Disk Load"
 msgstr "Diskbelastning"
 
-#: ../multiload/main.c:462
+#: ../multiload/main.c:463
 msgid "_Open System Monitor"
 msgstr "_Åpne systemmonitor"
 
-#: ../multiload/main.c:490
+#: ../multiload/main.c:491
 #: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:1
 msgid "System Monitor"
 msgstr "Systemmonitor"
 
-#: ../multiload/multiload.schemas.in.h:1
+#: ../multiload/netspeed.c:40
+#, c-format
+msgid "%s/s"
+msgstr "%s/s"
+
+#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:2
+msgid "A system load indicator"
+msgstr "Viser belastning på systemet"
+
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:1
 msgid "Enable CPU load graph"
 msgstr "Aktiver plott av CPU-belastning"
 
-#: ../multiload/multiload.schemas.in.h:2
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:2
 msgid "Enable memory load graph"
 msgstr "Aktiver plott av minnebelastning"
 
-#: ../multiload/multiload.schemas.in.h:3
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:3
 msgid "Enable network load graph"
 msgstr "Aktiver plott av nettverksbelastning"
 
-#: ../multiload/multiload.schemas.in.h:4
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:4
 msgid "Enable swap load graph"
 msgstr "Aktiver plott av swapbelastning"
 
-#: ../multiload/multiload.schemas.in.h:5
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:5
 msgid "Enable load average graph"
 msgstr "Aktiver plott av snittbelastning"
 
-#: ../multiload/multiload.schemas.in.h:6
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:6
 msgid "Enable disk load graph"
 msgstr "Aktiver plott av diskbelastning"
 
-#: ../multiload/multiload.schemas.in.h:7
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:7
 msgid "Applet refresh rate in milliseconds"
 msgstr "Oppdateringsintervall i millisekunder"
 
-#: ../multiload/multiload.schemas.in.h:8
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:8
 msgid "Graph size"
 msgstr "Størrelse på graf"
 
-#: ../multiload/multiload.schemas.in.h:9
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:9
 msgid ""
 "For horizontal panels, the width of the graphs in pixels. For vertical "
 "panels, this is the height of the graphs."
@@ -2386,283 +2272,234 @@ msgstr ""
 "Bredden av grafene i piksler for horisontale paneler. For vertikale paneler "
 "er dette høyden på grafene."
 
-#: ../multiload/multiload.schemas.in.h:10
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:10
 msgid "Graph color for user-related CPU activity"
 msgstr "Farge på graf for brukerrelatert CPU-aktivitet"
 
-#: ../multiload/multiload.schemas.in.h:11
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:11
 msgid "Graph color for system-related CPU activity"
 msgstr "Farge på graf for systemrelatert CPU-aktivitet"
 
-#: ../multiload/multiload.schemas.in.h:12
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:12
 msgid "Graph color for nice-related CPU activity"
 msgstr "Farge på graf for nice-relatert CPU-aktivitet"
 
-#: ../multiload/multiload.schemas.in.h:13
-msgid "Graph color for iowait related CPU activity"
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:13
+msgid "Graph color for iowait-related CPU activity"
 msgstr "Farge på graf for iowait-relatert CPU-aktivitet"
 
-#: ../multiload/multiload.schemas.in.h:14
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:14
 msgid "CPU graph background color"
 msgstr "Bakgrunnsfarge for CPU-plott"
 
-#: ../multiload/multiload.schemas.in.h:15
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:15
 msgid "Graph color for user-related memory usage"
 msgstr "Farge på graf for brukerrelatert minnebruk"
 
-#: ../multiload/multiload.schemas.in.h:16
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:16
 msgid "Graph color for shared memory"
 msgstr "Farge på graf for delt minne"
 
-#: ../multiload/multiload.schemas.in.h:17
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:17
 msgid "Graph color for buffer memory"
 msgstr "Farge på graf for bufferminne"
 
-#: ../multiload/multiload.schemas.in.h:18
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:18
 msgid "Graph color for cached memory"
 msgstr "Farge på graf for cache-minne"
 
-#: ../multiload/multiload.schemas.in.h:19
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:19
 msgid "Memory graph background color"
 msgstr "Bakgrunnsfarge for minnegraf"
 
-#: ../multiload/multiload.schemas.in.h:20
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:20
 msgid "Graph color for input network activity"
 msgstr "Farge på graf for innkommende nettverksaktivitet"
 
-#: ../multiload/multiload.schemas.in.h:21
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:21
 msgid "Graph color for output network activity"
 msgstr "Farge på graf for utgående nettverksaktivitet"
 
-#: ../multiload/multiload.schemas.in.h:22
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:22
 msgid "Graph color for loopback network usage"
 msgstr "Farge på graf for loopback nettverksaktivitet"
 
-#: ../multiload/multiload.schemas.in.h:23
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:23
 msgid "Network graph background color"
 msgstr "Bakgrunnsfarge for nettverksgraf"
 
-#: ../multiload/multiload.schemas.in.h:24
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:24
 msgid "Graph color for user-related swap usage"
 msgstr "Farge på graf for brukerrelatert swap-bruk"
 
-#: ../multiload/multiload.schemas.in.h:25
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:25
 msgid "Swap graph background color"
 msgstr "Bakgrunnsfarge for swap-graf"
 
-#: ../multiload/multiload.schemas.in.h:26
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:26
 msgid "Graph color for load average"
 msgstr "Farge på graf for snittbelastning"
 
-#: ../multiload/multiload.schemas.in.h:27
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:27
 msgid "Load graph background color"
 msgstr "akgrunnsfarge for graf for belastning"
 
-#: ../multiload/multiload.schemas.in.h:28
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:28
 msgid "Graph color for disk read"
 msgstr "Farge på graf for leseoperasjoner fra disk"
 
-#: ../multiload/multiload.schemas.in.h:29
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:29
 msgid "Graph color for disk write"
 msgstr "Farge på graf for skriveoperasjoner til disk"
 
-#: ../multiload/multiload.schemas.in.h:30
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:30
 msgid "Background color for disk load graph"
 msgstr "Bakgrunnsfarge for diskbelastningsgraf"
 
-#: ../multiload/multiload.schemas.in.h:31
+#: ../multiload/org.gnome.gnome-applets.multiload.gschema.xml.in.in.h:31
 msgid "The desktop description file to execute as the system monitor"
 msgstr "Skrivebordsfil som skal kjøres som systemmonitor"
 
-#: ../multiload/netspeed.c:40
-#, c-format
-msgid "%s/s"
-msgstr "%s/s"
-
-#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:2
-msgid "A system load indicator"
-msgstr "Viser belastning på systemet"
-
-#: ../multiload/properties.c:355
+#: ../multiload/properties.c:312
 msgid "Monitored Resources"
 msgstr "Overvåkede ressurser"
 
-#: ../multiload/properties.c:380
+#: ../multiload/properties.c:337
 msgid "_Processor"
 msgstr "_Prosessor"
 
-#: ../multiload/properties.c:393
+#: ../multiload/properties.c:350
 msgid "_Memory"
 msgstr "_Minne"
 
-#: ../multiload/properties.c:406
+#: ../multiload/properties.c:363
 msgid "_Network"
 msgstr "_Nettverk"
 
-#: ../multiload/properties.c:419
+#: ../multiload/properties.c:376
 msgid "S_wap Space"
 msgstr "S_wap-område"
 
-#: ../multiload/properties.c:432
+#: ../multiload/properties.c:389
 msgid "_Load"
 msgstr "Bel_astning"
 
-#: ../multiload/properties.c:445
+#: ../multiload/properties.c:402
 msgid "_Harddisk"
 msgstr "_Harddisk"
 
-#: ../multiload/properties.c:461
+#: ../multiload/properties.c:417
 msgid "Options"
 msgstr "Alternativer"
 
-#: ../multiload/properties.c:491
+#: ../multiload/properties.c:447
 msgid "System m_onitor width: "
 msgstr "Bredde for systemm_onitor: "
 
-#: ../multiload/properties.c:493
+#: ../multiload/properties.c:449
 msgid "System m_onitor height: "
 msgstr "Høyde for systemm_onitor: "
 
-#: ../multiload/properties.c:532
+#: ../multiload/properties.c:488
 msgid "Sys_tem monitor update interval: "
 msgstr "Oppdateringsintervall for sys_temmonitor: "
 
-#: ../multiload/properties.c:558
+#: ../multiload/properties.c:514
 msgid "milliseconds"
 msgstr "millisekunder"
 
-#: ../multiload/properties.c:596 ../multiload/properties.c:604
+#: ../multiload/properties.c:552 ../multiload/properties.c:560
 msgid "_User"
 msgstr "Br_uker"
 
-#: ../multiload/properties.c:597
+#: ../multiload/properties.c:553
 msgid "S_ystem"
 msgstr "S_ystem"
 
-#: ../multiload/properties.c:598
+#: ../multiload/properties.c:554
 msgid "N_ice"
 msgstr "Sn_ill"
 
-#: ../multiload/properties.c:599
+#: ../multiload/properties.c:555
 msgid "I_OWait"
 msgstr "I_OWait"
 
-#: ../multiload/properties.c:600
+#: ../multiload/properties.c:556
 msgid "I_dle"
 msgstr "Tom_gang"
 
-#: ../multiload/properties.c:605
+#: ../multiload/properties.c:561
 msgid "Sh_ared"
 msgstr "D_elt"
 
-#: ../multiload/properties.c:606
+#: ../multiload/properties.c:562
 msgid "_Buffers"
 msgstr "_Buffere"
 
-#: ../multiload/properties.c:607
+#: ../multiload/properties.c:563
 msgid "Cach_ed"
 msgstr "M_ellomlagret"
 
-#: ../multiload/properties.c:608
+#: ../multiload/properties.c:564
 msgid "F_ree"
 msgstr "Le_dig"
 
-#: ../multiload/properties.c:612
+#: ../multiload/properties.c:568
 msgid "_In"
 msgstr "_Inn"
 
-#: ../multiload/properties.c:613
+#: ../multiload/properties.c:569
 msgid "_Out"
 msgstr "_Ut"
 
-#: ../multiload/properties.c:614
+#: ../multiload/properties.c:570
 msgid "_Local"
 msgstr "_Lokal"
 
-#: ../multiload/properties.c:615 ../multiload/properties.c:625
-#: ../multiload/properties.c:631
+#: ../multiload/properties.c:571 ../multiload/properties.c:581
+#: ../multiload/properties.c:587
 msgid "_Background"
 msgstr "_Bakgrunn"
 
-#: ../multiload/properties.c:619
+#: ../multiload/properties.c:575
 msgid "_Used"
 msgstr "Br_ukt"
 
-#: ../multiload/properties.c:620
+#: ../multiload/properties.c:576
 msgid "_Free"
 msgstr "L_edig"
 
-#: ../multiload/properties.c:622
+#: ../multiload/properties.c:578
 msgid "Load"
 msgstr "Belastning"
 
-#: ../multiload/properties.c:624
+#: ../multiload/properties.c:580
 msgid "_Average"
 msgstr "_Gjennomsnitt"
 
-#: ../multiload/properties.c:627
+#: ../multiload/properties.c:583
 msgid "Harddisk"
 msgstr "Harddisk"
 
-#: ../multiload/properties.c:629
+#: ../multiload/properties.c:585
 msgid "_Read"
 msgstr "_Les"
 
-#: ../multiload/properties.c:630
+#: ../multiload/properties.c:586
 msgid "_Write"
 msgstr "_Skriv"
 
-#: ../multiload/properties.c:655
+#: ../multiload/properties.c:611
 msgid "System Monitor Preferences"
 msgstr "Brukervalg for systemmonitor"
 
-#: ../null_applet/null_applet.c:51
-msgid "Inbox Monitor"
-msgstr "Overvåking av innboks"
-
-#: ../null_applet/null_applet.c:53
-msgid "CD Player"
-msgstr "CD-spiller"
-
-#: ../null_applet/null_applet.c:59
-msgid "Keyboard Indicator"
-msgstr "Tastaturindikator"
-
-#: ../null_applet/null_applet.c:157
-msgid "Some panel items are no longer available"
-msgstr "Noen paneloppføringer er ikke tilgjengelige lenger"
-
-#: ../null_applet/null_applet.c:158
-msgid ""
-"One or more panel items (also referred to as applets) are no longer "
-"available in the GNOME desktop."
-msgstr ""
-"En eller flere paneloppføringer er ikke lenger tilgjengelig for GNOME-"
-"skrivebordet."
-
-#: ../null_applet/null_applet.c:160
-msgid "These items will now be removed from your configuration:"
-msgstr "Disse oppføringene vil nå bli fjernet fra din konfigurasjon:"
-
-#: ../null_applet/null_applet.c:163
-msgid "You will not receive this message again."
-msgstr "Du vil ikke få denne meldingen igjen."
-
-#: ../stickynotes/data/GNOME_StickyNotesApplet.server.in.h:1
-msgid "Tomboy (ne Stickynotes)"
-msgstr "Tomboy (ikke gule lapper)"
-
-#: ../stickynotes/data/GNOME_StickyNotesApplet.server.in.h:2
-msgid "Tomboy (transparent upgrade from stickynotes)"
-msgstr "Tomboy (oppgradering fra gule lapper)"
-
 #: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:1
 msgid "Sticky Notes Applet Factory"
 msgstr "Factory for notater"
 
 #: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:2
-#: ../stickynotes/stickynotes_applet.c:146
-#: ../stickynotes/stickynotes_applet.c:427
+#: ../stickynotes/stickynotes_applet.c:148
+#: ../stickynotes/stickynotes_applet.c:411
 msgid "Sticky Notes"
 msgstr "Gule lapper"
 
@@ -2670,15 +2507,15 @@ msgstr "Gule lapper"
 msgid "Create, view, and manage sticky notes on the desktop"
 msgstr "Opprett, vis og håndter gule lapper på skrivebordet"
 
-#: ../stickynotes/stickynotes.c:630
+#: ../stickynotes/stickynotes.c:621
 msgid "This note is locked."
 msgstr "Dette notatet er låst."
 
-#: ../stickynotes/stickynotes.c:634
+#: ../stickynotes/stickynotes.c:625
 msgid "This note is unlocked."
 msgstr "Dette notatet er låst opp."
 
-#: ../stickynotes/stickynotes.ui.h:1 ../stickynotes/stickynotes_applet.c:33
+#: ../stickynotes/stickynotes.ui.h:1 ../stickynotes/stickynotes_applet.c:34
 msgid "_New Note"
 msgstr "_Nytt notat"
 
@@ -2854,51 +2691,84 @@ msgstr "Spesifiser en tittel for notatet"
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: ../stickynotes/stickynotes.schemas.in.h:1
+#: ../stickynotes/stickynotes_applet.c:37
+msgid "Hi_de Notes"
+msgstr "S_kjul notater"
+
+#: ../stickynotes/stickynotes_applet.c:40
+msgid "_Delete Notes"
+msgstr "_Slett notater"
+
+#: ../stickynotes/stickynotes_applet.c:56
+msgid "_Lock Notes"
+msgstr "_Lås notater"
+
+#: ../stickynotes/stickynotes_applet.c:589
+#, c-format
+msgid "%d note"
+msgid_plural "%d notes"
+msgstr[0] "%d notat"
+msgstr[1] "%d notater"
+
+#: ../stickynotes/stickynotes_applet.c:590
+msgid "Show sticky notes"
+msgstr "Vis gule lapper"
+
+#: ../stickynotes/stickynotes_applet_callbacks.c:379
+msgid "Sticky Notes for the GNOME Desktop Environment"
+msgstr "Notater for skrivebordsmiljøet GNOME"
+
+#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:1
+msgid "Trash"
+msgstr "Papirkurv"
+
+#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2
+msgid "Go to Trash"
+msgstr "Gå til papirkurven"
+
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:1
 msgid "Default width for new notes"
 msgstr "Forvalgt bredde for nye lapper"
 
-#: ../stickynotes/stickynotes.schemas.in.h:2
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:2
 msgid "Default width for new sticky notes in pixels."
 msgstr "Forvalgt bredde i piksler for nye gule lapper."
 
-#: ../stickynotes/stickynotes.schemas.in.h:3
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:3
 msgid "Default height for new notes"
 msgstr "Forvalgt høyde for nye lapper"
 
-#: ../stickynotes/stickynotes.schemas.in.h:4
-msgid "Default height for new sticky notes in pixels."
-msgstr "Forvalgt høyde i piksler for nye gule lapper."
-
-#: ../stickynotes/stickynotes.schemas.in.h:5
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:4
 msgid "Default color for new notes"
 msgstr "Forvalgt farge for nye lapper"
 
-#: ../stickynotes/stickynotes.schemas.in.h:6
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:5
+#, fuzzy
 msgid ""
-"Default color for new sticky notes. This should be in html hex "
-"specification, for example \"#30FF50\"."
+"Default color for new sticky notes. This can be standard name, hexadecimal "
+"value, RGB color or RGBA color."
 msgstr ""
 "Forvalgt farge for nytt notat. Dette oppgis i heksadesimal notasjon som i "
 "HTML. For eksempel «#30FF50»."
 
-#: ../stickynotes/stickynotes.schemas.in.h:7
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:6
 msgid "Default color for font"
 msgstr "Forvalgt farge for skrift"
 
-#: ../stickynotes/stickynotes.schemas.in.h:8
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:7
+#, fuzzy
 msgid ""
-"Default font color for new sticky notes. This should be in html hex "
-"specification, for example \"#000000\"."
+"Default font color for new sticky notes. This can be standard name, "
+"hexadecimal value, RGB color or RGBA color."
 msgstr ""
 "Forvalgt farge for nye notater. Dette oppgis i heksadesimal notasjon som i "
 "HTML. For eksempel «#000000»."
 
-#: ../stickynotes/stickynotes.schemas.in.h:9
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:8
 msgid "Default font for new notes"
 msgstr "Forvalgt skrift for nye lapper"
 
-#: ../stickynotes/stickynotes.schemas.in.h:10
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:9
 msgid ""
 "Default font for new sticky notes. This should be a Pango Font Name, for "
 "example \"Sans Italic 10\"."
@@ -2906,11 +2776,11 @@ msgstr ""
 "Forvalgt skrift for nye lapper. Dette må være et Pango skriftnavn, for "
 "eksempel «Sans Italic 10»"
 
-#: ../stickynotes/stickynotes.schemas.in.h:11
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:10
 msgid "Sticky notes' workspace stickyness"
 msgstr "Tilhørighet til arbeidsområde for gul lapp"
 
-#: ../stickynotes/stickynotes.schemas.in.h:12
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:11
 msgid ""
 "Specifies whether the sticky notes are visible on ALL workspaces on the "
 "desktop, or not."
@@ -2918,19 +2788,19 @@ msgstr ""
 "Oppgir om notatene er synlige på alle arbeidsområder på skrivebordet eller "
 "ikke."
 
-#: ../stickynotes/stickynotes.schemas.in.h:13
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:12
 msgid "Sticky notes' locked state"
 msgstr "Låsetilstand for gul lapp"
 
-#: ../stickynotes/stickynotes.schemas.in.h:14
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:13
 msgid "Specifies whether the sticky notes are locked (non-editable) or not."
 msgstr "Oppgir om notat er låst (ikke redigerbar) eller eller ikke."
 
-#: ../stickynotes/stickynotes.schemas.in.h:15
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:14
 msgid "Date format of note's title"
 msgstr "Datoformat for lappens tittel"
 
-#: ../stickynotes/stickynotes.schemas.in.h:16
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:15
 msgid ""
 "By default, sticky notes are given the current date as the title when they "
 "are created. This format is used; anything that can be parsed by strftime() "
@@ -2939,11 +2809,11 @@ msgstr ""
 "Gule lapper gis som forvalg dagens dato som tittel når de opprettes. Dette "
 "formatet brukes; alle formater som kan tolkes av strftime() er gyldig."
 
-#: ../stickynotes/stickynotes.schemas.in.h:17
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:16
 msgid "Whether to use the default system color"
 msgstr "Om forvalgt systemfarge skal brukes"
 
-#: ../stickynotes/stickynotes.schemas.in.h:18
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:17
 msgid ""
 "If this option is disabled, a custom color can be used as the default color "
 "for all sticky notes."
@@ -2951,11 +2821,11 @@ msgstr ""
 "Hvis dette alternativet er deaktivert vil en egendefinert farge kunne brukes "
 "som forvalgt farge for alle lapper."
 
-#: ../stickynotes/stickynotes.schemas.in.h:19
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:18
 msgid "Whether to use the default system font"
 msgstr "Om forvalgt skrift for systemet skal brukes"
 
-#: ../stickynotes/stickynotes.schemas.in.h:20
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:19
 msgid ""
 "If this option is disabled, a custom font can be used as the default font "
 "for all sticky notes."
@@ -2963,11 +2833,11 @@ msgstr ""
 "Hvis dette alternativet er deaktivert vil en egendefinert skrift kunne "
 "brukes som forvalgt skrift for alle lapper."
 
-#: ../stickynotes/stickynotes.schemas.in.h:21
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:20
 msgid "Whether to force the default color and font on all notes"
 msgstr "Om forvalgt farge og skrift skal tvinges på alle notater"
 
-#: ../stickynotes/stickynotes.schemas.in.h:22
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:21
 msgid ""
 "If this option is enabled, the custom colors and fonts that have been "
 "assigned to individual notes will be ignored."
@@ -2975,11 +2845,11 @@ msgstr ""
 "Hvis dette alternativet er aktivert vil egendefinerte farger og skrifter som "
 "er tildelt individuelle lapper bli ignorert."
 
-#: ../stickynotes/stickynotes.schemas.in.h:23
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:22
 msgid "Whether to hide all notes when the desktop is selected"
 msgstr "Om alle notater skal skjules når skrivebordet klikkes på"
 
-#: ../stickynotes/stickynotes.schemas.in.h:24
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:23
 msgid ""
 "If this option is enabled, selecting the desktop in any way will "
 "automatically hide all the open notes."
@@ -2987,69 +2857,34 @@ msgstr ""
 "Hvis dette alternativet aktiveres vil klikk på skrivebordet skjule alle åpne "
 "notater."
 
-#: ../stickynotes/stickynotes.schemas.in.h:25
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:24
 msgid "Whether to ask for confirmation when deleting a note"
 msgstr "Om bekreftelse er nødvendig ved sletting av notat eller ikke"
 
-#: ../stickynotes/stickynotes.schemas.in.h:26
+#: ../stickynotes/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in.h:25
 msgid "Empty notes are always deleted without confirmation."
 msgstr "Tomme lapper slettes alltid uten bekreftelse"
 
-#: ../stickynotes/stickynotes_applet.c:36
-msgid "Hi_de Notes"
-msgstr "S_kjul notater"
-
-#: ../stickynotes/stickynotes_applet.c:39
-msgid "_Delete Notes"
-msgstr "_Slett notater"
-
-#: ../stickynotes/stickynotes_applet.c:55
-msgid "_Lock Notes"
-msgstr "_Lås notater"
-
-#: ../stickynotes/stickynotes_applet.c:620
-#, c-format
-msgid "%d note"
-msgid_plural "%d notes"
-msgstr[0] "%d notat"
-msgstr[1] "%d notater"
-
-#: ../stickynotes/stickynotes_applet.c:621
-msgid "Show sticky notes"
-msgstr "Vis gule lapper"
-
-#: ../stickynotes/stickynotes_applet_callbacks.c:379
-msgid "Sticky Notes for the GNOME Desktop Environment"
-msgstr "Notater for skrivebordsmiljøet GNOME"
-
-#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:1
-msgid "Trash"
-msgstr "Papirkurv"
-
-#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2
-msgid "Go to Trash"
-msgstr "Gå til papirkurven"
-
-#: ../trashapplet/src/trashapplet.c:69 ../trashapplet/src/trash-empty.c:343
+#: ../trashapplet/src/trashapplet.c:68 ../trashapplet/src/trash-empty.c:344
 msgid "_Empty Trash"
 msgstr "_Tøm papirkurven"
 
-#: ../trashapplet/src/trashapplet.c:72
+#: ../trashapplet/src/trashapplet.c:71
 msgid "_Open Trash"
 msgstr "_Åpne papirkurv"
 
-#: ../trashapplet/src/trashapplet.c:128
+#: ../trashapplet/src/trashapplet.c:127
 #, c-format
 msgid "%d Item in Trash"
 msgid_plural "%d Items in Trash"
 msgstr[0] "%d oppføring i papirkurven"
 msgstr[1] "%d oppføringer i papirkurven"
 
-#: ../trashapplet/src/trashapplet.c:136
+#: ../trashapplet/src/trashapplet.c:135
 msgid "No Items in Trash"
 msgstr "Ingen oppføringer papirkurven"
 
-#: ../trashapplet/src/trashapplet.c:377
+#: ../trashapplet/src/trashapplet.c:368
 #, c-format
 msgid ""
 "Error while spawning Nautilus:\n"
@@ -3058,7 +2893,7 @@ msgstr ""
 "Feil under oppstart av nautilus:\n"
 "%s"
 
-#: ../trashapplet/src/trashapplet.c:426
+#: ../trashapplet/src/trashapplet.c:417
 msgid ""
 "A GNOME trash bin that lives in your panel. You can use it to view the trash "
 "or drag and drop items into the trash."
@@ -3066,43 +2901,47 @@ msgstr ""
 "En papirkurv for GNOME panelet. Du kan bruke denne til å vise papirkurven "
 "eller dra-og-slippe oppføringer til papirkurven."
 
-#: ../trashapplet/src/trashapplet.c:451
+#: ../trashapplet/src/trashapplet.c:442
 msgid "Delete Immediately?"
 msgstr "Slett med en gang?"
 
-#: ../trashapplet/src/trashapplet.c:480
+#: ../trashapplet/src/trashapplet.c:470
 msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr ""
 "Kan ikke flytte oppføringer til papirkurven. Vil du slette dem med det samme?"
 
-#: ../trashapplet/src/trashapplet.c:485
+#: ../trashapplet/src/trashapplet.c:475
 msgid ""
 "Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 "Noen oppføringer kan ikke flyttes til papirkurven. Vil du slette disse med "
 "det samme?"
 
-#: ../trashapplet/src/trashapplet.c:615
+#: ../trashapplet/src/trashapplet.c:500
+msgid "_Delete"
+msgstr "_Slett"
+
+#: ../trashapplet/src/trashapplet.c:605
 msgid "Trash Applet"
 msgstr "Papirkurv"
 
 #. Translators: the %s in this string should be read as %d.
-#: ../trashapplet/src/trash-empty.c:73
+#: ../trashapplet/src/trash-empty.c:72
 #, c-format
 msgid "Removing item %s of %s"
 msgstr "Fjerner oppføring %s av %s"
 
 #. Translators: %s is a file name
-#: ../trashapplet/src/trash-empty.c:99
+#: ../trashapplet/src/trash-empty.c:98
 #, c-format
 msgid "Removing: %s"
 msgstr "Fjerner: %s<"
 
-#: ../trashapplet/src/trash-empty.c:322
+#: ../trashapplet/src/trash-empty.c:323
 msgid "Empty all of the items from the trash?"
 msgstr "Vil du fjerne alle oppføringer fra papirkurven?"
 
-#: ../trashapplet/src/trash-empty.c:329
+#: ../trashapplet/src/trash-empty.c:330
 msgid ""
 "If you choose to empty the trash, all items in it will be permanently lost. "
 "Please note that you can also delete them separately."


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]