[Xfce4-commits] <xfce4-notes-plugin:master> make update-po

Mike Massonnet noreply at xfce.org
Wed Dec 23 18:42:02 CET 2009


Updating branch refs/heads/master
         to 9177ba4b04fbcfc8c376f297bc404d9cbf9a12da (commit)
       from aaa8ec4375da9972edc01004a9f5bce7a4b1f122 (commit)

commit 9177ba4b04fbcfc8c376f297bc404d9cbf9a12da
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Wed Dec 23 18:30:14 2009 +0100

    make update-po

 po/POTFILES.in            |   31 +++++----
 po/POTFILES.skip          |   13 ++--
 po/ar.po                  |  127 ++++++++++++++++++------------------
 po/ast.po                 |  127 ++++++++++++++++++------------------
 po/ca.po                  |  158 ++++++++++++++++++++++++---------------------
 po/cs.po                  |  127 ++++++++++++++++++------------------
 po/da.po                  |  152 ++++++++++++++++++++++---------------------
 po/de.po                  |  127 ++++++++++++++++++------------------
 po/el.po                  |  127 ++++++++++++++++++------------------
 po/en_GB.po               |  127 ++++++++++++++++++------------------
 po/es.po                  |  154 +++++++++++++++++++++++---------------------
 po/eu.po                  |  128 ++++++++++++++++++-------------------
 po/fi.po                  |  127 ++++++++++++++++++------------------
 po/fr.po                  |  127 ++++++++++++++++++------------------
 po/gl.po                  |  152 ++++++++++++++++++++++---------------------
 po/hu.po                  |  127 ++++++++++++++++++------------------
 po/id.po                  |  127 ++++++++++++++++++------------------
 po/it.po                  |  127 ++++++++++++++++++------------------
 po/ja.po                  |  127 ++++++++++++++++++------------------
 po/kk.po                  |  127 ++++++++++++++++++------------------
 po/lv.po                  |  127 ++++++++++++++++++------------------
 po/nb.po                  |  127 ++++++++++++++++++------------------
 po/nl.po                  |  153 +++++++++++++++++++++++---------------------
 po/pl.po                  |  127 ++++++++++++++++++------------------
 po/pt.po                  |  157 ++++++++++++++++++++++++---------------------
 po/pt_BR.po               |  127 ++++++++++++++++++------------------
 po/ro.po                  |  127 ++++++++++++++++++------------------
 po/ru.po                  |  127 ++++++++++++++++++------------------
 po/sk.po                  |  127 ++++++++++++++++++------------------
 po/sq.po                  |  127 ++++++++++++++++++------------------
 po/sv.po                  |  151 ++++++++++++++++++++++---------------------
 po/tr.po                  |  127 ++++++++++++++++++------------------
 po/uk.po                  |  127 ++++++++++++++++++------------------
 po/ur.po                  |  127 ++++++++++++++++++------------------
 po/ur_PK.po               |  127 ++++++++++++++++++------------------
 po/vi.po                  |  127 ++++++++++++++++++------------------
 po/xfce4-notes-plugin.pot |  127 ++++++++++++++++++------------------
 po/zh_CN.po               |  127 ++++++++++++++++++------------------
 po/zh_TW.po               |  127 ++++++++++++++++++------------------
 39 files changed, 2449 insertions(+), 2483 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index b1a5022..f114917 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,15 +1,16 @@
-xfce4-notes.desktop.in
-panel-plugin/xfce4-notes-autostart.desktop.in
-panel-plugin/xfce4-notes-plugin.desktop.in.in
-panel-plugin/xfce4-notes-plugin-47.desktop.in.in
-panel-plugin/color.c
-panel-plugin/popup.c
-panel-plugin/xfce-autostart.c
-panel-plugin/main-panel-plugin.vala
-panel-plugin/main-status-icon.vala
-panel-plugin/application.vala
-panel-plugin/window.vala
-panel-plugin/note.vala
-panel-plugin/hypertextview.vala
-panel-plugin/xfce4-popup-notes.c
-panel-plugin/xfce4-notes-settings.c
+src/xfce4-notes.desktop.in
+src/xfce4-notes-autostart.desktop.in
+src/xfce4-notes-plugin.desktop.in.in
+src/xfce4-notes-plugin-47.desktop.in
+lib/color.c
+lib/popup.c
+lib/application.vala
+lib/window.vala
+lib/note.vala
+lib/hypertextview.vala
+src/xfce4-popup-notes.c
+src/xfce4-notes-settings.c
+src/main-panel-plugin-47.vala
+src/main-panel-plugin.vala
+src/xfce-autostart.c
+src/main-status-icon.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 2e0bdfd..b15aa76 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,7 @@
-panel-plugin/main-panel-plugin.c
-panel-plugin/main-status-icon.c
-panel-plugin/application.c
-panel-plugin/window.c
-panel-plugin/note.c
-panel-plugin/hypertextview.c
+lib/application.c
+lib/window.c
+lib/note.c
+lib/hypertextview.c
+src/main-panel-plugin-47.c
+src/main-panel-plugin.c
+src/main-status-icon.c
diff --git a/po/ar.po b/po/ar.po
index 68d3a0c..3263a20 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2008-07-15 22:05+0200\n"
 "Last-Translator: Mohamed Magdy <mohamedmk at gmail.com>\n"
 "Language-Team: Arabeyes <doc at arabeyes.org>\n"
@@ -11,212 +11,209 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Arabic\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr ""
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr ""
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr ""
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr ""
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr ""
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr ""
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr ""
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr ""
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr ""
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr ""
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr ""
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr ""
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr ""
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr ""
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr ""
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr ""
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr ""
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr ""
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr ""
diff --git a/po/ast.po b/po/ast.po
index f25dd36..995756d 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-09-20 14:54+0200\n"
 "Last-Translator: Marcos Antonio Alvarez Costales <marcoscostales at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
@@ -16,214 +16,211 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Xenial pa les sos notes rápides"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notes"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Dir"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Notes %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Renomar grupu"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "El nome %s yá ta n'usu"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "¿Daveres quies desaniciar esti grupu?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "El nome \"%s\" nun ye válidu."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Los carauteres non válidos son: %s "
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Nun puede abrise'l diálogu de configuración"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Dir"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Renomar"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Siempres encima"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Ventana adhesiva"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Renomar grupu"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Desaniciar grupu"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Amestar un nuevu grupu"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "¿Daveres quies desaniciar esta nota?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Renomar nota"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Configurar el complementu"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Configuración global"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Anubrir notes de la barra de xeres"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Fondu:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Fonte:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Nuevu grupu de configuración"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Pegañosu"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Tamañu:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "Nota"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Pequeñu"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Grande"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Mariellu"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Azul"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Verde"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Índigo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Oliva"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Carmin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Blancu"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Personalizáu..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Color de fondu"
 
diff --git a/po/ca.po b/po/ca.po
index 1a8717b..97cff33 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin 1.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-12-02 09:46+0100\n"
 "Last-Translator: Harald Servat <redcrash at gmail.com>\n"
 "Language-Team: Catalan\n"
@@ -21,276 +21,288 @@ msgstr ""
 "X-Poedit-Language: Catalan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ideal per notes ràpides"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98
-#: ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80
-#: ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945
-#: ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notes"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98
-#: ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Vés"
-
-#: ../panel-plugin/application.vala:102
-#: ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Notes %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Canvia el nom del grup"
 
-#: ../panel-plugin/application.vala:348
-#: ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "Ja s'està emprant el nom «%s»"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Voleu suprimir aquest grup?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "El nom «%s» no és vàlid."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "El caràcter no vàlid és: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "No s'ha pogut obrir la finestra de paràmetres"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 "Pau Ruŀlan Ferragut <paurullan at bulma.net>, 2006.\n"
 "Carles Muñoz Gorriz <carlesmu at internautas.org>, 2008-2009.\n"
 "Harald Servat <redcrash at gmail.com>, 2009."
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Vés"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Canvia el nom"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731
-#: ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Sempre en primer pla"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Finestra enganxosa"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Canvia el nom del grup"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Suprimeix un grup"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Afegeix un grup"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Voleu suprimir aquesta nota?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Canvia el nom de la nota"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Configura el connector"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Paràmetres globals"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "No mostris les notes a la barra de tasques"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Mostra la barra de navegació automàtica"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Posició de les pestanyes:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Fons:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Tipus de lletra:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Paràmetres del nou grup"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Enganxosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Mida:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Cap"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "A dalt"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "A la dreta"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "A baix"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "A l'esquerra"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Petita"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Gran"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Groc"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Blau"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Verd"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Indi"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Oliva"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Carmí"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Blanc"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Personalitzat…"
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Color de fons"
 
 #~ msgid "Show tabs in the notes"
 #~ msgstr "Mostra pestanyes a les notes"
+
 #~ msgid "Red"
 #~ msgstr "Vermell"
+
 #~ msgid "Purple"
 #~ msgstr "Porpra"
 
 #, fuzzy
 #~ msgid "Choose current note font"
 #~ msgstr "Trieu la font de la finestra"
+
 #~ msgid "Are you sure you want to delete this window?"
 #~ msgstr "Esteu segurs que voleu suprimir aquesta finestra?"
+
 #~ msgid "Window"
 #~ msgstr "Finestra"
+
 #~ msgid "_Options"
 #~ msgstr "_Opcions"
+
 #~ msgid "R_ename..."
 #~ msgstr "R_eanomena…"
+
 #~ msgid "Show tabs"
 #~ msgstr "Mostra les pestanyes"
+
 #~ msgid "Show on startup"
 #~ msgstr "Mostra al iniciar"
+
 #~ msgid "Always"
 #~ msgstr "Sempre"
+
 #~ msgid "Never"
 #~ msgstr "Mai"
+
 #~ msgid "Last state"
 #~ msgstr "Últim estat"
+
 #~ msgid "Rename window"
 #~ msgstr "Reanomena la finestra"
+
 #~ msgid "Error"
 #~ msgstr "Error"
