Merge translation files from master branch.

1 files changed, 47 insertions, 37 deletions

diff --git a/tde-i18n-nb/messages/tdebase/kcminput.po b/tde-i18n-nb/messages/tdebase/kcminput.po
index ccaddfb08a5..297b8d2ca08 100644
--- a/tde-i18n-nb/messages/tdebase/kcminput.po
+++ b/tde-i18n-nb/messages/tdebase/kcminput.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcminput\n"
-"POT-Creation-Date: 2024-06-08 20:15+0000\n"
+"POT-Creation-Date: 2024-06-09 20:16+0000\n"
 "PO-Revision-Date: 2006-09-08 08:27+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -243,19 +243,19 @@ msgstr ""
 msgid "Show feedback when clicking an icon"
 msgstr "Vis tilbakemelding når et ikon blir valgt"
 
-#: mouse.cpp:196
+#: mouse.cpp:179
 msgid "&Cursor Theme"
 msgstr "&Pekertema"
 
-#: mouse.cpp:200
+#: mouse.cpp:183
 msgid "Advanced"
 msgstr "Avansert"
 
-#: mouse.cpp:206
+#: mouse.cpp:189
 msgid "Pointer acceleration:"
 msgstr "Pekerakselerasjon:"
 
-#: mouse.cpp:211
+#: mouse.cpp:194
 msgid ""
 "This option allows you to change the relationship between the distance that "
 "the mouse pointer moves on the screen and the relative movement of the "
@@ -272,11 +272,11 @@ msgstr ""
 "musa. Hvis du velger veldig høye verdier kan det føre til at musepekeren "
 "flyr over skjermen og gjør det vanskelig å styre den."
 
-#: mouse.cpp:224
+#: mouse.cpp:207
 msgid "Pointer threshold:"
 msgstr "Pekerterskel:"
 
-#: mouse.cpp:232
+#: mouse.cpp:215
 msgid ""
 "The threshold is the smallest distance that the mouse pointer must move on "
 "the screen before acceleration has any effect. If the movement is smaller "
@@ -293,15 +293,15 @@ msgstr ""
 "Dette gir stor kontroll over musepekeren. Med større bevegelser kan du raskt "
 "flytte pekeren til andre deler av skjermen."
 
-#: mouse.cpp:244
+#: mouse.cpp:227
 msgid "Double click interval:"
 msgstr "Dobbeltklikkintervall:"
 
-#: mouse.cpp:246 mouse.cpp:295 mouse.cpp:349 mouse.cpp:357 mouse.cpp:366
+#: mouse.cpp:229 mouse.cpp:278 mouse.cpp:332 mouse.cpp:340 mouse.cpp:349
 msgid " msec"
 msgstr " ms"
 
-#: mouse.cpp:251
+#: mouse.cpp:234
 msgid ""
 "The double click interval is the maximal time (in milliseconds) between two "
 "mouse clicks which turns them into a double click. If the second click "
@@ -312,11 +312,11 @@ msgstr ""
 "museklikk som gjør dem til et dobbeltklikk. Hvis det andre klikket skjer "
 "etter dette tidspunktet, vil de bli oppfattet som to enkeltklikk."
 
-#: mouse.cpp:261
+#: mouse.cpp:244
 msgid "Double-click on the image below to test your double-click interval:"
 msgstr ""
 
-#: mouse.cpp:263
+#: mouse.cpp:246
 msgid ""
 "<p>The image will change when your double-click test time is less than or "
 "equal to the interval you configured. For example, if you configure a double-"
@@ -328,11 +328,11 @@ msgid ""
 "i> button before testing.</p>"
 msgstr ""
 
-#: mouse.cpp:293
+#: mouse.cpp:276
 msgid "Drag start time:"
 msgstr "Starttid for draoperasjoner:"
 
-#: mouse.cpp:300
+#: mouse.cpp:283
 msgid ""
 "If you click with the mouse (e.g. in a multi-line editor) and begin to move "
 "the mouse within the drag start time, a drag operation will be initiated."
@@ -341,11 +341,11 @@ msgstr ""
 "linjer) og begynner å flytte musa før starttiden er over, så vil en "
 "draoperasjon settes i gang."
 
-#: mouse.cpp:306
+#: mouse.cpp:289
 msgid "Drag start distance:"
 msgstr "Startavstand for draoperasjon:"
 
-#: mouse.cpp:314
+#: mouse.cpp:297
 msgid ""
 "If you click with the mouse and begin to move the mouse at least the drag "
 "start distance, a drag operation will be initiated."
