1 files changed, 65 insertions, 60 deletions

diff --git a/tde-i18n-nn/messages/tdepim/tdeabc_slox.po b/tde-i18n-nn/messages/tdepim/tdeabc_slox.po
index c9ce6793f58..15069199dfd 100644
--- a/tde-i18n-nn/messages/tdepim/tdeabc_slox.po
+++ b/tde-i18n-nn/messages/tdepim/tdeabc_slox.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc_slox\n"
-"POT-Creation-Date: 2006-05-17 04:02+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-04-13 18:05+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,63 +28,35 @@ msgid ""
 "Your emails"
 msgstr "korsvoll@skulelinux.no,gaute@verdsveven.com"
 
-#: tdeabcresourceslox.cpp:214
-msgid "Downloading contacts"
-msgstr "Lastar ned kontaktar"
-
-#: tdeabcresourceslox.cpp:523
-#, fuzzy
-msgid "Uploading contacts"
-msgstr "Lastar ned kontaktar"
-
-#: tdeabcresourcesloxconfig.cpp:47
-msgid "URL:"
-msgstr "URL:"
-
-#: tdeabcresourcesloxconfig.cpp:53 kcalresourcesloxconfig.cpp:56
-msgid "User:"
-msgstr "Brukar:"
-
-#: tdeabcresourcesloxconfig.cpp:59 kcalresourcesloxconfig.cpp:62
-msgid "Password:"
-msgstr "Passord:"
-
-#. i18n: file tderesources_tdeabc_slox.kcfg line 19
-#: tdeabcresourcesloxconfig.cpp:66 kcalresourcesloxconfig.cpp:69 rc.cpp:12
-#: rc.cpp:36
-#, no-c-format
-msgid "Only load data since last sync"
-msgstr "Berre last ned data etter førre synkronisering"
-
-#: tdeabcresourcesloxconfig.cpp:70
-msgid "Select Folder..."
+#: kcalresourceslox.cpp:74 tdeabcresourceslox.cpp:53
+msgid "OpenXchange Server"
 msgstr ""
 
-#: kcalresourceslox.cpp:178
+#: kcalresourceslox.cpp:180
 msgid "Non-http protocol: '%1'"
 msgstr "Ikkje-http protokoll: «%1»"
 
-#: kcalresourceslox.cpp:233
+#: kcalresourceslox.cpp:235
 msgid "Downloading events"
 msgstr "Lastar ned hendingar"
 
-#: kcalresourceslox.cpp:278
+#: kcalresourceslox.cpp:280
 msgid "Downloading to-dos"
 msgstr "Lastar ned oppgåvelister"
 
-#: kcalresourceslox.cpp:387
+#: kcalresourceslox.cpp:389
 msgid "Uploading incidence"
 msgstr "Lastar opp hendingar"
 
-#: kcalresourceslox.cpp:1226
+#: kcalresourceslox.cpp:1228
 msgid "Added"
 msgstr "Lagt til"
 
-#: kcalresourceslox.cpp:1227
+#: kcalresourceslox.cpp:1229
 msgid "Changed"
 msgstr "Endra"
 
-#: kcalresourceslox.cpp:1228
+#: kcalresourceslox.cpp:1230
 msgid "Deleted"
 msgstr "Sletta"
 
@@ -92,6 +65,21 @@ msgstr "Sletta"
 msgid "Download from:"
 msgstr "Nedlastings-URL:"
 
+#: kcalresourcesloxconfig.cpp:56 tdeabcresourcesloxconfig.cpp:53
+msgid "User:"
+msgstr "Brukar:"
+
+#: kcalresourcesloxconfig.cpp:62 tdeabcresourcesloxconfig.cpp:59
+msgid "Password:"
+msgstr "Passord:"
+
+#. i18n: file tderesources_kcal_slox.kcfg line 25
+#: kcalresourcesloxconfig.cpp:69 rc.cpp:18 rc.cpp:36
+#: tdeabcresourcesloxconfig.cpp:66
+#, no-c-format
+msgid "Only load data since last sync"
+msgstr "Berre last ned data etter førre synkronisering"
+
 #: kcalresourcesloxconfig.cpp:73
 msgid "Calendar Folder..."
 msgstr ""
@@ -100,60 +88,60 @@ msgstr ""
 msgid "Task Folder..."
 msgstr ""
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 10
-#: rc.cpp:3 rc.cpp:21
+#. i18n: file tderesources_kcal_slox.kcfg line 10
+#: rc.cpp:3 rc.cpp:27
 #, no-c-format
 msgid "Base Url"
 msgstr "Base Url"
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 13
-#: rc.cpp:6 rc.cpp:24
+#. i18n: file tderesources_kcal_slox.kcfg line 13
+#: rc.cpp:6 rc.cpp:30
 #, no-c-format
 msgid "User Name"
 msgstr "Brukarnamn"
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 16
-#: rc.cpp:9 rc.cpp:27
+#. i18n: file tderesources_kcal_slox.kcfg line 16
+#: rc.cpp:9 rc.cpp:33
 #, no-c-format
 msgid "Password"
 msgstr "Passord"
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 23
-#: rc.cpp:15 sloxfolderdialog.cpp:37
-#, no-c-format
-msgid "Folder ID"
-msgstr ""
-
-#. i18n: file tderesources_tdeabc_slox.kcfg line 27
-#: rc.cpp:18
-#, fuzzy, no-c-format
-msgid "Last Sync"
-msgstr "Siste hendingssynk"
-
 #. i18n: file tderesources_kcal_slox.kcfg line 19
-#: rc.cpp:30
+#: rc.cpp:12
 #, no-c-format
 msgid "Last Event Sync"
 msgstr "Siste hendingssynk"
 
 #. i18n: file tderesources_kcal_slox.kcfg line 22
-#: rc.cpp:33
+#: rc.cpp:15
 #, no-c-format
 msgid "Last To-do Sync"
 msgstr "Siste oppgåvelistesynk"
 
 #. i18n: file tderesources_kcal_slox.kcfg line 29
-#: rc.cpp:39
+#: rc.cpp:21
 #, no-c-format
 msgid "Calendar Folder"
 msgstr ""
 
 #. i18n: file tderesources_kcal_slox.kcfg line 33
-#: rc.cpp:42
+#: rc.cpp:24
 #, no-c-format
 msgid "Task Folder"
 msgstr ""
 
+#. i18n: file tderesources_tdeabc_slox.kcfg line 23
+#: rc.cpp:39 sloxfolderdialog.cpp:37
+#, no-c-format
+msgid "Folder ID"
+msgstr ""
+
+#. i18n: file tderesources_tdeabc_slox.kcfg line 27
+#: rc.cpp:42
+#, fuzzy, no-c-format
+msgid "Last Sync"
+msgstr "Siste hendingssynk"
+
 #: sloxfolder.cpp:45
 msgid "Global Addressbook"
 msgstr ""
@@ -185,3 +173,20 @@ msgstr ""
 #: sloxfoldermanager.cpp:167
 msgid "System Folder"
 msgstr ""
+
+#: tdeabcresourceslox.cpp:216
+msgid "Downloading contacts"
+msgstr "Lastar ned kontaktar"
+
+#: tdeabcresourceslox.cpp:529
+#, fuzzy
+msgid "Uploading contacts"
+msgstr "Lastar ned kontaktar"
+
+#: tdeabcresourcesloxconfig.cpp:47
+msgid "URL:"
+msgstr "URL:"
+
+#: tdeabcresourcesloxconfig.cpp:70
+msgid "Select Folder..."
+msgstr ""