+
 #~ msgid "Unable to rename window"
 #~ msgstr "No s'ha pogut reanomenar la finestra"
+
 #~ msgid "Unable to rename note"
 #~ msgstr "No s'ha pogut reanomenar la nota"
+
 #~ msgid "Hide arrow button"
 #~ msgstr "Amaga el botó de fletxa"
+
 #~ msgid "Notes plugin for the Xfce4 desktop"
 #~ msgstr "Connector de notes per l’escriptori Xfce4"
+
 #~ msgid "Resize grip"
 #~ msgstr "Redimensiona la barra"
+
 #~ msgid "Xfce 4 Notes Plugin"
 #~ msgstr "Connector de notes de Xfce 4"
+
 #~ msgid "Create new note"
 #~ msgstr "Crea una nota nova"
+
 #~ msgid "Delete this note"
 #~ msgstr "Suprimeix aquesta nota"
+
 #~ msgid "<b>Notes</b>"
 #~ msgstr "<b>Notes</b>"
+
 #~ msgid "Properties"
 #~ msgstr "Propietats"
-
diff --git a/po/cs.po b/po/cs.po
index 5429aaf..ac3933c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin 1.3.90.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-06-09 18:04+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -16,214 +16,211 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ideální pro rychlé poznámky"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Poznámky"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Přejít"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Poznámky %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Přejmenovat skupinu"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "Název %s se již používá"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Opravdu chcete smazat tuto skupinu?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "Název \"%s\" je neplatný."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Neplatné znaky: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Nelze otevřít dialogové okno s nastavením"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Přejít"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Vždy nahoře"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Přilepené okno"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Přejmenovat skupinu"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Smazat skupinu"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Přidat novou skupinu"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Opravdu chcete smazat tuto poznámku?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Přejmenovat poznámku"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Konfigurovat zásuvný modul"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Globální nastavení"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Skrýt poznámky z panelu úloh"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Pozadí"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Písmo:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Nastavení nové skupiny"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Přilepené"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Velikost:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "Poznámka"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Malé"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Běžné"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Velké"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Žluté"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Modré"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Zelené"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Bílé"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Vlastní..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Barva pozadí"
 
diff --git a/po/da.po b/po/da.po
index 2684570..5a52dca 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin 1.7.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-12-02 10:55+0100\n"
 "Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
@@ -18,71 +18,57 @@ msgstr ""
 "X-Poedit-Country: DENMARK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ideel til dine hurtignoter"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98
-#: ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80
-#: ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945
-#: ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Noter"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98
-#: ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Gå til"
-
-#: ../panel-plugin/application.vala:102
-#: ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Noter %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Omdøb gruppe"
 
-#: ../panel-plugin/application.vala:348
-#: ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "Navnet %s er allerede i brug"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Er du sikker på, at du vil slette denne gruppe?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "Navnet \"%s\" er ugyldigt."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Det ugyldige tegn er: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Kunne ikke åbne indstillingsvinduet"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 "Per Kongstad <p_kongstad at op.pl>\n"
@@ -90,193 +76,213 @@ msgstr ""
 "Dansk-gruppen <dansk at dansk-gruppen.dk>\n"
 "Mere info: http://www.dansk-gruppen.dk"
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Gå til"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Omdøb"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731
-#: ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Altid øverst"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Hold vindue permanent"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Omdøb gruppe"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Slet gruppe"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Tilføj en ny gruppe"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Er du sikker på, at du vil slette denne note?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Omdøb note"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Indstil udvidelsesmodulet"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Globale indstillinger"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Skjul noter på proceslinjen"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Vis den automatiske navigeringsbjælke"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Placering af faneblade:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Baggrund:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Skrifttype:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Nye gruppeindstillinger"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Klæbende"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Ingen"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Top"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Højre"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Bund"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Venstre"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Lille"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Stor"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Gul"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Blå"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Grøn"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Indigo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Olive"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Carmin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Hvid"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Tilpasset..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Baggrundsfarve"
 
 #~ msgid "Show tabs in the notes"
 #~ msgstr "Vis faneblade i noterne"
+
 #~ msgid "Red"
 #~ msgstr "Rød"
+
 #~ msgid "Purple"
 #~ msgstr "Lilla"
 
 #, fuzzy
 #~ msgid "Choose current note font"
 #~ msgstr "Vælg skrifttype for vinduet"
+
 #~ msgid "Are you sure you want to delete this window?"
 #~ msgstr "Er du sikker på, at du vil slette dette vindue?"
+
 #~ msgid "Window"
 #~ msgstr "Vindue"
+
 #~ msgid "_Options"
 #~ msgstr "_Indstillinger"
+
 #~ msgid "R_ename..."
 #~ msgstr "O_mdøb..."
+
 #~ msgid "Show tabs"
 #~ msgstr "Vis faneblade"
+
 #~ msgid "Show on startup"
 #~ msgstr "Vis ved opstart"
+
 #~ msgid "Always"
 #~ msgstr "Altid"
+
 #~ msgid "Never"
 #~ msgstr "Aldrig"
+
 #~ msgid "Last state"
 #~ msgstr "Sidste tilstand"
+
 #~ msgid "Rename window"
 #~ msgstr "Omdøb vindue"
+
 #~ msgid "Error"
 #~ msgstr "Fejl"
+
 #~ msgid "Unable to rename window"
 #~ msgstr "Kunne ikke omdøbe vindue"
+
 #~ msgid "Unable to rename note"
 #~ msgstr "Kunne ikke omdøbe notat"
+
 #~ msgid "Hide arrow button"
 #~ msgstr "Skjul pileknap"
+
 #~ msgid "Notes plugin for the Xfce4 desktop"
 #~ msgstr "Notat-udvidelsesmodul til Xfce4-skrivebordet"
-
diff --git a/po/de.po b/po/de.po
index 977a058..31aaabe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.3.99.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-06-11 19:34+0200\n"
 "Last-Translator: Fabian Nowak <timystery at arcor.de>\n"
 "Language-Team: German <xfce-i18n at xfce.org>\n"
@@ -20,214 +20,211 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Prima geeignet für kurze Notizen"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notizen"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Gehe zu"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Notizen %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Gruppe umbenennen"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "Der Name »%s« wird bereits verwendet"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Sind Sie sicher, dass Sie diese Gruppe löschen möchten?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "Der Name »%s« ist ungültig."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Die ungültigen Zeichen sind: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Der Einstellungsdialog kann nicht geöffnet werden"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Gehe zu"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Umbenennen"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Immer zuoberst"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Fenster anheften"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Gruppe umbenennen"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "G_ruppe löschen"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Neue Gruppe hinzufügen"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Sind Sie sicher, dass Sie diese Notiz löschen möchten?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Notiz umbenennen"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Erweiterung einrichten"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Globale Einstellungen"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Fenster aus der Taskleiste ausblenden"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Hintergrund:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Schrift:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Neue Gruppeneinstellungen"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Fenster anheften"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Größe:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "Notiz"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Klein"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Groß"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Gelb"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Blau"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Grün"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Weiß"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Benutzerdefiniert..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Hintergrundfarbe"
 
diff --git a/po/el.po b/po/el.po
index d3a8a26..b0c46cc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-09-20 14:55+0200\n"
 "Last-Translator: Evaggelos Balaskas <ebalaskas at ebalaskas.gr>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -19,214 +19,211 @@ msgstr ""
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ιδανικό για τις σημειώσεις σας"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Σημειώσεις"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Μετάβαση"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Σημειώσεις %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Μετονομασία ομάδας"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "Το όνομα %s χρησιμοποιείται ήδη"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την ομάδα;"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "Το όνομα \"%s\" είναι άκυρο."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Οι άκυροι χαρακτήρες είναι: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Αδυναμία ανοίγματος του διαλόγου ρυθμίσεων"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Μετάβαση"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "Μ_ετονομασία"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Πάντα στην κορυφή"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Επικόλληση παραθύρου"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "Μ_ετονομασία ομάδας"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Διαγραφή ομάδας"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Προσθήκη μίας νέας ομάδας"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Επιθυμείτε την διαγραφή της σημείωσης;"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Μετονομασία σημείωσης"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Ρύθμιση αρθρώματος"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Καθολικές ρυθμίσεις"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Απόκρυψη σημειώσεων από την λίστα εργασιών"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Παρασκήνιο:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Γραμματοσειρά:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Ρυθμίσεις νέας ομάδας"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Επικόλληση"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Μέγεθος:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "Σημειώσεις"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Μικρό"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Κανονικό"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Μεγάλο"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Μπεζ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Μπλέ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Πράσινο"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Μωβ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Λαδί"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Ροζ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Κίτρινο"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Άσπρο"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Προσαρμογή..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Χρώμα παρασκηνίου"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 272995d..19a3353 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-09-20 23:33+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
 "Language-Team: English/GB\n"
@@ -17,213 +17,210 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ideal for your quick notes"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notes"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Go"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Notes %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Rename group"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "The name %s is already in use"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Are you sure you want to delete this group?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "The name \"%s\" is invalid."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "The invalid characters are: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Unable to open the settings dialogue"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Go"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Rename"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Always on top"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Sticky window"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Rename group"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Delete group"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Add a new group"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Are you sure you want to delete this note?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Rename note"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Configure the plugin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Global settings"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Hide notes from taskbar"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Show the automatic navigation bar"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Tabs position:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Background:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Font:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "New group settings"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Sticky"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Size:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "None"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Top"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Right"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Bottom"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Left"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Small"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Large"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Yellow"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Blue"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Green"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Indigo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Olive"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Carmin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "White"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Custom..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Background Colour"
 
diff --git a/po/es.po b/po/es.po
index 3bb13de..a034c1c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-12-01 19:43-0300\n"
 "Last-Translator: elega <elega at elega.com.ar>\n"
 "Language-Team: Spanish <xfce-i18n at xfce.org>\n"
