Merge translation files from master branch.

4 files changed, 0 insertions, 16 deletions

diff --git a/tde-i18n-nb/messages/tdelibs/katepart.po b/tde-i18n-nb/messages/tdelibs/katepart.po
index ccc45b288e7..987accd79a6 100644
--- a/tde-i18n-nb/messages/tdelibs/katepart.po
+++ b/tde-i18n-nb/messages/tdelibs/katepart.po
@@ -1695,9 +1695,6 @@ msgstr "«document.insertText»: Trenger tre parametere (linje, kolonne, tekst)"
 
 #: part/kateluaindentscript.cpp:156
 #, fuzzy
-#| msgid ""
-#| "document.removeText:Three parameters needed (line,col,text) (number,"
-#| "number,string)"
 msgid ""
 "document.insertText:Three parameters needed (line,col,text) (number,number,"
 "string)"
diff --git a/tde-i18n-nb/messages/tdelibs/tdeio.po b/tde-i18n-nb/messages/tdelibs/tdeio.po
index bc4edf62cc3..b11b315d8da 100644
--- a/tde-i18n-nb/messages/tdelibs/tdeio.po
+++ b/tde-i18n-nb/messages/tdelibs/tdeio.po
@@ -3725,11 +3725,6 @@ msgstr ""
 
 #: tdeio/global.cpp:691
 #, fuzzy
-#| msgid ""
-#| "You may perform a search on the Internet for a TDE program (called a "
-#| "tdeioslave or ioslave) which supports this protocol. Places to search "
-#| "include <a href=\"http://kde-apps.org/\">http://kde-apps.org/</a> and <a "
-#| "href=\"http://freshmeat.net/\">http://freshmeat.net/</a>."
 msgid ""
 "You may perform a search on the Trinity website for a TDE program (called a "
 "tdeioslave, ioslave or tdeio) which supports this protocol. Places to search "
@@ -5360,7 +5355,6 @@ msgstr "Fant ikke programmet «umount»"
 
 #: ../tdeioslave/file/file.cpp:1655
 #, fuzzy
-#| msgid "Unknown Error"
 msgid "Unknown unmount error."
 msgstr "Ukjent feil"
 
@@ -5840,7 +5834,6 @@ msgstr ""
 
 #: ../tdeioslave/iso/tdeiso_info.cpp:50
 #, fuzzy
-#| msgid "TDE SSL Information"
 msgid "TDE ISO information utility"
 msgstr "TDE SSL-informasjon"
 
diff --git a/tde-i18n-nb/messages/tdelibs/tdelibs.po b/tde-i18n-nb/messages/tdelibs/tdelibs.po
index 85d0302fca7..4cd79eaee99 100644
--- a/tde-i18n-nb/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-nb/messages/tdelibs/tdelibs.po
@@ -4340,7 +4340,6 @@ msgstr "Kontakt systemadministratoren din."
 
 #: tdecore/tdeglobalsettings.cpp:147
 #, fuzzy
-#| msgid "Desktop %1"
 msgid "Desktop"
 msgstr "Skrivebord %1"
 
@@ -4367,7 +4366,6 @@ msgstr "Maler"
 
 #: tdecore/tdeglobalsettings.cpp:203
 #, fuzzy
-#| msgid "Video"
 msgid "Videos"
 msgstr "Video"
 
@@ -5231,9 +5229,6 @@ msgstr ""
 
 #: tdecore/tdehw/tdestoragedevice.cpp:1055
 #, fuzzy
-#| msgid ""
-#| "Cannot create the file\n"
-#| "\""
 msgid "Cannot create temporary password file"
 msgstr ""
 "Kan ikke lage fila\n"
diff --git a/tde-i18n-nb/messages/tdelibs/timezones.po b/tde-i18n-nb/messages/tdelibs/timezones.po
index edc6622b296..533d57a4df3 100644
--- a/tde-i18n-nb/messages/tdelibs/timezones.po
+++ b/tde-i18n-nb/messages/tdelibs/timezones.po
@@ -689,7 +689,6 @@ msgstr "Amerika/North_Dakota/Center"
 
 #: TIMEZONES:159
 #, fuzzy
-#| msgid "America/Jujuy"
 msgid "America/Nuuk"
 msgstr "Amerika/Jujuy"