Merge translation files from master branch.

4 files changed, 0 insertions, 16 deletions

diff --git a/tde-i18n-nn/messages/tdelibs/katepart.po b/tde-i18n-nn/messages/tdelibs/katepart.po
index 1788532c398..e5d2989e9c5 100644
--- a/tde-i18n-nn/messages/tdelibs/katepart.po
+++ b/tde-i18n-nn/messages/tdelibs/katepart.po
@@ -1691,9 +1691,6 @@ msgstr "document.insertText: Treng tre parametrar (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-nn/messages/tdelibs/tdeio.po b/tde-i18n-nn/messages/tdelibs/tdeio.po
index 20609dca9ed..8e20e9025b1 100644
--- a/tde-i18n-nn/messages/tdelibs/tdeio.po
+++ b/tde-i18n-nn/messages/tdelibs/tdeio.po
@@ -3701,11 +3701,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 "
@@ -5334,7 +5329,6 @@ msgstr "Fann ikkje programmet «unmount»"
 
 #: ../tdeioslave/file/file.cpp:1655
 #, fuzzy
-#| msgid "Unknown Error"
 msgid "Unknown unmount error."
 msgstr "Ukjend feil"
 
@@ -5815,7 +5809,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-nn/messages/tdelibs/tdelibs.po b/tde-i18n-nn/messages/tdelibs/tdelibs.po
index 9c4b24580dd..fa4b810db1b 100644
--- a/tde-i18n-nn/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-nn/messages/tdelibs/tdelibs.po
@@ -4341,7 +4341,6 @@ msgstr "Ta kontakt med systemadministratoren."
 
 #: tdecore/tdeglobalsettings.cpp:147
 #, fuzzy
-#| msgid "Desktop %1"
 msgid "Desktop"
 msgstr "Skrivebord %1"
 
@@ -4368,7 +4367,6 @@ msgstr "Malar"
 
 #: tdecore/tdeglobalsettings.cpp:203
 #, fuzzy
-#| msgid "Video"
 msgid "Videos"
 msgstr "Video"
 
@@ -5232,9 +5230,6 @@ msgstr ""
 
 #: tdecore/tdehw/tdestoragedevice.cpp:1055
 #, fuzzy
-#| msgid ""
-#| "Cannot create the file\n"
-#| "\""
 msgid "Cannot create temporary password file"
 msgstr ""
 "Kan ikkje laga fila\n"
diff --git a/tde-i18n-nn/messages/tdelibs/timezones.po b/tde-i18n-nn/messages/tdelibs/timezones.po
index d8e31cb94c2..9edbcf04c20 100644
--- a/tde-i18n-nn/messages/tdelibs/timezones.po
+++ b/tde-i18n-nn/messages/tdelibs/timezones.po
@@ -687,7 +687,6 @@ msgstr "Amerika/Nord-Dakota/Center"
 
 #: TIMEZONES:159
 #, fuzzy
-#| msgid "America/Jujuy"
 msgid "America/Nuuk"
 msgstr "Amerika/Jujuy"