@@ -16,265 +16,273 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ideal para sus notas rápidas"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98
-#: ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80
-#: ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945
-#: ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notas"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98
-#: ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Ir"
-
-#: ../panel-plugin/application.vala:102
-#: ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Notas %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Renombrar grupo"
 
-#: ../panel-plugin/application.vala:348
-#: ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "El nombre %s ya está en uso"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "¿Está seguro de querer borrar éste grupo?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "El nombre \"%s\" no es válido."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Los caracteres no válidos son: %s "
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "No se puede abrir el diálogo de configuración"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr "Elega <elega at elega.com.ar>"
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Ir"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Renombrar"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731
-#: ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Siempre encima"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Ventana adhesiva"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Renombrar grupo"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Eliminar grupo"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Añadir un nuevo grupo"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "¿Está seguro de querer borrar ésta nota?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Renombrar nota"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Configurar el complemento"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Configuración global"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Ocultar notas de la barra de tareas"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Mostrar la barra de navegación automática"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Posici"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Fondo:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Tipo de letra:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Nuevo grupo de configuración"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Pegajoso"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Ninguno"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Arriba"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Derecha"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Abajo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Izquierda"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Pequeño"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Grande"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Amarillo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Azul"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Verde"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Indigo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Oliva"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Carmin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Blanco"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Personalizado..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Color de fondo"
 
 #~ msgid "Show tabs in the notes"
 #~ msgstr "Mostrar pestañas en las notas"
+
 #~ msgid "Red"
 #~ msgstr "Rojo"
+
 #~ msgid "Purple"
 #~ msgstr "Violeta"
 
 #, fuzzy
 #~ msgid "Choose current note font"
 #~ msgstr "Elegir tipo de letra de la ventana"
+
 #~ msgid "Are you sure you want to delete this window?"
 #~ msgstr "¿Está seguro de querer eliminar esta ventana?"
+
 #~ msgid "Window"
 #~ msgstr "Ventana"
+
 #~ msgid "_Options"
 #~ msgstr "_Opciones"
+
 #~ msgid "R_ename..."
 #~ msgstr "R_enombrar..."
+
 #~ msgid "Show tabs"
 #~ msgstr "Mostrar pestañas"
+
 #~ msgid "Show on startup"
 #~ msgstr "Mostrar al inicio"
+
 #~ msgid "Always"
 #~ msgstr "Siempre"
+
 #~ msgid "Never"
 #~ msgstr "Nunca"
+
 #~ msgid "Last state"
 #~ msgstr "Último estado"
+
 #~ msgid "Rename window"
 #~ msgstr "Renombrar ventana"
+
 #~ msgid "Error"
 #~ msgstr "Error"
+
 #~ msgid "Unable to rename window"
 #~ msgstr "Imposible renombrar ventana"
+
 #~ msgid "Unable to rename note"
 #~ msgstr "Imposible renombrar nota"
+
 #~ msgid "Hide arrow button"
 #~ msgstr "Ocultar botón flecha"
+
 #~ msgid "Notes plugin for the Xfce4 desktop"
 #~ msgstr "Complemento de notas para el escritorio Xfce4"
+
 #~ msgid "Resize grip"
 #~ msgstr "Pulsador de redimensionado"
+
 #~ msgid "Xfce 4 Notes Plugin"
 #~ msgstr "Complemento de notas de Xfce 4"
-
diff --git a/po/eu.po b/po/eu.po
index 0fca113..348da12 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-12-15 11:57+0100\n"
 "Last-Translator: Piarres Beobide <pi+debian at beobide.net>\n"
 "Language-Team: Basque <debian-l10n-basque at lists.debian.org>\n"
@@ -19,213 +19,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Zure ohar azkarrentzat erabilgarria"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Oharrak"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Joan"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "%d oharrak"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Berrizendatu taldea"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "%s izenda dagoneko erabilia dago"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Ziur zaude talde hau ezabatu nahi duzula?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "\"%s\" izena baliogabea da."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Karaktere baliogabeak: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Ezin da ezarpen leihoa ireki"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr "Piarres Beobide "
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Joan"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "Be_rrizendatu"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Beti goian"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Finkatu liehoa"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "Be_rrizendatu taldea"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Ezabatu taldea"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Gehitu talde bat"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Ziur zaude ohar hau ezabatu nahi duzula?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Berrizendatu oharra"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Konfiguratu plugina"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Ezarpen orokorrak"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Ezkutatu oharrak ataza-barratik"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Ikusi nabigazio barra automatikoa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Fitxa kokalekua:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Atzeko-planoa:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Letra-tipoa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Leiho berri ezarpenak"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Finkatu"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Tamaina:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Batez"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Goian"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Eskuinean"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Behean"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Ezkerrean"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Txikia"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normala"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Handia"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Horia"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Urdina"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Berdea"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Indigoa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Oliba berdea"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Karmina"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Zuria"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Pertsonalizatu..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Atzeko planoaren kolorea"
-
diff --git a/po/fi.po b/po/fi.po
index 6ca2a7a..a39e455 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-02-25 09:49+0200\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
 "Language-Team: Finnish\n"
@@ -18,223 +18,220 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr ""
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Muistiinpanot"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr ""
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, fuzzy, c-format
 msgid "Notes %d"
 msgstr "Muistiinpanot"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 #, fuzzy
 msgid "Rename group"
 msgstr "Nimeä muistiinpano uudelleen"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr ""
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 #, fuzzy
 msgid "Are you sure you want to delete this group?"
 msgstr "Haluatko varmasti poistaa tämän muistiinpanon?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr ""
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr ""
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 #, fuzzy
 msgid "Unable to open the settings dialog"
 msgstr "URL:ia ei voi avata: %s"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr ""
+
+#: ../lib/window.vala:717
 #, fuzzy
 msgid "_Rename"
 msgstr "_Nimeä uudelleen..."
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Aina päällimmäisenä"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Kaikilla työpöydillä"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 #, fuzzy
 msgid "_Rename group"
 msgstr "Nimeä muistiinpano uudelleen"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Haluatko varmasti poistaa tämän muistiinpanon?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Nimeä muistiinpano uudelleen"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Muokkaa liitännäisen asetuksia"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 #, fuzzy
 msgid "Global settings"
 msgstr "Oletusasetukset"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 #, fuzzy
 msgid "Hide notes from taskbar"
 msgstr "Piilota ikkunat tehtäväpalkista"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Taustaväri:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Kirjasin:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 #, fuzzy
 msgid "New group settings"
 msgstr "Uuden ikkunan asetukset"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 #, fuzzy
 msgid "Sticky"
 msgstr "Kaikilla työpöydillä"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Koko:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "Muistiinpano"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Pieni"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Suuri"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Keltainen"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Sininen"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Vihreä"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Valkoinen"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Mukautettu..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Taustaväri"
 
diff --git a/po/fr.po b/po/fr.po
index 8472963..dc7f7a1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.3.99.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-12-01 23:14+0100\n"
 "Last-Translator: Mike Massonnet <mmassonnet at gmail.com>\n"
 "Language-Team: French <xfce-i18n at xfce.org>\n"
@@ -17,215 +17,212 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Idéal pour vos petites notes"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notes"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Aller"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Notes %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Renommer le groupe"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "Le nom %s est déjà utilisé"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Êtes-vous certain(e) de vouloir supprimer ce groupe ?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "Le nom « %s » est invalide."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Les caractères invalides sont : %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Impossible d'ouvrir le dialogue des paramètres."
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 "Mike Massonnet\n"
 "Maximilian Schleiss"
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Aller"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Renommer"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Toujours en dessus"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Coller sur tous les bureaux"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Renommer le groupe"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Supprimer le groupe"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Ajouter un nouveau groupe"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Êtes-vous certain(e) de vouloir supprimer cette note ?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Renommer la note"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Configurer le greffon"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Paramètres globaux"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Cacher les notes de la barre des tâches"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Afficher la barre de navigation automatique"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Position des onglets :"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Arrière-plan :"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Police :"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Paramètres d'un nouveau groupe"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Toujours sur l'espace de travail courant"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Taille :"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Aucun"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Haut"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Droite"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Bas"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Gauche"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Petite"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normale"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Grande"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Jaune"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Bleu"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Vert"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Indigo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Olive"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Carmin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Blanc"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Personnalisée..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Couleur d'arrière plan"
 
diff --git a/po/gl.po b/po/gl.po
index d2e6650..f0e9395 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-12-18 15:37+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -20,262 +20,268 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ideal para notas rápidas"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98
-#: ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80
-#: ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945
-#: ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notas "
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98
-#: ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Ir"
-
-#: ../panel-plugin/application.vala:102
-#: ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Notas %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Renomear o grupo"
 
-#: ../panel-plugin/application.vala:348
-#: ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "O nome %s xa está sendo utilizado"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Está seguro de que desexa eliminar este grupo?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "O nome \"%s\" non é válido."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Os caracteres incorrectos son: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Non foi posible abrir o diálogo de configuración"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 "Leandro Regueiro <leandro.regueiro at gmail.com>, 2009\n"
 "\n"
 "Proxecto Trasno http://trasno.net"
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Ir"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731
-#: ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Sempre enriba"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Ventá persistente"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Renomear grupo"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Eliminar grupo"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "Enga_dir un novo grupo"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Está seguro de que desexa eliminar esta nota?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Renomear nota"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Configurar o engadido"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Configuración global"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Agochar as notas dende a barra de ferramentas"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Mostrar a barra de navegación automática"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Posición das lapelas:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Fondo:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Tipo de letra:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Configuración de novo grupo"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Persistente"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Ningún"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Arriba"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Dereita"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Fondo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Pequeno"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Grande"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Azul"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Verde"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Índigo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Oliva"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Carmín"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Branco"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Personalizado..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Cor de fondo"
 
 #~ msgid "Red"
 #~ msgstr "Vermello"
+
 #~ msgid "Purple"
 #~ msgstr "Púrpura"
 
 #, fuzzy
 #~ msgid "Choose current note font"
 #~ msgstr "Escoller o tipo de letra da ventá"