@@ -353,11 +353,11 @@ msgstr ""
 "Hvis du klikker med musepekeren og drar musa mer enn startavstanden, settes "
 "en draoperasjon i gang."
 
-#: mouse.cpp:320
+#: mouse.cpp:303
 msgid "Mouse wheel scrolls by:"
 msgstr "Musehjulet ruller med:"
 
-#: mouse.cpp:328
+#: mouse.cpp:311
 msgid ""
 "If you use the wheel of a mouse, this value determines the number of lines "
 "to scroll for each wheel movement. Note that if this number exceeds the "
@@ -369,47 +369,47 @@ msgstr ""
 "dette tallet er større enn antall synlige linjer, så blir teksten i stedet "
 "bare flyttet en side fram eller tilbake."
 
-#: mouse.cpp:334
+#: mouse.cpp:317
 msgid "Mouse Navigation"
 msgstr "Musenavigering"
 
-#: mouse.cpp:342
+#: mouse.cpp:325
 msgid "&Move pointer with keyboard (using the num pad)"
 msgstr "Flytt &musepekeren med det numeriske tastaturet"
 
-#: mouse.cpp:348
+#: mouse.cpp:331
 msgid "&Acceleration delay:"
 msgstr "&Akselerasjonsforsinkelse:"
 
-#: mouse.cpp:356
+#: mouse.cpp:339
 msgid "R&epeat interval:"
 msgstr "R&epetisjonsintervall:"
 
-#: mouse.cpp:364
+#: mouse.cpp:347
 msgid "Acceleration &time:"
 msgstr "Akselerasjons&tid:"
 
-#: mouse.cpp:372
+#: mouse.cpp:355
 msgid "Ma&ximum speed:"
 msgstr "&Høyeste fart:"
 
-#: mouse.cpp:374
+#: mouse.cpp:357
 msgid " pixel/sec"
 msgstr " piksler/sek"
 
-#: mouse.cpp:380
+#: mouse.cpp:363
 msgid "Acceleration &profile:"
 msgstr "Akselerasjons&profil:"
 
-#: mouse.cpp:453
+#: mouse.cpp:436
 msgid "Mouse"
 msgstr "Mus"
 
-#: mouse.cpp:454
+#: mouse.cpp:437
 msgid "(c) 1997 - 2005 Mouse developers"
 msgstr "© 1997–2005 Musutviklerne"
 
-#: mouse.cpp:786 mouse.cpp:791
+#: mouse.cpp:769 mouse.cpp:774
 msgid ""
 "_n:  pixel\n"
 " pixels"
@@ -417,7 +417,7 @@ msgstr ""
 "  piksel\n"
 " piksler"
 
-#: mouse.cpp:796
+#: mouse.cpp:779
 msgid ""
 "_n:  line\n"
 " lines"
@@ -533,10 +533,8 @@ msgid "Re&verse scroll direction"
 msgstr "Om&vendt rulleretning"
 
 #: kmousedlg.ui:138
-#, no-c-format
-msgid ""
-"Change the direction of scrolling for the mouse wheel or the 4th and 5th "
-"mouse buttons."
+#, fuzzy, no-c-format
+msgid "Change the direction of scrolling for the mouse wheel, if present."
 msgstr "Snu rulleretningen for musehjulet eller 4. og 5. museknapp."
 
 #: kmousedlg.ui:146
@@ -546,9 +544,7 @@ msgstr ""
 
 #: kmousedlg.ui:149
 #, fuzzy, no-c-format
-msgid ""
-"Swap the two history navigation buttons on the mouse (8th and 9th mouse "
-"button)."
+msgid "Swap the two history navigation buttons on the mouse, if present."
 msgstr "Snu rulleretningen for musehjulet eller 4. og 5. museknapp."
 
 #: kmousedlg.ui:157
@@ -647,3 +643,17 @@ msgstr "Kanal 1"
 #, no-c-format
 msgid "Channel 2"
 msgstr "Kanal 2"
+
+#~ msgid ""
+#~ "Change the direction of scrolling for the mouse wheel or the 4th and 5th "
+#~ "mouse buttons."
+#~ msgstr "Snu rulleretningen for musehjulet eller 4. og 5. museknapp."
+
+#, fuzzy
+#~| msgid ""
+#~| "Change the direction of scrolling for the mouse wheel or the 4th and 5th "
+#~| "mouse buttons."
+#~ msgid ""
+#~ "Swap the two history navigation buttons on the mouse (8th and 9th mouse "
+#~ "button)."
+#~ msgstr "Snu rulleretningen for musehjulet eller 4. og 5. museknapp."