Merge translation files from master branch.

1 files changed, 33 insertions, 41 deletions

diff --git a/tde-i18n-nb/messages/tdebase/kcmmedia.po b/tde-i18n-nb/messages/tdebase/kcmmedia.po
index 9fffd372f1d..24f63b76a77 100644
--- a/tde-i18n-nb/messages/tdebase/kcmmedia.po
+++ b/tde-i18n-nb/messages/tdebase/kcmmedia.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmmedia\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:16+0100\n"
 "PO-Revision-Date: 2006-01-31 23:37+0100\n"
 "Last-Translator: Axel Bojer <axelb@skolelinux.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -121,23 +121,11 @@ msgstr ""
 "montert."
 
 #: managermoduleview.ui:60
-#, fuzzy, no-c-format
-msgid "Enable notification popups"
-msgstr "&Beskjed"
-
-#: managermoduleview.ui:63
-#, no-c-format
-msgid ""
-"Deselect this if you do not want action request popups to be generated when "
-"devices are plugged in."
-msgstr ""
-
-#: managermoduleview.ui:71
 #, no-c-format
 msgid "Mount options"
 msgstr ""
 
-#: managermoduleview.ui:90
+#: managermoduleview.ui:79
 #, no-c-format
 msgid ""
 "Here you can specify default mount options for your storage media. Please "
@@ -148,77 +136,77 @@ msgid ""
 "the best value depending on your media."
 msgstr ""
 
-#: managermoduleview.ui:110
+#: managermoduleview.ui:99
 #, no-c-format
 msgid "Read only"
 msgstr ""
 
-#: managermoduleview.ui:113
+#: managermoduleview.ui:102
 #, no-c-format
 msgid "By default, mount all file systems read-only."
 msgstr ""
 
-#: managermoduleview.ui:121
+#: managermoduleview.ui:110
 #, no-c-format
 msgid "Mount as user"
 msgstr ""
 
-#: managermoduleview.ui:124
+#: managermoduleview.ui:113
 #, no-c-format
 msgid "Mount this file system as user."
 msgstr ""
 
-#: managermoduleview.ui:132
+#: managermoduleview.ui:121
 #, no-c-format
 msgid "Flushed IO"
 msgstr ""
 
-#: managermoduleview.ui:138
+#: managermoduleview.ui:127
 #, no-c-format
 msgid ""
 "Always flush all data to the hot plug devices immediately and don't cache it."
 msgstr ""
 
-#: managermoduleview.ui:146
+#: managermoduleview.ui:135
 #, no-c-format
 msgid "Synchronous"
 msgstr ""
 
-#: managermoduleview.ui:152
+#: managermoduleview.ui:141
 #, no-c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr ""
 
-#: managermoduleview.ui:160
+#: managermoduleview.ui:149
 #, no-c-format
 msgid "Quiet"
 msgstr ""
 
-#: managermoduleview.ui:163
+#: managermoduleview.ui:152
 #, no-c-format
 msgid ""
 "Attempts to chown or chmod files do not return errors, although they fail. "
 "Use with caution!"
 msgstr ""
 
-#: managermoduleview.ui:171
+#: managermoduleview.ui:160
 #, no-c-format
 msgid "UTF-8 charset"
 msgstr ""
 
-#: managermoduleview.ui:174
+#: managermoduleview.ui:163
 #, no-c-format
 msgid ""
 "UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the "
 "console. It can be be enabled for the filesystem with this option."
 msgstr ""
 
-#: managermoduleview.ui:190
+#: managermoduleview.ui:179
 #, no-c-format
 msgid "Short names:"
 msgstr ""
 
-#: managermoduleview.ui:196
+#: managermoduleview.ui:185
 #, no-c-format
 msgid ""
 "<h2>Defines  the  behaviour  for  creation and display of filenames which "
@@ -245,27 +233,27 @@ msgid ""
 "all upper case."
 msgstr ""
 
-#: managermoduleview.ui:217
+#: managermoduleview.ui:206
 #, no-c-format
 msgid "All Data"
 msgstr ""
 
-#: managermoduleview.ui:222
+#: managermoduleview.ui:211
 #, no-c-format
 msgid "Ordered"
 msgstr ""
 
-#: managermoduleview.ui:227
+#: managermoduleview.ui:216
 #, no-c-format
 msgid "Writeback"
 msgstr ""
 
-#: managermoduleview.ui:242
+#: managermoduleview.ui:231
 #, no-c-format
 msgid "Journaling:"
 msgstr ""
 
-#: managermoduleview.ui:248
+#: managermoduleview.ui:237
 #, no-c-format
 msgid ""
 "<h2>Specifies  the journalling mode for file data. Metadata is always "
@@ -288,42 +276,42 @@ msgid ""
 "after  a  crash  and  journal recovery."
 msgstr ""
 
-#: managermoduleview.ui:268
+#: managermoduleview.ui:257
 #, no-c-format
 msgid "Lower"
 msgstr ""
 
-#: managermoduleview.ui:273
+#: managermoduleview.ui:262
 #, no-c-format
 msgid "Windows 95"
 msgstr ""
 
-#: managermoduleview.ui:278
+#: managermoduleview.ui:267
 #, no-c-format
 msgid "Windows NT"
 msgstr ""
 
-#: managermoduleview.ui:283
+#: managermoduleview.ui:272
 #, no-c-format
 msgid "Mixed"
 msgstr ""
 
-#: managermoduleview.ui:297
+#: managermoduleview.ui:286
 #, no-c-format
 msgid "Mount automatically"
 msgstr ""
 
-#: managermoduleview.ui:300
+#: managermoduleview.ui:289
 #, no-c-format
 msgid "By default, mount all file systems automatically."
 msgstr ""
 
-#: managermoduleview.ui:308
+#: managermoduleview.ui:297
 #, no-c-format
 msgid "Access time updates"
 msgstr ""
 
-#: managermoduleview.ui:314
+#: managermoduleview.ui:303
 #, no-c-format
 msgid "Update inode access time for each access."
 msgstr ""
@@ -407,3 +395,7 @@ msgstr "Vis &tjenester for:"
 #, no-c-format
 msgid "Command:"
 msgstr "Kommando:"
+
+#, fuzzy
+#~ msgid "Enable notification popups"
+#~ msgstr "&Beskjed"