+
 #~ msgid "Are you sure you want to delete this window?"
 #~ msgstr "Está seguro de que desexa eliminar esta ventá?"
+
 #~ msgid "Window"
 #~ msgstr "Ventá"
+
 #~ msgid "_Options"
 #~ msgstr "_Opcións"
+
 #~ msgid "R_ename..."
 #~ msgstr "R_enomear..."
+
 #~ msgid "Show tabs"
 #~ msgstr "Mostrar as lingüetas"
+
 #~ msgid "Show on startup"
 #~ msgstr "Mostrar ó iniciar"
+
 #~ msgid "Always"
 #~ msgstr "Sempre"
+
 #~ msgid "Never"
 #~ msgstr "Nunca"
+
 #~ msgid "Last state"
 #~ msgstr "Último estado"
+
 #~ msgid "Rename window"
 #~ msgstr "Renomear ventá"
+
 #~ msgid "Error"
 #~ msgstr "Erro"
+
 #~ msgid "Unable to rename window"
 #~ msgstr "Non foi posible renomear a ventá"
+
 #~ msgid "Unable to rename note"
 #~ msgstr "Non foi posible renomear a nota"
+
 #~ msgid "Hide arrow button"
 #~ msgstr "Agochar o botón de frecha"
+
 #~ msgid "Notes plugin for the Xfce4 desktop"
 #~ msgstr "Engadido de notas para o escritorio Xfce4"
 
@@ -283,6 +289,6 @@ msgstr "Cor de fondo"
 #, fuzzy
 #~ msgid "Resize grip"
 #~ msgstr "Redimensionar imaxe"
+
 #~ msgid "Xfce 4 Notes Plugin"
 #~ msgstr "Plugin de notas de Xfce 4"
-
diff --git a/po/hu.po b/po/hu.po
index fc16a47..02032af 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-09-23 23:26+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
@@ -18,212 +18,209 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ideális gyors jegyzeteléshez"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Jegyzetek"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Ugrás"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "%d. jegyzet"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Csoport átnevezése"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "A név (%s) már használatban van"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Biztos, hogy törli ezt a csoportot?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "A név („%s”) érvénytelen."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Az érvénytelen karakterek: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "A beállítások ablak nem nyitható meg"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Ugrás"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "Á_tnevezés"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Mindig felül"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Mindig látható ablak"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Csoport átnevezése"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "Csoport _törlése"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "Új csoport _hozzáadása"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Biztos, hogy törli ezt a jegyzetet?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Jegyzet átnevezése"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Bővítmény beállítása"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Általános beállítások"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Jegyzetek elrejtése a feladatsávról"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Automatikus navigációs sáv megjelenítése"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Tabok helye:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Háttér:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Betűkészlet:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Új csoport beállításai"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Mindig látható"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Méret:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Nincs"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Fent"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Jobbra"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Lent"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Balra"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Kicsi"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normál"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Nagy"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Sárga"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Kék"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Zöld"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Indigó"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Olívazöld"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Kármin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimóza"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Fehér"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Egyéni…"
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Háttérszín"
diff --git a/po/id.po b/po/id.po
index 7cf8130..8e7876f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin 1.3.99.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-09-20 14:55+0200\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@ -16,214 +16,211 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ideal untuk catatan cepat anda"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Catatan"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Ke"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Catatan %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Ganti nama grup"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "Nama %s telah digunakan"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Anda yakin ingin menghapus grup ini?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "Nama \"%s\" tidak sah."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Karakter tidak sah adalah: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Tak dapat membuka dialog pengaturan"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Ke"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Ganti Nama"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Selalu di atas"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Jendela lekat"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Ganti nama grup"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Hapus grup"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Tambah grup baru"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Anda yakin ingin menghapus catatan ini?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Ganti nama catatan"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Atur plugin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Pengaturan global"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Sembunyikan catatan dari batang tugas"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Latar belakang:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Fonta:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Pengaturan grup baru"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Lekat"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Ukuran:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "Catatan"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Kecil"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Besar"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Kuning"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Biru"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Hijau"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Ungu Lembayung"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Hijau Kekuningan"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Carmin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Putih"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Suai..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Warna Latar Belakang"
 
diff --git a/po/it.po b/po/it.po
index 454389d..446c858 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-12-08 12:01+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta at gmail.com>\n"
 "Language-Team: Italian <xfce-it-translators at googlegroups.com>\n"
@@ -16,213 +16,210 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ideale per le proprie annotazioni"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Note"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Vai"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Note %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Rinomina gruppo"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "Il nome %s è già in uso"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Cancellare davvero questo gruppo?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "Il nome %s non è valido."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "I caratteri non validi sono: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Impossibile aprire la finestra delle impostazioni"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr "Cristian Marchi <cri.penta at gmail.com>, 2009"
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Vai"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Rinomina"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Sempre in primo piano"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Finestra appiccicosa"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Rinomina gruppo"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Cancella gruppo"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Aggiungi un nuovo gruppo"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Eliminare davvero questa nota?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Rinomina questa nota"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Confugurazione del plugin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Impostazioni globali"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Nascondi le note dalla barra delle applicazioni"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Mostra la barra di navigazione automatica"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Posizione delle schede:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Sfondo:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Tipo di carattere:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Impostazioni per un nuovo gruppo"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Appiccicosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Dimensione:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Nessuna"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Alto"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Destra"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Basso"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Sinistra"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Piccolo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normale"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Grande"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Giallo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Blu"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Verde"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Indigo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Olive"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Carmin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Bianco"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Personalizzato"
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Colore di sfondo"
 
diff --git a/po/ja.po b/po/ja.po
index 3a942cc..ceab6d4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-02 22:58+0900\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-12-02 22:56+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: Japanese <xfce-i18n at xfce.org>\n"
@@ -16,217 +16,214 @@ msgstr ""
 "X-Poedit-Language: Japanese\n"
 "X-Poedit-Country: JAPAN\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "ちょっとしたメモに最適です"
 
 # Label for Add panel-items dialog, tip help of notes icon on panel, default group name and default note name.
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notes"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "移動(_G)"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Notes %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "グループ名の変更"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "名前 %s はすでに使われています"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "本当にこのグループを削除しますか?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "\"%s\" は不正な名前です。"
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "不正な文字です: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "設定ダイアログを表示できません"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 "Nobuhiro Iwamatsu\n"
 "Masato Hashimoto"
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "移動(_G)"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "名前の変更(_R)"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "常に最前面へ"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "スティッキーウィンドウ"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "グループ名の変更(_R)"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "グループの削除(_D)"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "新しいグループの追加(_A)"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "本当にこのメモを削除しますか?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "メモ名の変更"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "プラグインの設定"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "一般設定"
 
 # Exact name is 'task list', not 'task bar'.
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "タスクリストにウィンドウを表示しない"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "自動ナビゲーションバーを表示する"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "タブの位置:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "背景色:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "フォント:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "新しいグループの設定"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "スティッキー"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "サイズ:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "なし"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "上"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "右"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "下"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "左"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "小さい"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "普通"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "大きい"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "黄"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "青"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "緑"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "インディゴ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "オリーブ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "カーマイン"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "ミモザ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "白"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "カスタム..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "背景色"
 
diff --git a/po/kk.po b/po/kk.po
index f51c649..ae89539 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-09-20 20:50+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
@@ -16,212 +16,209 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Жылдам жазбаларыңыз үшін жарайды"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Жазбалар"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "Ө_ту"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Жазба %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Топтың атын ауыстыру"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "%s аты қазір қоланылып тұр"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Осы топты өшіруді шынымен қалайсыз ба?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "\"%s\" аты қате."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Дұрыс емес таңбалар: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Баптаулар терез сұзбатын ашу мүмкін емес"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "Ө_ту"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "Атын ауысты_ру"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Әрқашан үстінде"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Жабысқақ терезе"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "То_п атын ауыстыру"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "Т_опты өшіру"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "Ж_аңа топты қосу"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Бұл жазбаны өшіруді шынымен қалайсыз ба?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Жазба атын ауыстыру"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Плагинді баптау"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Жалпы баптаулар"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Жазбаларды есептер панелінен жасыру"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Автоматты навигация панелін көрсету"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Беттердің орналасуы:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Фон:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Қаріп:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Жаңа топтың баптаулары"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Жабысқақ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Өлшемі:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Жоқ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Жоғары"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Оң жақ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Төмен"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Сол жақ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Кішкентай"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Қалыпты"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Үлкен"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Сары"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Көк"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Жасыл"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Индиго"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Олив"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Кармин"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Мимоза"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Ақ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Таңдауыңызша..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Фон түсі"
diff --git a/po/lv.po b/po/lv.po
index 515fc34..122bdfb 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-09-20 18:16+0100\n"
 "Last-Translator: Rihards Prieditis <rprieditis at gmail.com>\n"
 "Language-Team: Latvian <translation-team-lv at lists.sourceforge.net>\n"
@@ -19,213 +19,210 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ideāls ātrām piezīmēm"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Piezīmes"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Aiziet"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Piezīmes %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Pārdēvēt grupu"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "Nosaukums %s jau tiek lietots"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Esat drošs, ka vēlaties dzēst šo grupu?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "Nosaukums \"%s\" ir nederīgs."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Nederīgās rakstzīmes ir: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Nevarēja atvērt uzstādījumu dialogu"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Aiziet"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Pārdēvēt"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Vienmēr priekšā"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Lipīgs logs"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Pārdēvēt grupu"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Dzēst grupu"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Pievienot jaunu grupu"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Esat drošs, ka vēlaties dzēst šo piezīmi?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Pārdēvēt piezīmi"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Konfigurēt spraudni"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Globālie uzstādījumi"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Slēpt piezīmes no uzdevumu joslas"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Rādīt automātisko navigācijas joslu"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Cilņu pozīcija:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Fons:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Fonts:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Jaunas grupas uzstādījumi"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Lipīgs"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Izmērs:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Nekas"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Augša"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Pa labi"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Apakša"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Pa kreisi"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Mazs"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Parasts"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Liels"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Dzeltens"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Zils"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Zaļš"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Indigo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Olīvzaļš"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Karmina"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Balts"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Pielāgots..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Fona krāsa"
 
