Merge translation files from master branch.

1 files changed, 47 insertions, 37 deletions

diff --git a/tde-i18n-nn/messages/tdebase/kcminput.po b/tde-i18n-nn/messages/tdebase/kcminput.po
index 5573448e7d4..3a36a36c0c3 100644
--- a/tde-i18n-nn/messages/tdebase/kcminput.po
+++ b/tde-i18n-nn/messages/tdebase/kcminput.po
@@ -3,7 +3,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-06-22 17:28+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -230,19 +230,19 @@ msgstr ""
 msgid "Show feedback when clicking an icon"
 msgstr "Vis tilbakemelding når eit ikon vert valt"
 
-#: mouse.cpp:196
+#: mouse.cpp:179
 msgid "&Cursor Theme"
 msgstr "Pei&kartema"
 
-#: mouse.cpp:200
+#: mouse.cpp:183
 msgid "Advanced"
 msgstr "Avansert"
 
-#: mouse.cpp:206
+#: mouse.cpp:189
 msgid "Pointer acceleration:"
 msgstr "Peikarakselerasjon:"
 
-#: 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 "
@@ -259,11 +259,11 @@ msgstr ""
 "eit kort stykke. Ved svært høge verdiar kan musepeikaren verta vanskeleg å "
 "kontrollera."
 
-#: mouse.cpp:224
+#: mouse.cpp:207
 msgid "Pointer threshold:"
 msgstr "Peikarterskel:"
 
-#: 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 "
@@ -280,15 +280,15 @@ msgstr ""
 "avstandar. Dersom du flyttar lengre kan du raskt flytta peikaren til andre "
 "delar 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 "
@@ -299,11 +299,11 @@ msgstr ""
 "mellom to museklikk for at dei skal oppfattast som eit dobbeltklikk. Dersom "
 "det andre klikket skjer seinare vert klikka tolka som to separate klikk."
 
-#: 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-"
@@ -315,11 +315,11 @@ msgid ""
 "i> button before testing.</p>"
 msgstr ""
 
-#: mouse.cpp:293
+#: mouse.cpp:276
 msgid "Drag start time:"
 msgstr "Starttid for draoperasjonar:"
 
-#: 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."
@@ -327,11 +327,11 @@ msgstr ""
 "Dersom du klikkar med musa (t.d. i eit redigeringsvindauge) og flyttar musa "
 "innan starttida for draoperasjonar, vert ein draoperasjon sett 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."
@@ -339,11 +339,11 @@ msgstr ""
 "Dersom du klikkar med musa og flyttar peikaren lengre enn startavstanden, "
 "vert ein draoperasjon sett i gang."
 
-#: mouse.cpp:320
+#: mouse.cpp:303
 msgid "Mouse wheel scrolls by:"
 msgstr "Musehjul rullar 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 "
@@ -355,47 +355,47 @@ msgstr ""
 "talet er større enn talet på synlege linjer, vert teksten i staden berre "
 "flytta ei side fram/tilbake."
 
-#: mouse.cpp:334
+#: mouse.cpp:317
 msgid "Mouse Navigation"
 msgstr "Musnavigasjon"
 
-#: mouse.cpp:342
+#: mouse.cpp:325
 msgid "&Move pointer with keyboard (using the num pad)"
 msgstr "&Flytt musa med tastaturet (numerisk tastatur)"
 
-#: mouse.cpp:348
+#: mouse.cpp:331
 msgid "&Acceleration delay:"
 msgstr "Forseinking for &akselerasjon:"
 
-#: mouse.cpp:356
+#: mouse.cpp:339
 msgid "R&epeat interval:"
 msgstr "&Repetisjonsintervall:"
 
-#: mouse.cpp:364
+#: mouse.cpp:347
 msgid "Acceleration &time:"
 msgstr "Akselerasjons&tid:"
 
-#: mouse.cpp:372
+#: mouse.cpp:355
 msgid "Ma&ximum speed:"
 msgstr "&Høgste fart:"
 
-#: mouse.cpp:374
+#: mouse.cpp:357
 msgid " pixel/sec"
 msgstr " biletpunkt/s"
 
-#: 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"
@@ -403,7 +403,7 @@ msgstr ""
 " biletpunkt\n"
 " biletpunkt"
 
-#: mouse.cpp:796
+#: mouse.cpp:779
 msgid ""
 "_n:  line\n"
 " lines"
@@ -519,10 +519,8 @@ msgid "Re&verse scroll direction"
 msgstr "Om&vend rulling"
 
 #: 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 rulleretninga for musehjulet eller 4. og 5. museknapp."
 
 #: kmousedlg.ui:146
@@ -532,9 +530,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 rulleretninga for musehjulet eller 4. og 5. museknapp."
 
 #: kmousedlg.ui:157
@@ -633,3 +629,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 rulleretninga 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 rulleretninga for musehjulet eller 4. og 5. museknapp."