diff --git a/po/nb.po b/po/nb.po
index 8b0c86d..3c3d2ff 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin 1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2007-07-01 23:28+0200\n"
 "Last-Translator: Christian Lomsdalen <christian at vindstille.net>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb at lister.ping.uio.no>\n"
@@ -17,220 +17,217 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr ""
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notater"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr ""
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, fuzzy, c-format
 msgid "Notes %d"
 msgstr "Notater"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 #, fuzzy
 msgid "Rename group"
 msgstr "Gi nytt navn til notatet"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr ""
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 #, fuzzy
 msgid "Are you sure you want to delete this group?"
 msgstr "Er du sikker på at du vil slette dette notatet?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr ""
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr ""
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 #, fuzzy
 msgid "Unable to open the settings dialog"
 msgstr "Kunne ikke gi nytt navn til vinduet"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr ""
+
+#: ../lib/window.vala:717
 #, fuzzy
 msgid "_Rename"
 msgstr "_Gi nytt navn..."
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Alltid øverst"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Fast vindu"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 #, fuzzy
 msgid "_Rename group"
 msgstr "Gi nytt navn til notatet"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Er du sikker på at du vil slette dette notatet?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Gi nytt navn til notatet"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr ""
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr ""
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr ""
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 #, fuzzy
 msgid "Sticky"
 msgstr "Fast vindu"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "Notat"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 95c4801..4482dfa 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-12-01 23:30+0100\n"
 "Last-Translator: Vincent Tunru <projects at vinnl.nl>\n"
 "Language-Team: Dutch <vertaling at vrijschrift.org>\n"
@@ -16,263 +16,270 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ideaal voor snelle notities"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98
-#: ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80
-#: ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945
-#: ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notities"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98
-#: ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Ga"
-
-#: ../panel-plugin/application.vala:102
-#: ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Notities %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Groepsnaam wijzigen"
 
-#: ../panel-plugin/application.vala:348
-#: ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "De naam %s is al in gebruik"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Weet u zeker dat u deze groep wilt verwijderen?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "De naam \"%s\" is ongeldig."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "De ongeldige tekens zijn: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Kon het configuratievenster niet openen"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr "Vincent Tunru"
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Ga"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "Naam _wijzigen"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731
-#: ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Altijd bovenop"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Plakkend venster"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "Groepsnaam _wijzigen"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "Group _verwijderen"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Nieuwe groep toevoegen"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Weet u zeker dat u deze notitie wilt verwijderen?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Notitienaam wijzigen"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Plugin configureren"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Globale instellingen"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Notities verbergen voor de taakbalk"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Automatische navigatiebalk weergeven"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Positie tabbladen:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Achtergrond:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Lettertype:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Nieuwe groepsinstellingen"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Plakkend venster"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Grootte:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Geen"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Boven"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Rechts"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Onder"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Links"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Klein"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normaal"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Groot"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Geel"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Blauw"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Groen"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Indigo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Olijfgroen"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Karmijnrood"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa-geel"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Wit"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Aangepast..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Achtergrondkleur"
 
 #~ msgid "Show tabs in the notes"
 #~ msgstr "Tabbladen bij notities weergeven"
+
 #~ msgid "Red"
 #~ msgstr "Rood"
+
 #~ msgid "Purple"
 #~ msgstr "Paars"
 
 #, fuzzy
 #~ msgid "Choose current note font"
 #~ msgstr "Kies vensterlettertype"
+
 #~ msgid "Are you sure you want to delete this window?"
 #~ msgstr "Weet u zeker dat u dit venster wilt verwijderen?"
+
 #~ msgid "Window"
 #~ msgstr "Venster"
+
 #~ msgid "_Options"
 #~ msgstr "_Opties"
+
 #~ msgid "R_ename..."
 #~ msgstr "Naam _wijzigen"
+
 #~ msgid "Show on startup"
 #~ msgstr "Notities altijd weergeven na het opstarten"
+
 #~ msgid "Always"
 #~ msgstr "Altijd"
+
 #~ msgid "Never"
 #~ msgstr "Nooit"
+
 #~ msgid "Last state"
 #~ msgstr "Laatste status"
+
 #~ msgid "Rename window"
 #~ msgstr "Vensternaam wijzigen"
+
 #~ msgid "Error"
 #~ msgstr "Fout"
+
 #~ msgid "Unable to rename window"
 #~ msgstr "Kon de naam van het venster niet wijzigen"
+
 #~ msgid "Unable to rename note"
 #~ msgstr "Kon de naam van de notitie niet wijzigen"
+
 #~ msgid "Hide arrow button"
 #~ msgstr "Pijlknop verbergen"
+
 #~ msgid "Notes plugin for the Xfce4 desktop"
 #~ msgstr "Notitie-plugin voor Xfce4"
+
 #~ msgid "Resize grip"
 #~ msgstr "Handvat voor venstergrootte"
+
 #~ msgid "Xfce 4 Notes Plugin"
 #~ msgstr "Xfce 4 notities plugin"
-
diff --git a/po/pl.po b/po/pl.po
index e43c8d5..e38b777 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-04-11 11:31+0100\n"
 "Last-Translator: Piotr Sokół <piotr.sokol at 10g.pl>\n"
 "Language-Team: Polish\n"
@@ -15,223 +15,220 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr ""
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notatki"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr ""
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, fuzzy, c-format
 msgid "Notes %d"
 msgstr "Notatki"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 #, fuzzy
 msgid "Rename group"
 msgstr "Zmień nazwę"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr ""
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 #, fuzzy
 msgid "Are you sure you want to delete this group?"
 msgstr "Usunąć notatkę?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr ""
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr ""
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 #, fuzzy
 msgid "Unable to open the settings dialog"
 msgstr "Nie można otworzyć adresu URL: %s"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr ""
+
+#: ../lib/window.vala:717
 #, fuzzy
 msgid "_Rename"
 msgstr "Zmień _nazwę..."
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Zawsze na wierzchu"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Na wszystkich obszarach roboczych"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 #, fuzzy
 msgid "_Rename group"
 msgstr "Zmień nazwę"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Usunąć notatkę?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Zmień nazwę"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Konfiguruje ustawienia apletu"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 #, fuzzy
 msgid "Global settings"
 msgstr "Domyślne"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 #, fuzzy
 msgid "Hide notes from taskbar"
 msgstr "Ukrycie okien na liście okien"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Kolor tła:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Czcionka:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 #, fuzzy
 msgid "New group settings"
 msgstr "Nowe okno"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 #, fuzzy
 msgid "Sticky"
 msgstr "Na wszystkich obszarach roboczych"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "Notatka"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Mały"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normalny"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Duży"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Żółty"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Niebieski"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Zielony"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Biały"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Własny..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Kolor tła"
 
diff --git a/po/pt.po b/po/pt.po
index 114ee30..45ac31a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-12-02 02:09+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -15,271 +15,282 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ideal para as suas notas rápidas"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98
-#: ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80
-#: ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945
-#: ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notas"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98
-#: ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Ir"
-
-#: ../panel-plugin/application.vala:102
-#: ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Notas %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Renomear grupo"
 
-#: ../panel-plugin/application.vala:348
-#: ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "O nome %s está em uso"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Tem a certeza que quer apagar este grupo?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "O nome \"%s\" é inválido."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Os caracteres inválidos são: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Incapaz de abrir o diálogo de definições"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr "Nuno Miguel"
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Ir"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731
-#: ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Sempre no topo"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Janela presa"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Renomear grupo"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "A_pagar grupo"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Adicionar um novo grupo"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Tem a certeza que quer apagar esta nota?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Renomear nota"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Configurar o plugin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Definições globais"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Ocultar notas da barra de tarefas"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Mostrar a barra de navegação automática"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Separadores:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Fundo:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Fonte:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Novo grupo de definições"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Prender"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Nenhum"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Topo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Direita"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Abaixo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Pequeno"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Grande"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Azul"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Verde"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Indigo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Oliva"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Carmim"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Branco"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Personalizar..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Cor de fundo"
 
 #~ msgid "Show tabs in the notes"
 #~ msgstr "Mostrar separadores nas notas"
+
 #~ msgid "Red"
 #~ msgstr "Vermelho"
+
 #~ msgid "Purple"
 #~ msgstr "Púrpura"
 
 #, fuzzy
 #~ msgid "Choose current note font"
 #~ msgstr "Escolher Fonte de Janela"
+
 #~ msgid "Are you sure you want to delete this window?"
 #~ msgstr "Tem a certeza que quer apagar esta janela?"
+
 #~ msgid "Window"
 #~ msgstr "Janela"
+
 #~ msgid "_Options"
 #~ msgstr "_Opções"
+
 #~ msgid "R_ename..."
 #~ msgstr "R_enomear..."
+
 #~ msgid "Show tabs"
 #~ msgstr "Mostrar separadores"
+
 #~ msgid "Show on startup"
 #~ msgstr "Mostrar no arranque"
+
 #~ msgid "Always"
 #~ msgstr "Sempre"
+
 #~ msgid "Never"
 #~ msgstr "Nunca"
+
 #~ msgid "Last state"
 #~ msgstr "Último estado"
+
 #~ msgid "Rename window"
 #~ msgstr "Renomear janela"
+
 #~ msgid "Error"
 #~ msgstr "Erro"
+
 #~ msgid "Unable to rename window"
 #~ msgstr "Incapaz de renomear janela"
+
 #~ msgid "Unable to rename note"
 #~ msgstr "Incapaz de renomear nota"
+
 #~ msgid "Hide arrow button"
 #~ msgstr "Ocultar botão seta"
+
 #~ msgid "Notes plugin for the Xfce4 desktop"
 #~ msgstr "Plugin de notas para o Xfce4 desktop"
+
 #~ msgid "Resize grip"
 #~ msgstr "Redimensionar grelha"
+
 #~ msgid "Xfce 4 Notes Plugin"
 #~ msgstr "Xfce 4 Notes Plugin"
+
 #~ msgid "Create new note"
 #~ msgstr "Criar nova nota"
+
 #~ msgid "Delete this note"
 #~ msgstr "Apagar esta nota"
+
 #~ msgid "<b>Notes</b>"
 #~ msgstr "<b>Notas</b>"
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bb52f0a..3087416 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2008-05-01 17:03-0500\n"
 "Last-Translator: Filipe Rosset <rosset.filipe at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldpldp-br at bazar2.conectiva.com.br>\n"
@@ -17,223 +17,220 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr ""
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notas"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr ""
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, fuzzy, c-format
 msgid "Notes %d"
 msgstr "Notas"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 #, fuzzy
 msgid "Rename group"
 msgstr "Renomear nota"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr ""
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 #, fuzzy
 msgid "Are you sure you want to delete this group?"
 msgstr "Você tem certeza que quer excluir esta nota?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr ""
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr ""
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 #, fuzzy
 msgid "Unable to open the settings dialog"
 msgstr "Não foi possível abrir o seguinte url: %s"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr ""
+
+#: ../lib/window.vala:717
 #, fuzzy
 msgid "_Rename"
 msgstr "_Renomear..."
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Sempre no topo"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Janela fixa"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 #, fuzzy
 msgid "_Rename group"
 msgstr "Renomear nota"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Você tem certeza que quer excluir esta nota?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Renomear nota"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Configure o plug-in"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 #, fuzzy
 msgid "Global settings"
 msgstr "Configuraões padrão"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 #, fuzzy
 msgid "Hide notes from taskbar"
 msgstr "Ocultar janelas da barra de tarefas"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Fundo:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Fonte:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 #, fuzzy
 msgid "New group settings"
 msgstr "Nova configuração de janela"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 #, fuzzy
 msgid "Sticky"
 msgstr "Janela fixa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "Nota"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Pequeno"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Grande"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Azul"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Verde"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Branco"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Personalizada..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Cor de fundo"
 
diff --git a/po/ro.po b/po/ro.po
index ac6d9d8..ab91863 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-09-20 14:55+0200\n"
 "Last-Translator: Igor Știrbu <igor.stirbu at gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -16,214 +16,211 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ideal pentru notițe rapide"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notițe"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Salt"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Notița %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Redenumire grup"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "Numele %s este deja folosit"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Sigur doriți să ștergeți acest grup?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "Numele „%s” nu este valid."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Caracterele nevalide sunt: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Nu s-a putut deschide dialogul cu opțiuni"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Salt"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Redenumire"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Tot timpul deasupra"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Fereastră lipită"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Redenumire grup"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "Șt_ergere grup"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Adăugare grup nou"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Sigur doriți să ștergeți notița?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Redenumire notă"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Opțiuni modul"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Opțiuni globale"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Nu arăta notițele în taskbar"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Fundal:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Font:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Opțiuni grup nou"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Lipicioase"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Dimensiune:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "Notiță"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Mică"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normală"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Mare"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Galben"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Albastru"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Verde"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Indigo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Măsliniu"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Carmin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Galben mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Alb"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Personalizat..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Culoare fundal"
 
diff --git a/po/ru.po b/po/ru.po
index 6b387d6..62450e7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Urmas <dwqwt3i02 at sneakemail.com>\n"
 "Language-Team: \n"
@@ -14,212 +14,209 @@ msgstr ""
 "Plural-Forms: n%10==1 && n%100!=11 ?0: n%10>=2 && n%10<=4 && (n%100<10 || n%"
 "100>=20)?1:2\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Средство создания текстовых заметок"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Заметки"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "П_ереход"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Заметка %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Переименование"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "Название «%s» уже используется"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Вы действительно хотите удалить данную группу?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "Недопустимое название: «%s»."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Недопустимые символы: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Не удалось открыть окно настроек"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "П_ереход"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "Пере_именовать"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Поверх всех окон"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Поверх рабочих столов"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "Пере_именовать группу"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Удалить группу"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "Со_здать группу"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Вы действительно хотите удалить эту заметку?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Переименование"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Настройка данного модуля"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Общие настройки"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Убрать окна с панели задач"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Показывать панель навигации"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Положение вкладок:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Фон:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Шрифт:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Свойства новых групп"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Поверх рабочих столов"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Размер:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Нет"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Сверху"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Справа"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Снизу"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Слева"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Мелкий"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Средний"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Крупный"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Желтый"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Голубой"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Зеленый"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Сиреневый"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Оливковый"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Бордовый"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Ярко-желтый"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Белый"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Другой..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Цвет фона"
diff --git a/po/sk.po b/po/sk.po
index 7ef30d6..a668a1c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin 1.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-11-05 16:48+0100\n"
 "Last-Translator: Robert Hartl <hartl.robert at gmail.com>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -14,212 +14,209 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ideálny pre rýchle poznámky"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Poznámky"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Prejsť"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Poznámky %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Premenovať skupinu"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "Názov %s sa už používa"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Naozaj chcete zmazať túto skupinu?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "Názov \"%s\" je neplatný."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Neplatné znaky: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Nedá sa otvoriť dialógové okno s nastavením"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Prejsť"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Premenovať"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Vždy navrchu"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Prilepené okno"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Premenovať skupinu"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Zmazať skupinu"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Pridať novú skupinu"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Naozaj chcete zmazať túto poznámku?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Premenovať poznámku"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Konfigurovať zásuvný modul"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Globálne nastavenia"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Skryť poznámky z panelu úloh"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Automaticky zobraziť navigačný panel"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Umiestnenie kariet:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Pozadie:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Písmo:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Nastavenia novej skupiny:"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Prilepené"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Veľkosť:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Žiadne"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Hore"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Vpravo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Dole"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Vľavo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Malé"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Bežné"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Veľké"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Žlté"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Modré"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Zelené"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Indigo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Olivové"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Karmínové"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Biele"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Vlastné..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Farba pozadia"
diff --git a/po/sq.po b/po/sq.po
index 2b1a559..7226345 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin 1.3.99.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2008-11-04 23:26+0200\n"
 "Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq at lists.sourceforge.net>\n"
@@ -16,225 +16,222 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr ""
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Shënime"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr ""
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, fuzzy, c-format
 msgid "Notes %d"
 msgstr "Shënime"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 #, fuzzy
 msgid "Rename group"
 msgstr "Riemërto shënimin"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr ""
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 #, fuzzy
 msgid "Are you sure you want to delete this group?"
 msgstr "Jeni i sigurt se doni të fshihet ky shënim?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr ""
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr ""
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 #, fuzzy
 msgid "Unable to open the settings dialog"
 msgstr "I pazoti të hapë url-në vijuese: %s"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr ""
+
+#: ../lib/window.vala:717
 #, fuzzy
 msgid "_Rename"
 msgstr "_Riemërto..."
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Përherë sipër"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Dritare ngjitëse"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 #, fuzzy
 msgid "_Rename group"
 msgstr "Riemërto shënimin"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Jeni i sigurt se doni të fshihet ky shënim?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Riemërto shënimin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 #, fuzzy
 msgid "Global settings"
 msgstr "Rregullime parazgjedhje"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 #, fuzzy
 msgid "Hide notes from taskbar"
 msgstr "Fshihi dritaret prej tërë shtyllës së veprimeve"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 #, fuzzy
 msgid "Font:"
 msgstr "Gërma"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 #, fuzzy
 msgid "New group settings"
 msgstr "Rregullime dritareje të re"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 #, fuzzy
 msgid "Sticky"
 msgstr "Dritare ngjitëse"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 #, fuzzy
 msgid "Size:"
 msgstr "Madhësi"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "Shënim"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index d64f82d..969bd6e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-12-16 17:52+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -15,71 +15,57 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Perfekt för dina snabba anteckningar"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98
-#: ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80
-#: ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945
-#: ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Anteckningar"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98
-#: ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Gå"
-
-#: ../panel-plugin/application.vala:102
-#: ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Anteckningar %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Byt namn på grupp"
 
-#: ../panel-plugin/application.vala:348
-#: ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "Namnet %s används redan"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Är du säker på att du vill ta bort denna grupp?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "Namnet \"%s\" är ogiltigt."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "De ogiltiga tecknen är: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Kunde inte öppna inställningsdialogen"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po at danielnylander.se>\n"
@@ -87,191 +73,210 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv at listor.tp-sv.se>."
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Gå"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_Byt namn"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731
-#: ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Alltid överst"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Klistrigt fönster"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "_Byt namn på grupp"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Ta bort grupp"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Lägg till en ny grupp"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Är du säker på att du vill ta bort denna anteckning?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Byt namn på anteckning"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Konfigurera insticksmodulen"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Allmänna inställningar"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Dölj anteckningar från verktygsrad"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Visa den automatiska navigeringsraden"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Position för flikar:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Bakgrund:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Typsnitt:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Inställningar för nya grupper"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Klistrigt"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Storlek:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Ingen"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Överkant"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Höger"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Nederkant"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Vänster"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Liten"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Stor"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Gul"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Blå"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Grön"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Indigo"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Oliv"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Carmine"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimosa"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Vit"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Anpassad..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Bakgrundsfärg"
 
 #~ msgid "Red"
 #~ msgstr "Röd"
+
 #~ msgid "Purple"
 #~ msgstr "Lila"
 
 #, fuzzy
 #~ msgid "Choose current note font"
 #~ msgstr "Välj fönstertypsnitt"
+
 #~ msgid "Are you sure you want to delete this window?"
 #~ msgstr "Är du säker på att du vill ta bort detta fönster?"
+
 #~ msgid "Window"
 #~ msgstr "Fönster"
+
 #~ msgid "_Options"
 #~ msgstr "A_lternativ"
+
 #~ msgid "R_ename..."
 #~ msgstr "Byt _namn..."
+
 #~ msgid "Show tabs"
 #~ msgstr "Visa flikar"
+
 #~ msgid "Show on startup"
 #~ msgstr "Visa vid uppstart"
+
 #~ msgid "Always"
 #~ msgstr "Alltid"
+
 #~ msgid "Never"
 #~ msgstr "Aldrig"
+
 #~ msgid "Last state"
 #~ msgstr "Senaste tillstånd"
+
 #~ msgid "Rename window"
 #~ msgstr "Byt namn på fönster"
+
 #~ msgid "Error"
 #~ msgstr "Fel"
+
 #~ msgid "Unable to rename window"
 #~ msgstr "Kunde inte byta namn på fönster"
+
 #~ msgid "Unable to rename note"
 #~ msgstr "Kunde inte byta namn på anteckning"
+
 #~ msgid "Hide arrow button"
 #~ msgstr "Dölj pilknapp"
+
 #~ msgid "Notes plugin for the Xfce4 desktop"
 #~ msgstr "Anteckningsinsticksmodul för Xfce4-skrivbordet"
-
diff --git a/po/tr.po b/po/tr.po
index 8ee0131..bbf84bb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-09-21 11:48+0200\n"
 "Last-Translator: Samed Beyribey <ras0ir at eventualis.org>\n"
 "Language-Team: Xfce-TR <xfce-tr at googlegroups.com>\n"
@@ -11,213 +11,210 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Country: TURKEY\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Hızlı not almak için idealdir"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Notlar"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Git"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Notlar %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Grubu yeniden adlandır"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "İsim %s zaten kullanımda"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Bu grubu silmek istediğinizden emin misiniz?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "Verilen isim \"%s\" geçersiz."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Geçersiz karakterler: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Yapılandırma menüsü açılamadı"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Git"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "Yeniden Adlandı_r"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Her zaman üstte"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Yapışkan pencere"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "G_rubu yeniden adlandır"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "Grubu _Sil"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Yeni grup ekle"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Bu notu silmek istediğinizden emin misiniz?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Notu yeniden adlandır"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Eklentiyi yapılandır"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Genel ayarlar"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Notları görev listesi menüsünde gösterme"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "Otomatik dolaşım çubuğunu göster"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "Sekme konumu:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Arkaplan:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Yazıtipi:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Yeni grup ayarları"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Yapışkan"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Boyut:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "Hiçbiri"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "Ğst"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "Sağ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "Alt"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "Sol"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Küçük"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Normal"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Büyük"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Sarı"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Mavi"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Yeşil"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "Çivit rengi"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "Zeytin rengi"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "Kızıl"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "Mimoza"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Beyaz"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Özel..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Arkaplan Rengi"
 
diff --git a/po/uk.po b/po/uk.po
index a13fc18..f6cd949 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-02-24 19:54+0200\n"
 "Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
 "Language-Team: Ukrainian <xfce4-dev at xfce.org>\n"
@@ -16,223 +16,220 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr ""
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "Записки"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr ""
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, fuzzy, c-format
 msgid "Notes %d"
 msgstr "Записки"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 #, fuzzy
 msgid "Rename group"
 msgstr "Перейменувати записку"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr ""
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 #, fuzzy
 msgid "Are you sure you want to delete this group?"
 msgstr "Ви впевнені, що бажаєте видалити записку?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr ""
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr ""
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 #, fuzzy
 msgid "Unable to open the settings dialog"
 msgstr "Неможливо відкрити наступне посилання: %s"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr ""
+
+#: ../lib/window.vala:717
 #, fuzzy
 msgid "_Rename"
 msgstr "_Перейменувати..."
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Завжди зверху"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Липуче вікно"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 #, fuzzy
 msgid "_Rename group"
 msgstr "Перейменувати записку"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Ви впевнені, що бажаєте видалити записку?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Перейменувати записку"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Налаштувати плагін"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 #, fuzzy
 msgid "Global settings"
 msgstr "Типові налаштування"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 #, fuzzy
 msgid "Hide notes from taskbar"
 msgstr "Ховати вікна від панелі задач"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Фон:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Шрифт:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 #, fuzzy
 msgid "New group settings"
 msgstr "Властивості нового вікна"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 #, fuzzy
 msgid "Sticky"
 msgstr "Липуче вікно"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Розмір:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "Записка"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Малий"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Звичайний"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Великий"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Жовтий"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Синій"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Зелений"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Білий"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Вибрати..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Колір фону"
 
diff --git a/po/ur.po b/po/ur.po
index 2c42ae7..ef539da 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-09-20 14:56+0200\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -19,214 +19,211 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "آپ کے فوری نوٹس کے لیے بہترین ہے"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "نوٹ"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_منتقل"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "نوٹ %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "گروپ کا نام بدلیں"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "نام %s پہلے ہی استعمال میں ہے"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "کیا آپ واقعی یہ گروپ حذف کرنا چاہتے ہیں؟"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "نام \"%s\" ناموزوں ہے."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "ناموزوں حرف ہے: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "ترتیبات ڈائیلاگ نہیں کھولا جاسکا"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_منتقل"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_نام بدلیں"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "ہمیشہ آگے"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "چسپاں ونڈو"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "گروپ کا نام _بدلیں"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "گروپ _حذف کریں"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "نیا گروپ _شامل کریں"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "کیا آپ واقعی یہ نوٹ حذف کرنا چاہتے ہیں؟"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "نوٹ کا نام بدلیں"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "پلک ان وضع کریں"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "عالمگیر ترتیبات"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "نوٹ ٹاسک بارے سے ہٹائیں"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "پس منظر:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "فونٹ:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "نیا گروپ ترتیبات"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "چسپاں"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "حجم:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "نوٹ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "چھوٹا"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "سادہ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "بڑا"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "پیلا"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "نیلا"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "سبز"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "نیلی"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "زیتونی"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "قرمزی"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "میموسا"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "سفید"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "صوابدیدی..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "پس منظر رنگ"
 
diff --git a/po/ur_PK.po b/po/ur_PK.po
index 2c42ae7..ef539da 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-09-20 14:56+0200\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -19,214 +19,211 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "آپ کے فوری نوٹس کے لیے بہترین ہے"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "نوٹ"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_منتقل"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "نوٹ %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "گروپ کا نام بدلیں"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "نام %s پہلے ہی استعمال میں ہے"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "کیا آپ واقعی یہ گروپ حذف کرنا چاہتے ہیں؟"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "نام \"%s\" ناموزوں ہے."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "ناموزوں حرف ہے: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "ترتیبات ڈائیلاگ نہیں کھولا جاسکا"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_منتقل"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "_نام بدلیں"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "ہمیشہ آگے"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "چسپاں ونڈو"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "گروپ کا نام _بدلیں"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "گروپ _حذف کریں"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "نیا گروپ _شامل کریں"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "کیا آپ واقعی یہ نوٹ حذف کرنا چاہتے ہیں؟"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "نوٹ کا نام بدلیں"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "پلک ان وضع کریں"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "عالمگیر ترتیبات"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "نوٹ ٹاسک بارے سے ہٹائیں"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "پس منظر:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "فونٹ:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "نیا گروپ ترتیبات"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "چسپاں"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "حجم:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "نوٹ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "چھوٹا"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "سادہ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "بڑا"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "پیلا"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "نیلا"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "سبز"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "نیلی"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "زیتونی"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "قرمزی"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "میموسا"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "سفید"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "صوابدیدی..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "پس منظر رنگ"
 
diff --git a/po/vi.po b/po/vi.po
index 0f5ff67..f97b2da 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: i 18n.xfce.org\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-06-15 13:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,213 +17,210 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "Ý tưởng cho chú thích nhanh của bạn"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr ""
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "_Đến"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "Ghi chú %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "Đổi tên nhóm"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "Tên %s đã được sử dụng rồi"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "Bạn chắc rằng muốn xoá nhóm này chứ?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "Tên \"%s\" không hợp lệ."
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "Kí tự không hợp lệ là: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "Không thể mở hộp thoại cài đặt"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "_Đến"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "Đổ_i tên"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "Luôn luôn hiển thị trên cùng"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "Ghim cửa sổ lại"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "Đổ_i tên nhóm"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "_Xoá nhóm"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "_Thêm nhóm mới"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "Bạn có chắc muốn xoá ghi chú này?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "Đổi tên ghi chú"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "Cấu hình plugin"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "Thiết lập toàn cục"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "Giấu chú thích khỏi thanh tác vụ"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "Nền:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "Font:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "Thiết lập cho nhóm mới"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "Ghim"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "Kích cỡ:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "Nhỏ"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "Trung bình"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "Lớn"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "Vàng"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "Xanh da trời"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "Xanh lá cây"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "Trắng"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "Tuỳ chỉnh"
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "Màu nền"
 
diff --git a/po/xfce4-notes-plugin.pot b/po/xfce4-notes-plugin.pot
index d7cea43..6c1d59e 100644
--- a/po/xfce4-notes-plugin.pot
+++ b/po/xfce4-notes-plugin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,212 +16,209 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr ""
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr ""
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr ""
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr ""
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr ""
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr ""
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr ""
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr ""
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr ""
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr ""
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr ""
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr ""
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr ""
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr ""
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr ""
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr ""
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr ""
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr ""
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d285a4d..2b556d6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2009-12-02 15:01+0800\n"
 "Last-Translator: Hunt Xu <huntxu at live.cn>\n"
 "Language-Team: Chinese (Simplified) <xfce-i18n at xfce.org>\n"
@@ -16,215 +16,212 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr "一个理想的快速便笺程序"
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "便笺"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr "转到(_G)"
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, c-format
 msgid "Notes %d"
 msgstr "便笺 %d"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 msgid "Rename group"
 msgstr "重命名组"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr "名称 %s 已被使用"
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 msgid "Are you sure you want to delete this group?"
 msgstr "您确定要删除该组?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr "名称“%s”无效。"
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr "无效字符是: %s"
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr "无法打开设置对话框"
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 "Hunt Xu <huntxu at live.cn>, 2009.\n"
 "Dig <Dig.Ge.CN at gmail.com>, 2009."
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr "转到(_G)"
+
+#: ../lib/window.vala:717
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "总是置顶"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 msgid "Sticky window"
 msgstr "粘住窗口"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 msgid "_Rename group"
 msgstr "重命名组(_R)"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr "删除组(_D)"
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr "添加一个组(_A)"
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "确定要删除该便笺?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 msgid "Rename note"
 msgstr "重命名便笺"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr "配置此插件"
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr "全局设置"
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr "从任务栏中隐藏"
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr "显示自动导航栏"
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr "标签位置:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr "背景:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr "字体:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr "新建设置组"
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 msgid "Sticky"
 msgstr "粘滞"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr "尺寸:"
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 msgid "None"
 msgstr "不显示"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr "在顶部"
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr "在右边"
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr "在底部"
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr "在左边"
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr "小"
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr "中等"
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr "大"
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr "黄色"
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr "蓝色"
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr "绿色"
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr "靛青色"
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr "橄榄色"
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr "胭脂色"
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr "淡黄色"
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr "白色"
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr "自定义..."
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr "背景颜色"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 43a7a11..de5317f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-notes-plugin 1.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:13+0100\n"
+"POT-Creation-Date: 2009-12-23 18:28+0100\n"
 "PO-Revision-Date: 2007-03-08 00:54+0800\n"
 "Last-Translator: Hydonsingore Cia <hydonsingore at educities.edu.tw>\n"
 "Language-Team: Tradictional Chinese <zh-l10n at linux.org.tw>\n"
@@ -17,221 +17,218 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../xfce4-notes.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:1
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:1
-#: ../panel-plugin/application.vala:527
+#: ../src/xfce4-notes.desktop.in.h:1
+#: ../src/xfce4-notes-autostart.desktop.in.h:1
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:1
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:1 ../lib/application.vala:539
 msgid "Ideal for your quick notes"
 msgstr ""
 
-#: ../xfce4-notes.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-autostart.desktop.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin.desktop.in.in.h:2
-#: ../panel-plugin/xfce4-notes-plugin-47.desktop.in.in.h:2
-#: ../panel-plugin/main-panel-plugin.vala:72
-#: ../panel-plugin/main-status-icon.vala:53
-#: ../panel-plugin/main-status-icon.vala:131
-#: ../panel-plugin/application.vala:98 ../panel-plugin/application.vala:525
-#: ../panel-plugin/window.vala:80 ../panel-plugin/window.vala:165
-#: ../panel-plugin/window.vala:945 ../panel-plugin/xfce4-notes-settings.c:91
+#: ../src/xfce4-notes.desktop.in.h:2
+#: ../src/xfce4-notes-autostart.desktop.in.h:2
+#: ../src/xfce4-notes-plugin.desktop.in.in.h:2
+#: ../src/xfce4-notes-plugin-47.desktop.in.h:2 ../lib/application.vala:110
+#: ../lib/application.vala:537 ../lib/window.vala:82 ../lib/window.vala:169
+#: ../lib/window.vala:951 ../src/xfce4-notes-settings.c:93
+#: ../src/main-panel-plugin-47.vala:46 ../src/main-panel-plugin.vala:45
+#: ../src/main-status-icon.vala:34 ../src/main-status-icon.vala:114
 msgid "Notes"
 msgstr "小筆記"
 
-#: ../panel-plugin/main-panel-plugin.vala:76
-#: ../panel-plugin/main-status-icon.vala:98 ../panel-plugin/window.vala:688
-msgid "_Go"
-msgstr ""
-
-#: ../panel-plugin/application.vala:102 ../panel-plugin/window.vala:948
+#: ../lib/application.vala:114 ../lib/window.vala:954
 #, fuzzy, c-format
 msgid "Notes %d"
 msgstr "小筆記"
 
-#: ../panel-plugin/application.vala:327
+#: ../lib/application.vala:339
 #, fuzzy
 msgid "Rename group"
 msgstr "更名"
 
-#: ../panel-plugin/application.vala:348 ../panel-plugin/window.vala:1069
+#: ../lib/application.vala:360 ../lib/window.vala:1075
 #, c-format
 msgid "The name %s is already in use"
 msgstr ""
 
-#: ../panel-plugin/application.vala:374
+#: ../lib/application.vala:386
 #, fuzzy
 msgid "Are you sure you want to delete this group?"
 msgstr "您確定要刪除這份筆記嗎?"
 
-#: ../panel-plugin/application.vala:431
+#: ../lib/application.vala:443
 #, c-format
 msgid "The name \"%s\" is invalid."
 msgstr ""
 
-#: ../panel-plugin/application.vala:432
+#: ../lib/application.vala:444
 #, c-format
 msgid "The invalid characters are: %s"
 msgstr ""
 
-#: ../panel-plugin/application.vala:489
+#: ../lib/application.vala:501
 msgid "Unable to open the settings dialog"
 msgstr ""
 
-#: ../panel-plugin/application.vala:534
+#: ../lib/application.vala:546
 msgid "translator-credits"
 msgstr ""
 
-#: ../panel-plugin/window.vala:711
+#: ../lib/window.vala:694 ../src/main-panel-plugin-47.vala:50
+#: ../src/main-panel-plugin.vala:49 ../src/main-status-icon.vala:53
+msgid "_Go"
+msgstr ""
+
+#: ../lib/window.vala:717
 #, fuzzy
 msgid "_Rename"
 msgstr "更名"
 
 #. Always on top
-#: ../panel-plugin/window.vala:731 ../panel-plugin/xfce4-notes-settings.c:174
+#: ../lib/window.vala:737 ../src/xfce4-notes-settings.c:176
 msgid "Always on top"
 msgstr "置於最上層"
 
-#: ../panel-plugin/window.vala:736
+#: ../lib/window.vala:742
 #, fuzzy
 msgid "Sticky window"
 msgstr "附黏模式"
 
-#: ../panel-plugin/window.vala:798
+#: ../lib/window.vala:804
 #, fuzzy
 msgid "_Rename group"
 msgstr "更名"
 
-#: ../panel-plugin/window.vala:805
+#: ../lib/window.vala:811
 msgid "_Delete group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:812
+#: ../lib/window.vala:818
 msgid "_Add a new group"
 msgstr ""
 
-#: ../panel-plugin/window.vala:1022
+#: ../lib/window.vala:1028
 msgid "Are you sure you want to delete this note?"
 msgstr "您確定要刪除這份筆記嗎?"
 
-#: ../panel-plugin/window.vala:1048
+#: ../lib/window.vala:1054
 #, fuzzy
 msgid "Rename note"
 msgstr "更名"
 
-#: ../panel-plugin/xfce4-notes-settings.c:95
+#: ../src/xfce4-notes-settings.c:97
 msgid "Configure the plugin"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:114
+#: ../src/xfce4-notes-settings.c:116
 msgid "Global settings"
 msgstr ""
 
 #. Hide from taskbar
-#: ../panel-plugin/xfce4-notes-settings.c:119
+#: ../src/xfce4-notes-settings.c:121
 msgid "Hide notes from taskbar"
 msgstr ""
 
 #. Show navigation bar
-#: ../panel-plugin/xfce4-notes-settings.c:126
+#: ../src/xfce4-notes-settings.c:128
 msgid "Show the automatic navigation bar"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:136
+#: ../src/xfce4-notes-settings.c:138
 msgid "Tabs position:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:146
+#: ../src/xfce4-notes-settings.c:148
 msgid "Background:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:159
+#: ../src/xfce4-notes-settings.c:161
 msgid "Font:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:169
+#: ../src/xfce4-notes-settings.c:171
 msgid "New group settings"
 msgstr ""
 
 #. Sticky window
-#: ../panel-plugin/xfce4-notes-settings.c:181
+#: ../src/xfce4-notes-settings.c:183
 #, fuzzy
 msgid "Sticky"
 msgstr "附黏模式"
 
-#: ../panel-plugin/xfce4-notes-settings.c:191
+#: ../src/xfce4-notes-settings.c:193
 msgid "Size:"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:209
+#: ../src/xfce4-notes-settings.c:211
 #, fuzzy
 msgid "None"
 msgstr "小筆記"
 
-#: ../panel-plugin/xfce4-notes-settings.c:210
+#: ../src/xfce4-notes-settings.c:212
 msgid "Top"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:211
+#: ../src/xfce4-notes-settings.c:213
 msgid "Right"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:212
+#: ../src/xfce4-notes-settings.c:214
 msgid "Bottom"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:213
+#: ../src/xfce4-notes-settings.c:215
 msgid "Left"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:229
+#: ../src/xfce4-notes-settings.c:231
 msgid "Small"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:230
+#: ../src/xfce4-notes-settings.c:232
 msgid "Normal"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:231
+#: ../src/xfce4-notes-settings.c:233
 msgid "Large"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:289
+#: ../src/xfce4-notes-settings.c:291
 msgid "Yellow"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:290
+#: ../src/xfce4-notes-settings.c:292
 msgid "Blue"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:291
+#: ../src/xfce4-notes-settings.c:293
 msgid "Green"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:292
+#: ../src/xfce4-notes-settings.c:294
 msgid "Indigo"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:293
+#: ../src/xfce4-notes-settings.c:295
 msgid "Olive"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:294
+#: ../src/xfce4-notes-settings.c:296
 msgid "Carmine"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:295
+#: ../src/xfce4-notes-settings.c:297
 msgid "Mimosa"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:296
+#: ../src/xfce4-notes-settings.c:298
 msgid "White"
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:297
+#: ../src/xfce4-notes-settings.c:299
 msgid "Custom..."
 msgstr ""
 
-#: ../panel-plugin/xfce4-notes-settings.c:394
+#: ../src/xfce4-notes-settings.c:411
 msgid "Background Color"
 msgstr ""
 



More information about the Xfce4-commits mailing list