[Xfce4-commits] <xfce4-settings:stephan/dialogs> Merge remote-tracking branch 'origin/master' into stephan/dialogs

Stephan Arts noreply at xfce.org
Tue Mar 27 19:47:14 CEST 2012


Updating branch refs/heads/stephan/dialogs
         to ed830a6f0a9f475324edc5658d341e70e87d3fc0 (commit)
       from 9b7c043370a162d9b82359bbc243f250fb72af78 (commit)

commit ed830a6f0a9f475324edc5658d341e70e87d3fc0
Merge: 9b7c043 d71f992
Author: Stephan Arts <stephan at xfce.org>
Date:   Tue Mar 27 19:44:22 2012 +0200

    Merge remote-tracking branch 'origin/master' into stephan/dialogs

commit d71f99285507853d37b5b2791b29f8d1523677d1
Author: Algimantas Margevičius <margevicius.algimantas at gmail.com>
Date:   Mon Mar 26 18:47:19 2012 +0200

    l10n: Updated Lithuanian (lt) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 2ed1bc33786ecfbef756a9f2581c367cb5f07476
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Mar 25 19:54:36 2012 +0200

    Properly round display refresh rate to find match.

commit 80d63c1050211973a2e38dc1afde2f170bd8197b
Author: Utku Berberoğlu <utku.berber at gmail.com>
Date:   Sun Mar 25 16:28:58 2012 +0200

    l10n: Updated Turkish (tr) translation to 72%
    
    New status: 238 messages complete with 86 fuzzies and 6 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 88a45b6378ffb35c4b6e7d4a4a619b33b4d4bc67
Author: kim Svensson <ks6g10 at soton.ac.uk>
Date:   Sat Mar 24 21:20:20 2012 +0100

    l10n: Updated Swedish (sv) translation to 86%
    
    New status: 284 messages complete with 37 fuzzies and 9 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 4161d0fde48091b1e7b12e65c68d9315ea0b9daf
Author: Andres Sanchez <afsanchez93 at gmail.com>
Date:   Wed Mar 14 17:55:09 2012 +0100

    l10n: Updated Spanish (Castilian) (es) translation to 96%
    
    New status: 320 messages complete with 4 fuzzies and 6 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit d02b7fd5fed65d7cbb6467b11f6323f8801a18ae
Author: Praveen Illa <mail2ipn at gmail.com>
Date:   Sun Mar 11 18:56:40 2012 +0100

    l10n: Updated Telugu (te) translation to 49%
    
    New status: 162 messages complete with 2 fuzzies and 166 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 973f613df07766080727d595f1b1897d47ad93a6
Author: Cheng-Chia Tseng <pswo10680 at gmail.com>
Date:   Sat Mar 10 10:55:07 2012 +0100

    l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit d41e80490d8e168cd66f8b58db38bd7bed948ec0
Author: Nuno Miguel <nunomgue at gmail.com>
Date:   Fri Mar 9 16:59:35 2012 +0100

    l10n: Updated Portuguese (pt) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 067090e8807a6f08f855e657dbdff0c879b9ad39
Author: Seong-ho Cho <darkcircle.0426 at gmail.com>
Date:   Thu Mar 8 22:55:27 2012 +0100

    l10n: Updated Korean (ko) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 53dfd091e902eaf320b1d9fe9a4b5a6d3b19e38f
Author: Seong-ho Cho <darkcircle.0426 at gmail.com>
Date:   Thu Mar 8 22:44:40 2012 +0100

    l10n: Updated Korean (ko) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 45cd91a44a80bc01417f3d378809557cfbbf4fba
Author: Seong-ho Cho <darkcircle.0426 at gmail.com>
Date:   Thu Mar 8 22:39:40 2012 +0100

    l10n: Updated Korean (ko) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit b63f378ae15ae406b5ad081d78b08fbb3f4738eb
Author: Seong-ho Cho <darkcircle.0426 at gmail.com>
Date:   Thu Mar 8 22:16:21 2012 +0100

    l10n: Updated Korean (ko) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 65c8cb9037b88b6715a2f810d7036d5837b9811a
Author: Seong-ho Cho <darkcircle.0426 at gmail.com>
Date:   Thu Mar 8 21:24:47 2012 +0100

    l10n: Updated Korean (ko) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit de0bfcc3d237b4daa082a6e92a851e012d6b5431
Author: Roger Pueyo Centelles <xfce at rogerpueyo.com>
Date:   Tue Mar 6 16:49:50 2012 +0100

    l10n: Updated Catalan (Valencian) (ca) translation to 97%
    
    New status: 322 messages complete with 3 fuzzies and 5 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit dcf6c4cab13a80157be8cedc837a2299932da361
Author: Roger Pueyo Centelles <xfce at rogerpueyo.com>
Date:   Tue Mar 6 16:48:39 2012 +0100

    l10n: Updated Catalan (Valencian) (ca) translation to 95%
    
    New status: 316 messages complete with 8 fuzzies and 6 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 2cf2692843a39f5b6a1f47792527f62eabbbb7ad
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Mar 3 20:29:16 2012 +0100

    Editor: Set sensitivity of save button on init.

commit 0c51b02d7f26125d46ea819aa17628ecefa254a3
Author: Seong-ho Cho <darkcircle.0426 at gmail.com>
Date:   Thu Mar 1 20:23:50 2012 +0100

    l10n: Updated Korean (ko) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 0009cb4c3cc7fc76f0716acdca027f1168e22041
Author: Seong-ho Cho <darkcircle.0426 at gmail.com>
Date:   Tue Feb 28 18:40:16 2012 +0100

    l10n: Updated Korean (ko) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 65b41b828a4998f95501527b7b2f57a45e4e3075
Author: Seong-ho Cho <darkcircle.0426 at gmail.com>
Date:   Tue Feb 28 12:35:07 2012 +0100

    l10n: Updated Korean (ko) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 9b1f5afd1522dfd261a1e9cd23a41881b64ec623
Author: Chipong Luo <chipong.luo at yahoo.com>
Date:   Mon Feb 27 15:36:54 2012 +0100

    l10n: Updated Chinese (China) (zh_CN) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit dbddd013a406bcdd5c0338002a2bbc703e613105
Author: Peter de Ridder <peter at xfce.org>
Date:   Sun Feb 26 20:50:09 2012 +0100

    Further implemented script.
    
    Added support for Gtk-3.0 and Icons themes.
    Support themes which don't have a theme name directory in there package.
    Added tar.xz file extension for packages.

commit e22d28f50106282dd193da95d879cf6012837b39
Author: Seong-ho Cho <darkcircle.0426 at gmail.com>
Date:   Sun Feb 26 06:57:25 2012 +0100

    l10n: Updated Korean (ko) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 0da29126e382138ebf5cfe72305fecb0ad6d2174
Author: كريم أولاد الشلحة <herr.linux88 at gmail.com>
Date:   Fri Feb 24 22:05:59 2012 +0100

    l10n: Updated Arabic (ar) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 1e9217d9930e0094ff139e31df82ba4cbfbd7a08
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Feb 24 21:38:22 2012 +0100

    Include xscreensaver in the manager dialog.

commit 0705844cfcf0b66f5f1d686c0c0cb141ae50beb5
Author: Utku Berberoğlu <utku.berber at gmail.com>
Date:   Thu Feb 23 16:32:37 2012 +0100

    l10n: Updated Turkish (tr) translation to 72%
    
    New status: 238 messages complete with 85 fuzzies and 7 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit d35209b45758f0d2f0349f211748c218b569a074
Author: Utku Berberoğlu <utku.berber at gmail.com>
Date:   Thu Feb 23 16:21:18 2012 +0100

    l10n: Updated Turkish (tr) translation to 72%
    
    New status: 238 messages complete with 78 fuzzies and 14 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 2bee0dc04e789abd8d0834f7530426d5ec8a5c93
Author: Utku Berberoğlu <utku.berber at gmail.com>
Date:   Wed Feb 22 21:07:38 2012 +0100

    l10n: Updated Turkish (tr) translation to 72%
    
    New status: 238 messages complete with 76 fuzzies and 16 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit c6acf4ecd4b9975d41b726080c1814dd0ca3c3a7
Author: Benoit THIBAUD <frombenny at gmail.com>
Date:   Tue Feb 21 20:37:42 2012 +0100

    l10n: Updated French (fr) translation to 98%
    
    New status: 326 messages complete with 4 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 78f6dbe7004ae8325e055b5de02a97a0bda732a1
Author: Seong-ho Cho <darkcircle.0426 at gmail.com>
Date:   Mon Feb 20 19:09:40 2012 +0100

    l10n: Updated Korean (ko) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 4a748d67fcb665c2eab4a201fb824adfa1e7d84b
Author: Seong-ho Cho <darkcircle.0426 at gmail.com>
Date:   Mon Feb 20 18:47:23 2012 +0100

    l10n: Updated Korean (ko) translation to 100%
    
    New status: 294 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 4659ae40c9cfe9c8fe7eebfd0898e9c2bbcd38c9
Author: كريم أولاد الشلحة <herr.linux88 at gmail.com>
Date:   Sun Feb 19 15:40:22 2012 +0100

    l10n: Updated Arabic (ar) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 23d82b73d9d3c857f9ae8298a5d7e92abc22f53b
Author: Michal Várady <miko.vaji at gmail.com>
Date:   Sun Feb 19 01:21:31 2012 +0100

    l10n: Updated Czech (cs) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 68ea0ec43397fe6bd467fb7b6a509a5914a29fde
Author: Michal Várady <miko.vaji at gmail.com>
Date:   Sun Feb 19 01:19:31 2012 +0100

    l10n: Updated Czech (cs) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit bb60c0bc573ce1d646aad0901815d7ee8684bd5d
Author: Michal Várady <miko.vaji at gmail.com>
Date:   Sun Feb 19 01:18:54 2012 +0100

    l10n: Updated Czech (cs) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 1ef4abaf9bffc4c900d77eff775d5516787db8eb
Author: Michal Várady <miko.vaji at gmail.com>
Date:   Sun Feb 19 01:16:28 2012 +0100

    l10n: Updated Czech (cs) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit b38c7b34b20d53ecf6fbb602c414d48f0c6bcbd5
Author: Michal Várady <miko.vaji at gmail.com>
Date:   Sun Feb 19 01:02:22 2012 +0100

    l10n: Updated Czech (cs) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 44ba9ba9cc2495ca627e4f2340713087c8edbfde
Author: Andhika Padmawan <andhika.padmawan at gmail.com>
Date:   Sat Feb 18 05:33:26 2012 +0100

    l10n: Updated Indonesian (id) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 3488715b6a97f8bd0caadf2e4f7b5208d79e514e
Author: Christoph Wickert <christoph.wickert at googlemail.com>
Date:   Fri Feb 17 15:11:02 2012 +0100

    l10n: Updated German (de) translation to 98%
    
    New status: 326 messages complete with 4 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit b22a17821449524750dfd1606faae1383365c1d3
Author: Piarres Beobide <pi at beobide.net>
Date:   Fri Feb 17 10:34:08 2012 +0100

    l10n: Updated Basque (eu) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 3d8463181ac25a127026466d89980f49f6d77bcc
Author: Piarres Beobide <pi at beobide.net>
Date:   Fri Feb 17 10:29:37 2012 +0100

    l10n: Updated Basque (eu) translation to 95%
    
    New status: 315 messages complete with 11 fuzzies and 4 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit bd10952e7126e57ceb4e17b7786e7fb0c3ee6b65
Author: Chris Leick <c.leick at vollbio.de>
Date:   Thu Feb 16 21:15:51 2012 +0100

    l10n: Updated German (de) translation to 95%
    
    New status: 314 messages complete with 16 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 1cb3fbdb1b80a0f162d5c1dcdd15d5d606e9c7cf
Author: Aleksandr Ponomarenko <davian818 at gmail.com>
Date:   Thu Feb 16 13:43:55 2012 +0100

    l10n: Updated Russian (ru) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit be8ac4226e01cb8a75149a4f6b597645d174df0c
Author: Per Kongstad <p_kongstad at op.pl>
Date:   Thu Feb 16 08:24:25 2012 +0100

    l10n: Updated Danish (da) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 12caebc536fe3555804fed057340aa6958ebf116
Author: Tomáš Vadina <kyberdev at gmail.com>
Date:   Mon Feb 13 11:10:21 2012 +0100

    l10n: Updated Slovak (sk) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit e49a92ae46fb9451d8d8a9c0eb1339d3c62d254d
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Feb 12 18:18:03 2012 +0100

    Xfsettingsd: Don't set large dpi in xrdb (bug #8415).

commit fb267dc099353373e38cf88275cfc97cec040b1f
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Feb 12 17:34:00 2012 +0100

    Post release tag bump.

commit 9c5004f8acd6074375fed5c55cad34d7ee5c6b3c
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Feb 12 17:22:34 2012 +0100

    Updates for release.

commit 6d5cf80f7b7826e791d503713c965e969549ea15
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sun Feb 12 14:41:41 2012 +0300

    Clear out all the old entries before resetting to defaults
    
    When resetting the keyboard shortcuts to their default entries we
    need to clear out all the old entires in the list to prevent
    duplicates from appearing. (Bug 8138)

commit 5173ad38b11edf3f58831ce421a22358ba147f02
Author: Cristian Marchi <cri.penta at gmail.com>
Date:   Sat Feb 11 16:14:13 2012 +0100

    l10n: Updated Italian (it) translation to 97%
    
    New status: 323 messages complete with 0 fuzzies and 7 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit b2e62a8a6f7b5574878d4792da41c38573b0710c
Author: Per Kongstad <p_kongstad at op.pl>
Date:   Fri Feb 10 20:21:59 2012 +0100

    l10n: Updated Danish (da) translation to 98%
    
    New status: 325 messages complete with 1 fuzzy and 4 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 9f3c69bd87e1e81791fdff484c8c0770b96e8e5b
Author: Roger Pueyo Centelles <xfce at rogerpueyo.com>
Date:   Fri Feb 10 11:31:04 2012 +0100

    l10n: Updated Catalan (Valencian) (ca) translation to 91%
    
    New status: 301 messages complete with 16 fuzzies and 13 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 3f041dfb1fa15e81a920e0b3754aefb1f66b234e
Author: Ardjuna <asyura.x at gmail.com>
Date:   Fri Feb 10 07:03:57 2012 +0100

    l10n: Updated Indonesian (id) translation to 99%
    
    New status: 329 messages complete with 1 fuzzy and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 74a4e5231ecedb700d081fa020c0dcfec6e3a0d1
Author: Sergio Marques <smarquespt at gmail.com>
Date:   Thu Feb 9 21:05:27 2012 +0100

    l10n: Updated Portuguese (pt) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit b495ea5a631dc23fffbb6d96ec64aa1b8743cb28
Author: Bauzhan Muftakhidinov <baurthefirst at gmail.com>
Date:   Thu Feb 9 10:53:18 2012 +0100

    l10n: Updated Kazakh (kk) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit c7dfc29a8cb8f3f86c3d8f0d6e0aea1395e2d56b
Author: Eivind Ødegård <gingermig at yahoo.no>
Date:   Wed Feb 8 17:42:31 2012 +0100

    l10n: Updated Norwegian Nynorsk (nn) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit aceda8b835d29d1251b00a03b40d80ab4eb5ed82
Author: Eivind Ødegård <gingermig at yahoo.no>
Date:   Wed Feb 8 17:40:54 2012 +0100

    l10n: Updated Norwegian Nynorsk (nn) translation to 98%
    
    New status: 326 messages complete with 4 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit a2ffd142924f4c0e75dcb57c48eb7c93375ee049
Author: Eivind Ødegård <gingermig at yahoo.no>
Date:   Wed Feb 8 17:39:04 2012 +0100

    l10n: Updated Norwegian Nynorsk (nn) translation to 96%
    
    New status: 319 messages complete with 11 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 8db1028bc244f4f49ba15a961399076de71a2dc2
Author: Sergio Marques <smarquespt at gmail.com>
Date:   Wed Feb 8 17:17:55 2012 +0100

    l10n: Updated Portuguese (pt) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 3382f66a8d371d012994da0e377de215a7ba652d
Author: Bauzhan Muftakhidinov <baurthefirst at gmail.com>
Date:   Wed Feb 8 12:42:40 2012 +0100

    l10n: Updated Kazakh (kk) translation to 95%
    
    New status: 314 messages complete with 12 fuzzies and 4 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit fdf7a08d7f33a6bf061e63b8a2a7a8d7f4dd1027
Author: Chipong Luo <chipong.luo at yahoo.com>
Date:   Wed Feb 8 10:25:05 2012 +0100

    l10n: Updated Chinese (China) (zh_CN) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit eb12de5e85b21ff1ad815f93bacecda49db7b4c3
Author: Chipong Luo <chipong.luo at yahoo.com>
Date:   Wed Feb 8 07:41:44 2012 +0100

    l10n: Updated Chinese (China) (zh_CN) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit d12913ecd1813682dca0325594cd43dac1cbc423
Author: كريم أولاد الشلحة <herr.linux88 at gmail.com>
Date:   Tue Feb 7 21:09:01 2012 +0100

    l10n: Updated Arabic (ar) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit cf667b1b58e4a0a48abc54e129ad7b29b5121e6b
Author: Chipong Luo <chipong_l at yahoo.com>
Date:   Tue Feb 7 11:46:23 2012 +0100

    l10n: Updated Chinese (China) (zh_CN) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit ab9b4b206315ec81e237082505cff1ff4e92eae6
Author: Algimantas Margevičius <gymka at mail.ru>
Date:   Tue Feb 7 11:24:00 2012 +0100

    l10n: Updated Lithuanian (lt) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 29dd23b5f47c3e2e5b2ed0155c301c471c795a20
Author: Algimantas Margevičius <gymka at mail.ru>
Date:   Tue Feb 7 11:23:12 2012 +0100

    l10n: Updated Lithuanian (lt) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit e9ecb2bedbba64c8c8f3a16f3e4a6bc1e4c88807
Author: Algimantas Margevičius <gymka at mail.ru>
Date:   Tue Feb 7 11:22:45 2012 +0100

    l10n: Updated Lithuanian (lt) translation to 99%
    
    New status: 329 messages complete with 1 fuzzy and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 629751c9996950511dfcc2c25d3cb95e688526da
Author: Chipong Luo <chipong_l at yahoo.com>
Date:   Tue Feb 7 11:21:58 2012 +0100

    l10n: Updated Chinese (China) (zh_CN) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit 115f0e0bafbf12fba76021718807b512f85d0734
Author: Chipong Luo <chipong_l at yahoo.com>
Date:   Tue Feb 7 11:07:34 2012 +0100

    l10n: Updated Chinese (China) (zh_CN) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit bafddacf9a65eb0ce17955ffb35c70f6e24792c7
Author: Chipong Luo <chipong_l at yahoo.com>
Date:   Tue Feb 7 02:05:33 2012 +0100

    l10n: Updated Chinese (China) (zh_CN) translation to 100%
    
    New status: 330 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

commit db93ac1a3ea4dc9acfb3a0327c48aefe9ba3c915
Author: Chipong Luo <chipong_l at yahoo.com>
Date:   Tue Feb 7 01:56:48 2012 +0100

    l10n: Updated Chinese (China) (zh_CN) translation to 99%
    
    New status: 327 messages complete with 0 fuzzies and 3 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

 NEWS                                               |   11 +
 configure.ac.in                                    |    6 +-
 .../appearance-settings/appearance-install-theme   |   80 ++-
 dialogs/keyboard-settings/xfce-keyboard-settings.c |   14 +-
 po/ar.po                                           |  291 +++--
 po/ca.po                                           |  738 +++++++++----
 po/cs.po                                           |  450 +++++---
 po/da.po                                           |  362 ++++---
 po/de.po                                           |  351 ++++---
 po/es.po                                           |  312 +++---
 po/eu.po                                           |  449 +++++---
 po/fr.po                                           |  737 ++++++++-----
 po/id.po                                           |  286 +++--
 po/it.po                                           |  324 +++---
 po/kk.po                                           |  902 ++++++++++-----
 po/ko.po                                           | 1010 +++++++++--------
 po/lt.po                                           |  277 +++--
 po/nn.po                                           |  297 +++--
 po/pt.po                                           |  727 +++++--------
 po/ru.po                                           |  278 +++--
 po/sk.po                                           |  614 +++++++----
 po/sv.po                                           | 1197 ++++++++++++++------
 po/te.po                                           |  840 +++++++++-----
 po/tr.po                                           |  310 +++--
 po/zh_CN.po                                        |  295 +++---
 po/zh_TW.po                                        |  264 +++--
 xfce4-settings-editor/xfce-settings-prop-dialog.c  |    4 +
 xfce4-settings-manager/xfce-settings-manager.menu  |    1 +
 xfsettingsd/Makefile.am                            |    3 +-
 xfsettingsd/displays.c                             |    5 +-
 xfsettingsd/xsettings.c                            |    2 +-
 31 files changed, 7013 insertions(+), 4424 deletions(-)

diff --git a/NEWS b/NEWS
index 2f6ddb5..9bdb501 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+4.9.2
+=====
+- Add mime icons in the mime-editor treeview.
+- Store window and column sizes in xfconf.
+- Add cateogry based settings manager.
+- Re-add support for pluggable dialogs and enable them always.
+- Rework settings editor.
+- Clear out keyboard shortcuts before resetting to defaults (bug #8138).
+- Updated translations: ar, ca, cs, da, de, es, id, it, kk, lt, nl,
+  nn, pt, ru, tr, uk, zh_CN, zh_TW.
+
 4.9.1
 =====
 - Use daemon() for xfsettingsd if available.
diff --git a/configure.ac.in b/configure.ac.in
index 47efaaf..7603335 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,7 +11,7 @@ dnl *** Version information ***
 dnl ***************************
 m4_define([xfce4_settings_version_major], [4])
 m4_define([xfce4_settings_version_minor], [9])
-m4_define([xfce4_settings_version_micro], [1])
+m4_define([xfce4_settings_version_micro], [2])
 m4_define([xfce4_settings_version_nano], [])
 m4_define([xfce4_settings_version_build], [@REVISION@])
 m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases
@@ -75,11 +75,11 @@ XDT_I18N([@LINGUAS@])
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
+XDT_CHECK_PACKAGE([EXO], [exo-1], [0.7.1])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0])
-XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.1.9])
+XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.1.10])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.9.0])
 XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], [libxfce4kbd-private-2], [4.9.0])
diff --git a/dialogs/appearance-settings/appearance-install-theme b/dialogs/appearance-settings/appearance-install-theme
index 59e10f4..13f61ae 100755
--- a/dialogs/appearance-settings/appearance-install-theme
+++ b/dialogs/appearance-settings/appearance-install-theme
@@ -16,6 +16,20 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+# appearance-install-theme <theme-package>
+# return value:
+# 1: common error, should never happen
+# 2: File too big
+# 3: Failed to create temp directory
+# 4: Failed to extract archive
+# 5: Unknown file format
+# theme-package can be a tar-file zip-file or a directory
+# the following themes types are supported:
+# - Gtk-2
+# - Gtk-3
+# - Xfwm
+# - Icons
+
 dndfilename="$1"
 retval=0
 
@@ -26,9 +40,10 @@ installtheme()
 
     basedir=${file#$tmpdir/}
     themedir=${basedir%/$suffix}
-    themename=`basename "$themedir"`
+    themename=${3:-`basename "$themedir"`}
     themetype=`dirname "$suffix"`
-    src="$tmpdir/$themedir/$themetype"
+    themesrc=`dirname "$basedir"`
+    src="$tmpdir/$themesrc"
 
     dest="$HOME/.themes/$themename"
     if test ! -d "$dest/$themetype"; then
@@ -37,6 +52,35 @@ installtheme()
     fi
 }
 
+installicontheme()
+{
+    file="$1"
+    suffix="$2"
+
+    basedir=${file#$tmpdir/}
+    themedir=${basedir%/$suffix}
+    themename=${3:-`basename "$themedir"`}
+    src="$tmpdir/$themedir"
+
+    dest="$HOME/.icons"
+    if test ! -d "$dest/$themename"; then
+        # move theme to the users' theme directory
+        mkdir -p "$dest" && mv "$src" "$dest"
+    fi
+}
+
+detectthemes()
+{
+    suffix="$1"
+
+    if test -f "$tmpdir/$suffix"; then
+        installtheme "$tmpdir/$suffix" "$suffix" "$pkgname"
+    fi
+    find "$tmpdir" -path "$tmpdir/*/$suffix" -type f | while read file; do
+        installtheme "$file" "$suffix"
+    done
+}
+
 # leave if no file is provided
 if test -z "$dndfilename" -o -z "$HOME"; then
     # 1: common error, should never happen
@@ -56,7 +100,7 @@ fi
 # we try $XDG_CACHE_HOME because it is more likely this is on the
 # same partition, so moving the theme after extract is faster
 if test x"`which mktemp 2>/dev/null`" != x""; then
-    tmpdir=`TMPDIR="$XDG_CACHE_HOME" mktemp -d`
+    tmpdir=`TMPDIR="${XDG_CACHE_HOME:-$TMPDIR}" mktemp -d`
 else
     tmpdir="/tmp/tmp.$$.$RANDOM"
     mkdir "$tmpdir"
@@ -69,15 +113,18 @@ fi
 # check if uri is directory or file
 if test -d "$dndfilename"; then
     cp -r "$dndfilename" "$tmpdir" || retval=1
+    pkgname=`basename "$dndfilename"`
 elif test -f "$dndfilename"; then
     case "$dndfilename" in
-        *.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tbz2|*.tbz|*.tar)
+        *.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tbz2|*.tbz|*.tar|*.tar.xz|*.txz)
             # extract the archive
             tar -C "$tmpdir" -xf "$dndfilename" || retval=4
+            pkgname=`basename "${dndfilename%.*}" .tar`
         ;;
         *.zip)
             # extract the archive
-            unzip -d "$tmpdir" "$dndfilename" || retval=4
+            unzip -qq -d "$tmpdir" "$dndfilename" || retval=4
+            pkgname=`basename "$dndfilename" .zip`
         ;;
         *)
             # 5: unknow file format
@@ -90,15 +137,26 @@ fi
 # extracting or copying succeeded
 if test "$retval" -eq 0; then
     # install gtk-2.0 themes
-    suffix="gtk-2.0/gtkrc"
-    find "$tmpdir" -path "$tmpdir/*/$suffix" -type f | while read file; do
-        installtheme "$file" "$suffix"
-    done
+    detectthemes "gtk-2.0/gtkrc"
+
+    # install gtk-3.0 themes
+    detectthemes "gtk-3.0/gtkrc"
 
     # install xfwm4 themes
-    suffix="xfwm4/themerc"
+    detectthemes "xfwm4/themerc"
+
+    # install icon themes
+    suffix="index.theme"
+    section="Icon Theme"
+    if test -f "$tmpdir/$suffix"; then
+        if grep -q -i "^\\[$section\\]" "$tmpdir/$suffix"; then
+            installicontheme "$tmpdir/$suffix" "$suffix" "$pkgname"
+        fi
+    fi
     find "$tmpdir" -path "$tmpdir/*/$suffix" -type f | while read file; do
-        installtheme "$file" "$suffix"
+        if grep -q -i "^\\[$section\\]" "$file"; then
+            installicontheme "$file" "$suffix"
+        fi
     done
 fi
 
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index 8c9daf6..a5723ad 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -1143,7 +1143,9 @@ xfce_keyboard_settings_delete_button_clicked (XfceKeyboardSettings *settings)
 static void
 xfce_keyboard_settings_reset_button_clicked (XfceKeyboardSettings *settings)
 {
-  gint response;
+  gint          response;
+  GObject      *view;
+  GtkListStore *store;
 
   g_return_if_fail (XFCE_IS_KEYBOARD_SETTINGS (settings));
 
@@ -1156,7 +1158,15 @@ xfce_keyboard_settings_reset_button_clicked (XfceKeyboardSettings *settings)
                                   NULL);
 
   if (G_LIKELY (response == GTK_RESPONSE_YES))
-    xfce_shortcuts_provider_reset_to_defaults (settings->priv->provider);
+    {
+      view = gtk_builder_get_object (GTK_BUILDER (settings), "kbd_shortcuts_view");
+
+      /* Clear out all the previous entries */
+      store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (view)));
+      gtk_list_store_clear (store);
+
+      xfce_shortcuts_provider_reset_to_defaults (settings->priv->provider);
+    }
 }
 
 
diff --git a/po/ar.po b/po/ar.po
index e0b5026..18bd3c4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # mohammad <malham1 at gmail.com>, 2012.
+
+# كريم أولاد الشلحة <herr.linux88 at gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 08:30+0000\n"
+"POT-Creation-Date: 2012-02-19 10:39+0000\n"
 "PO-Revision-Date: 2012-01-30 16:42+0300\n"
 "Last-Translator: mohammad <malham1 at gmail.com>\n"
 "Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.7.0\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Poedit-Language: Arabic\n"
 "X-Poedit-Country: MOROCCO\n"
+"X-Generator: Virtaal 0.7.0\n"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
 msgid "Acceleration _profile:"
@@ -260,7 +261,7 @@ msgstr "أكتب '%s --help' لإستعمال."
 #: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82
 #: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
-msgstr "فريق تطوير إكسفسي. كل الحقوق محفوظة."
+msgstr "فريق تطوير إكسفس. كل الحقوق محفوظة."
 
 #: ../dialogs/accessibility-settings/main.c:212
 #: ../dialogs/appearance-settings/main.c:986
@@ -613,7 +614,7 @@ msgstr "الإعداد السابق سيتم إستعادته في %i ثوان 
 #: ../dialogs/display-settings/main.c:505
 #, c-format
 msgid "%.1f Hz"
-msgstr ""
+msgstr "%.1f هرتز"
 
 #: ../dialogs/display-settings/main.c:651
 msgid ""
@@ -633,7 +634,7 @@ msgstr "غير قادر على الاستعلام عن إصدار الملحق R
 #: ../dialogs/display-settings/main.c:1076
 #: ../dialogs/display-settings/main.c:1112
 msgid "Unable to start the Xfce Display Settings"
-msgstr "غير قادر على بدء مدير عرض إكسفسي"
+msgstr "غير قادر على بدء مدير عرض إكسفس"
 
 #: ../dialogs/display-settings/main.c:1107
 msgid "ATI Settings"
@@ -886,12 +887,12 @@ msgstr "مغاير"
 msgid "Shortcut command may not be empty."
 msgstr "يجب لا يكون الأمر اختصار فارغاً."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "إعادة تعيين كإفتراضي"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
 msgid ""
 "This will reset all shortcuts to their default values. Do you really want to "
 "do this?"
@@ -899,12 +900,12 @@ msgstr ""
 "وهذا سيعيد تعيين كافة الاختصارات إلى قيمها الافتراضية. هل تريد حقا للقيام "
 "بهذا؟"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr ""
 "سيتم استعادة الإعدادات الافتراضية النظام عند تسجيل الدخول المرة القادمة."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "تحذير"
 
@@ -1048,7 +1049,7 @@ msgstr "إسم الجهاز"
 #: ../dialogs/mouse-settings/main.c:142
 #, c-format
 msgid "%g px"
-msgstr ""
+msgstr "%g بكسل"
 
 #. miliseconds value for some of the scales in the dialog
 #: ../dialogs/mouse-settings/main.c:152
@@ -1268,168 +1269,200 @@ msgstr "_دوران:"
 msgid "_Sensitivity:"
 msgstr "_الحساسية:"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "محرر الإعدادات"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "خصص الإعدادات المخزنة من طرف Xfconf"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "قناة"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "خصائص"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "نوع"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "مغلق"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "قيمة"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "فارغ"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "خصائص جديدة"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "إسم الخصائص غير سليم."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "تحرير الخصائص المحددة"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "إعادة تعيين"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_إعادة تعيين"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr "إعادة التعيين الخصائص ستزيل بشكل دائم الإعدادات المخصصة."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "إعادة تعيين الخصائص المحددة"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "أمتأكّدٌ أنّك تريد إعادة تعيين الخصائص \"%s\"؟"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "فارغ"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "أسماء الخصائص يجب أن تبدأ بحرف '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "مصفوفة"
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "عنصر الجذر ('/') ليس اسم خاصية صالح"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "سلسلة"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid ""
-"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
-"'-', '<' and '>', as well as '/' as a separator"
-msgstr ""
-"يمكن أن تتضمن أسماء الخصائص فقط الأحرف A-Z, 0-9, '_', '-', '<' and '>', as "
-"فضلا عن '/' كفاصل"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "صحيح"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "لا يمكن أن تحتوي أسماء الخصائص اثنين أو أكثر من الأحرف '/' متتالية"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "منطقي"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "أسماء الخصائص لا يمكن أن تنتهي بحرف '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "مضاعف"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_إعادة تعيين"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "_إعادة تعيين القناة"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
 msgstr "إعادة تعيين القناة سيزيل بشكل دائم الإعدادات المخصصة."
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr "متأكد أنك تريد إعادة تعيين القناة \"%s\" وكافة خصائصه؟"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "محرر إعدادات رسومي لـXfce 4"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "محرر الإعدادات"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "إعادة تعيين"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "منطقي"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "مراقب %s"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "خصص الإعدادات المخزنة من طرف Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "شاهد قناة Xfconf لمعرفة الخصائص المغيرة"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "مضاعف"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "بدء مراقبة القناة \"%s\""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "تحرير الخصائص"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "_مراقب"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "تحرير الخصائص"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr "إعادة التعيين الخصائص ستزيل بشكل دائم الإعدادات المخصصة."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "مفعل"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "أمتأكّدٌ أنّك تريد إعادة تعيين الخصائص \"%s\"؟"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "عدد صحيح"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "عدد صحيح موجب"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
-msgstr ""
+msgstr "Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "إسم:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Int64 غير موقعة"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
 msgstr "خصائص جديدة"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "إعادة تعيين الخصائص"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "خصائص_"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "سلسلة"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "ال_نوع:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "النوع:"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "ق_يمة:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "عدد صحيح موجب"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "أسماء الخصائص يجب أن تبدأ بحرف '/'"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "عنصر الجذر ('/') ليس اسم خاصية صالح"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
+#, c-format
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
 msgstr ""
+"يمكن أن تتضمن أسماء الخصائص فقط الأحرف A-Z, 0-9, '_', '-', '<' and '>', as "
+"فضلا عن '/' كفاصل"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr "لا يمكن أن تحتوي أسماء الخصائص اثنين أو أكثر من الأحرف '/' متتالية"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "قيمة:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "أسماء الخصائص لا يمكن أن تنتهي بحرف '/'"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "قناوات Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "تحرير الخصائص"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "محرر إعدادات رسومي لـإكسفس4"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1487,7 +1520,7 @@ msgstr "مساحة العمل %d"
 
 #: ../xfsettingsd/xfsettingsd.desktop.in.h:1
 msgid "The Xfce Settings Daemon"
-msgstr "بريمج إعدادات إكسفسي"
+msgstr "بريمج إعدادات إكسفس"
 
 #: ../xfce4-settings-manager/main.c:40
 msgid "Settings dialog to show"
@@ -1513,12 +1546,24 @@ msgstr "تعطيل بدء \"%s\""
 
 #: ../xfce4-settings-manager/xfce-settings-manager.desktop.in.h:1
 msgid "Graphical Settings Manager for Xfce 4"
-msgstr "مدير إعدادات رسومي لإكسفسي 4"
+msgstr "مدير إعدادات رسومي لإكسفس 4"
 
 #: ../xfce4-settings-manager/xfce-settings-manager.desktop.in.h:2
 msgid "Settings Manager"
 msgstr "مدير الإعدادات"
 
+#~ msgid "This property name is not valid."
+#~ msgstr "إسم الخصائص غير سليم."
+
+#~ msgid "Enabled"
+#~ msgstr "مفعل"
+
+#~ msgid "Name:"
+#~ msgstr "إسم:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "قناوات Xfconf"
+
 #~ msgid "_Overview"
 #~ msgstr "ن_ظرة عامة"
 
diff --git a/po/ca.po b/po/ca.po
index 6fc4e07..8e6f140 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2008 THE xfce'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce package.
 # Carles Muñoz Gorriz <carlesmu at internautas.org>, 2008-2012.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 17:48+0000\n"
+"POT-Creation-Date: 2012-03-06 12:24+0000\n"
 "PO-Revision-Date: 2012-01-15 20:13+0100\n"
 "Last-Translator: Carles Muñoz Gorriz <carlesmu at internautas.org>\n"
 "Language-Team: Catalan\n"
-"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Catalan\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -58,8 +58,12 @@ msgid "Disable sticky keys if _two keys are pressed"
 msgstr "Deshabilita les tecles enganxoses si es pitgen _dos tecles"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
-msgid "If enabled, the session manager will start the required applications for screen readers and magnifiers"
-msgstr "Si està habilitat, el gestor de sessió iniciarà les aplicacions necessàries per lectors de pantalla i lupes"
+msgid ""
+"If enabled, the session manager will start the required applications for "
+"screen readers and magnifiers"
+msgstr ""
+"Si està habilitat, el gestor de sessió iniciarà les aplicacions necessàries "
+"per lectors de pantalla i lupes"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
 msgid "K_eystroke delay:"
@@ -98,8 +102,12 @@ msgid "The amount of time, in milliseconds, required between keystrokes"
 msgstr "El temps que cal, en milisegons, entre codis de tecla"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted"
-msgstr "El temps, en milisegons, que ha de passar abans que s'accepti un codi de tecla"
+msgid ""
+"The amount of time, in milliseconds, that must elapse before a keystroke "
+"will be accepted"
+msgstr ""
+"El temps, en milisegons, que ha de passar abans que s'accepti un codi de "
+"tecla"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
 msgid "The maximum pointer speed after acceleration"
@@ -114,20 +122,33 @@ msgid "The time, in milliseconds, between repeated motion events"
 msgstr "El temps en milisegons entre dos esdeveniments de repetició"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
-msgid "The time, in milliseconds, between the initial key press and first repeated motion event"
-msgstr "El temps en milisegons entre el pitjament de tecla inicial i el primer esdeveniment de repetició"
+msgid ""
+"The time, in milliseconds, between the initial key press and first repeated "
+"motion event"
+msgstr ""
+"El temps en milisegons entre el pitjament de tecla inicial i el primer "
+"esdeveniment de repetició"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:25
 msgid "The time, in milliseconds, to get to maximum speed"
 msgstr "El temps en milisegons per obtenir la velocitat màxima"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:26
-msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted"
-msgstr "Per evitar pitjar accidentalment alguna tecla, les tecles lentes fan que calgui que una tecla romangui pitjada una quantitat mínima de temps abans que s'accepti el codi de tecla"
+msgid ""
+"To help prevent accidental keystrokes, slow keys requires that a key is held "
+"for a certain minimum amount of time before the keystroke will be accepted"
+msgstr ""
+"Per evitar pitjar accidentalment alguna tecla, les tecles lentes fan que "
+"calgui que una tecla romangui pitjada una quantitat mínima de temps abans "
+"que s'accepti el codi de tecla"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
-msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes"
-msgstr "Per evitar pitjar accidentalment més d'una tecla alhora, el rebot de tecles imposa un retard mínim entre codis de tecles"
+msgid ""
+"To help prevent accidental multiple keystrokes, bounce keys imposes a "
+"minimum delay between keystrokes"
+msgstr ""
+"Per evitar pitjar accidentalment més d'una tecla alhora, el rebot de tecles "
+"imposa un retard mínim entre codis de tecles"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
 msgid "Use _bounce keys"
@@ -142,20 +163,38 @@ msgid "Use slow _keys"
 msgstr "Activa les _tecles lentes"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time"
-msgstr "Quan està seleccionat els modificadors de tecles (com Ctrl, Alt i Maj) no cal que es quedin pitjades (es poden pitjar i després deixar anar) quan varies d'elles s'haurien de pitjar al mateix temps"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
+"to be held down (they can be pressed and then released) when multiple keys "
+"would normally need to be pressed at the same time"
+msgstr ""
+"Quan està seleccionat els modificadors de tecles (com Ctrl, Alt i Maj) no "
+"cal que es quedin pitjades (es poden pitjar i després deixar anar) quan "
+"varies d'elles s'haurien de pitjar al mateix temps"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:32
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again"
-msgstr "Quan està seleccionat els modificadors de tecles (com Ctrl, Alt i Maj) continuaran en l'estat de pitjades fins que es tornin a pitjar"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
+"locked in the pressed state until pressed again"
+msgstr ""
+"Quan està seleccionat els modificadors de tecles (com Ctrl, Alt i Maj) "
+"continuaran en l'estat de pitjades fins que es tornin a pitjar"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:33
-msgid "When selected, the \"sticky keys\" feature will be disabled if two keys are pressed simultaneously"
-msgstr "Si està habilitat la característica de «tecles enganxoses» romandrà deshabilitada si es pitgen dies tecles alhora"
+msgid ""
+"When selected, the \"sticky keys\" feature will be disabled if two keys are "
+"pressed simultaneously"
+msgstr ""
+"Si està habilitat la característica de «tecles enganxoses» romandrà "
+"deshabilitada si es pitgen dies tecles alhora"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:34
-msgid "When selected, the mouse pointer can be controlled using the keyboard number pad"
-msgstr "Si està habilitat podreu controlar el punter del ratoí emprant el teclat numèric"
+msgid ""
+"When selected, the mouse pointer can be controlled using the keyboard number "
+"pad"
+msgstr ""
+"Si està habilitat podreu controlar el punter del ratoí emprant el teclat "
+"numèric"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:35
 msgid "_Acceleration delay:"
@@ -192,38 +231,32 @@ msgstr "píxels/s"
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
 #: ../dialogs/display-settings/main.c:102
-#: ../dialogs/keyboard-settings/main.c:39
-#: ../dialogs/mouse-settings/main.c:97
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:97
 msgid "Settings manager socket"
 msgstr "Sòcol del gestor de paràmetres"
 
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
 #: ../dialogs/display-settings/main.c:102
-#: ../dialogs/keyboard-settings/main.c:39
-#: ../dialogs/mouse-settings/main.c:97
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:97
 msgid "SOCKET ID"
 msgstr "SÒCOL ID"
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:95
 #: ../dialogs/display-settings/main.c:103
-#: ../dialogs/keyboard-settings/main.c:40
-#: ../dialogs/mouse-settings/main.c:98
-#: ../xfce4-settings-editor/main.c:43
-#: ../xfsettingsd/main.c:77
-#: ../xfce4-settings-manager/main.c:39
+#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40
+#: ../dialogs/mouse-settings/main.c:98 ../xfce4-settings-editor/main.c:43
+#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39
 msgid "Version information"
 msgstr "Informació de la versió"
 
 #: ../dialogs/accessibility-settings/main.c:192
 #: ../dialogs/appearance-settings/main.c:966
 #: ../dialogs/display-settings/main.c:1043
-#: ../dialogs/keyboard-settings/main.c:76
-#: ../dialogs/mouse-settings/main.c:1515
-#: ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173
-#: ../xfce4-settings-manager/main.c:57
+#: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
+#: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63
+#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Feu «%s --help» per veure l'ús."
@@ -231,22 +264,18 @@ msgstr "Feu «%s --help» per veure l'ús."
 #: ../dialogs/accessibility-settings/main.c:211
 #: ../dialogs/appearance-settings/main.c:985
 #: ../dialogs/display-settings/main.c:1062
-#: ../dialogs/keyboard-settings/main.c:92
-#: ../dialogs/mouse-settings/main.c:1534
-#: ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189
-#: ../xfce4-settings-manager/main.c:70
+#: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
+#: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82
+#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
 msgstr "The Xfce development team. All rights reserved."
 
 #: ../dialogs/accessibility-settings/main.c:212
 #: ../dialogs/appearance-settings/main.c:986
 #: ../dialogs/display-settings/main.c:1063
-#: ../dialogs/keyboard-settings/main.c:93
-#: ../dialogs/mouse-settings/main.c:1535
-#: ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190
-#: ../xfce4-settings-manager/main.c:71
+#: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
+#: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83
+#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Envieu els errors a <%s>."
@@ -256,8 +285,10 @@ msgid "Improve keyboard and mouse accessibility"
 msgstr "Millora l'accessibilitat del teclat i ratolí"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
-msgstr "Antialiàsing, o lletres suaus, pot millorar com es veu el text en pantalla"
+msgid ""
+"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgstr ""
+"Antialiàsing, o lletres suaus, pot millorar com es veu el text en pantalla"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:1
@@ -308,15 +339,21 @@ msgstr "Habilita els sons de retroacció d'e_ntrada"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:13
 msgid "Enable or disable event sounds globally (requires \"Canberra\" support)"
-msgstr "Habilita o deshabilita els sons d'esdeveniment de forma global (cal el suport «canberra»)"
+msgstr ""
+"Habilita o deshabilita els sons d'esdeveniment de forma global (cal el "
+"suport «canberra»)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:14
 msgid "Event sounds"
 msgstr "Sons dels esdeveniments"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
-msgid "Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen"
-msgstr "La qualitat del tipus de lletra en pantalles TFT o LCD es pot millorar força si es tria l'ordre de sub-píxel correcte de la pantalla"
+msgid ""
+"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
+"correct sub-pixel order of the screen"
+msgstr ""
+"La qualitat del tipus de lletra en pantalles TFT o LCD es pot millorar força "
+"si es tria l'ordre de sub-píxel correcte de la pantalla"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
 msgid "Full"
@@ -327,12 +364,22 @@ msgid "Icons"
 msgstr "Icones"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
-msgid "If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut"
-msgstr "Si es selecciona, les dreceres del teclat dels elements del menú es poden canviar al mantenir el ratolí sobre l'element del menú i pitjat la nova combinació de tecles per la drecera"
+msgid ""
+"If selected, keyboard shortcuts for menu items can be changed by hovering "
+"the mouse over the menu item and pressing the new key combination for the "
+"shortcut"
+msgstr ""
+"Si es selecciona, les dreceres del teclat dels elements del menú es poden "
+"canviar al mantenir el ratolí sobre l'element del menú i pitjat la nova "
+"combinació de tecles per la drecera"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
-msgid "Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference"
-msgstr "Molts tipus de lletres tenen informació que donen dades extres per com mostrar millor les lletres; trieu la que us sembli millor"
+msgid ""
+"Many fonts contain information that provides extra hints as to how best draw "
+"the font; pick whichever looks best according to personal preference"
+msgstr ""
+"Molts tipus de lletres tenen informació que donen dades extres per com "
+"mostrar millor les lletres; trieu la que us sembli millor"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
 msgid "Medium"
@@ -349,8 +396,11 @@ msgid "None"
 msgstr "Cap"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
-msgid "Override the detected monitor resolution if fonts look too large or too small"
-msgstr "Substitueix la resolució del monitor que s'ha detectat en cas que les lletres semblin massa grans o petites"
+msgid ""
+"Override the detected monitor resolution if fonts look too large or too small"
+msgstr ""
+"Substitueix la resolució del monitor que s'ha detectat en cas que les "
+"lletres semblin massa grans o petites"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
 msgid "Rendering"
@@ -378,15 +428,21 @@ msgstr "Indica què es mostrarà en els elements de les barres d'eines"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:30
 msgid "Specify whether icons should be displayed next to items in menus"
-msgstr "Especifica si s'han de mostrar les icones al costat dels elements dels menús"
+msgstr ""
+"Especifica si s'han de mostrar les icones al costat dels elements dels menús"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:31
 msgid "Specify whether icons should be displayed next to text in buttons"
-msgstr "Especifica si s'han de mostrar les icones al costat del text en els botons"
+msgstr ""
+"Especifica si s'han de mostrar les icones al costat del text en els botons"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
-msgid "Specify whether mouse clicks and other user input will cause event sounds to play"
-msgstr "Indica si els clics del ratolí i altres entrades de l'usuari produiran que es senti un so"
+msgid ""
+"Specify whether mouse clicks and other user input will cause event sounds to "
+"play"
+msgstr ""
+"Indica si els clics del ratolí i altres entrades de l'usuari produiran que "
+"es senti un so"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
 msgid "St_yle"
@@ -401,8 +457,12 @@ msgid "Text"
 msgstr "Text"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
-msgid "This font will be used as the default font used when drawing user interface text"
-msgstr "S'emprarà aquest tipus de llesta serà la lletra per defecte quan s'escriu el text de la interfície d'usuari "
+msgid ""
+"This font will be used as the default font used when drawing user interface "
+"text"
+msgstr ""
+"S'emprarà aquest tipus de llesta serà la lletra per defecte quan s'escriu el "
+"text de la interfície d'usuari "
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
 msgid "_Fonts"
@@ -483,8 +543,12 @@ msgid "Restore the previous configuration"
 msgstr "Recupera l'anterior configuració"
 
 #: ../dialogs/display-settings/confirmation-dialog.glade.h:5
-msgid "The previous configuration will be restored in 10 seconds if you do not reply to this question."
-msgstr "En cas de que no respongueu a aquesta pregunta en 10 segons es restablirà la configuració anterior."
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+"En cas de que no respongueu a aquesta pregunta en 10 segons es restablirà la "
+"configuració anterior."
 
 #: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
@@ -562,8 +626,12 @@ msgstr "Interfície mínima per estable una sortida externa"
 
 #: ../dialogs/display-settings/main.c:171
 #, c-format
-msgid "The previous configuration will be restored in %i seconds if you do not reply to this question."
-msgstr "En cas de que no respongueu a aquesta pregunta en %i segons es restablirà la configuració anterior."
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
+"En cas de que no respongueu a aquesta pregunta en %i segons es restablirà la "
+"configuració anterior."
 
 #. Insert the mode
 #: ../dialogs/display-settings/main.c:505
@@ -572,8 +640,11 @@ msgid "%.1f Hz"
 msgstr "%.1f Hz"
 
 #: ../dialogs/display-settings/main.c:651
-msgid "The last active output must not be disabled, the system would be unusable."
-msgstr "La darrera sortida activa no s'ha de deshabilitar, el sistema no es podria utilitzar."
+msgid ""
+"The last active output must not be disabled, the system would be unusable."
+msgstr ""
+"La darrera sortida activa no s'ha de deshabilitar, el sistema no es podria "
+"utilitzar."
 
 #: ../dialogs/display-settings/main.c:653
 msgid "Selected output not disabled"
@@ -596,13 +667,18 @@ msgstr "Configuració per ATI"
 
 #: ../dialogs/display-settings/main.c:1122
 msgid "Unable to launch the proprietary driver settings"
-msgstr "No s'ha pogut executar el gestor d'ajustaments del controlador propietari"
+msgstr ""
+"No s'ha pogut executar el gestor d'ajustaments del controlador propietari"
 
 #. 1.2 is required
 #: ../dialogs/display-settings/xfce-randr.c:257
 #, c-format
-msgid "This system is using RandR %d.%d. For the display settings to work version 1.2 is required at least"
-msgstr "El sistema està emprant RandR %d.%d. Per a que els ajustaments de pantalla funcionin cal almenys la versió 1.2"
+msgid ""
+"This system is using RandR %d.%d. For the display settings to work version "
+"1.2 is required at least"
+msgstr ""
+"El sistema està emprant RandR %d.%d. Per a que els ajustaments de pantalla "
+"funcionin cal almenys la versió 1.2"
 
 #: ../dialogs/display-settings/xfce-randr.c:536
 msgid "Laptop"
@@ -654,26 +730,32 @@ msgid "Select command"
 msgstr "Seleccioneu ordre"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:235
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:386
 msgid "All Files"
 msgstr "Tots els fitxers"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:240
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:391
 msgid "Executable Files"
 msgstr "Fitxer executables"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:255
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:406
 msgid "Perl Scripts"
 msgstr "Seqüències en Perl"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:261
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:412
 msgid "Python Scripts"
 msgstr "Seqüències en Python"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:267
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:418
 msgid "Ruby Scripts"
 msgstr "Seqüències en Ruby"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:273
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:424
 msgid "Shell Scripts"
 msgstr "Seqüències de shell"
 
@@ -745,8 +827,12 @@ msgid "Show _blinking"
 msgstr "Mostra _Parpelleig"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17
-msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server"
-msgstr "Indica si el comportament del teclat es controla des d'aquesta finestra d'ajustaments o des de el servidor de les X"
+msgid ""
+"Specifies whether the keyboard layout is controlled with this settings "
+"dialog, or by the X server"
+msgstr ""
+"Indica si el comportament del teclat es controla des d'aquesta finestra "
+"d'ajustaments o des de el servidor de les X"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
 msgid "Specify whether or not the text cursor blinks"
@@ -758,19 +844,25 @@ msgstr "El retard en milisegons entre successius pampallugades del cursor"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20
 msgid "The rate at which keystrokes are generated while a key is pressed"
-msgstr "La velocitat en que els codis de tecla es generen quan està pitjada una tecla"
+msgstr ""
+"La velocitat en que els codis de tecla es generen quan està pitjada una tecla"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
 msgid "The time, in milliseconds, before a pressed key begins repeating"
-msgstr "El temps en milisegons abans que una tecla pitjada comenci a repetir-se"
+msgstr ""
+"El temps en milisegons abans que una tecla pitjada comenci a repetir-se"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
 msgid "Typing Settings"
 msgstr "Configuració de les tecles"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:23
-msgid "When selected, pressing and holding down a key emits the same character over and over again"
-msgstr "Quan està habilitat, pitjar i mantenir pitjada una tecla fa que s'escrigui el mateix caràcter un cop i un altre"
+msgid ""
+"When selected, pressing and holding down a key emits the same character over "
+"and over again"
+msgstr ""
+"Quan està habilitat, pitjar i mantenir pitjada una tecla fa que s'escrigui "
+"el mateix caràcter un cop i un altre"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:24
 msgid "_Enable key repeat"
@@ -825,23 +917,156 @@ msgstr "Variant"
 msgid "Shortcut command may not be empty."
 msgstr "L'ordre de drecera no pot estar buida."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "Reinicia als valors per defecte"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
-msgstr "Això reiniciarà totes les dreceres als seus valors per defecte. És el que voleu?"
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
+msgstr ""
+"Això reiniciarà totes les dreceres als seus valors per defecte. És el que "
+"voleu?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
-msgstr "Els valors per defecte del sistema es recuperaran la propera vegada que entreu."
+msgstr ""
+"Els valors per defecte del sistema es recuperaran la propera vegada que "
+"entreu."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "Advertència"
 
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:128
+msgid "Select Application"
+msgstr "Seleccioneu l'aplicació"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:204
+msgid "Use a c_ustom command:"
+msgstr "Utilitza una o_rdre personalitzada:"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:205
+msgid ""
+"Use a custom command for an application that is not available from the above "
+"application list."
+msgstr ""
+"Utilitza una ordre personalitzada per a una aplicació que no està disponible "
+"a la  llista d'aplicacions de sobre"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:223
+msgid "_Browse..."
+msgstr "_Navega..."
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:376
+msgid "Select an Application"
+msgstr "Seleccioneu una aplicació"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:526
+msgid "None available"
+msgstr "No n'hi ha cap disponible"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:573
+msgid "Recommended Applications"
+msgstr "Aplicacions recomanades"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:591
+msgid "Other Applications"
+msgstr "Altres aplicacions"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:611
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "Obre <i>%s</i> i altres fitxers del tipus \"%s\" amb:"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:647
+#, c-format
+msgid "Failed to add new application \"%s\""
+msgstr "No s'ha pogut afegir la nova aplicació \"%s\""
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:174
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:2
+msgid "MIME Type Editor"
+msgstr "Editor de tipus MIME"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:178
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:1
+msgid "Associate applications with MIME types"
+msgstr "Associa les aplicacions amb els tipus MIME"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:203
+msgid "_Filter:"
+msgstr "_Filtre:"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:211
+msgid "Clear filter"
+msgstr "Esborra el filtre"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:257
+msgid "MIME Type"
+msgstr "Tipus MIME"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:287
+msgid "Status"
+msgstr "Estat"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:308
+msgid "Default Application"
+msgstr "Aplicació per defecte"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:479
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+msgid "User Set"
+msgstr ""
+
+#. sort the names but keep Default on top
+#: ../dialogs/mime-settings/xfce-mime-window.c:481
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+#: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
+#: ../dialogs/mouse-settings/main.c:434
+msgid "Default"
+msgstr "Per defecte"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:550
+#, c-format
+msgid "%d MIME type found"
+msgid_plural "%d MIME types found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:649
+#, c-format
+msgid "Failed to set application \"%s\" for mime type \"%s\"."
+msgstr ""
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:906
+#, fuzzy, c-format
+msgid ""
+"Are you sure you want to reset content type \"%s\" to its default value?"
+msgstr "Voleu reiniciar el canal «<b>%s</b>» així com les seves propietats?"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:910
+msgid "Question"
+msgstr "Pregunta"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:913
+msgid ""
+"This will remove your custom mime-association and restore the system-wide "
+"default."
+msgstr ""
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:917
+#: ../dialogs/mime-settings/xfce-mime-window.c:988
+#, fuzzy
+msgid "Reset to Default"
+msgstr "Reinicia als valors per defecte"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:983
+msgid "Choose Application..."
+msgstr "Escolliu una Aplicació..."
+
 #: ../dialogs/mouse-settings/main.c:96
 msgid "Active device in the dialog"
 msgstr "Activa el dispositiu a la finestra de diàleg"
@@ -862,13 +1087,6 @@ msgstr "%g px"
 msgid "%g ms"
 msgstr "%g ms"
 
-#. sort the names but keep Default on top
-#: ../dialogs/mouse-settings/main.c:372
-#: ../dialogs/mouse-settings/main.c:374
-#: ../dialogs/mouse-settings/main.c:434
-msgid "Default"
-msgstr "Per defecte"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:1
 msgid "B_uttons and Feedback"
 msgstr "_Botons i opinions"
@@ -968,8 +1186,12 @@ msgid "Scrolling"
 msgstr "Desplaçament"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:26
-msgid "Set the acceleration and sensitivity for the selected device to the default values"
-msgstr "Ajusta l'acceleració i sensibilitat del dispositiu seleccionat als valors per defecte"
+msgid ""
+"Set the acceleration and sensitivity for the selected device to the default "
+"values"
+msgstr ""
+"Ajusta l'acceleració i sensibilitat del dispositiu seleccionat als valors "
+"per defecte"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
 msgid "Size"
@@ -996,20 +1218,33 @@ msgid "Th_reshold:"
 msgstr "_Llindar:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:33
-msgid "The factor at which the pointer's speed will increase as the mouse is moved"
-msgstr "El factor amb que s'incrementarà la velocitat del punter al moure el ratolí"
+msgid ""
+"The factor at which the pointer's speed will increase as the mouse is moved"
+msgstr ""
+"El factor amb que s'incrementarà la velocitat del punter al moure el ratolí"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:34
-msgid "The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click"
-msgstr "El ponter del ratolí no es pot moure més ràpid que aquesta distància entre dos clics per que aquests es puguin considerar com a doble-clic"
+msgid ""
+"The mouse pointer cannot move farther than this distance between two clicks "
+"for them to be considered a double click"
+msgstr ""
+"El ponter del ratolí no es pot moure més ràpid que aquesta distància entre "
+"dos clics per que aquests es puguin considerar com a doble-clic"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:35
-msgid "The number of pixels the pointer must move before a drag operation will start"
-msgstr "El nombre de píxels que el punter ha de moure abans d'una operació d'arrossegament"
+msgid ""
+"The number of pixels the pointer must move before a drag operation will start"
+msgstr ""
+"El nombre de píxels que el punter ha de moure abans d'una operació "
+"d'arrossegament"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:36
-msgid "The number of pixels the pointer must move in a short time before it starts accelerating"
-msgstr "El nombre de píxels que el punter ha de moure en un espai de temps petit abans que s'inicii l'acceleració"
+msgid ""
+"The number of pixels the pointer must move in a short time before it starts "
+"accelerating"
+msgstr ""
+"El nombre de píxels que el punter ha de moure en un espai de temps petit "
+"abans que s'inicii l'acceleració"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:37
 msgid "Ti_me:"
@@ -1020,8 +1255,12 @@ msgid "Tr_acking mode:"
 msgstr "Mode _tàctil:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:39
-msgid "Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click"
-msgstr "Dos clics de botó seguits en menys temps que aquest temps (en milisegons) es considerarà com un doble-clic"
+msgid ""
+"Two mouse clicks in less than this length of time (in milliseconds) will be "
+"considered a double click"
+msgstr ""
+"Dos clics de botó seguits en menys temps que aquest temps (en milisegons) es "
+"considerarà com un doble-clic"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:40
 msgid "Two-_finger scrolling"
@@ -1029,11 +1268,15 @@ msgstr "Desplaçament de dos-_dits"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:41
 msgid "When selected, the scroll wheel will work in the opposite direction"
-msgstr "Si està habilitat la rodeta del ratolí funcionarà en el sentit contrari"
+msgstr ""
+"Si està habilitat la rodeta del ratolí funcionarà en el sentit contrari"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:42
-msgid "When selected, the touchpad will be disabled when the keyboard is being used"
-msgstr "Quan es selecciona, el ratolí tàctil no funcionarà si s'està emprant el teclat"
+msgid ""
+"When selected, the touchpad will be disabled when the keyboard is being used"
+msgstr ""
+"Quan es selecciona, el ratolí tàctil no funcionarà si s'està emprant el "
+"teclat"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:43
 msgid "_Acceleration:"
@@ -1067,164 +1310,202 @@ msgstr "_Rotació:"
 msgid "_Sensitivity:"
 msgstr "_Sensibilitat:"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Editor de paràmetres"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Personalitzeu els paràmetres desats per Xfconf"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Canal"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Propietat"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Tipus"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Bloquejat"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Valor"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "Buit"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Nova propietat"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "No és vàlid el nom de la propietat."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Edita la propietat seleccionada"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr " Reinicia "
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Reinicia"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr "La reinicialització d'una propietat farà que es perdin els seus valors."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Reinicia la propietat seleccionada"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "Voleu reiniciar la propietat «%s»?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "Buit"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "Els noms de les propietats han de començar amb el caràcter «/»"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "Vector"
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "L'element arrel («/») no és un nom de propietat vàlid"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "Cadena"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
-msgstr "Els noms de les propietats només poden tenir caràcters ASCII A-Z, a-z, 0-9, «_», «-», «<» i «>», i també «/» com a separador"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "Enter"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "Els noms de les propietats no poden tenir dos caràcters «/» seguits"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Booleà"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "Els noms de les propietats no poden acabar amb el caràcter «/»"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Doble"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_Reinicia"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "_Reinicia el canal"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
 msgstr "La reinicialització d'un canal farà que es perdin els seus valors."
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr "Voleu reiniciar el canal «<b>%s</b>» així com les seves propietats?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Editor gràfic de paràmetres de Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "reinicia"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Editor de paràmetres"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Booleà"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "Monitor %s"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Personalitzeu els paràmetres desats per Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr ""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Doble"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "inicia la monitorització del canal \"%s\""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Edita la propietat"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "_Monitor"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Editar la propietat"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr ""
+"La reinicialització d'una propietat farà que es perdin els seus valors."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Habilitada"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "Voleu reiniciar la propietat «%s»?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "Enter"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Enter sense signe"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "Enter64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Nom:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Enter64 sense signe"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:141
+#, fuzzy
+msgid "New Property"
 msgstr "Nova propietat"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Reinicia la propietat"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:158
+msgid "_Property:"
+msgstr "_Propietat:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "Cadena"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:173
+msgid "_Type:"
+msgstr "_Tipus:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Tipus:"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:204
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:215
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:227
+msgid "_Value:"
+msgstr "_Valor:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Enter sense signe"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:385
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "Els noms de les propietats han de començar amb el caràcter «/»"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Enter64 sense signe"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:396
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "L'element arrel («/») no és un nom de propietat vàlid"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Valor:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:412
+#, c-format
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Els noms de les propietats només poden tenir caràcters ASCII A-Z, a-z, 0-9, "
+"«_», «-», «<» i «>», i també «/» com a separador"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:425
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr "Els noms de les propietats no poden tenir dos caràcters «/» seguits"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Canals «xfconf»"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:439
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "Els noms de les propietats no poden acabar amb el caràcter «/»"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:652
+msgid "Edit Property"
+msgstr "Edita la propietat"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Editor gràfic de paràmetres de Xfconf"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1284,25 +1565,24 @@ msgstr "Espai de treball %d"
 msgid "The Xfce Settings Daemon"
 msgstr "El dimoni gestor d'ajustaments de Xfce"
 
-#: ../xfce4-settings-manager/main.c:41
+#: ../xfce4-settings-manager/main.c:40
 msgid "Settings dialog to show"
 msgstr "Diàleg de paràmetres a mostrar"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:163
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
+msgid "_All Settings"
+msgstr "_Tots els paràmetres"
+
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "Paràmetres"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:164
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "Personalitzeu l'escriptori"
 
-#. Create back button which takes the user back to the overview
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:271
-msgid "_Overview"
-msgstr "_Resum"
-
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:608
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:624
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
 msgstr "No s'ha pogut iniciar «%s»"
@@ -1315,6 +1595,21 @@ msgstr "Gestor d'ajustaments gràfic de Xfce 4"
 msgid "Settings Manager"
 msgstr "Gestor d'ajustaments"
 
+#~ msgid "This property name is not valid."
+#~ msgstr "No és vàlid el nom de la propietat."
+
+#~ msgid "Enabled"
+#~ msgstr "Habilitada"
+
+#~ msgid "Name:"
+#~ msgstr "Nom:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Canals «xfconf»"
+
+#~ msgid "_Overview"
+#~ msgstr "_Resum"
+
 #~ msgid "Use this area to _test the settings above:"
 #~ msgstr "Empreu aquesta àrea per _provar la configuració:"
 
@@ -1619,6 +1914,3 @@ msgstr "Gestor d'ajustaments"
 
 #~ msgid "Shortcut conflict"
 #~ msgstr "Conflicte de dreceres"
-
-#~ msgid "Set shortcut for command:"
-#~ msgstr "Defineix una drecera per l'ordre:"
diff --git a/po/cs.po b/po/cs.po
index b0564ac..8f76857 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-21 15:51+0000\n"
-"PO-Revision-Date: 2012-01-22 01:47+0100\n"
+"POT-Creation-Date: 2012-02-18 17:06+0000\n"
+"PO-Revision-Date: 2012-02-19 01:21+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech\n"
 "Language: \n"
@@ -206,6 +206,7 @@ msgstr "SOCKET ID"
 #: ../dialogs/appearance-settings/main.c:95
 #: ../dialogs/display-settings/main.c:103
 #: ../dialogs/keyboard-settings/main.c:40
+#: ../dialogs/mime-settings/main.c:40
 #: ../dialogs/mouse-settings/main.c:98
 #: ../xfce4-settings-editor/main.c:43
 #: ../xfsettingsd/main.c:77
@@ -217,10 +218,11 @@ msgstr "Informace o verzi"
 #: ../dialogs/appearance-settings/main.c:966
 #: ../dialogs/display-settings/main.c:1043
 #: ../dialogs/keyboard-settings/main.c:76
+#: ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1515
 #: ../xfce4-settings-editor/main.c:63
 #: ../xfsettingsd/main.c:173
-#: ../xfce4-settings-manager/main.c:57
+#: ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Informace o použití získáte příkazem '%s --help'"
@@ -229,10 +231,11 @@ msgstr "Informace o použití získáte příkazem '%s --help'"
 #: ../dialogs/appearance-settings/main.c:985
 #: ../dialogs/display-settings/main.c:1062
 #: ../dialogs/keyboard-settings/main.c:92
+#: ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1534
 #: ../xfce4-settings-editor/main.c:82
 #: ../xfsettingsd/main.c:189
-#: ../xfce4-settings-manager/main.c:70
+#: ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
 msgstr "Vývojářský tým Xfce. Všechna práva vyhrazena."
 
@@ -240,10 +243,11 @@ msgstr "Vývojářský tým Xfce. Všechna práva vyhrazena."
 #: ../dialogs/appearance-settings/main.c:986
 #: ../dialogs/display-settings/main.c:1063
 #: ../dialogs/keyboard-settings/main.c:93
+#: ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1535
 #: ../xfce4-settings-editor/main.c:83
 #: ../xfsettingsd/main.c:190
-#: ../xfce4-settings-manager/main.c:71
+#: ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Prosíme, abyste chyby hlásili na <%s>."
@@ -415,7 +419,7 @@ msgstr "_Ikony"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:40
 msgid "_Settings"
-msgstr "_Nastavené"
+msgstr "_Nastavení"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:41
 msgid "_Toolbar Style"
@@ -651,26 +655,32 @@ msgid "Select command"
 msgstr "Vyberte příkaz"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:235
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:386
 msgid "All Files"
 msgstr "Všechny soubory"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:240
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:391
 msgid "Executable Files"
 msgstr "Spustitelné soubory"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:255
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:406
 msgid "Perl Scripts"
 msgstr "Skripty jazyka Perl"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:261
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:412
 msgid "Python Scripts"
 msgstr "Skripty jazyka Python"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:267
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:418
 msgid "Ruby Scripts"
 msgstr "Skripty jazyka Ruby"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:273
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:424
 msgid "Shell Scripts"
 msgstr "Shellové skripty"
 
@@ -822,23 +832,144 @@ msgstr "Varianta"
 msgid "Shortcut command may not be empty."
 msgstr "Klávesová zkratka příkazu nemůže zůstat prázdná."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "Obnovit výchozí"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
 msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
 msgstr "Touto akcí nastavíte všechny klávesové zkratky na výchozí hodnoty. Opravdu chcete pokračovat?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr "Výchozí nastavení systému budou obnovena po příštím přihlášení."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "Varování"
 
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:128
+msgid "Select Application"
+msgstr "Výběr aplikace"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:204
+msgid "Use a c_ustom command:"
+msgstr "Použít _vlastní příkaz:"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:205
+msgid "Use a custom command for an application that is not available from the above application list."
+msgstr "Použít vlastní příkaz pro aplikaci, která není dostupná v seznamu aplikací uvedených výše."
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:223
+msgid "_Browse..."
+msgstr "_Procházet..."
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:376
+msgid "Select an Application"
+msgstr "Vyberte aplikaci"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:526
+msgid "None available"
+msgstr "Žádné dostupné"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:573
+msgid "Recommended Applications"
+msgstr "Doporučené aplikace"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:591
+msgid "Other Applications"
+msgstr "Jiné aplikace"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:611
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "Otevřít <i>%s</i> a jiné soubory typu \"%s\" pomocí:"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:647
+#, c-format
+msgid "Failed to add new application \"%s\""
+msgstr "Přidání nové aplikace \"%s\" se nezdařilo"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:174
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:2
+msgid "MIME Type Editor"
+msgstr "Editor typů MIME"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:178
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:1
+msgid "Associate applications with MIME types"
+msgstr "Asociace aplikací s typy MIME"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:203
+msgid "_Filter:"
+msgstr "_Filtr:"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:211
+msgid "Clear filter"
+msgstr "Zrušit filtr"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:257
+msgid "MIME Type"
+msgstr "Typ MIME"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:287
+msgid "Status"
+msgstr "Stav"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:308
+msgid "Default Application"
+msgstr "Výchozí aplikace"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:479
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+msgid "User Set"
+msgstr "Uživatelské nastavení"
+
+#. sort the names but keep Default on top
+#: ../dialogs/mime-settings/xfce-mime-window.c:481
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+#: ../dialogs/mouse-settings/main.c:372
+#: ../dialogs/mouse-settings/main.c:374
+#: ../dialogs/mouse-settings/main.c:434
+msgid "Default"
+msgstr "Výchozí"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:550
+#, c-format
+msgid "%d MIME type found"
+msgid_plural "%d MIME types found"
+msgstr[0] "Nalezen %d typ MIME"
+msgstr[1] "Nalezeny %d typy MIME"
+msgstr[2] "Nalezeno %d typů MIME"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:649
+#, c-format
+msgid "Failed to set application \"%s\" for mime type \"%s\"."
+msgstr "Aplikaci \"%s\" se nepodařilo nastavit typ MIME \"%s\"."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:906
+#, c-format
+msgid "Are you sure you want to reset content type \"%s\" to its default value?"
+msgstr "Opravdu chcete obnovit typ obsahu „%s“ na jeho výchozí hodnotu?"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:910
+msgid "Question"
+msgstr "Otázka"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:913
+msgid "This will remove your custom mime-association and restore the system-wide default."
+msgstr "Tato akce odebere vaše vlastní asociace podle MIME a obnoví výchozí nastavení systému."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:917
+#: ../dialogs/mime-settings/xfce-mime-window.c:988
+msgid "Reset to Default"
+msgstr "Obnovit výchozí"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:983
+msgid "Choose Application..."
+msgstr "Zvolit aplikaci..."
+
 #: ../dialogs/mouse-settings/main.c:96
 msgid "Active device in the dialog"
 msgstr "Aktivní zařízení v dialogovém okně"
@@ -859,13 +990,6 @@ msgstr "%g px"
 msgid "%g ms"
 msgstr "%g ms"
 
-#. sort the names but keep Default on top
-#: ../dialogs/mouse-settings/main.c:372
-#: ../dialogs/mouse-settings/main.c:374
-#: ../dialogs/mouse-settings/main.c:434
-msgid "Default"
-msgstr "Výchozí"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:1
 msgid "B_uttons and Feedback"
 msgstr "_Tlačítka a odezva"
@@ -897,7 +1021,7 @@ msgstr "_Vzdálenost:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
 msgid "De_vice:"
-msgstr "_Zařízení"
+msgstr "Zaříz_ení"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
 msgid "Di_sabled"
@@ -958,7 +1082,7 @@ msgstr "Obnovit _výchozí"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
 msgid "Reverse scroll d_irection"
-msgstr "Otočit s_měr posouvání"
+msgstr "Otočit smě_r posouvání"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
 msgid "Scrolling"
@@ -1010,7 +1134,7 @@ msgstr "Počet pixelů, o které se ukazatel musí v krátkém časovém úseku
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:37
 msgid "Ti_me:"
-msgstr "Č_as:"
+msgstr "Ča_s:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:38
 msgid "Tr_acking mode:"
@@ -1034,7 +1158,7 @@ msgstr "Vyberete-li tuto volbu, bude touchpad během používání klávesnice z
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:43
 msgid "_Acceleration:"
-msgstr "_Akcelerace:"
+msgstr "A_kcelerace:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:44
 msgid "_Behavior"
@@ -1042,11 +1166,11 @@ msgstr "_Chování"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:45
 msgid "_Devices"
-msgstr "_Zařízení"
+msgstr "Z_ařízení"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:46
 msgid "_Enable this device"
-msgstr "_Povolit toto zařízení"
+msgstr "P_ovolit toto zařízení"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:47
 msgid "_Left-handed"
@@ -1062,166 +1186,198 @@ msgstr "O_točení:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:50
 msgid "_Sensitivity:"
-msgstr "_Citlivost:"
+msgstr "Citlivo_st:"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Editor nastavení"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Přizpůsobení nastavení uloženého službou Xfconf"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Kanál"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Vlastnost"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Typ"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Uzamčeno"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "Prázdné"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Nová vlastnost"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Toto není platný název vlasnosti."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Úprava vybrané vlastnosti"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Inicializovat"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Obnovit na výchozí"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr "Inicializace vlastnosti trvale odstraní vlastní nastavení."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Obnovit vybranou vlastnost na výchozí hodnotu"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "Opravdu chcete inicializovat vlastnost „%s“?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "Prázdné"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "Názvy vlastnostní musí začínat znakem '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "Pole"
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "Kořenový element ('/') není platným názvem vlastnosti"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "String"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
-msgstr "Názvy vlastností mohou obsahovat pouze znaky ASCII:  A-Z, a-z, 0-9, '_', '-', '<' a '>', a znak '/' jako oddělovač"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "Celočíselná hodnota"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "Názvy vlastností nemohou obsahovat dva po sobě jdoucí znaky '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Boolean"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "Názvy vlastností nemohou končit znakem '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Double"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_Inicializovat"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "_Obnovit kanál na výchozí hodnotu"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
-msgstr "Inicializace kanálu trvale odstraní vlastní nastavení."
+msgstr "Obnovení kanálu na výchozí hodnotu trvale odstraní vlastní nastavení."
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
-msgstr "Opravdu chcete inicializovat kanál „%s“ a všechny jeho vlastnosti?"
+msgstr "Opravdu chcete obnovit  kanál „%s“ a všechny jeho vlastnosti na výchozí hodnoty?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Grafický editor nastavení služby Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "obnovit na výchozí hodnotu"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Editor nastavení"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Boolean"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "Monitor %s"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Přizpůsobení nastavení uloženého službou Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "Sledovat změny vlastností kanálem Xfconf"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Double"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "zahájit monitorování kanálu \"%s\""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Úprava vlastnosti"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "_Monitor"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Úprava vlastnosti"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr "Obnovení vlastnosti na výchozí hodnotu odstraní vlastní nastavení."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Povoleno"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "Opravdu chcete obnovit vlastnost „%s“ na výchozí hodnotu?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "Int"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Unsigned Int"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Název:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Unsigned Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
 msgstr "Nová vlastnost"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Inicializovat vlastnost"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "_Vlastnost:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "String"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "_Typ:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Typ:"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "_Hodnota:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Unsigned Int"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "Názvy vlastnostní musí začínat znakem '/'"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Unsigned Int64"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "Kořenový element ('/') není platným názvem vlastnosti"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Hodnota:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
+#, c-format
+msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
+msgstr "Názvy vlastností mohou obsahovat pouze znaky ASCII:  A-Z, a-z, 0-9, '_', '-', '<' a '>', a znak '/' jako oddělovač"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Kanály xfconf"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr "Názvy vlastností nemohou obsahovat dva po sobě jdoucí znaky '/'"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "Názvy vlastností nemohou končit znakem '/'"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "Úprava vlastnosti"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Grafický editor nastavení služby Xfconf"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1281,25 +1437,24 @@ msgstr "Pracovní plocha %d"
 msgid "The Xfce Settings Daemon"
 msgstr "Démon nastavení prostředí Xfce"
 
-#: ../xfce4-settings-manager/main.c:41
+#: ../xfce4-settings-manager/main.c:40
 msgid "Settings dialog to show"
 msgstr "Zobrazené dialogové okno nastavení"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:163
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
+msgid "_All Settings"
+msgstr "_Všechna nastavení"
+
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "Nastavení"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:164
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "Přízpůsobte si své pracovní prostředí"
 
-#. Create back button which takes the user back to the overview
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:271
-msgid "_Overview"
-msgstr "_Přehled"
-
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:608
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:624
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
 msgstr "Nelze spustit „%s“"
@@ -1312,6 +1467,21 @@ msgstr "Grafický správce nastavení pro prostředí Xfce 4"
 msgid "Settings Manager"
 msgstr "Správce nastavení"
 
+#~ msgid "This property name is not valid."
+#~ msgstr "Toto není platný název vlasnosti."
+
+#~ msgid "Enabled"
+#~ msgstr "Povoleno"
+
+#~ msgid "Name:"
+#~ msgstr "Název:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Kanály xfconf"
+
+#~ msgid "_Overview"
+#~ msgstr "_Přehled"
+
 #~ msgid "_General"
 #~ msgstr "_Obecné"
 
diff --git a/po/da.po b/po/da.po
index 9fa2857..ba7fcdf 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings 4.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-22 09:06+0000\n"
+"POT-Creation-Date: 2012-02-16 06:36+0000\n"
 "PO-Revision-Date: 2010-01-19 21:40+0100\n"
 "Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
 "Language-Team: Dansk <dansk at dansk-gruppen.dk>\n"
@@ -243,7 +243,7 @@ msgstr "SOKKEL-ID"
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:95
 #: ../dialogs/display-settings/main.c:103
-#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:39
+#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40
 #: ../dialogs/mouse-settings/main.c:98 ../xfce4-settings-editor/main.c:43
 #: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39
 msgid "Version information"
@@ -252,9 +252,9 @@ msgstr "Versionsinformation"
 #: ../dialogs/accessibility-settings/main.c:192
 #: ../dialogs/appearance-settings/main.c:966
 #: ../dialogs/display-settings/main.c:1043
-#: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:61
+#: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:57
+#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Tast '%s --help' for brug."
@@ -262,18 +262,18 @@ msgstr "Tast '%s --help' for brug."
 #: ../dialogs/accessibility-settings/main.c:211
 #: ../dialogs/appearance-settings/main.c:985
 #: ../dialogs/display-settings/main.c:1062
-#: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:80
+#: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:70
+#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce-udviklingsholdet. Alle rettigheder forbeholdes."
 
 #: ../dialogs/accessibility-settings/main.c:212
 #: ../dialogs/appearance-settings/main.c:986
 #: ../dialogs/display-settings/main.c:1063
-#: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:81
+#: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:71
+#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Rapportér venligst fejl til <%s>."
@@ -910,12 +910,12 @@ msgstr "Variant"
 msgid "Shortcut command may not be empty."
 msgstr "Genvejskommando må ikke være tom."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "Nulstil til standardindstillinger"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
 msgid ""
 "This will reset all shortcuts to their default values. Do you really want to "
 "do this?"
@@ -923,11 +923,11 @@ msgstr ""
 "Dette vil nulstille alle genvejene til deres standardværdier. Vil du "
 "virkelig gøre dette?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr "Systemstandarder vil blive genskabt, når du logger ind næste gang."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -943,7 +943,7 @@ msgstr "Brug en til_passet kommando:"
 msgid ""
 "Use a custom command for an application that is not available from the above "
 "application list."
-msgstr ""
+msgstr "Brug en tilpasset kommando for et program som ikke er tilgængeligt på programlisten."
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:223
 msgid "_Browse..."
@@ -975,85 +975,85 @@ msgstr "Åbn <i>%s</i> og andre filer af typen \"%s\" med:"
 msgid "Failed to add new application \"%s\""
 msgstr "Kunne ikke føje nyt prgram\"%s\" til"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:162
+#: ../dialogs/mime-settings/xfce-mime-window.c:174
 #: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:2
 msgid "MIME Type Editor"
 msgstr "Redigering af MIME-type"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:166
+#: ../dialogs/mime-settings/xfce-mime-window.c:178
 #: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:1
 msgid "Associate applications with MIME types"
 msgstr "Tilknyt programmer med MIME-typer"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:186
+#: ../dialogs/mime-settings/xfce-mime-window.c:203
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:194
+#: ../dialogs/mime-settings/xfce-mime-window.c:211
 msgid "Clear filter"
 msgstr "Ryd filter"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:239
+#: ../dialogs/mime-settings/xfce-mime-window.c:257
 msgid "MIME Type"
 msgstr "MIME-type"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:262
+#: ../dialogs/mime-settings/xfce-mime-window.c:287
 msgid "Status"
 msgstr "Status"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:276
+#: ../dialogs/mime-settings/xfce-mime-window.c:308
 msgid "Default Application"
 msgstr "Standardprogram"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:397
-#: ../dialogs/mime-settings/xfce-mime-window.c:519
+#: ../dialogs/mime-settings/xfce-mime-window.c:479
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
 msgid "User Set"
-msgstr ""
+msgstr "Indstil bruger"
 
 #. sort the names but keep Default on top
-#: ../dialogs/mime-settings/xfce-mime-window.c:399
-#: ../dialogs/mime-settings/xfce-mime-window.c:519
+#: ../dialogs/mime-settings/xfce-mime-window.c:481
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
 #: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
 #: ../dialogs/mouse-settings/main.c:434
 msgid "Default"
 msgstr "Standard"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:467
+#: ../dialogs/mime-settings/xfce-mime-window.c:550
 #, c-format
 msgid "%d MIME type found"
 msgid_plural "%d MIME types found"
 msgstr[0] "%d MIME-type fundet"
 msgstr[1] "%d MIME-typer fundet"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:564
+#: ../dialogs/mime-settings/xfce-mime-window.c:649
 #, c-format
 msgid "Failed to set application \"%s\" for mime type \"%s\"."
-msgstr ""
+msgstr "Kunne ikke indstille program \"%s\" til mime-type \"%s\"."
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:821
-#, fuzzy, c-format
+#: ../dialogs/mime-settings/xfce-mime-window.c:906
+#, c-format
 msgid ""
 "Are you sure you want to reset content type \"%s\" to its default value?"
 msgstr ""
 "Er du sikker på, at du vil nulstille kanalen \"%s\" og alle dens "
 "indstillinger?"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:825
+#: ../dialogs/mime-settings/xfce-mime-window.c:910
 msgid "Question"
 msgstr "Spørgsmål"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:828
+#: ../dialogs/mime-settings/xfce-mime-window.c:913
 msgid ""
 "This will remove your custom mime-association and restore the system-wide "
 "default."
-msgstr ""
+msgstr "Dette vil fjerne dine tilpassede MIME-tilknytninger og genskabe systemstandarderne."
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:832
-#: ../dialogs/mime-settings/xfce-mime-window.c:903
+#: ../dialogs/mime-settings/xfce-mime-window.c:917
+#: ../dialogs/mime-settings/xfce-mime-window.c:988
 msgid "Reset to Default"
 msgstr "Nulstil til standardindstillinger"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:898
+#: ../dialogs/mime-settings/xfce-mime-window.c:983
 msgid "Choose Application..."
 msgstr "Vælg program..."
 
@@ -1296,176 +1296,208 @@ msgstr "Ro_tation:"
 msgid "_Sensitivity:"
 msgstr "_Følsomhed:"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Indstillingsredigering"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Tilpas indstillinger gemt af Xfconf"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Egenskab"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Type"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Låst"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Værdi"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "Tom"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Ny egenskab"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Dette egenskabsnavn er ugyldigt."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Redigér vlagte egenskab"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Nulstil"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Nulstil"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr ""
-"Nulstilling af en egenskab vil fjerne disse tilpassede indstillinger for "
-"bestandig."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Nulstil valgte egenskab"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "Er du sikker på, at du vil nulstille egenskab \"%s\"?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "Tom"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "Egenskabsnavne skal begynde med '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "Tabel"
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "Rodelementet ('/') er ikke et gyldigt egenskabsnavn"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "Streng"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid ""
-"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
-"'-', '<' and '>', as well as '/' as a separator"
-msgstr ""
-"Egenskabsnavne kan kun indeholde ASCII-tegnene A-Z, a-z, 0-9, '_', '-', '<' "
-"og '>', samt '/' som en adskiller"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "Heltal"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr ""
-"Egenskabsnavne kan ikke indeholde to eller flere tegn af '/' i rækkefølge"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Boolesk"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "Egenskabsnavne kan ikke afsluttes med '/'"
+# Number with decimal
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Double"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_Nulstil"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "_Nulstil kanal"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
 msgstr ""
 "Nulstilling af en kanal vil for bestandigt fjerne disse tilpassede "
 "indstillinger."
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr ""
 "Er du sikker på, at du vil nulstille kanalen \"%s\" og alle dens "
 "indstillinger?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Grafisk indstillingredigering til Xfconf"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Indstillingsredigering"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "nulstil"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Boolesk"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "Overvåg %s"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Tilpas indstillinger gemt af Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "Overvåg en Xconf-kanal for ændring af egenskaber"
 
-# Number with decimal
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Double"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "start overvågning af kanalen \"%s\""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Redigér egenskab"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "_Overvåg"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Redigér egenskab"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr ""
+"Nulstilling af en egenskab vil fjerne disse tilpassede indstillinger for "
+"bestandig."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Aktiveret"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "Er du sikker på, at du vil nulstille egenskab \"%s\"?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "Int"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Int uden fortegn"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Navn:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Int64 uden fortegn"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
 msgstr "Ny egenskab"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Nulstil egenskab"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "_Egenskab"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "Streng"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "_Type:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Type:"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "_Værdi:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Int uden fortegn"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "Egenskabsnavne skal begynde med '/'"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Int64 uden fortegn"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "Rodelementet ('/') er ikke et gyldigt egenskabsnavn"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
+#, c-format
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Egenskabsnavne kan kun indeholde ASCII-tegnene A-Z, a-z, 0-9, '_', '-', '<' "
+"og '>', samt '/' som en adskiller"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr ""
+"Egenskabsnavne kan ikke indeholde to eller flere tegn af '/' i rækkefølge"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Værdi:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "Egenskabsnavne kan ikke afsluttes med '/'"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "Redigér egenskab"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Kanaler til Xfconf"
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Grafisk indstillingredigering til Xfconf"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1525,25 +1557,24 @@ msgstr "Arbejdsområde %d"
 msgid "The Xfce Settings Daemon"
 msgstr "Håndteringstjenesten til Xfce"
 
-#: ../xfce4-settings-manager/main.c:41
+#: ../xfce4-settings-manager/main.c:40
 msgid "Settings dialog to show"
 msgstr "Indstillingsdialog til visning"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:163
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
+msgid "_All Settings"
+msgstr "_Alle indstillinger"
+
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:164
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "Tilpas dit skrivebord"
 
-#. Create back button which takes the user back to the overview
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:271
-msgid "_Overview"
-msgstr "_Overblik"
-
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:578
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:594
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
 msgstr "Kunne ikke starte \"%s\""
@@ -1556,6 +1587,21 @@ msgstr "Grafisk indstillingshåndtering til Xfce 4"
 msgid "Settings Manager"
 msgstr "Indstillingshåndtering"
 
+#~ msgid "This property name is not valid."
+#~ msgstr "Dette egenskabsnavn er ugyldigt."
+
+#~ msgid "Enabled"
+#~ msgstr "Aktiveret"
+
+#~ msgid "Name:"
+#~ msgstr "Navn:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Kanaler til Xfconf"
+
+#~ msgid "_Overview"
+#~ msgstr "_Overblik"
+
 #~ msgid "_General"
 #~ msgstr "_Generelt"
 
diff --git a/po/de.po b/po/de.po
index b91a882..c5f4db5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings 0.0.1-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-27 16:42+0000\n"
+"POT-Creation-Date: 2012-02-17 11:51+0000\n"
 "PO-Revision-Date: 2010-02-19 18:52+0100\n"
 "Last-Translator: Thomas Schütz <xfce at thschuetz.de>\n"
 "Language-Team: German <xfce-i18n-de at xfce.org>\n"
@@ -23,11 +23,11 @@ msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
 msgid "Acceleration _profile:"
-msgstr "Be_schleunigungsprofil:"
+msgstr "Beschleunigungs_profil:"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:2
 msgid "Acceleration _time:"
-msgstr "B_eschleunigungszeit:"
+msgstr "Beschleunigungszei_t:"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:3
 msgid "Acceptance _delay:"
@@ -52,11 +52,11 @@ msgstr "Zurückschnellende Tasten"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:8
 msgid "Configure keyboard and mouse accessibility"
-msgstr "Erleichtern Sie sich die Verwendung von Tastatur und Maus"
+msgstr "Barrierefreiheit für Tastatur und Maus einrichten"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9
 msgid "Disable sticky keys if _two keys are pressed"
-msgstr "Haftende Tasten deaktivieren, wenn zwei Tasten gedrückt werden"
+msgstr "Haftende _Tasten deaktivieren, wenn zwei Tasten gedrückt werden"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
 msgid ""
@@ -72,7 +72,7 @@ msgstr "Verzö_gerung des Tastendrucks:"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12
 msgid "Keyboa_rd"
-msgstr "_Tastatur"
+msgstr "Tastatu_r"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13
 msgid "Maximum _speed:"
@@ -822,7 +822,6 @@ msgid "Reset to _Defaults"
 msgstr "Auf Standardwerte _zurücksetzen"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
-#, fuzzy
 msgid "Restore num l_ock state on startup"
 msgstr "NumL_ock-Status beim Start wiederherstellen"
 
@@ -885,7 +884,6 @@ msgid "_Repeat delay:"
 msgstr "V_erzögerung der Wiederholung:"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:27
-#, fuzzy
 msgid "_Test area:"
 msgstr "_Testbereich:"
 
@@ -926,12 +924,12 @@ msgstr "Variante"
 msgid "Shortcut command may not be empty."
 msgstr "Der Befehl für das Tastenkürzel darf nicht leer sein."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "Standardwerte setzen"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
 msgid ""
 "This will reset all shortcuts to their default values. Do you really want to "
 "do this?"
@@ -939,110 +937,96 @@ msgstr ""
 "Dies setzt alle Tastenkürzel auf ihre Standardwerte zurück. Möchten Sie dies "
 "wirklich?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr ""
 "Die Systemvorgaben werden wiederhergestellt, wenn Sie sich das nächste Mal "
 "anmelden."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "Warnung"
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:128
-#, fuzzy
 msgid "Select Application"
 msgstr "Anwendung auswählen"
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:204
-#, fuzzy
 msgid "Use a c_ustom command:"
 msgstr "Einen ben_utzerdefinierten Befehl verwenden:"
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:205
-#, fuzzy
 msgid ""
 "Use a custom command for an application that is not available from the above "
 "application list."
-msgstr "Einen benutzerdefinierten Befehl für eine Anwendung eingeben, die nicht in der obigen Liste enthalten ist."
+msgstr ""
+"Einen benutzerdefinierten Befehl für eine Anwendung eingeben, die nicht in "
+"der obigen Liste enthalten ist."
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:223
-#, fuzzy
 msgid "_Browse..."
 msgstr "_Durchsuchen"
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:376
-#, fuzzy
 msgid "Select an Application"
 msgstr "Anwendung auswählen"
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:526
-#, fuzzy
 msgid "None available"
 msgstr "Keine verfügbar"
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:573
-#, fuzzy
 msgid "Recommended Applications"
-msgstr "Bevorzugte Anwendungen"
+msgstr "Empfohlene Anwendungen"
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:591
-#, fuzzy
 msgid "Other Applications"
 msgstr "Andere Anwendungen"
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:611
-#, c-format, fuzzy
+#, c-format
 msgid "Open <i>%s</i> and other files of type \"%s\" with:"
 msgstr "<i>%s</i> und andere Dateien vom Typ »%s« öffnen mit:"
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:647
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to add new application \"%s\""
 msgstr "Die Anwendung »%s« konnte nicht hinzugefügt werden"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:174
 #: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:2
-#, fuzzy
 msgid "MIME Type Editor"
 msgstr "MIME-Typ-Editor"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:178
 #: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:1
-#, fuzzy
 msgid "Associate applications with MIME types"
 msgstr "Verknüpfe Anwendungen mit MIME-Typen"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:203
-#, fuzzy
 msgid "_Filter:"
 msgstr "_Filter:"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:211
-#, fuzzy
 msgid "Clear filter"
-msgstr "Lösche Filter"
+msgstr "Filter löschen"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:257
-#, fuzzy
 msgid "MIME Type"
 msgstr "MIME-Typ"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:287
-#, fuzzy
 msgid "Status"
 msgstr "Status"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:308
-#, fuzzy
 msgid "Default Application"
 msgstr "Standardanwendung"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:479
 #: ../dialogs/mime-settings/xfce-mime-window.c:604
-#, fuzzy
 msgid "User Set"
-msgstr "Benutzer"
+msgstr "Benutzereinstellung"
 
 #. sort the names but keep Default on top
 #: ../dialogs/mime-settings/xfce-mime-window.c:481
@@ -1053,46 +1037,46 @@ msgid "Default"
 msgstr "Standard"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:550
-#, c-format, fuzzy
+#, c-format
 msgid "%d MIME type found"
 msgid_plural "%d MIME types found"
 msgstr[0] "%d MIME-Typ gefunden"
 msgstr[1] "%d MIME-Typen gefunden"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:649
-#, c-format, fuzzy
+#, c-format
 msgid "Failed to set application \"%s\" for mime type \"%s\"."
-msgstr "Die Anwendung »%s« konnte nicht für den MIME-Typ »%s« festgelegt werden."
+msgstr ""
+"Die Anwendung »%s« konnte nicht für den MIME-Typ »%s« festgelegt werden."
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:906
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to reset content type \"%s\" to its default value?"
 msgstr ""
-"Sind Sie sicher, dass Sie die den MIME-Typ »%s« auf seine Standardeinstellung zurücksetzen möchten?"
+"Sind Sie sicher, dass Sie die den MIME-Typ »%s« auf seine "
+"Standardeinstellung zurücksetzen möchten?"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:910
-#, fuzzy
 msgid "Question"
 msgstr "Frage"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:913
-#, fuzzy
 msgid ""
 "This will remove your custom mime-association and restore the system-wide "
 "default."
-msgstr "Hiermit wird Ihre persönliche MIME-Verknüpfung gelöscht und die Standardeinstellung wieder hergestellt."
+msgstr ""
+"Hiermit wird Ihre persönliche MIME-Verknüpfung gelöscht und die "
+"Standardeinstellung wieder hergestellt."
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:917
 #: ../dialogs/mime-settings/xfce-mime-window.c:988
-#, fuzzy
 msgid "Reset to Default"
 msgstr "Auf Standard zurücksetzen"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:983
-#, fuzzy
 msgid "Choose Application..."
-msgstr "Anwendung auswählen..."
+msgstr "Anwendung auswählen"
 
 #: ../dialogs/mouse-settings/main.c:96
 msgid "Active device in the dialog"
@@ -1115,7 +1099,6 @@ msgid "%g ms"
 msgstr "%g Millisekunden"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:1
-#, fuzzy
 msgid "B_uttons and Feedback"
 msgstr "Tasten und Rückmeld_ung"
 
@@ -1338,174 +1321,209 @@ msgstr "_Drehung:"
 msgid "_Sensitivity:"
 msgstr "_Empfindlichkeit:"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Einstellungseditor"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Von Xfconf gespeicherte Einstellungen bearbeiten"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Eigenschaft"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Typ"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Wert"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "Leer"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Neue Eigenschaft"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Dieser Eigenschaftsname ist ungültig"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Ausgewählte Eigenschaft bearbeiten"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Zurücksetzen"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Zurücksetzen"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr ""
-"Zurücksetzen der Eigenschaften wird diese benutzerdefinierten Einstellungen "
-"löschen."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Ausgewählte Eigenschaft zurücksetzen"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "Sind Sie sicher, dass Sie die Eigenschaft »%s« zurücksetzen möchten?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "Leer"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "Eigenschaftsnamen müssen mit '/' beginnen."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+#, fuzzy
+msgid "Array"
+msgstr "Feld"
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "Das Stammelement (/) ist kein gültiger Name für eine Eigenschaft"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "String"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid ""
-"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
-"'-', '<' and '>', as well as '/' as a separator"
-msgstr ""
-"Eigenschaftsnamen können nur ASCII Zeichen beinhalten.\n"
-"A-Z, a-z, 0-9, '_', '-', '<' und '>', sowie '/' als Trennzeichen"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+#, fuzzy
+msgid "Integer"
+msgstr "Ganzzahl"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "Eigenschaftsnamen dürfen keine aufeinander folgenden '/' enthalten"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Boolesch"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "Eigenschaftsnamen dürfen nicht mit '/' enden"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "<b>Doppelklick</b>"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_Zurücksetzen"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "Kanal zu_rücksetzen"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
 msgstr ""
 "Zurücksetzen des Kanals wird diese benutzerdefinierten Einstellungen "
 "dauerhaft löschen."
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr ""
 "Sind Sie sicher, dass Sie die den Kanal »%s« und alle zugehörigen "
 "Eigenschaften zurücksetzen möchten?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Grafischer Einstellungseditor für Xfconf"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Einstellungseditor"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "Zurücksetzen"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Boolesch"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "%s überwachen"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Einstellungen, die von Xfconf gespeichert werden, bearbeiten"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "Einen Xfconf-Kanal auf Änderungen von Eigenschaften überwachen"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "<b>Doppelklick</b>"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "Überwachung des Kanals »%s« starten "
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Eigenschaft bearbeiten"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+#, fuzzy
+msgid "_Monitor"
+msgstr "_Überwachung"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Eigenschaft bearbeiten"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr ""
+"Zurücksetzen der Eigenschaften wird diese benutzerdefinierten Einstellungen "
+"löschen."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Aktiviert"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "Sind Sie sicher, dass Sie die Eigenschaft »%s« zurücksetzen möchten?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "Int"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Unsigned Int"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Name:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Unsigned Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
 msgstr "Neue Eigenschaft"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Eigenschaft zurücksetzen/entfernen"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "_Eigenschaft"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "String"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "_Typ:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Typ:"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "_Wert:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Unsigned Int"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "Eigenschaftsnamen müssen mit '/' beginnen."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Unsigned Int64"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "Das Stammelement (/) ist kein gültiger Name für eine Eigenschaft"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Wert:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
+#, c-format
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Eigenschaftsnamen können nur ASCII Zeichen beinhalten.\n"
+"A-Z, a-z, 0-9, '_', '-', '<' und '>', sowie '/' als Trennzeichen"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Kanäle"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr "Eigenschaftsnamen dürfen keine aufeinander folgenden '/' enthalten"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "Eigenschaftsnamen dürfen nicht mit '/' enden"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "Eigenschaft bearbeiten"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Grafischer Einstellungseditor für Xfconf"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1569,21 +1587,20 @@ msgstr "Der Einstellungs-Daemon für Xfce"
 msgid "Settings dialog to show"
 msgstr "Anzuzeigende Einstellungen"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:184
-#, fuzzy
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
 msgid "_All Settings"
 msgstr "_Alle Einstellungen"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:364
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "Passen Sie Ihre Arbeitsumgebung Ihren Wünschen an"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:850
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:861
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
 msgstr "Kann »%s« nicht starten"
@@ -1596,6 +1613,18 @@ msgstr "Grafische Einstellungsverwaltung für Xfce 4"
 msgid "Settings Manager"
 msgstr "Einstellungen"
 
+#~ msgid "This property name is not valid."
+#~ msgstr "Dieser Eigenschaftsname ist ungültig"
+
+#~ msgid "Enabled"
+#~ msgstr "Aktiviert"
+
+#~ msgid "Name:"
+#~ msgstr "Name:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Kanäle"
+
 #~ msgid "_General"
 #~ msgstr "All_gemein"
 
diff --git a/po/es.po b/po/es.po
index 5efd11d..836dbe6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-24 19:06+0000\n"
+"POT-Creation-Date: 2012-03-14 11:48+0000\n"
 "PO-Revision-Date: 2010-01-27 05:15-0800\n"
 "Last-Translator: Javier Sánchez <donoban at gmail.com>\n"
 "Language-Team: Spanish/ES <xfce-i18n at xfce.org>\n"
@@ -254,7 +254,7 @@ msgstr "Información de versión"
 #: ../dialogs/display-settings/main.c:1043
 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:57
+#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Escriba «%s --help» para instrucciones de uso."
@@ -264,7 +264,7 @@ msgstr "Escriba «%s --help» para instrucciones de uso."
 #: ../dialogs/display-settings/main.c:1062
 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:70
+#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
 msgstr "El equipo de desarrollo de Xfce. Todos los derechos reservados."
 
@@ -273,7 +273,7 @@ msgstr "El equipo de desarrollo de Xfce. Todos los derechos reservados."
 #: ../dialogs/display-settings/main.c:1063
 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:71
+#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Por favor, informe de fallos a <%s>"
@@ -820,7 +820,7 @@ msgstr "Reestablecer a Opciones _Predeterminadas"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
 msgid "Restore num l_ock state on startup"
-msgstr ""
+msgstr "Restaurar estado de num l_ock al inicio"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
 msgid "Select keyboard layout and variant"
@@ -922,12 +922,12 @@ msgstr "Variante"
 msgid "Shortcut command may not be empty."
 msgstr "El comando de atajo no puede estar vacío."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "Restablecer opciones predeterminadas"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
 msgid ""
 "This will reset all shortcuts to their default values. Do you really want to "
 "do this?"
@@ -935,13 +935,13 @@ msgstr ""
 "Esto restablecerá todos los atajos a sus valores predeterminados. ¿Seguro "
 "que desea hacer esto?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr ""
 "Las opciones predeterminadas del sistema se restaurarán la próxima vez que "
 "inicie sesión."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "Atención"
 
@@ -964,12 +964,10 @@ msgid "_Browse..."
 msgstr "_Navegar..."
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:376
-#, fuzzy
 msgid "Select an Application"
-msgstr "Seleccione el tipo de letra predeterminado"
+msgstr "Seleccionar una Aplicación"
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:526
-#, fuzzy
 msgid "None available"
 msgstr "Nada disponible"
 
@@ -1318,63 +1316,182 @@ msgstr "Ro_tación:"
 msgid "_Sensitivity:"
 msgstr "_Sensibilidad:"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Editor de configuración"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Personalizar configuración guardada por Xfconf"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Canal"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Propiedad"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Tipo"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Valor"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Nueva propiedad"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+#, fuzzy
+msgid "Edit selected property"
+msgstr "Editar propiedad"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Reiniciar"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+#, fuzzy
+msgid "Reset selected property"
+msgstr "Restablecer propiedad"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
 msgid "Empty"
 msgstr "Vacío"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Este nombre para la propiedad es inválido"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "Arreglo"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Restablecer"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "String"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "Entero"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Boolean"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Double"
 
-#: ../xfce4-settings-editor/main_window.c:926
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "_Reiniciar Canal"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
+msgid "Resetting a channel will permanently remove those custom settings."
+msgstr ""
+"Restabler un canal eliminará permanentemente sus configuraciones "
+"personalizadas."
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
+#, c-format
+msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
+msgstr ""
+"¿Está seguro de querer restablecer el canal \"%s\" y todas sus propiedades?"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "reiniciar"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "Monitor %s"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr ""
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "empezar a monitorear canal \"%s\""
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "_Monitor"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
 msgid "Resetting a property will permanently remove those custom settings."
 msgstr ""
 "Restablecer una propiedad eliminará permamente sus configuraciones "
 "personalizadas."
 
-#: ../xfce4-settings-editor/main_window.c:927
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
 #, c-format
 msgid "Are you sure you want to reset property \"%s\"?"
 msgstr "¿Está seguro de querer restablecer la propiedad \"%s\"?"
 
-#: ../xfce4-settings-editor/main_window.c:983
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
+msgid "Int"
+msgstr "Int"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Unsigned Int"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
+msgid "Int64"
+msgstr "Int64"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Unsigned Int64"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:141
+msgid "New Property"
+msgstr "Nueva Propiedad"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:158
+msgid "_Property:"
+msgstr "_Propiedad:"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:173
+msgid "_Type:"
+msgstr "_Tipo:"
+
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:204
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:215
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:227
+msgid "_Value:"
+msgstr "_Valor:"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:385
 #, c-format
 msgid "Property names must start with a '/' character"
 msgstr "Los nombres de las propiedades deben empezar con el carácter '/'"
 
-#: ../xfce4-settings-editor/main_window.c:992
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:396
 #, c-format
 msgid "The root element ('/') is not a valid property name"
 msgstr "La raíz ('/') no es válida como nombre de propiedad"
 
-#: ../xfce4-settings-editor/main_window.c:1006
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:412
 #, c-format
 msgid ""
 "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
@@ -1383,111 +1500,26 @@ msgstr ""
 "Los nombres de las propiedades sólo pueden incluir los carácteres ASCII A-Z, "
 "a-z, 0-9, '_', '-', '>', y '>', aparte del separador '/'"
 
-#: ../xfce4-settings-editor/main_window.c:1015
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:425
 #, c-format
 msgid "Property names cannot have two or more consecutive '/' characters"
 msgstr ""
 "Los nombres de las propiedades no pueden tener dos o más carácteres '/' "
 "consecutivos"
 
-#: ../xfce4-settings-editor/main_window.c:1026
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:439
 #, c-format
 msgid "Property names cannot end with a '/' character"
 msgstr "Los nombres de las propiedades no pueden terminar con el carácter '/'"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_Reiniciar"
-
-#: ../xfce4-settings-editor/main_window.c:1079
-msgid "Resetting a channel will permanently remove those custom settings."
-msgstr ""
-"Restabler un canal eliminará permanentemente sus configuraciones "
-"personalizadas."
-
-#: ../xfce4-settings-editor/main_window.c:1080
-#, c-format
-msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
-msgstr ""
-"¿Está seguro de querer restablecer el canal \"%s\" y todas sus propiedades?"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:652
+msgid "Edit Property"
+msgstr "Editar propiedad"
 
 #: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
 msgid "Graphical settings editor for Xfconf"
 msgstr "Editor gráfico de configuración para Xfconf"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Editor de configuración"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Boolean"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Personalizar configuración guardada por Xfconf"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Double"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Editar propiedad"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Editar propiedad"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Activado"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
-msgid "Int"
-msgstr "Int"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
-msgid "Int64"
-msgstr "Int64"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Nombre:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
-msgstr "Nueva propiedad"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Restablecer propiedad"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "String"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Tipo:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Unsigned Int"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Unsigned Int64"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Valor:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Canales de Xfconf"
-
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
 msgstr "Las teclas persistentes están activadas"
@@ -1547,25 +1579,24 @@ msgstr "Área de trabajo %d"
 msgid "The Xfce Settings Daemon"
 msgstr "El demonio de configuraciones de Xfce"
 
-#: ../xfce4-settings-manager/main.c:41
+#: ../xfce4-settings-manager/main.c:40
 msgid "Settings dialog to show"
 msgstr "Diálogo de configuración a mostrar"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:163
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
+msgid "_All Settings"
+msgstr "_Todos los Ajustes"
+
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "Configuración"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:164
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "Personalice su escritorio"
 
-#. Create back button which takes the user back to the overview
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:271
-msgid "_Overview"
-msgstr "_General"
-
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:578
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:594
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
 msgstr "Imposible iniciar \"%s\""
@@ -1578,6 +1609,21 @@ msgstr "Gestor gráfico de configuración para Xfce 4"
 msgid "Settings Manager"
 msgstr "Administrador de configuración"
 
+#~ msgid "This property name is not valid."
+#~ msgstr "Este nombre para la propiedad es inválido"
+
+#~ msgid "Enabled"
+#~ msgstr "Activado"
+
+#~ msgid "Name:"
+#~ msgstr "Nombre:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Canales de Xfconf"
+
+#~ msgid "_Overview"
+#~ msgstr "_General"
+
 #~ msgid "Use this area to _test the settings above:"
 #~ msgstr "Use este campo para _probar la configuración de arriba:"
 
diff --git a/po/eu.po b/po/eu.po
index 23b0712..8978ce6 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-16 05:18+0000\n"
+"POT-Creation-Date: 2012-02-17 06:00+0000\n"
 "PO-Revision-Date: 2010-02-10 22:13+0100\n"
 "Last-Translator: \n"
 "Language-Team: Basque <kde-i18n-doc at kde.org>\n"
@@ -239,18 +239,18 @@ msgstr "SOCKET IDa"
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:95
 #: ../dialogs/display-settings/main.c:103
-#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:98
-#: ../xfce4-settings-editor/main.c:43 ../xfsettingsd/main.c:77
-#: ../xfce4-settings-manager/main.c:39
+#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40
+#: ../dialogs/mouse-settings/main.c:98 ../xfce4-settings-editor/main.c:43
+#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39
 msgid "Version information"
 msgstr "Bertsio argibideak"
 
 #: ../dialogs/accessibility-settings/main.c:192
 #: ../dialogs/appearance-settings/main.c:966
 #: ../dialogs/display-settings/main.c:1043
-#: ../dialogs/keyboard-settings/main.c:76
+#: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:57
+#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Idatzi '%s --help' erabilerarentzat."
@@ -258,18 +258,18 @@ msgstr "Idatzi '%s --help' erabilerarentzat."
 #: ../dialogs/accessibility-settings/main.c:211
 #: ../dialogs/appearance-settings/main.c:985
 #: ../dialogs/display-settings/main.c:1062
-#: ../dialogs/keyboard-settings/main.c:92
+#: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:70
+#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce garapen taldea. Eskubide guztiak erreserbatuta."
 
 #: ../dialogs/accessibility-settings/main.c:212
 #: ../dialogs/appearance-settings/main.c:986
 #: ../dialogs/display-settings/main.c:1063
-#: ../dialogs/keyboard-settings/main.c:93
+#: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:71
+#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Programa-erroreen berri eman <%s>-ra."
@@ -720,26 +720,32 @@ msgid "Select command"
 msgstr "Hautatu komandoa"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:235
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:386
 msgid "All Files"
 msgstr "Fitxategi denak"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:240
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:391
 msgid "Executable Files"
 msgstr "Fitxategi exekutagarriak"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:255
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:406
 msgid "Perl Scripts"
 msgstr "Perl script-ak"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:261
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:412
 msgid "Python Scripts"
 msgstr "Python script-ak"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:267
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:418
 msgid "Ruby Scripts"
 msgstr "Ruby script-ak"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:273
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:424
 msgid "Shell Scripts"
 msgstr "Shell script-ak"
 
@@ -899,12 +905,12 @@ msgstr "Aldagaia"
 msgid "Shortcut command may not be empty."
 msgstr "Lasterbide komandoak ezin  du hutsi egon."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "Berrezarri lehenetsian"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
 msgid ""
 "This will reset all shortcuts to their default values. Do you really want to "
 "do this?"
@@ -912,14 +918,139 @@ msgstr ""
 "Honek laster-tekla guztiak bere lehenetsiriko balioetara ezarriko ditu. "
 "Benetan hau egin nahi duzula?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr "Sistema lehenespenak berrezarriko dira saio hasten duzun hurrengoan."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "Abisua"
 
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:128
+msgid "Select Application"
+msgstr "Hautatu aplikazioa"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:204
+msgid "Use a c_ustom command:"
+msgstr "Erabili pertsonalizat_utako komandoa"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:205
+msgid ""
+"Use a custom command for an application that is not available from the above "
+"application list."
+msgstr "Erabili pertsonalizatutako komando bat behekoz zerrendan agertzen ez de aplikazio batentzat."
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:223
+msgid "_Browse..."
+msgstr "_Arakatu..."
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:376
+msgid "Select an Application"
+msgstr "Hautatu aplikazio bat"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:526
+msgid "None available"
+msgstr "Batez erabilgarri"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:573
+msgid "Recommended Applications"
+msgstr "Gomendatutako aplikazioak"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:591
+msgid "Other Applications"
+msgstr "Beste aplikazioak"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:611
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "Ireki <i>%s</i> eta \"%s\" motako fitxategiak honekin:"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:647
+#, c-format
+msgid "Failed to add new application \"%s\""
+msgstr "Huts \"%s\" aplikazio berria gehitzean."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:174
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:2
+msgid "MIME Type Editor"
+msgstr "MIME mota editorea"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:178
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:1
+msgid "Associate applications with MIME types"
+msgstr "Lotu MIME motak aplikazioekin."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:203
+msgid "_Filter:"
+msgstr "_Iragazkia:"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:211
+msgid "Clear filter"
+msgstr "Garbitu iragazkia"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:257
+msgid "MIME Type"
+msgstr "MIME mota"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:287
+msgid "Status"
+msgstr "Egoera"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:308
+msgid "Default Application"
+msgstr "Lehenetsitako aplikazioa"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:479
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+msgid "User Set"
+msgstr "Erabiltzaile ezarpenak"
+
+#. sort the names but keep Default on top
+#: ../dialogs/mime-settings/xfce-mime-window.c:481
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+#: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
+#: ../dialogs/mouse-settings/main.c:434
+msgid "Default"
+msgstr "Lehenetsia"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:550
+#, c-format
+msgid "%d MIME type found"
+msgid_plural "%d MIME types found"
+msgstr[0] "MIME mota %d topatu da"
+msgstr[1] "%d MIME mota topatu dira"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:649
+#, c-format
+msgid "Failed to set application \"%s\" for mime type \"%s\"."
+msgstr "Huts \"%s\" aplikazioa \"%s\" MIME motarentzat ezartzerakoan."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:906
+#, c-format
+msgid ""
+"Are you sure you want to reset content type \"%s\" to its default value?"
+msgstr ""
+"Ziur zaude \"%s\" kanala eta dituen propietateak berrabiarazi nahi duzula?"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:910
+msgid "Question"
+msgstr "Galdera"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:913
+msgid ""
+"This will remove your custom mime-association and restore the system-wide "
+"default."
+msgstr "Honek zure pertsonalizatutako mime-lotura ezabatu eta sistemaren lehenespena berrezarriko du."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:917
+#: ../dialogs/mime-settings/xfce-mime-window.c:988
+msgid "Reset to Default"
+msgstr "Berrezarri lehenetsian"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:983
+msgid "Choose Application..."
+msgstr "Hautatu aplikazioa..."
+
 #: ../dialogs/mouse-settings/main.c:96
 msgid "Active device in the dialog"
 msgstr "Gaitu gailua elkarrizketan"
@@ -940,12 +1071,6 @@ msgstr "%g px"
 msgid "%g ms"
 msgstr "%g ms"
 
-#. sort the names but keep Default on top
-#: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
-#: ../dialogs/mouse-settings/main.c:434
-msgid "Default"
-msgstr "Lehenetsia"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:1
 msgid "B_uttons and Feedback"
 msgstr "B_otoi eta berrelikadura"
@@ -1167,63 +1292,178 @@ msgstr "Bi_raketa:"
 msgid "_Sensitivity:"
 msgstr "_Sentikortasuna:"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Ezarpen editorea"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Xfconf-ek gordetako ezarpenak pertsonlizatu"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Kanala"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Propietatea"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Mota"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Blokeatuta"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Balioa"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Propietate berria"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Editatu hautatutako propietatea"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "Be_rrezarri"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Berrezarri hautatutako propietatea"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
 msgid "Empty"
 msgstr "Hutsik"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Propietate izen baliogabea."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "Array-a"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "Katea"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "Osokoa"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Boolearra"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Bikoitza"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "Be_rrezarri kanala"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
+msgid "Resetting a channel will permanently remove those custom settings."
+msgstr "Kanal bat berrezartzean pertsonalizazioak betirako galduko dira."
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
+#, c-format
+msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
+msgstr ""
+"Ziur zaude \"%s\" kanala eta dituen propietateak berrabiarazi nahi duzula?"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "berrezarri"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "%s monitorea"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "Ikusi Xfconf kanala propietate aldaketetarako."
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "hasi \"%s\" kanala kontrolatzen"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Berrezarri"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "_Monitorea"
 
-#: ../xfce4-settings-editor/main_window.c:926
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
 msgid "Resetting a property will permanently remove those custom settings."
 msgstr ""
 "Propietate bat berrezartzean betirako galtzen dira pertsonalizatutako "
 "ezarpenak."
 
-#: ../xfce4-settings-editor/main_window.c:927
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
 #, c-format
 msgid "Are you sure you want to reset property \"%s\"?"
 msgstr "Ziur zaude \"%s\" propietatea berrabiarazi nahi duzula?"
 
-#: ../xfce4-settings-editor/main_window.c:983
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
+msgid "Int"
+msgstr "Int"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Sinatu-gabeko int"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
+msgid "Int64"
+msgstr "Int64"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Sinatu-gabeko int64"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
+msgstr "Propietate berria"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "_Propietatea:"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "Mo_ta:"
+
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "_Balioa:"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
 #, c-format
 msgid "Property names must start with a '/' character"
 msgstr "Propietate izenak '/' karaktereaz hasi behar dira"
 
-#: ../xfce4-settings-editor/main_window.c:992
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
 #, c-format
 msgid "The root element ('/') is not a valid property name"
 msgstr "Erro elementua ('/') ez da propietate izen erabilgarri bat"
 
-#: ../xfce4-settings-editor/main_window.c:1006
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
 #, c-format
 msgid ""
 "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
@@ -1232,107 +1472,24 @@ msgstr ""
 "Propietate izeneko A-Z, a-z, 0-9, '_', '-', '<' eta '> ASCII karaktereak eta "
 "'/' bereizle gisa bakarrik eduki ditzakete."
 
-#: ../xfce4-settings-editor/main_window.c:1015
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
 #, c-format
 msgid "Property names cannot have two or more consecutive '/' characters"
 msgstr "Propietate izenek zin dute '/' baino gehiago jarraian eduki"
 
-#: ../xfce4-settings-editor/main_window.c:1026
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
 #, c-format
 msgid "Property names cannot end with a '/' character"
 msgstr "Propietate izenak ezin dira '/' karaktereaz amaitu"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "Be_rrezarri"
-
-#: ../xfce4-settings-editor/main_window.c:1079
-msgid "Resetting a channel will permanently remove those custom settings."
-msgstr "Kanal bat berrezartzean pertsonalizazioak betirako galduko dira."
-
-#: ../xfce4-settings-editor/main_window.c:1080
-#, c-format
-msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
-msgstr ""
-"Ziur zaude \"%s\" kanala eta dituen propietateak berrabiarazi nahi duzula?"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "Editatu propietatea"
 
 #: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
 msgid "Graphical settings editor for Xfconf"
 msgstr "Xfconf-ren ezarpen editore grafikoa"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Ezarpen editorea"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Boolearra"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Xfconf-ek gordetako ezarpenak pertsonlizatu"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Bikoitza"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Editatu propietatea"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Editatu propietatea"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Gaituta"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
-msgid "Int"
-msgstr "Int"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
-msgid "Int64"
-msgstr "Int64"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Izena:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
-msgstr "Propietate berria"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Berrezarri propietatea"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "Katea"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Mota:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Sinatu-gabeko int"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Sinatu-gabeko int64"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Balioa:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Xfconf kanalak"
-
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
 msgstr "Tekla itsaskorrak gaiturik daude"
@@ -1391,25 +1548,24 @@ msgstr "%d idazmahaia"
 msgid "The Xfce Settings Daemon"
 msgstr "Xfce ezarpen deabrua"
 
-#: ../xfce4-settings-manager/main.c:41
+#: ../xfce4-settings-manager/main.c:40
 msgid "Settings dialog to show"
 msgstr "Erakutsiko den ezarpen elkarrizketa"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:163
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
+msgid "_All Settings"
+msgstr "Ezarpenak _guztiak"
+
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:164
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "Pertsonalizatu zure mahaigaina"
 
-#. Create back button which takes the user back to the overview
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:271
-msgid "_Overview"
-msgstr "_Ikuspegi orokorra"
-
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:608
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:624
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
 msgstr "Ezin da\"%s\" abiarazi"
@@ -1422,6 +1578,21 @@ msgstr "Xfce 4 ezarpen kudeatzaile grafikoa"
 msgid "Settings Manager"
 msgstr "Ezarpen kudeatzailea"
 
+#~ msgid "This property name is not valid."
+#~ msgstr "Propietate izen baliogabea."
+
+#~ msgid "Enabled"
+#~ msgstr "Gaituta"
+
+#~ msgid "Name:"
+#~ msgstr "Izena:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Xfconf kanalak"
+
+#~ msgid "_Overview"
+#~ msgstr "_Ikuspegi orokorra"
+
 #~ msgid "Use this area to _test the settings above:"
 #~ msgstr "Erabili eremu hau aurreko ezarpenak proba_tzeko:"
 
diff --git a/po/fr.po b/po/fr.po
index 9ad7257..034d1ff 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-19 16:07+0000\n"
+"POT-Creation-Date: 2012-02-21 15:18+0000\n"
 "PO-Revision-Date: 2010-07-28 07:37+0100\n"
 "Last-Translator: Durand-Favreau Arnaud <biginoz at free.fr>\n"
 "Language-Team: French <i18n-xfce at xfce.org>\n"
@@ -58,7 +58,9 @@ msgstr "Désactiver les touches collantes si deux _touches sont pressées"
 msgid ""
 "If enabled, the session manager will start the required applications for "
 "screen readers and magnifiers"
-msgstr "Si activé, le gestionnaire de session démarre les applications requises pour les lecteurs d'écran et les loupes"
+msgstr ""
+"Si activé, le gestionnaire de session démarre les applications requises pour "
+"les lecteurs d'écran et les loupes"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
 msgid "K_eystroke delay:"
@@ -219,53 +221,53 @@ msgid "pixels/sec"
 msgstr "pixels/sec"
 
 #: ../dialogs/accessibility-settings/main.c:43
-#: ../dialogs/appearance-settings/main.c:86
+#: ../dialogs/appearance-settings/main.c:94
 #: ../dialogs/display-settings/main.c:102
-#: ../dialogs/keyboard-settings/main.c:38 ../dialogs/mouse-settings/main.c:97
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:97
 msgid "Settings manager socket"
 msgstr "Socket du gestionnaire de paramètres"
 
 #: ../dialogs/accessibility-settings/main.c:43
-#: ../dialogs/appearance-settings/main.c:86
+#: ../dialogs/appearance-settings/main.c:94
 #: ../dialogs/display-settings/main.c:102
-#: ../dialogs/keyboard-settings/main.c:38 ../dialogs/mouse-settings/main.c:97
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:97
 msgid "SOCKET ID"
 msgstr "ID SOCKET"
 
 #: ../dialogs/accessibility-settings/main.c:44
-#: ../dialogs/appearance-settings/main.c:87
+#: ../dialogs/appearance-settings/main.c:95
 #: ../dialogs/display-settings/main.c:103
-#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:98
-#: ../xfce4-settings-editor/main.c:43 ../xfsettingsd/main.c:77
-#: ../xfce4-settings-manager/main.c:39
+#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40
+#: ../dialogs/mouse-settings/main.c:98 ../xfce4-settings-editor/main.c:43
+#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39
 msgid "Version information"
 msgstr "Information sur la version"
 
-#: ../dialogs/accessibility-settings/main.c:180
-#: ../dialogs/appearance-settings/main.c:826
-#: ../dialogs/display-settings/main.c:1040
-#: ../dialogs/keyboard-settings/main.c:63
-#: ../dialogs/mouse-settings/main.c:1504 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:57
+#: ../dialogs/accessibility-settings/main.c:192
+#: ../dialogs/appearance-settings/main.c:966
+#: ../dialogs/display-settings/main.c:1043
+#: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
+#: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63
+#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Tapez '%s --help' pour plus d'aide."
 
-#: ../dialogs/accessibility-settings/main.c:199
-#: ../dialogs/appearance-settings/main.c:845
-#: ../dialogs/display-settings/main.c:1059
-#: ../dialogs/keyboard-settings/main.c:79
-#: ../dialogs/mouse-settings/main.c:1523 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:70
+#: ../dialogs/accessibility-settings/main.c:211
+#: ../dialogs/appearance-settings/main.c:985
+#: ../dialogs/display-settings/main.c:1062
+#: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
+#: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82
+#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
 msgstr "L'équipe de développement Xfce. Tous droits réservés."
 
-#: ../dialogs/accessibility-settings/main.c:200
-#: ../dialogs/appearance-settings/main.c:846
-#: ../dialogs/display-settings/main.c:1060
-#: ../dialogs/keyboard-settings/main.c:80
-#: ../dialogs/mouse-settings/main.c:1524 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:71
+#: ../dialogs/accessibility-settings/main.c:212
+#: ../dialogs/appearance-settings/main.c:986
+#: ../dialogs/display-settings/main.c:1063
+#: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
+#: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83
+#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Veuillez envoyer vos rapports de bogues à <%s>."
@@ -380,7 +382,7 @@ msgid "Menus and Buttons"
 msgstr "Menus et boutons"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
-#: ../dialogs/appearance-settings/main.c:722
+#: ../dialogs/appearance-settings/main.c:852
 #: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Aucune"
@@ -472,19 +474,45 @@ msgstr "_Paramètres"
 msgid "_Toolbar Style"
 msgstr "S_tyle de la barre d'outils"
 
-#: ../dialogs/appearance-settings/main.c:726
+#: ../dialogs/appearance-settings/main.c:733
+#, c-format
+msgid "File is larger then %d MB, installation aborted"
+msgstr "Le fichier dépasse %d Mo. Installation annulée."
+
+#: ../dialogs/appearance-settings/main.c:738
+msgid "Failed to create temporary directory"
+msgstr "La création d'un dossier temporaire a échoué"
+
+#: ../dialogs/appearance-settings/main.c:743
+msgid "Failed to extract archive"
+msgstr "L'extraction de l'archive a échoué"
+
+#: ../dialogs/appearance-settings/main.c:748
+msgid "Unknown format, only archives and directories are supported"
+msgstr "Format inconnu, Seuls les dossiers et archives sont pris en charge"
+
+#: ../dialogs/appearance-settings/main.c:753
+#, c-format
+msgid "An unknown error, exit code is %d"
+msgstr "Erreur inconnue, le code de sortie est %d"
+
+#: ../dialogs/appearance-settings/main.c:760
+msgid "Failed to install theme"
+msgstr "Échec de l'installation du thème"
+
+#: ../dialogs/appearance-settings/main.c:856
 msgid "RGB"
 msgstr "RVB"
 
-#: ../dialogs/appearance-settings/main.c:730
+#: ../dialogs/appearance-settings/main.c:860
 msgid "BGR"
 msgstr "BVR"
 
-#: ../dialogs/appearance-settings/main.c:734
+#: ../dialogs/appearance-settings/main.c:864
 msgid "Vertical RGB"
 msgstr "RVB vertical"
 
-#: ../dialogs/appearance-settings/main.c:738
+#: ../dialogs/appearance-settings/main.c:868
 msgid "Vertical BGR"
 msgstr "BVR vertical"
 
@@ -612,22 +640,22 @@ msgstr ""
 msgid "Selected output not disabled"
 msgstr "La sortie sélectionnée n'est pas désactivée"
 
-#: ../dialogs/display-settings/main.c:1072
+#: ../dialogs/display-settings/main.c:1075
 #: ../dialogs/display-settings/xfce-randr.c:249
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Échec à la vérification de la version de l'extension RandR utilisée"
 
-#: ../dialogs/display-settings/main.c:1073
-#: ../dialogs/display-settings/main.c:1109
+#: ../dialogs/display-settings/main.c:1076
+#: ../dialogs/display-settings/main.c:1112
 msgid "Unable to start the Xfce Display Settings"
 msgstr "Impossible de lancer la fenêtre de configuration des écrans"
 
-#: ../dialogs/display-settings/main.c:1104
+#: ../dialogs/display-settings/main.c:1107
 msgid "ATI Settings"
 msgstr "Paramètres ATI"
 
-#: ../dialogs/display-settings/main.c:1119
+#: ../dialogs/display-settings/main.c:1122
 msgid "Unable to launch the proprietary driver settings"
 msgstr ""
 "Impossible d'exécuter la fenêtre de configuration du pilote propriétaire "
@@ -693,26 +721,32 @@ msgid "Select command"
 msgstr "Choisissez une commande"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:235
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:386
 msgid "All Files"
 msgstr "Tous les fichiers"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:240
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:391
 msgid "Executable Files"
 msgstr "Fichiers exécutables"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:255
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:406
 msgid "Perl Scripts"
 msgstr "Scripts Perl"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:261
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:412
 msgid "Python Scripts"
 msgstr "Scripts Python"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:267
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:418
 msgid "Ruby Scripts"
 msgstr "Scripts Ruby"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:273
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:424
 msgid "Shell Scripts"
 msgstr "Scripts Shell"
 
@@ -742,39 +776,48 @@ msgid "Edit keyboard settings and application shortcuts"
 msgstr "Éditer les paramètres du clavier et raccourcis des applications"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
+msgid "General"
+msgstr "Général"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2
 msgid "Keyboard"
 msgstr "Clavier"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
 msgid "Keyboard layout"
 msgstr "Disposition du clavier"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
 msgid "Keyboard layout selection"
 msgstr "Changeur de disposition de clavier"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
 msgid "Keyboard model"
 msgstr "Modèle du clavier"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
 msgid "Repeat _speed:"
 msgstr "Vitesse de _répétition :"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13
 msgid "Reset to _Defaults"
 msgstr "Valeurs par _défaut"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
+msgid "Restore num l_ock state on startup"
+msgstr "Restaurer l'état du Num l_ock au démarrage"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
 msgid "Select keyboard layout and variant"
 msgstr "Sélectionner la disposition et variante du clavier"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:16
 msgid "Show _blinking"
 msgstr "Afficher le _clignotement"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17
 msgid ""
 "Specifies whether the keyboard layout is controlled with this settings "
 "dialog, or by the X server"
@@ -782,93 +825,93 @@ msgstr ""
 "Spécifie qui de X server ou ces paramètres prendra le contrôle de la "
 "disposition du clavier"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:16
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
 msgid "Specify whether or not the text cursor blinks"
 msgstr "Définie si le curseur doit clignoter ou non"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19
 msgid "The delay, in milliseconds, between successive blinks of the cursor"
 msgstr "Le temps, en millisecondes, entre chaque clignotement du curseur"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20
 msgid "The rate at which keystrokes are generated while a key is pressed"
 msgstr ""
 "La vitesse à laquelle les frappes sont générées lorsqu'une touche est "
 "enfoncée"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
 msgid "The time, in milliseconds, before a pressed key begins repeating"
 msgstr "Le temps, en millisecondes, avant la répétition d'une touche enfoncée"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
 msgid "Typing Settings"
 msgstr "Paramètres de frappe"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
-msgid "Use this area to _test the settings above:"
-msgstr "Utilisez cette zone de saisie pour _tester les paramètres :"
-
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:23
 msgid ""
 "When selected, pressing and holding down a key emits the same character over "
 "and over again"
 msgstr "Appuyer et maintenir une touche imprime le même caractère sans arrêt"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:23
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:24
 msgid "_Enable key repeat"
 msgstr "_Activer la répétition de touche"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:24
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:25
 msgid "_Layout"
 msgstr "_Disposition"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:25
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:26
 msgid "_Repeat delay:"
 msgstr "Délai de _répétition :"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:26
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:27
+msgid "_Test area:"
+msgstr "Zone de _test :"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:28
 msgid "_Use system defaults"
 msgstr "_Utiliser les paramètres par défaut"
 
-#: ../dialogs/keyboard-settings/main.c:69
+#: ../dialogs/keyboard-settings/main.c:82
 msgid "Unable to initialize GTK+."
 msgstr "Impossible d'initialiser GTK+."
 
-#: ../dialogs/keyboard-settings/main.c:89
+#: ../dialogs/keyboard-settings/main.c:102
 #, c-format
 msgid "Failed to connect to xfconf daemon. Reason: %s"
 msgstr "Échec à la connexion au démon xfconf. Raison : %s"
 
-#: ../dialogs/keyboard-settings/main.c:100
+#: ../dialogs/keyboard-settings/main.c:113
 msgid "Could not create the settings dialog."
 msgstr "Impossible de créer la boîte de dialogue des propriétés."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:295
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:300
 msgid "Command"
 msgstr "Commande"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:300
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:305
 msgid "Shortcut"
 msgstr "Raccourci"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:374
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:380
 msgid "Layout"
 msgstr "Disposition"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:375
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:381
 msgid "Variant"
 msgstr "Variante"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:851
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:857
 msgid "Shortcut command may not be empty."
 msgstr "La commande de raccourci ne doit pas être vide."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:959
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:960
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "Réinitialiser aux valeurs par défaut"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:961
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
 msgid ""
 "This will reset all shortcuts to their default values. Do you really want to "
 "do this?"
@@ -876,16 +919,142 @@ msgstr ""
 "Voulez-vous vraiment réinitialiser tous les raccourcis à leur valeur par "
 "défaut ?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1026
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr ""
 "Les paramètres par défaut du système seront restaurés lors de votre "
 "prochaine connexion."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1028
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "Avertissement"
 
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:128
+msgid "Select Application"
+msgstr "Choisissez une Application"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:204
+msgid "Use a c_ustom command:"
+msgstr "Utiliser une commande personnalisée :"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:205
+msgid ""
+"Use a custom command for an application that is not available from the above "
+"application list."
+msgstr "Utiliser une commande personnalisée pour une application qui n'est pas disponible dans la liste d'applications citée plus haut"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:223
+msgid "_Browse..."
+msgstr "_Naviguer..."
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:376
+msgid "Select an Application"
+msgstr "Choisissez une Application"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:526
+msgid "None available"
+msgstr "Aucun disponible"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:573
+msgid "Recommended Applications"
+msgstr "Applications recommandées"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:591
+msgid "Other Applications"
+msgstr "Autres Applications"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:611
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "Ouvrir <i>%s</i>  et autres fichiers de type \"%s\" avec :"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:647
+#, c-format
+msgid "Failed to add new application \"%s\""
+msgstr "L'ajout de la nouvelle application \"%s\" a échoué"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:174
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:2
+msgid "MIME Type Editor"
+msgstr "Éditeur de type MIME"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:178
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:1
+msgid "Associate applications with MIME types"
+msgstr "Associez les applications avec les types MIME"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:203
+msgid "_Filter:"
+msgstr "_Filtre :"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:211
+msgid "Clear filter"
+msgstr "Supprimer le filtre"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:257
+msgid "MIME Type"
+msgstr "Type MIME"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:287
+msgid "Status"
+msgstr "État"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:308
+msgid "Default Application"
+msgstr "Application par défaut"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:479
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+msgid "User Set"
+msgstr "Défini par l'utilisateur"
+
+#. sort the names but keep Default on top
+#: ../dialogs/mime-settings/xfce-mime-window.c:481
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+#: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
+#: ../dialogs/mouse-settings/main.c:434
+msgid "Default"
+msgstr "Par défaut"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:550
+#, c-format
+msgid "%d MIME type found"
+msgid_plural "%d MIME types found"
+msgstr[0] "Type MIME %d trouvé"
+msgstr[1] "Types MIME %d trouvés"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:649
+#, c-format
+msgid "Failed to set application \"%s\" for mime type \"%s\"."
+msgstr "La définition de l'application \"%s\" pour le type mime \"%s\" a échoué."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:906
+#, c-format
+msgid ""
+"Are you sure you want to reset content type \"%s\" to its default value?"
+msgstr ""
+"Êtes-vous certain de vouloir réinitialiser toutes les propriétés du canal "
+"\"%s\" ?"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:910
+msgid "Question"
+msgstr "Question"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:913
+msgid ""
+"This will remove your custom mime-association and restore the system-wide "
+"default."
+msgstr "Cela supprimera vos associations-mime personnalisées et restaurera les réglages par défaut du système."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:917
+#: ../dialogs/mime-settings/xfce-mime-window.c:988
+msgid "Reset to Default"
+msgstr "Réinitialiser aux valeurs par défaut"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:983
+msgid "Choose Application..."
+msgstr "Choisir une Application..."
+
 #: ../dialogs/mouse-settings/main.c:96
 msgid "Active device in the dialog"
 msgstr "Périphérique actif dans la boîte de dialogue"
@@ -906,115 +1075,107 @@ msgstr "%g px"
 msgid "%g ms"
 msgstr "%g ms"
 
-#. sort the names but keep Default on top
-#: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
-#: ../dialogs/mouse-settings/main.c:434
-msgid "Default"
-msgstr "Par défaut"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:1
+msgid "B_uttons and Feedback"
+msgstr "Bo_utons et Retour d'expérience"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:2
 msgid "Buttons"
 msgstr "Boutons"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:2
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:3
 msgid "Clockwise"
 msgstr "Dans le sens horaire"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:3
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:4
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:1
 msgid "Configure pointer device behavior and appearance"
 msgstr "Configurer le comportement et style de la souris"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:4
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:5
 msgid "Counterclockwise"
 msgstr "Dans le sens anti-horaire"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:5
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
 msgid "Cursor _size:"
 msgstr "Taille du _curseur :"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
 msgid "D_istance:"
 msgstr "_Distance :"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
 msgid "De_vice:"
 msgstr "Périp_hérique :"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
 msgid "Di_sabled"
 msgstr "Dé_sactivé"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
 msgid "Disable to_uchpad while typing"
 msgstr "Désactiver le to_uchpad durant la frappe"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
 msgid "Double Click"
 msgstr "Double clic"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
 msgid "Drag and Drop"
 msgstr "Glisser/déposer"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
-msgid "Edge scro_lling"
-msgstr ""
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
 #, fuzzy
-msgid "Enable hori_zontal scrolling"
-msgstr "Activer l'_anti-crénelage"
+msgid "Edge scro_lling"
+msgstr "Défi_lement"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:14
-msgid "General"
-msgstr "Général"
+msgid "Enable hori_zontal scrolling"
+msgstr "Activer le défilement hori_zontal"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
-#, fuzzy
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
 msgid "Half (left-handed)"
-msgstr "_Gaucher"
+msgstr "Demi (Gauchers)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
 #, fuzzy
 msgid "Mouse (relative)"
-msgstr "Émulation de la souris"
+msgstr "Souris (relative)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:2
 msgid "Mouse and Touchpad"
 msgstr "Souris et touchpad"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
-#, fuzzy
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
 msgid "None (right-handed)"
-msgstr "_Droitier"
+msgstr "Aucun (Droitiers)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
 msgid "Pen (absolute)"
 msgstr "Stylo (Absolue)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
 msgid "Pointer Speed"
 msgstr "Vitesse du pointeur"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:22
 msgid "Preview"
 msgstr "Prévisualisation"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:22
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:23
 msgid "Reset to De_faults"
 msgstr "Valeurs par _défaut"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:23
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
 msgid "Reverse scroll d_irection"
 msgstr "In_verser le sens de défilement"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
 msgid "Scrolling"
 msgstr "Défilement"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:26
 msgid ""
 "Set the acceleration and sensitivity for the selected device to the default "
 "values"
@@ -1022,38 +1183,38 @@ msgstr ""
 "Remettre les paramètres d'accélération et de seuil à zéro pour le "
 "périphérique sélectionné"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:26
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
 msgid "Size"
 msgstr "Taille"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:28
 msgid "T_ap touchpad to click"
 msgstr "T_apoter le touchpad pour cliquer"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:28
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:29
 msgid "T_heme"
 msgstr "_Thème"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:29
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:30
 msgid "T_ouchpad"
 msgstr "T_ouchpad"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:30
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:31
 msgid "Table_t"
 msgstr "Ta_blette"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:31
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:32
 msgid "Th_reshold:"
 msgstr "_Seuil :"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:32
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:33
 msgid ""
 "The factor at which the pointer's speed will increase as the mouse is moved"
 msgstr ""
 "Le facteur d'accélération du pointeur de la souris en fonction de son "
 "mouvement"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:33
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:34
 msgid ""
 "The mouse pointer cannot move farther than this distance between two clicks "
 "for them to be considered a double click"
@@ -1061,12 +1222,12 @@ msgstr ""
 "La distance maximum parcourue par la souris entre deux clics, en pixels, "
 "pour être considérés comme un double clic"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:34
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:35
 msgid ""
 "The number of pixels the pointer must move before a drag operation will start"
 msgstr "Le nombre de pixels le pointeur doit bouger avant de déplacer un objet"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:35
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:36
 msgid ""
 "The number of pixels the pointer must move in a short time before it starts "
 "accelerating"
@@ -1074,15 +1235,16 @@ msgstr ""
 "Le nombre de pixels le pointeur doit bouger dans un court laps de temps "
 "avant d'entamer l'accélération"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:36
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:37
 msgid "Ti_me:"
 msgstr "_Temps :"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:37
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:38
+#, fuzzy
 msgid "Tr_acking mode:"
-msgstr ""
+msgstr "Mode"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:38
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:39
 msgid ""
 "Two mouse clicks in less than this length of time (in milliseconds) will be "
 "considered a double click"
@@ -1090,42 +1252,36 @@ msgstr ""
 "Le temps maximum entre deux clics (en millisecondes) pour être considérés "
 "comme un double clic"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:39
-#, fuzzy
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:40
 msgid "Two-_finger scrolling"
 msgstr "Défilement à _deux doigts"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:40
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:41
 msgid "When selected, the scroll wheel will work in the opposite direction"
 msgstr "Fait fonctionner la molette de la souris à l'envers"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:41
-#, fuzzy
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:42
 msgid ""
 "When selected, the touchpad will be disabled when the keyboard is being used"
 msgstr ""
 "Une fois sélectionné, le pointeur peut être contrôlé avec le pavé numérique"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:42
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:43
 msgid "_Acceleration:"
 msgstr "_Accélération :"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:43
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:44
 msgid "_Behavior"
 msgstr "_Comportement"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:44
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:45
 msgid "_Devices"
 msgstr "_Périphériques"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:45
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:46
 msgid "_Enable this device"
 msgstr "Activ_er ce périphérique"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:46
-msgid "_General"
-msgstr "_Général"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:47
 msgid "_Left-handed"
 msgstr "_Gaucher"
@@ -1142,176 +1298,209 @@ msgstr "Ro_tation :"
 msgid "_Sensitivity:"
 msgstr "_Sensibilité :"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Éditeur de paramètres"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Modifier les paramètres stockés par Xfconf"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Canal"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Propriété"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Type"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Valeur"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "Vide"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Nouvelle propriété"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Le nom de la propriété n'est pas valide."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Éditer la propriété sélectionnée"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Réinitialiser"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Réinitialiser"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr ""
-"Réinitialiser une propriété effacera de manière permanente les modifications "
-"personnalisées."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Réinitialiser la propriété sélectionnée"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "Êtes-vous sûr de vouloir réinitialiser la propriété \"%s\" ?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "Vide"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "Les noms d'une propriété doivent commencer par le caractère '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "Rangée"
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "L'élément racine ('/') n'est pas un nom de propriété valide"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "String"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid ""
-"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
-"'-', '<' and '>', as well as '/' as a separator"
-msgstr ""
-"Les noms des propriétés ne peuvent contenir que des caractères ASCII parmisA-"
-"Z, a-z, 0-9, '_', '-', '<' et '>', ainsi que '/' comme séparateur"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+#, fuzzy
+msgid "Integer"
+msgstr "Nombre entier"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr ""
-"Les noms de propriétés ne peuvent pas contenir plusieurs caractères '/' "
-"consécutifs"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Booléen"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "Les noms de propriétés ne peuvent pas se terminer par le caractère '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Double"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_Réinitialiser"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "_Réinitialiser le Canal"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
 msgstr ""
 "Réinitialiser le canal effacera de manière permanente les modifications "
 "apportées."
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr ""
 "Êtes-vous certain de vouloir réinitialiser toutes les propriétés du canal "
 "\"%s\" ?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Éditeur graphique des paramètres Xfconf"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Éditeur de paramètres"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "réinitialiser"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Booléen"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "Moniteur %s"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Modifier les paramètres stockés par Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "Observer les changements de propriété d'un canal Xfconf"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Double"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "démarrer la surveillance du canal \"%s\""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Éditer la propriété"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "_Moniteur"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Éditer la propriété"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr ""
+"Réinitialiser une propriété effacera de manière permanente les modifications "
+"personnalisées."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Activé"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "Êtes-vous sûr de vouloir réinitialiser la propriété \"%s\" ?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "Entier"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Int non signé"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Nom :"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Int64 non signé"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
 msgstr "Nouvelle propriété"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Réinitialiser la propriété"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "_Propriété :"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "String"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "_Type :"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Type :"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "_Valeur :"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Int non signé"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "Les noms d'une propriété doivent commencer par le caractère '/'"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Int64 non signé"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "L'élément racine ('/') n'est pas un nom de propriété valide"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
+#, c-format
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Les noms des propriétés ne peuvent contenir que des caractères ASCII parmisA-"
+"Z, a-z, 0-9, '_', '-', '<' et '>', ainsi que '/' comme séparateur"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr ""
+"Les noms de propriétés ne peuvent pas contenir plusieurs caractères '/' "
+"consécutifs"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Valeur :"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "Les noms de propriétés ne peuvent pas se terminer par le caractère '/'"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Canaux Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "Éditer la propriété"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Éditeur graphique des paramètres Xfconf"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1362,7 +1551,7 @@ msgstr "Ne pas démarrer en arrière-plan"
 msgid "Replace running xsettings daemon (if any)"
 msgstr "Remplacement de tout démon xsettings"
 
-#: ../xfsettingsd/workspaces.c:365
+#: ../xfsettingsd/workspaces.c:385
 #, c-format
 msgid "Workspace %d"
 msgstr "Espace de travail %d"
@@ -1371,33 +1560,28 @@ msgstr "Espace de travail %d"
 msgid "The Xfce Settings Daemon"
 msgstr "Gestionnaire de paramètres Xfce"
 
-#: ../xfce4-settings-manager/main.c:41
+#: ../xfce4-settings-manager/main.c:40
 msgid "Settings dialog to show"
 msgstr "Fenêtre de paramètres à afficher"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:163
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
+msgid "_All Settings"
+msgstr "_Paramètres"
+
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "Paramétrage"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:164
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "Personnaliser l'environnement de bureau"
 
-#. Create back button which takes the user back to the overview
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:271
-msgid "_Overview"
-msgstr "_Vue d'ensemble"
-
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:601
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:617
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
 msgstr "Impossible de démarrer \"%s\""
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:664
-msgid "Failed to open the documentation"
-msgstr "Échec à l'ouverture de la documentation"
-
 #: ../xfce4-settings-manager/xfce-settings-manager.desktop.in.h:1
 msgid "Graphical Settings Manager for Xfce 4"
 msgstr "Gestionnaire graphique de paramètres pour Xfce 4"
@@ -1406,6 +1590,27 @@ msgstr "Gestionnaire graphique de paramètres pour Xfce 4"
 msgid "Settings Manager"
 msgstr "Gestionnaire de paramètres"
 
+#~ msgid "Use this area to _test the settings above:"
+#~ msgstr "Utilisez cette zone de saisie pour _tester les paramètres :"
+
+#~ msgid "_General"
+#~ msgstr "_Général"
+
+#~ msgid "This property name is not valid."
+#~ msgstr "Le nom de la propriété n'est pas valide."
+
+#~ msgid "Enabled"
+#~ msgstr "Activé"
+
+#~ msgid "Name:"
+#~ msgstr "Nom :"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Canaux Xfconf"
+
+#~ msgid "_Overview"
+#~ msgstr "_Vue d'ensemble"
+
 #~ msgid "_Reset to Defaults"
 #~ msgstr "_Réinitialiser"
 
diff --git a/po/id.po b/po/id.po
index d38a0e2..41a24f2 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,14 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-03 11:06+0000\n"
-"PO-Revision-Date: 2010-06-26 09:43-0400\n"
+"POT-Creation-Date: 2012-02-17 23:33+0000\n"
+"PO-Revision-Date: 2012-02-18 11:31+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
 msgid "Acceleration _profile:"
@@ -909,12 +910,12 @@ msgstr "Jenis"
 msgid "Shortcut command may not be empty."
 msgstr "Jalan pintas perintah mungkin tidak kosong."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "Set Ulang ke Standar"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
 msgid ""
 "This will reset all shortcuts to their default values. Do you really want to "
 "do this?"
@@ -922,11 +923,11 @@ msgstr ""
 "Ini akan mengatur ulang semua jalan pintas ke nilai standar mereka. Anda "
 "yakin ingin melakukan ini?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr "Standar sistem akan dikembalikan ketika lain kali anda log masuk."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "Peringatan"
 
@@ -942,7 +943,9 @@ msgstr "Gunakan perintah s_uai:"
 msgid ""
 "Use a custom command for an application that is not available from the above "
 "application list."
-msgstr "Gunakan perintah suai untuk aplikasi yang tidak tersedia dari senarai aplikasi di atas."
+msgstr ""
+"Gunakan perintah suai untuk aplikasi yang tidak tersedia dari senarai "
+"aplikasi di atas."
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:223
 msgid "_Browse..."
@@ -1022,7 +1025,6 @@ msgstr "Standar"
 msgid "%d MIME type found"
 msgid_plural "%d MIME types found"
 msgstr[0] "%d tipe MIME ditemukan"
-msgstr[1] "%d tipe MIME ditemukan"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:649
 #, c-format
@@ -1044,7 +1046,9 @@ msgstr "Pertanyaan"
 msgid ""
 "This will remove your custom mime-association and restore the system-wide "
 "default."
-msgstr "Ini akan menghapus asosiasi mime sesuai anda dan mengembalikan standar seluruh sistem"
+msgstr ""
+"Ini akan menghapus asosiasi mime sesuai anda dan mengembalikan standar "
+"seluruh sistem"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:917
 #: ../dialogs/mime-settings/xfce-mime-window.c:988
@@ -1294,62 +1298,178 @@ msgstr "_Rotasi:"
 msgid "_Sensitivity:"
 msgstr "_Sensitivitas:"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Penyunting Pengaturan"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Sesuaikan pengaturan yang disimpan oleh Xfconf"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Properti"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Tipe"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Terkunci"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Nilai"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Properti baru"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Sunting properti terpilih"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Atur Ulang"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Atur ulang properti terpilih"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
 msgid "Empty"
 msgstr "Kosong"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Nama properti ini tidak sah."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "Jajaran"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "Benang"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "Integer"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Boolean"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Ganda"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "Atur Ulang Kanal"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Atur Ulang"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
+msgid "Resetting a channel will permanently remove those custom settings."
+msgstr ""
+"Mengatur ulang kanal akan secara permanen menghapus pengaturan suainya."
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
+#, c-format
+msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
+msgstr ""
+"Apakah anda yakin ingin mengatur ulang kanal \"%s\"? dan semua propertinya?"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "atur ulang"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "Monitor %s"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "Pantau kanal Xfconf untuk perubahan properti"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "mulai pantau kanal \"%s\""
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "_Monitor"
 
-#: ../xfce4-settings-editor/main_window.c:926
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
 msgid "Resetting a property will permanently remove those custom settings."
 msgstr ""
 "Mengatur ulang properti akan secara permanen menghapus pengaturan suainya."
 
-#: ../xfce4-settings-editor/main_window.c:927
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
 #, c-format
 msgid "Are you sure you want to reset property \"%s\"?"
 msgstr "Apakah anda yakin ingin mengatur ulang properti \"%s\"?"
 
-#: ../xfce4-settings-editor/main_window.c:983
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
+msgid "Int"
+msgstr "Int"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Int Tak Ditugaskan"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
+msgid "Int64"
+msgstr "Int64"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Int64 Tak Ditugaskan"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
+msgstr "Properti Baru"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "_Properti:"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "_Tipe:"
+
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "_Nilai:"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
 #, c-format
 msgid "Property names must start with a '/' character"
 msgstr "Nama properti harus dimulai dengan karakter '/'"
 
-#: ../xfce4-settings-editor/main_window.c:992
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
 #, c-format
 msgid "The root element ('/') is not a valid property name"
 msgstr "Elemen root ('/') bukan mana properti yang sah"
 
-#: ../xfce4-settings-editor/main_window.c:1006
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
 #, c-format
 msgid ""
 "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
@@ -1358,109 +1478,25 @@ msgstr ""
 "Nama properti hanya termasuk karakter ASCII A-Z, a-z, 0-9, '_', '-', '<' dan "
 "'>', begitu juga '/' sebagai pemisah"
 
-#: ../xfce4-settings-editor/main_window.c:1015
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
 #, c-format
 msgid "Property names cannot have two or more consecutive '/' characters"
 msgstr ""
 "Nama properti tak dapat berisi dua atau lebih karakter '/' yang berurutan"
 
-#: ../xfce4-settings-editor/main_window.c:1026
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
 #, c-format
 msgid "Property names cannot end with a '/' character"
 msgstr "Nama properti tak dapat diakhiri dengan karakter '/'"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_Atur Ulang"
-
-#: ../xfce4-settings-editor/main_window.c:1079
-msgid "Resetting a channel will permanently remove those custom settings."
-msgstr ""
-"Mengatur ulang kanal akan secara permanen menghapus pengaturan suainya."
-
-#: ../xfce4-settings-editor/main_window.c:1080
-#, c-format
-msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
-msgstr ""
-"Apakah anda yakin ingin mengatur ulang kanal \"%s\"? dan semua propertinya?"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "Sunting Properti"
 
 #: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
 msgid "Graphical settings editor for Xfconf"
 msgstr "Penyunting pengaturan grafis untuk Xfconf"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Penyunting Pengaturan"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Boolean"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Sesuaikan pengaturan yang disimpan oleh Xfconf"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Ganda"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Sunting Properti"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Sunting properti"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Aktifkan"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
-msgid "Int"
-msgstr "Int"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
-msgid "Int64"
-msgstr "Int64"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Nama:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
-msgstr "Properti baru"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Atur ulang properti"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "Benang"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Tipe:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Int Tak Ditugaskan"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Int64 Tak Ditugaskan"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Nilai:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Kanal Xfconf"
-
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
 msgstr "Tombol lekat diaktifkan"
@@ -1549,6 +1585,18 @@ msgstr "Manajer Pengaturan Grafis untuk Xfce 4"
 msgid "Settings Manager"
 msgstr "Manajer Pengaturan"
 
+#~ msgid "This property name is not valid."
+#~ msgstr "Nama properti ini tidak sah."
+
+#~ msgid "Enabled"
+#~ msgstr "Aktifkan"
+
+#~ msgid "Name:"
+#~ msgstr "Nama:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Kanal Xfconf"
+
 #~ msgid "Use this area to _test the settings above:"
 #~ msgstr "Gunakan area ini untuk _mengetes pengaturan di atas:"
 
diff --git a/po/it.po b/po/it.po
index f55b1dd..f8e8dd1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-22 14:54+0000\n"
+"POT-Creation-Date: 2012-02-11 10:30+0000\n"
 "PO-Revision-Date: 2011-02-26 11:48+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta at gmail.com>\n"
 "Language-Team: Italian Translation Team <xfce-it-translators at googlegroups.com>\n"
@@ -283,7 +283,7 @@ msgstr "Informazioni di versione"
 #: ../dialogs/display-settings/main.c:1043
 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:57
+#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Digitare \"%s --help\" per le modalità d'uso"
@@ -293,7 +293,7 @@ msgstr "Digitare \"%s --help\" per le modalità d'uso"
 #: ../dialogs/display-settings/main.c:1062
 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:70
+#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
 msgstr "Il gruppo di sviluppo di Xfce. Tutti i diritti riservati."
 
@@ -302,7 +302,7 @@ msgstr "Il gruppo di sviluppo di Xfce. Tutti i diritti riservati."
 #: ../dialogs/display-settings/main.c:1063
 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:71
+#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Segnalare i problemi a <%s>."
@@ -1003,7 +1003,9 @@ msgstr "Usa un co_mando personalizzato:"
 msgid ""
 "Use a custom command for an application that is not available from the above "
 "application list."
-msgstr "Usa un comando personalizzato per avviare un'applicazione che non è disponibile nella lista delle applicazioni."
+msgstr ""
+"Usa un comando personalizzato per avviare un'applicazione che non è "
+"disponibile nella lista delle applicazioni."
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:223
 msgid "_Browse..."
@@ -1066,13 +1068,13 @@ msgid "Default Application"
 msgstr "Applicazione predefinita"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:479
-#: ../dialogs/mime-settings/xfce-mime-window.c:602
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
 msgid "User Set"
 msgstr "Impostato dall'utente"
 
 #. sort the names but keep Default on top
 #: ../dialogs/mime-settings/xfce-mime-window.c:481
-#: ../dialogs/mime-settings/xfce-mime-window.c:602
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
 #: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
 #: ../dialogs/mouse-settings/main.c:434
 msgid "Default"
@@ -1085,33 +1087,36 @@ msgid_plural "%d MIME types found"
 msgstr[0] "%d tipo MIME trovato"
 msgstr[1] "%d tipi MIME trovati"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:647
+#: ../dialogs/mime-settings/xfce-mime-window.c:649
 #, c-format
 msgid "Failed to set application \"%s\" for mime type \"%s\"."
 msgstr "Impossibile impostare l'applicazione \"%s\" per il tipo MIME \"%s\"."
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:904
+#: ../dialogs/mime-settings/xfce-mime-window.c:906
 #, c-format
 msgid ""
 "Are you sure you want to reset content type \"%s\" to its default value?"
-msgstr "Ripristinare davvero il tipo di contenuto \"%s\" al valore predefinito?"
+msgstr ""
+"Ripristinare davvero il tipo di contenuto \"%s\" al valore predefinito?"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:908
+#: ../dialogs/mime-settings/xfce-mime-window.c:910
 msgid "Question"
 msgstr "Domanda"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:911
+#: ../dialogs/mime-settings/xfce-mime-window.c:913
 msgid ""
 "This will remove your custom mime-association and restore the system-wide "
 "default."
-msgstr "In questo modo verranno rimosse le associazioni MIME personalizzate e ripristinate le impostazioni predefinite del sistema."
+msgstr ""
+"In questo modo verranno rimosse le associazioni MIME personalizzate e "
+"ripristinate le impostazioni predefinite del sistema."
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:915
-#: ../dialogs/mime-settings/xfce-mime-window.c:986
+#: ../dialogs/mime-settings/xfce-mime-window.c:917
+#: ../dialogs/mime-settings/xfce-mime-window.c:988
 msgid "Reset to Default"
 msgstr "Ripristina predefiniti"
 
-#: ../dialogs/mime-settings/xfce-mime-window.c:981
+#: ../dialogs/mime-settings/xfce-mime-window.c:983
 msgid "Choose Application..."
 msgstr "Seleziona applicazione..."
 
@@ -1190,9 +1195,8 @@ msgid "Edge scro_lling"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:14
-#, fuzzy
 msgid "Enable hori_zontal scrolling"
-msgstr "Abilita l'_anti-aliasing"
+msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
 msgid "Half (left-handed)"
@@ -1367,63 +1371,179 @@ msgstr "Rota_zione:"
 msgid "_Sensitivity:"
 msgstr "_Sensibilità"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Editor delle impostazioni"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Personalizzazione delle impostazioni immagazzinate da Xfconf"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Canale"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Proprietà"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Tipo"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Bloccato"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Valore"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Nuova proprietà"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Modifica la proprietà selezionata"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Ripristina"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Ripristina la proprietà selezionata"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
 msgid "Empty"
 msgstr "Vuoto"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Questo nome di proprietà non è valido."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "Serie"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "Stringa"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "Intero"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Booleano"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Ripristina"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Double"
 
-#: ../xfce4-settings-editor/main_window.c:926
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "_Ripristina canale"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
+msgid "Resetting a channel will permanently remove those custom settings."
+msgstr ""
+"Ripristinando un canale, verranno rimosse permanentemente le impostazioni "
+"personalizzate."
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
+#, c-format
+msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
+msgstr "Ripristinare davvero il canale \"%s\" e tutte le sue proprietà?"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "ripristina"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "Monitor %s"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "Controlla un canale Xfconf per i cambiamenti della proprietà"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "avvia il monitoraggio del canale \"%s\""
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "_Monitor"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
 msgid "Resetting a property will permanently remove those custom settings."
 msgstr ""
 "Ripristinando una proprietà, verranno rimosse permanentemente le "
 "impostazioni personalizzate."
 
-#: ../xfce4-settings-editor/main_window.c:927
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
 #, c-format
 msgid "Are you sure you want to reset property \"%s\"?"
 msgstr "Ripristinare davvero la proprietà \"%s\"?"
 
-#: ../xfce4-settings-editor/main_window.c:983
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
+msgid "Int"
+msgstr "Intero"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Intero senza segno"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
+msgid "Int64"
+msgstr "Intero 64"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Intero 64 senza segno"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
+msgstr "Nuova proprietà"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "P_roprietà:"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "_Tipo:"
+
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "_Valore:"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
 #, c-format
 msgid "Property names must start with a '/' character"
 msgstr "Il nome di una proprietà deve iniziare con il carattere \"/\""
 
-#: ../xfce4-settings-editor/main_window.c:992
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
 #, c-format
 msgid "The root element ('/') is not a valid property name"
 msgstr "L'elemento radice (\"/\") non è un nome di proprietà valido"
 
-#: ../xfce4-settings-editor/main_window.c:1006
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
 #, c-format
 msgid ""
 "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
@@ -1432,110 +1552,26 @@ msgstr ""
 "I nomi delle proprietà possono contenere solamente i caratteri ASCII A-Z, a-"
 "z, 0-9, '_', '-', '<', '>' e  '/' come separatore"
 
-#: ../xfce4-settings-editor/main_window.c:1015
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
 #, c-format
 msgid "Property names cannot have two or more consecutive '/' characters"
 msgstr ""
 "I nomi delle proprietà non possono contenere due o più caratteri \"/\" "
 "consecutivi"
 
-#: ../xfce4-settings-editor/main_window.c:1026
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
 #, c-format
 msgid "Property names cannot end with a '/' character"
 msgstr "I nomi delle proprietà non possono terminare con il carattere \"/\""
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_Ripristina"
-
-#: ../xfce4-settings-editor/main_window.c:1079
-msgid "Resetting a channel will permanently remove those custom settings."
-msgstr ""
-"Ripristinando un canale, verranno rimosse permanentemente le impostazioni "
-"personalizzate."
-
-#: ../xfce4-settings-editor/main_window.c:1080
-#, c-format
-msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
-msgstr "Ripristinare davvero il canale \"%s\" e tutte le sue proprietà?"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "Modifica proprietà"
 
 #: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
 msgid "Graphical settings editor for Xfconf"
 msgstr "Editor grafico delle impostazioni per Xfconf"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Editor delle impostazioni"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Booleano"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Personalizzazione delle impostazioni immagazzinate da Xfconf"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Double"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Modifica proprietà"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Modifica proprietà"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Abilitato"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
-msgid "Int"
-msgstr "Intero"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
-msgid "Int64"
-msgstr "Intero 64"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Nome:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
-msgstr "Nuova proprietà"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Ripristina proprietà"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "Stringa"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Tipo:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Intero senza segno"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Intero 64 senza segno"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Valore:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Canali Xfconf"
-
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
 msgstr "I tasti appiccicosi sono abilitati"
@@ -1594,25 +1630,24 @@ msgstr "Spazio di lavoro %d"
 msgid "The Xfce Settings Daemon"
 msgstr "Demone delle impostazioni di Xfce"
 
-#: ../xfce4-settings-manager/main.c:41
+#: ../xfce4-settings-manager/main.c:40
 msgid "Settings dialog to show"
 msgstr "Finestra delle impostazioni da visualizzare"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:163
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
+msgid "_All Settings"
+msgstr "_Tutte le impostazioni"
+
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:164
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "Personalizzazione della scrivania"
 
-#. Create back button which takes the user back to the overview
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:271
-msgid "_Overview"
-msgstr "Pan_oramica"
-
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:578
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:594
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
 msgstr "Impossibile avviare \"%s\""
@@ -1625,6 +1660,21 @@ msgstr "Gestore delle impostazioni grafico per Xfce4"
 msgid "Settings Manager"
 msgstr "Gestore delle impostazioni"
 
+#~ msgid "This property name is not valid."
+#~ msgstr "Questo nome di proprietà non è valido."
+
+#~ msgid "Enabled"
+#~ msgstr "Abilitato"
+
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Canali Xfconf"
+
+#~ msgid "_Overview"
+#~ msgstr "Pan_oramica"
+
 #~ msgid "Use this area to _test the settings above:"
 #~ msgstr "Utilizzare que_sto spazio per provare le impostazioni:"
 
diff --git a/po/kk.po b/po/kk.po
index 34087d9..562533b 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -2,19 +2,19 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Baurzhan Muftakhidinov <baurthefirst at gmail.com>, 2009.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-17 10:48+0000\n"
+"POT-Creation-Date: 2012-02-09 06:18+0000\n"
 "PO-Revision-Date: 2011-12-17 22:54+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
@@ -53,8 +53,12 @@ msgid "Disable sticky keys if _two keys are pressed"
 msgstr "Екі перне басулы _тұрса жабысқақтығын сөндіру"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
-msgid "If enabled, the session manager will start the required applications for screen readers and magnifiers"
-msgstr "Іске қосулы болса, сессияларды басқарушысы экраннан оқу мен ұлғайтқыш сияқты керек қолданбаларды іске қосатын болады"
+msgid ""
+"If enabled, the session manager will start the required applications for "
+"screen readers and magnifiers"
+msgstr ""
+"Іске қосулы болса, сессияларды басқарушысы экраннан оқу мен ұлғайтқыш сияқты "
+"керек қолданбаларды іске қосатын болады"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
 msgid "K_eystroke delay:"
@@ -93,7 +97,9 @@ msgid "The amount of time, in milliseconds, required between keystrokes"
 msgstr "Екі қатар басылған перне арасындағы керек уақыт аралығы, мсек"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted"
+msgid ""
+"The amount of time, in milliseconds, that must elapse before a keystroke "
+"will be accepted"
 msgstr "Перне басылымы қабылдану үшін өту керек уақыты аралығы, мсек"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
@@ -109,20 +115,32 @@ msgid "The time, in milliseconds, between repeated motion events"
 msgstr "Қайталанулардың арасындағы уақыт аралығы, мсек"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
-msgid "The time, in milliseconds, between the initial key press and first repeated motion event"
-msgstr "Бірінші басылу мен қайталанудың біріншісі арасындағы өту керек уақыт аралығы, мсек"
+msgid ""
+"The time, in milliseconds, between the initial key press and first repeated "
+"motion event"
+msgstr ""
+"Бірінші басылу мен қайталанудың біріншісі арасындағы өту керек уақыт "
+"аралығы, мсек"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:25
 msgid "The time, in milliseconds, to get to maximum speed"
 msgstr "Максималды жылдамдыққа жету үшін керек уақыт аралығы, мсек"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:26
-msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted"
-msgstr "Күтпеген басылуларға жол бермеу үшін, баяу пернелер басылу қабылданғанға дейін перне басылулы күйінде тұру керек ең аз уақытын анықтайды"
+msgid ""
+"To help prevent accidental keystrokes, slow keys requires that a key is held "
+"for a certain minimum amount of time before the keystroke will be accepted"
+msgstr ""
+"Күтпеген басылуларға жол бермеу үшін, баяу пернелер басылу қабылданғанға "
+"дейін перне басылулы күйінде тұру керек ең аз уақытын анықтайды"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
-msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes"
-msgstr "Күтпеген басылуларға жол бермеу үшін, қайталанатын пернелер қабылдануға дейін басылулар арасындағы минимал бөгеуді анықтайды"
+msgid ""
+"To help prevent accidental multiple keystrokes, bounce keys imposes a "
+"minimum delay between keystrokes"
+msgstr ""
+"Күтпеген басылуларға жол бермеу үшін, қайталанатын пернелер қабылдануға "
+"дейін басылулар арасындағы минимал бөгеуді анықтайды"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
 msgid "Use _bounce keys"
@@ -137,20 +155,38 @@ msgid "Use slow _keys"
 msgstr "Ба_яу пернелер"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time"
-msgstr "Таңдаулы тұрса, бір уақытта бірнеше перне басылу керек болса, түрлендіргіш пернелерін (Control, Alt, пен Shift сияқты) басылулы ұстау керек емес (оларды бір рет басу мен жіберу жеткілікті)"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
+"to be held down (they can be pressed and then released) when multiple keys "
+"would normally need to be pressed at the same time"
+msgstr ""
+"Таңдаулы тұрса, бір уақытта бірнеше перне басылу керек болса, түрлендіргіш "
+"пернелерін (Control, Alt, пен Shift сияқты) басылулы ұстау керек емес "
+"(оларды бір рет басу мен жіберу жеткілікті)"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:32
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again"
-msgstr "Таңдаулы тұрса, түрлендіргіш пернелер (Control, Alt, пен Shift сияқты) қайта басылғанға дейін басылулы күйінде тұрады"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
+"locked in the pressed state until pressed again"
+msgstr ""
+"Таңдаулы тұрса, түрлендіргіш пернелер (Control, Alt, пен Shift сияқты) қайта "
+"басылғанға дейін басылулы күйінде тұрады"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:33
-msgid "When selected, the \"sticky keys\" feature will be disabled if two keys are pressed simultaneously"
-msgstr "Таңдаулы тұрса, екі перне басылса, \"жабысқақ пернелер\" мүмкіндігі сөндіріледі"
+msgid ""
+"When selected, the \"sticky keys\" feature will be disabled if two keys are "
+"pressed simultaneously"
+msgstr ""
+"Таңдаулы тұрса, екі перне басылса, \"жабысқақ пернелер\" мүмкіндігі "
+"сөндіріледі"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:34
-msgid "When selected, the mouse pointer can be controlled using the keyboard number pad"
-msgstr "Таңдаулы тұрса, тышқан курсорын пернетақтаның сандық бөлігінен басқаруға болады"
+msgid ""
+"When selected, the mouse pointer can be controlled using the keyboard number "
+"pad"
+msgstr ""
+"Таңдаулы тұрса, тышқан курсорын пернетақтаның сандық бөлігінен басқаруға "
+"болады"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:35
 msgid "_Acceleration delay:"
@@ -187,61 +223,51 @@ msgstr "пиксель/сек"
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
 #: ../dialogs/display-settings/main.c:102
-#: ../dialogs/keyboard-settings/main.c:38
-#: ../dialogs/mouse-settings/main.c:97
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:97
 msgid "Settings manager socket"
 msgstr "Баптаулар басқарушы сокеті"
 
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
 #: ../dialogs/display-settings/main.c:102
-#: ../dialogs/keyboard-settings/main.c:38
-#: ../dialogs/mouse-settings/main.c:97
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:97
 msgid "SOCKET ID"
 msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:95
 #: ../dialogs/display-settings/main.c:103
-#: ../dialogs/keyboard-settings/main.c:39
-#: ../dialogs/mouse-settings/main.c:98
-#: ../xfce4-settings-editor/main.c:43
-#: ../xfsettingsd/main.c:77
-#: ../xfce4-settings-manager/main.c:39
+#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40
+#: ../dialogs/mouse-settings/main.c:98 ../xfce4-settings-editor/main.c:43
+#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39
 msgid "Version information"
 msgstr "Нұсқа ақпараты"
 
-#: ../dialogs/accessibility-settings/main.c:180
-#: ../dialogs/appearance-settings/main.c:956
-#: ../dialogs/display-settings/main.c:1040
-#: ../dialogs/keyboard-settings/main.c:63
-#: ../dialogs/mouse-settings/main.c:1504
-#: ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173
-#: ../xfce4-settings-manager/main.c:57
+#: ../dialogs/accessibility-settings/main.c:192
+#: ../dialogs/appearance-settings/main.c:966
+#: ../dialogs/display-settings/main.c:1043
+#: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
+#: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63
+#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Көмек үшін '%s --help' енгізіңіз."
 
-#: ../dialogs/accessibility-settings/main.c:199
-#: ../dialogs/appearance-settings/main.c:975
-#: ../dialogs/display-settings/main.c:1059
-#: ../dialogs/keyboard-settings/main.c:79
-#: ../dialogs/mouse-settings/main.c:1523
-#: ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189
-#: ../xfce4-settings-manager/main.c:70
+#: ../dialogs/accessibility-settings/main.c:211
+#: ../dialogs/appearance-settings/main.c:985
+#: ../dialogs/display-settings/main.c:1062
+#: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
+#: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82
+#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce өндіру тобы. Барлық құқықтары қорғалған."
 
-#: ../dialogs/accessibility-settings/main.c:200
-#: ../dialogs/appearance-settings/main.c:976
-#: ../dialogs/display-settings/main.c:1060
-#: ../dialogs/keyboard-settings/main.c:80
-#: ../dialogs/mouse-settings/main.c:1524
-#: ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190
-#: ../xfce4-settings-manager/main.c:71
+#: ../dialogs/accessibility-settings/main.c:212
+#: ../dialogs/appearance-settings/main.c:986
+#: ../dialogs/display-settings/main.c:1063
+#: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
+#: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83
+#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Ақаулықтар жөнінде хабарласыңыз: <%s>."
@@ -251,8 +277,11 @@ msgid "Improve keyboard and mouse accessibility"
 msgstr "Пернетақта мен тышқан қолжетерлілігін жақсарту"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
-msgstr "Анти-алиасинг, не қаріптерді тегістеу, экрандағы мәтіннің түрін жақсарта алады"
+msgid ""
+"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgstr ""
+"Анти-алиасинг, не қаріптерді тегістеу, экрандағы мәтіннің түрін жақсарта "
+"алады"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:1
@@ -303,15 +332,20 @@ msgstr "Теру кезіндегі _кері байланыс дыбыстар
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:13
 msgid "Enable or disable event sounds globally (requires \"Canberra\" support)"
-msgstr "Оқиғалар дыбыстарын глобалды қосады не сөндіреді (\"Canberra\" қолдауы керек)"
+msgstr ""
+"Оқиғалар дыбыстарын глобалды қосады не сөндіреді (\"Canberra\" қолдауы керек)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:14
 msgid "Event sounds"
 msgstr "Оқиғалар дыбыстары"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
-msgid "Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen"
-msgstr "TFT не LCD экрандарда дұрыс суб-пиксель ретін таңдау арқылы қаріп сапасын көп есе жақсартуға болады"
+msgid ""
+"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
+"correct sub-pixel order of the screen"
+msgstr ""
+"TFT не LCD экрандарда дұрыс суб-пиксель ретін таңдау арқылы қаріп сапасын "
+"көп есе жақсартуға болады"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
 msgid "Full"
@@ -322,12 +356,21 @@ msgid "Icons"
 msgstr "Таңбашалар"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
-msgid "If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut"
-msgstr "Таңдаулы тұрса, мәзір элементтері үшін пернетақта жарлықтарын ол элемент үстінде курсорды ұстап, жаңа перне жарлығын енгізу арқылы өзгертуге болады"
+msgid ""
+"If selected, keyboard shortcuts for menu items can be changed by hovering "
+"the mouse over the menu item and pressing the new key combination for the "
+"shortcut"
+msgstr ""
+"Таңдаулы тұрса, мәзір элементтері үшін пернетақта жарлықтарын ол элемент "
+"үстінде курсорды ұстап, жаңа перне жарлығын енгізу арқылы өзгертуге болады"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
-msgid "Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference"
-msgstr "Қаріптердің көбінде оларды қалай тегістеу керек туралы ақпарат бар; өзіңіз үшін жақсысын таңдаңыз"
+msgid ""
+"Many fonts contain information that provides extra hints as to how best draw "
+"the font; pick whichever looks best according to personal preference"
+msgstr ""
+"Қаріптердің көбінде оларды қалай тегістеу керек туралы ақпарат бар; өзіңіз "
+"үшін жақсысын таңдаңыз"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
 msgid "Medium"
@@ -344,8 +387,11 @@ msgid "None"
 msgstr "Ешнәрсе"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
-msgid "Override the detected monitor resolution if fonts look too large or too small"
-msgstr "Монитордың анықталған кеңейтуін алмастырады, егер қаріптер тым үлкен не кіші боп көрінсе"
+msgid ""
+"Override the detected monitor resolution if fonts look too large or too small"
+msgstr ""
+"Монитордың анықталған кеңейтуін алмастырады, егер қаріптер тым үлкен не кіші "
+"боп көрінсе"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
 msgid "Rendering"
@@ -380,8 +426,12 @@ msgid "Specify whether icons should be displayed next to text in buttons"
 msgstr "Батырмаларда мәтін қасында суреттің көрсетілуін анықтайды"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
-msgid "Specify whether mouse clicks and other user input will cause event sounds to play"
-msgstr "Тышқан шертулері мен басқа да пайдаланушы әрекеттері дыбыстарды туғызуын анықтайды"
+msgid ""
+"Specify whether mouse clicks and other user input will cause event sounds to "
+"play"
+msgstr ""
+"Тышқан шертулері мен басқа да пайдаланушы әрекеттері дыбыстарды туғызуын "
+"анықтайды"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
 msgid "St_yle"
@@ -396,8 +446,11 @@ msgid "Text"
 msgstr "Мәтін"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
-msgid "This font will be used as the default font used when drawing user interface text"
-msgstr "Бұл қаріп пайдаланушы интерфейсін жасауда негізгі қаріп ретінде қолданылады"
+msgid ""
+"This font will be used as the default font used when drawing user interface "
+"text"
+msgstr ""
+"Бұл қаріп пайдаланушы интерфейсін жасауда негізгі қаріп ретінде қолданылады"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
 msgid "_Fonts"
@@ -478,8 +531,12 @@ msgid "Restore the previous configuration"
 msgstr "Алдыңғы баптауларды қалпына келтіру"
 
 #: ../dialogs/display-settings/confirmation-dialog.glade.h:5
-msgid "The previous configuration will be restored in 10 seconds if you do not reply to this question."
-msgstr "Егер осы сұраққа жауап бермесеңіз, алдыңғы баптаулар 10 секундтан кейін қалпына келтіріледі."
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+"Егер осы сұраққа жауап бермесеңіз, алдыңғы баптаулар 10 секундтан кейін "
+"қалпына келтіріледі."
 
 #: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
@@ -557,8 +614,12 @@ msgstr "Сыртқы шығысты орнату үшін минималды и
 
 #: ../dialogs/display-settings/main.c:171
 #, c-format
-msgid "The previous configuration will be restored in %i seconds if you do not reply to this question."
-msgstr "Егер осы сұраққа жауап бермесеңіз, алдыңғы баптаулар %i секундтан кейін қалпына келтіріледі."
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
+"Егер осы сұраққа жауап бермесеңіз, алдыңғы баптаулар %i секундтан кейін "
+"қалпына келтіріледі."
 
 #. Insert the mode
 #: ../dialogs/display-settings/main.c:505
@@ -567,37 +628,44 @@ msgid "%.1f Hz"
 msgstr "%.1f Гц"
 
 #: ../dialogs/display-settings/main.c:651
-msgid "The last active output must not be disabled, the system would be unusable."
-msgstr "Соңғы белсенді шығысты сөндіруге болмайды, өйткені жүйеңіз қолдануға жарамайтын болады."
+msgid ""
+"The last active output must not be disabled, the system would be unusable."
+msgstr ""
+"Соңғы белсенді шығысты сөндіруге болмайды, өйткені жүйеңіз қолдануға "
+"жарамайтын болады."
 
 #: ../dialogs/display-settings/main.c:653
 msgid "Selected output not disabled"
 msgstr "Таңдалған шығыс сөндірілген емес"
 
-#: ../dialogs/display-settings/main.c:1072
+#: ../dialogs/display-settings/main.c:1075
 #: ../dialogs/display-settings/xfce-randr.c:249
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Қолданулы тұрған RandR кеңейтуінің нұсқасын анықтау мүмкін емес"
 
-#: ../dialogs/display-settings/main.c:1073
-#: ../dialogs/display-settings/main.c:1109
+#: ../dialogs/display-settings/main.c:1076
+#: ../dialogs/display-settings/main.c:1112
 msgid "Unable to start the Xfce Display Settings"
 msgstr "Xfce экран баптауларын жөнелту мүмкін емес"
 
-#: ../dialogs/display-settings/main.c:1104
+#: ../dialogs/display-settings/main.c:1107
 msgid "ATI Settings"
 msgstr "ATI баптаулары"
 
-#: ../dialogs/display-settings/main.c:1119
+#: ../dialogs/display-settings/main.c:1122
 msgid "Unable to launch the proprietary driver settings"
 msgstr "Проприетарлы драйвер баптауларын жөнелту мүмкін емес"
 
 #. 1.2 is required
 #: ../dialogs/display-settings/xfce-randr.c:257
 #, c-format
-msgid "This system is using RandR %d.%d. For the display settings to work version 1.2 is required at least"
-msgstr "Жүйеңіздегі RandR нұсқасы %d.%d. Дисплей баптауларының жұмысы үшін кем дегенде 1.2 нұсқасы керек"
+msgid ""
+"This system is using RandR %d.%d. For the display settings to work version "
+"1.2 is required at least"
+msgstr ""
+"Жүйеңіздегі RandR нұсқасы %d.%d. Дисплей баптауларының жұмысы үшін кем "
+"дегенде 1.2 нұсқасы керек"
 
 #: ../dialogs/display-settings/xfce-randr.c:536
 msgid "Laptop"
@@ -649,26 +717,32 @@ msgid "Select command"
 msgstr "Команданы таңдаңыз"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:235
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:386
 msgid "All Files"
 msgstr "Барлық файлдар"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:240
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:391
 msgid "Executable Files"
 msgstr "Орындалатын файлдар"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:255
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:406
 msgid "Perl Scripts"
 msgstr "Perl скриптері"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:261
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:412
 msgid "Python Scripts"
 msgstr "Python скриптері"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:267
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:418
 msgid "Ruby Scripts"
 msgstr "Ruby скриптері"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:273
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:424
 msgid "Shell Scripts"
 msgstr "Қоршам скриптері"
 
@@ -698,136 +772,283 @@ msgid "Edit keyboard settings and application shortcuts"
 msgstr "Пернетақта баптауларын мен қолданбалар жарлықтарын түзету"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
+msgid "General"
+msgstr "Жалпы"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2
 msgid "Keyboard"
 msgstr "Пернетақта"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
 msgid "Keyboard layout"
 msgstr "Пернетақта жаймасы"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
 msgid "Keyboard layout selection"
 msgstr "Пернетақта жаймасын таңдау"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
 msgid "Keyboard model"
 msgstr "Пернетақта түрі"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
 msgid "Repeat _speed:"
 msgstr "Қайталау жы_лдамдығы:"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13
 msgid "Reset to _Defaults"
 msgstr "Баста_пқы түріне келтіру"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
+msgid "Restore num l_ock state on startup"
+msgstr "Қосылғанда num lock кү_йін қалпына келтіру"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
 msgid "Select keyboard layout and variant"
 msgstr "Пернетақта жаймасы мен нұсқасын таңдау"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:16
 msgid "Show _blinking"
 msgstr "Жыпылықтауды көр_сету"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
-msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server"
-msgstr "Пернетақта жаймасы осы баптаулармен не X серверімен басқарылуын анықтайды"
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17
+msgid ""
+"Specifies whether the keyboard layout is controlled with this settings "
+"dialog, or by the X server"
+msgstr ""
+"Пернетақта жаймасы осы баптаулармен не X серверімен басқарылуын анықтайды"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:16
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
 msgid "Specify whether or not the text cursor blinks"
 msgstr "Мәтін курсоры жыпылықтауын анықтайды"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19
 msgid "The delay, in milliseconds, between successive blinks of the cursor"
 msgstr "Курсор екі жыпылықтауының аралығы, мсек"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20
 msgid "The rate at which keystrokes are generated while a key is pressed"
 msgstr "Перне басулы тұрған кезде туғызылатын басылымдар жиілігі"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
 msgid "The time, in milliseconds, before a pressed key begins repeating"
 msgstr "Басылған перне қайталана бастауға дейінгі өтетін уақыт аралығы, мсек"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
 msgid "Typing Settings"
 msgstr "Теру баптаулары"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
-msgid "Use this area to _test the settings above:"
-msgstr "Жоғарыдағы б_аптауларды сынау өрісі:"
-
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
-msgid "When selected, pressing and holding down a key emits the same character over and over again"
-msgstr "Таңдаулы тұрса, пернені басып, ұстау оның таңбасын қайта-қайта енгізуді туғызады"
-
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:23
+msgid ""
+"When selected, pressing and holding down a key emits the same character over "
+"and over again"
+msgstr ""
+"Таңдаулы тұрса, пернені басып, ұстау оның таңбасын қайта-қайта енгізуді "
+"туғызады"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:24
 msgid "_Enable key repeat"
 msgstr "_Пернелер қайталауын іске қосу"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:24
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:25
 msgid "_Layout"
 msgstr "Жа_йма"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:25
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:26
 msgid "_Repeat delay:"
 msgstr "Қайталау бө_геуі:"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:26
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:27
+msgid "_Test area:"
+msgstr "Сын_ау жері:"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:28
 msgid "_Use system defaults"
 msgstr "_Жүйелік негізгі түріне келтіру"
 
-#: ../dialogs/keyboard-settings/main.c:69
+#: ../dialogs/keyboard-settings/main.c:82
 msgid "Unable to initialize GTK+."
 msgstr "GTK+ іске қосу мүмкін емес."
 
-#: ../dialogs/keyboard-settings/main.c:89
+#: ../dialogs/keyboard-settings/main.c:102
 #, c-format
 msgid "Failed to connect to xfconf daemon. Reason: %s"
 msgstr "Xfconf қызметімен байланыс орнату мүмкін емес. Себебі: %s"
 
-#: ../dialogs/keyboard-settings/main.c:100
+#: ../dialogs/keyboard-settings/main.c:113
 msgid "Could not create the settings dialog."
 msgstr "Баптаулар сұхбат терезесін жасау мүмкін емес."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:295
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:300
 msgid "Command"
 msgstr "Команда"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:300
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:305
 msgid "Shortcut"
 msgstr "Жарлық"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:374
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:380
 msgid "Layout"
 msgstr "Жайма"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:375
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:381
 msgid "Variant"
 msgstr "Нұсқа"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:851
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:857
 msgid "Shortcut command may not be empty."
 msgstr "Жарлық командасы бос болуы мүмкін емес."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:959
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:960
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
 msgid "Reset to Defaults"
 msgstr "Бастапқы түріне келтіру"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:961
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
-msgstr "Бұл әрекет барлық жарлықтарды бастапқы түріне келтіреді. Осыны шынымен қалайсыз ба?"
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
+msgstr ""
+"Бұл әрекет барлық жарлықтарды бастапқы түріне келтіреді. Осыны шынымен "
+"қалайсыз ба?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1026
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
 msgid "The system defaults will be restored next time you log in."
-msgstr "Жүйенің бастапқы баптаулары сіз келесі рет жүйеге кіргенде іске қосылады."
+msgstr ""
+"Жүйенің бастапқы баптаулары сіз келесі рет жүйеге кіргенде іске қосылады."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1028
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
 msgid "Warning"
 msgstr "Ескерту"
 
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:128
+msgid "Select Application"
+msgstr "Қолданбаны таңдаңыз"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:204
+msgid "Use a c_ustom command:"
+msgstr "Өз ко_мандаңызды қолдану:"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:205
+msgid ""
+"Use a custom command for an application that is not available from the above "
+"application list."
+msgstr ""
+"Жоғарыдағы тізімде жоқ қоданабаны таңдау үшін өз командаңызды көрсетіңіз."
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:223
+msgid "_Browse..."
+msgstr "_Шолу..."
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:376
+msgid "Select an Application"
+msgstr "Қолданбаны таңдаңыз"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:526
+msgid "None available"
+msgstr "Қолжетерлік жоқ"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:573
+msgid "Recommended Applications"
+msgstr "Ұсынылатын қолданбалар"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:591
+msgid "Other Applications"
+msgstr "Басқа қолданбалар"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:611
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "<i>%s</i> және \"%s\" түріндегі файлдарды көмегімен ашу:"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:647
+#, c-format
+msgid "Failed to add new application \"%s\""
+msgstr "Жаңа \"%s\" қолданбасын қосу сәтсіз"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:174
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:2
+msgid "MIME Type Editor"
+msgstr "MIME түрінің түзетушісі"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:178
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:1
+msgid "Associate applications with MIME types"
+msgstr "Қолданбаларды MIME түрлерімен сәйкестендіру"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:203
+msgid "_Filter:"
+msgstr "Сүз_гі:"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:211
+msgid "Clear filter"
+msgstr "Сүзгіні тазарту"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:257
+msgid "MIME Type"
+msgstr "MIME түрі"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:287
+msgid "Status"
+msgstr "Қалып-күйі"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:308
+msgid "Default Application"
+msgstr "Бастапқы қолданба"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:479
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+msgid "User Set"
+msgstr "Пайдаланушы орнатқан"
+
+#. sort the names but keep Default on top
+#: ../dialogs/mime-settings/xfce-mime-window.c:481
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+#: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
+#: ../dialogs/mouse-settings/main.c:434
+msgid "Default"
+msgstr "Бастапқы"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:550
+#, c-format
+msgid "%d MIME type found"
+msgid_plural "%d MIME types found"
+msgstr[0] "%d MIME түрі табылды"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:649
+#, c-format
+msgid "Failed to set application \"%s\" for mime type \"%s\"."
+msgstr "\"%s\" қолданабсын \"%s\" mime түрі үшін орнату сәтсіз аяқталды."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:906
+#, c-format
+msgid ""
+"Are you sure you want to reset content type \"%s\" to its default value?"
+msgstr "\"%s\" құрама түрін оның бастапқы түріне тастауды шынымен қалайсыз ба?"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:910
+msgid "Question"
+msgstr "Сұрақ"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:913
+msgid ""
+"This will remove your custom mime-association and restore the system-wide "
+"default."
+msgstr ""
+"Бұл әрекет сіз орнатқан сәйкестікті өшіреді және оны бастапқы мәніне "
+"орнатады."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:917
+#: ../dialogs/mime-settings/xfce-mime-window.c:988
+msgid "Reset to Default"
+msgstr "Бастапқы түріне тастау"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:983
+msgid "Choose Application..."
+msgstr "Қолданбаны таңдаңыз..."
+
 #: ../dialogs/mouse-settings/main.c:96
 msgid "Active device in the dialog"
 msgstr "Сұхбат терезесіндегі белсенді құрылғылар"
@@ -848,199 +1069,205 @@ msgstr "%g пикс"
 msgid "%g ms"
 msgstr "%g мс"
 
-#. sort the names but keep Default on top
-#: ../dialogs/mouse-settings/main.c:372
-#: ../dialogs/mouse-settings/main.c:374
-#: ../dialogs/mouse-settings/main.c:434
-msgid "Default"
-msgstr "Бастапқы"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:1
+msgid "B_uttons and Feedback"
+msgstr "Б_атырмалар мен кері әсер"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:2
 msgid "Buttons"
 msgstr "Батырмалар"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:2
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:3
 msgid "Clockwise"
 msgstr "Сағат тілі бағытымен"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:3
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:4
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:1
 msgid "Configure pointer device behavior and appearance"
 msgstr "Көрсету құрылғысының мінез-құлығын мен сыртқы түрін баптау"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:4
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:5
 msgid "Counterclockwise"
 msgstr "Сағат тілі бағытына қарсы"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:5
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
 msgid "Cursor _size:"
 msgstr "Курсор өл_шемі:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
 msgid "D_istance:"
 msgstr "Қ_ашықтығы:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
 msgid "De_vice:"
 msgstr "Құ_рылғы:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
 msgid "Di_sabled"
 msgstr "Сө_ндірулі"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
 msgid "Disable to_uchpad while typing"
 msgstr "Теру кезінде та_чпадты сөндіру"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
 msgid "Double Click"
 msgstr "Қос шерту"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
 msgid "Drag and Drop"
 msgstr "Ұстап апару мен тастау"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
 msgid "Edge scro_lling"
 msgstr "Шеттермен а_йналдыру"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:14
 msgid "Enable hori_zontal scrolling"
 msgstr "Гор_изонталды айналдыруды іске қосу"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:14
-msgid "General"
-msgstr "Жалпы"
-
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
 msgid "Half (left-handed)"
 msgstr "Жартылай (солақай)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
 msgid "Mouse (relative)"
 msgstr "Тышқан (салыстырмалы)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:2
 msgid "Mouse and Touchpad"
 msgstr "Тышқан мен тачпад"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
 msgid "None (right-handed)"
 msgstr "Жоқ (оңақай)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
 msgid "Pen (absolute)"
 msgstr "Қалам (абсолют)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
 msgid "Pointer Speed"
 msgstr "Курсор жылдамдығы"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:22
 msgid "Preview"
 msgstr "Алдын-ала қарау"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:22
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:23
 msgid "Reset to De_faults"
 msgstr "Баст_апқы түріне келтіру"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:23
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
 msgid "Reverse scroll d_irection"
 msgstr "Ты_шқан дөңгелегін айналдыруды терістеу"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
 msgid "Scrolling"
 msgstr "Айналдыру"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
-msgid "Set the acceleration and sensitivity for the selected device to the default values"
-msgstr "Таңдалған құрылғы үшін үшін үдету мен шек мәнін бастапқы мәндеріне тастау"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:26
+msgid ""
+"Set the acceleration and sensitivity for the selected device to the default "
+"values"
+msgstr ""
+"Таңдалған құрылғы үшін үшін үдету мен шек мәнін бастапқы мәндеріне тастау"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
 msgid "Size"
 msgstr "Өлшемі"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:28
 msgid "T_ap touchpad to click"
 msgstr "Шерту үшін тач_падқа тию"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:28
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:29
 msgid "T_heme"
 msgstr "_Тақырыбы"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:29
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:30
 msgid "T_ouchpad"
 msgstr "_Тачпад"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:30
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:31
 msgid "Table_t"
 msgstr "План_шет"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:31
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:32
 msgid "Th_reshold:"
 msgstr "_Шегі:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:32
-msgid "The factor at which the pointer's speed will increase as the mouse is moved"
-msgstr "Тышқан жылжытылған кезде курсор жылдамдығы еселену реті"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:33
-msgid "The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click"
-msgstr "Қос шерту ретінде санау үшін бірінші шертуден кейін курсорды осы пиксель санынан үлкен емес санға жылжытуға рұқсат етілген"
+msgid ""
+"The factor at which the pointer's speed will increase as the mouse is moved"
+msgstr "Тышқан жылжытылған кезде курсор жылдамдығы еселену реті"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:34
-msgid "The number of pixels the pointer must move before a drag operation will start"
-msgstr "Ұстап апару әрекетін бастау үшін курсор өту керек пиксельдер саны"
+msgid ""
+"The mouse pointer cannot move farther than this distance between two clicks "
+"for them to be considered a double click"
+msgstr ""
+"Қос шерту ретінде санау үшін бірінші шертуден кейін курсорды осы пиксель "
+"санынан үлкен емес санға жылжытуға рұқсат етілген"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:35
-msgid "The number of pixels the pointer must move in a short time before it starts accelerating"
-msgstr "Курсорды үдетуді бастау үшін курсор қысқа уақытта өту керек пиксельдер саны"
+msgid ""
+"The number of pixels the pointer must move before a drag operation will start"
+msgstr "Ұстап апару әрекетін бастау үшін курсор өту керек пиксельдер саны"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:36
+msgid ""
+"The number of pixels the pointer must move in a short time before it starts "
+"accelerating"
+msgstr ""
+"Курсорды үдетуді бастау үшін курсор қысқа уақытта өту керек пиксельдер саны"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:37
 msgid "Ti_me:"
 msgstr "У_ақыт:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:37
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:38
 msgid "Tr_acking mode:"
 msgstr "Бақ_ылау режимі:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:38
-msgid "Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click"
-msgstr "Қос шерту ретінде санау үшін, екі қатар тышқан шертулер арасындағы ең үлкен уақыт аралығы, мсек"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:39
+msgid ""
+"Two mouse clicks in less than this length of time (in milliseconds) will be "
+"considered a double click"
+msgstr ""
+"Қос шерту ретінде санау үшін, екі қатар тышқан шертулер арасындағы ең үлкен "
+"уақыт аралығы, мсек"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:40
 msgid "Two-_finger scrolling"
 msgstr "Қос_саусақты айналдыру:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:40
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:41
 msgid "When selected, the scroll wheel will work in the opposite direction"
 msgstr "Таңдаулы тұрса, тышқан дөңгелегін айналдыру кері бағытта іске асады"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:41
-msgid "When selected, the touchpad will be disabled when the keyboard is being used"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:42
+msgid ""
+"When selected, the touchpad will be disabled when the keyboard is being used"
 msgstr "Таңдаулы тұрса, пернетақта қолданған кезде тачпад сөндіріледі"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:42
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:43
 msgid "_Acceleration:"
 msgstr "Үд_ету:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:43
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:44
 msgid "_Behavior"
 msgstr "_Мінез-құлығы"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:44
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:45
 msgid "_Devices"
 msgstr "Құ_рылғылар"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:45
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:46
 msgid "_Enable this device"
 msgstr "Бұл құрылғыны і_ске қосу"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:46
-msgid "_General"
-msgstr "Жал_пы"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:47
 msgid "_Left-handed"
 msgstr "_Солақай"
@@ -1057,164 +1284,202 @@ msgstr "Бұ_рылуы:"
 msgid "_Sensitivity:"
 msgstr "Се_зімділігі:"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Баптаулар түзетуші"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Xfconf сақтап тұрған баптауларды түзету"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Арна"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Қасиеті"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Түрі"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Бұғатталған"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Мәні"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "Бос"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Жаңа қасиет"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Қасиет аты қате."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Таңдалған қасиетті түзету"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Тастау"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Тастау"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr "Қасиетті тастау бұл баптаулардың жоғалуына әкеп соғады."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Таңдалған қасиетті тастау"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "\"%s\" қасиетін тастауды шынымен қалайсыз ба?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "Бос"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "Қасиеттердің атаулары '/' таңбасынан басталуы керек"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "Массив"
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "Түбірлік ('/') элементі дұрыс қасиет аты емес"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "String"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
-msgstr "Қасиеттің атында тек ASCII-дің таңбалары A-Z, a-z, 0-9, '_', '-', '<' және '>', оған қоса ажыратқыш ретінде '/' таңбасы болуы керек"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "Бүтін"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "Қасиет аттарында қатар тұрған екі немесе одан да көп '/' таңбалары болмауы керек"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Boolean"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "Қасиеттің аты '/' таңбасымен аяқталмауы тиіс"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Double"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_Тастау"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "Арна_ны тастау"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
 msgstr "Каналды тастау бұл баптаулардың жоғалуына әкеп соғады."
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr "\"%s\" каналын мен оның қасиеттерін тастауды шынымен қалайсыз ба?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Xfconf үшін баптауларды графикалық түзетуші"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Баптаулар түзетуші"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "тастау"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Boolean"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "%s бақылау"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Xfconf сақтап тұрған баптауларды түзету"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "Xfconf арнасын өзгерістерге бақылау"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Double"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "\"%s\" арнасын бақылауды бастау"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Қасиетті түзету"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "Бақ_ылау"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Қасиетті түзету"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr "Қасиетті тастау бұл баптаулардың жоғалуына әкеп соғады."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Қосулы"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "\"%s\" қасиетін тастауды шынымен қалайсыз ба?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "Int"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Unsigned Int"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Аты:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Unsigned Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
 msgstr "Жаңа қасиет"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Қасиетті тастау"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "Қас_иет:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "String"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "_Түрі:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Түрі:"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "Мә_ні:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Unsigned Int"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "Қасиеттердің атаулары '/' таңбасынан басталуы керек"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Unsigned Int64"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "Түбірлік ('/') элементі дұрыс қасиет аты емес"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
+#, c-format
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Қасиеттің атында тек ASCII-дің таңбалары A-Z, a-z, 0-9, '_', '-', '<' және "
+"'>', оған қоса ажыратқыш ретінде '/' таңбасы болуы керек"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr ""
+"Қасиет аттарында қатар тұрған екі немесе одан да көп '/' таңбалары болмауы "
+"керек"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Мәні:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "Қасиеттің аты '/' таңбасымен аяқталмауы тиіс"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Xfconf каналдары"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "Қасиетті түзету"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Xfconf үшін баптауларды графикалық түзетуші"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1265,7 +1530,7 @@ msgstr "Фон режиміне өтпеу"
 msgid "Replace running xsettings daemon (if any)"
 msgstr "Қосулы тұрған xsettings қызметін алмастыру (бар болса)"
 
-#: ../xfsettingsd/workspaces.c:365
+#: ../xfsettingsd/workspaces.c:385
 #, c-format
 msgid "Workspace %d"
 msgstr "Жұмыс орны %d"
@@ -1274,33 +1539,28 @@ msgstr "Жұмыс орны %d"
 msgid "The Xfce Settings Daemon"
 msgstr "Xfce баптаулар қызметі"
 
-#: ../xfce4-settings-manager/main.c:41
+#: ../xfce4-settings-manager/main.c:40
 msgid "Settings dialog to show"
 msgstr "Көрсетілетін баптаулар сұхбаты"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:163
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
+msgid "_All Settings"
+msgstr "Бар_лық баптаулар"
+
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "Баптаулар"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:164
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "Жұмыс үстеліңізді баптаңыз"
 
-#. Create back button which takes the user back to the overview
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:271
-msgid "_Overview"
-msgstr "Алд_ын-ала қарау"
-
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:601
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:617
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
 msgstr "\"%s\" іске қосу мүмкін емес"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:664
-msgid "Failed to open the documentation"
-msgstr "Құжаттаманы ашу сәтсіз аяқталды"
-
 #: ../xfce4-settings-manager/xfce-settings-manager.desktop.in.h:1
 msgid "Graphical Settings Manager for Xfce 4"
 msgstr "Xfce 4 үшін баптауларды графикалық түзету сайманы"
@@ -1309,6 +1569,30 @@ msgstr "Xfce 4 үшін баптауларды графикалық түзету
 msgid "Settings Manager"
 msgstr "Баптаулар басқарушысы"
 
+#~ msgid "Use this area to _test the settings above:"
+#~ msgstr "Жоғарыдағы б_аптауларды сынау өрісі:"
+
+#~ msgid "_General"
+#~ msgstr "Жал_пы"
+
+#~ msgid "This property name is not valid."
+#~ msgstr "Қасиет аты қате."
+
+#~ msgid "Enabled"
+#~ msgstr "Қосулы"
+
+#~ msgid "Name:"
+#~ msgstr "Аты:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Xfconf каналдары"
+
+#~ msgid "_Overview"
+#~ msgstr "Алд_ын-ала қарау"
+
+#~ msgid "Failed to open the documentation"
+#~ msgstr "Құжаттаманы ашу сәтсіз аяқталды"
+
 #~ msgid "_Reset to Defaults"
 #~ msgstr "_Бастапқы түріне келтіру"
 
diff --git a/po/ko.po b/po/ko.po
index 5a4585a..17c4880 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,35 +2,35 @@
 # Copyright (C) 2003-2011 The Xfce development team.
 # This file is distributed under the same license as the xfce4-settings package.
 # Seong-ho, Cho <darkcircle.0426 at gmail.com>, 2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings.xfce-4-8\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-15 16:34+0000\n"
-"PO-Revision-Date: 2011-09-13 07:04+0900\n"
+"Report-Msgid-Bugs-To: xfce4-users-kr-i18n <xfce4-users-kr-i18n at lists.sourceforge.net>\n"
+"POT-Creation-Date: 2012-02-20 15:54+0000\n"
+"PO-Revision-Date: 2012-02-26 14:57+0900\n"
 "Last-Translator: Seong-ho, Cho <darkcircle.0426 at gmail.com>\n"
 "Language-Team: xfce4-users-kr-i18n <xfce4-users-kr-i18n at lists.sourceforge.net>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: Ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Language: Korean\n"
-"X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: KOREA, REPUBLIC OF\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
 msgid "Acceleration _profile:"
-msgstr "가속 프로파일(_p):"
+msgstr "가속 프로파일(_P):"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:2
 msgid "Acceleration _time:"
-msgstr "가속 시간(_t):"
+msgstr "가속 시간(_T):"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:3
 msgid "Acceptance _delay:"
-msgstr "허용 지연(_d):"
+msgstr "허용 지연(_D):"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:4
 #: ../dialogs/accessibility-settings/xfce4-accessibility-settings.desktop.in.h:1
@@ -41,7 +41,7 @@ msgstr "접근성"
 msgid ""
 "Assistive technologies will be available the\n"
 "next time you login"
-msgstr "다음 로그인 시 보조 기술이 사용 가능하게 될 것입니다."
+msgstr "다음 로그인 시 보조 기술을 사용 할 수 있을 것입니다."
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7
 msgid "Bounce Keys"
@@ -53,27 +53,23 @@ msgstr "키보드와 마우스 접근성 설정"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9
 msgid "Disable sticky keys if _two keys are pressed"
-msgstr "두 키가 눌렸을 경우 끈적이 키를 비활성화(_t)"
+msgstr "두 키가 눌렸을 경우 끈적이 키를 비활성화(_T)"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
-msgid ""
-"If enabled, the session manager will start the required applications for "
-"screen readers and magnifiers"
-msgstr ""
-"활성화 되었다면, 세션 관리자는 화면 리더와 화면 돋보기를 위해 필요한 프로그램"
-"을 시작할 것입니다"
+msgid "If enabled, the session manager will start the required applications for screen readers and magnifiers"
+msgstr "활성화 되었다면, 세션 관리자는 화면 리더와 화면 돋보기를 위해 필요한 프로그램을 시작할 것입니다"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
 msgid "K_eystroke delay:"
-msgstr "키 누름 지연(_e):"
+msgstr "키 누름 지연(_E):"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12
 msgid "Keyboa_rd"
-msgstr "키보드(_r)"
+msgstr "키보드(_R)"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13
 msgid "Maximum _speed:"
-msgstr "최대 속도(_s):"
+msgstr "최대 속도(_S):"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:14
 msgid "Mouse Emulation"
@@ -85,7 +81,7 @@ msgstr "AT-SPI 제공자를 시스템에서 찾을 수 없습니다"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
 msgid "R_epeat interval:"
-msgstr "반복 주기(_e):"
+msgstr "반복 주기(_E):"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
 msgid "Slow Keys"
@@ -100,11 +96,8 @@ msgid "The amount of time, in milliseconds, required between keystrokes"
 msgstr "키 입력이 발생하는데 필요한 밀리세컨드 단위의 시간의 양"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid ""
-"The amount of time, in milliseconds, that must elapse before a keystroke "
-"will be accepted"
-msgstr ""
-"키 누름이 허용되기 위해 반드시 경과되어야 할 밀리세컨드 단위의 시간의 양"
+msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted"
+msgstr "키 누름이 허용되기 위해 반드시 경과되어야 할 밀리세컨드 단위의 시간의 양"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
 msgid "The maximum pointer speed after acceleration"
@@ -119,77 +112,48 @@ msgid "The time, in milliseconds, between repeated motion events"
 msgstr "반복 움직임이 발생하는 사이의 밀리세컨드 단위의 시간"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
-msgid ""
-"The time, in milliseconds, between the initial key press and first repeated "
-"motion event"
-msgstr ""
-"최초 키 입력과 처음 반복된 움직임이 발생한 사이의 밀리세컨드 단위의 시간"
+msgid "The time, in milliseconds, between the initial key press and first repeated motion event"
+msgstr "최초 키 입력과 처음 반복된 움직임이 발생한 사이의 밀리세컨드 단위의 시간"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:25
 msgid "The time, in milliseconds, to get to maximum speed"
 msgstr "최대 속도를 얻기 위한 밀리세컨드 단위의 시간 "
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:26
-msgid ""
-"To help prevent accidental keystrokes, slow keys requires that a key is held "
-"for a certain minimum amount of time before the keystroke will be accepted"
-msgstr ""
-"갑작스런 키 입력을 막아보기위해, 느린 키에서는 키 입력이 수락되기 전의 최소한"
-"의 특정 시간동안 키 누름을 유지하는 것을 필요로 합니다"
+msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted"
+msgstr "갑작스런 키 입력을 막아보기위해, 느린 키에서는 키 입력이 수락되기 전의 최소한의 특정 시간동안 키 누름을 유지하는 것을 필요로 합니다"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
-msgid ""
-"To help prevent accidental multiple keystrokes, bounce keys imposes a "
-"minimum delay between keystrokes"
-msgstr ""
-"갑작스런 다중 키입력을 막아보기위해, 탄력 키에서는 키 누름간의 최소한의 지연 "
-"시간을 사용합니다"
+msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes"
+msgstr "갑작스런 다중 키입력을 막아보기위해, 탄력 키에서는 키 누름간의 최소한의 지연 시간을 사용합니다"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
 msgid "Use _bounce keys"
-msgstr "탄력 키 사용(_b)"
+msgstr "탄력 키 사용(_B)"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:29
 msgid "Use _sticky keys"
-msgstr "끈적이 키 사용(_s)"
+msgstr "끈적이 키 사용(_S)"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:30
 msgid "Use slow _keys"
-msgstr "느린 키 사용(_k)"
+msgstr "느린 키 사용(_K)"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
-msgid ""
-"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
-"to be held down (they can be pressed and then released) when multiple keys "
-"would normally need to be pressed at the same time"
-msgstr ""
-"이 것이 선택되었을 때, 여러 키가 보통 동시에 눌릴 필요가 있을 경우, 수정 키"
-"(Control, Alt, Shift 같은 것들)는 누른 상태로 유지(눌렀다 땔 수 있습니다)할 "
-"필요가 없습니다."
+msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time"
+msgstr "이 것을 선택했을 때, 여러 키가 보통 동시에 눌릴 필요가 있을 경우, 수정 키(Control, Alt, Shift 같은 것들)는 누른 상태로 유지(눌렀다 땔 수 있습니다)할 필요가 없습니다."
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:32
-msgid ""
-"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
-"locked in the pressed state until pressed again"
-msgstr ""
-"이 것이 선택되었을 때, 수정 키(Control, Alt, Shift 같은 것들)는 다시 눌리기 "
-"전에 눌린 상태가 잠긴 채로 유지될 것입니다"
+msgid "When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again"
+msgstr "이 것을 선택했을 때, 수정 키(Control, Alt, Shift 같은 것들)는 다시 눌리기 전에 눌린 상태가 잠긴 채로 유지 것입니다"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:33
-msgid ""
-"When selected, the \"sticky keys\" feature will be disabled if two keys are "
-"pressed simultaneously"
-msgstr ""
-"이 것이 선택되었을 때, 두 키가 동시에 눌렸을 경우 \"끈적이 키\" 기능이 비활성"
-"화 될 것입니다"
+msgid "When selected, the \"sticky keys\" feature will be disabled if two keys are pressed simultaneously"
+msgstr "이 것을 선택했을 때, 두 키가 동시에 눌렸을 경우 \"끈적이 키\" 기능을 비활성화 할 것입니다"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:34
-msgid ""
-"When selected, the mouse pointer can be controlled using the keyboard number "
-"pad"
-msgstr ""
-"이 것이 선택되었을 때, 마우스 포인터를 키보드 숫자패드를 사용하여 조종할 수 "
-"있습니다"
+msgid "When selected, the mouse pointer can be controlled using the keyboard number pad"
+msgstr "이 것을 선택했을 때, 마우스 포인터를 키보드 숫자패드를 사용하여 조종할 수 있습니다"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:35
 msgid "_Acceleration delay:"
@@ -226,70 +190,81 @@ msgstr "pixels/sec"
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
 #: ../dialogs/display-settings/main.c:102
-#: ../dialogs/keyboard-settings/main.c:38 ../dialogs/mouse-settings/main.c:97
+#: ../dialogs/keyboard-settings/main.c:39
+#: ../dialogs/mouse-settings/main.c:97
 msgid "Settings manager socket"
 msgstr "설정 관리자 소켓"
 
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
 #: ../dialogs/display-settings/main.c:102
-#: ../dialogs/keyboard-settings/main.c:38 ../dialogs/mouse-settings/main.c:97
+#: ../dialogs/keyboard-settings/main.c:39
+#: ../dialogs/mouse-settings/main.c:97
 msgid "SOCKET ID"
 msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:95
 #: ../dialogs/display-settings/main.c:103
-#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:98
-#: ../xfce4-settings-editor/main.c:43 ../xfsettingsd/main.c:77
+#: ../dialogs/keyboard-settings/main.c:40
+#: ../dialogs/mime-settings/main.c:40
+#: ../dialogs/mouse-settings/main.c:98
+#: ../xfce4-settings-editor/main.c:43
+#: ../xfsettingsd/main.c:77
 #: ../xfce4-settings-manager/main.c:39
 msgid "Version information"
 msgstr "버전 정보"
 
-#: ../dialogs/accessibility-settings/main.c:180
-#: ../dialogs/appearance-settings/main.c:956
-#: ../dialogs/display-settings/main.c:1040
-#: ../dialogs/keyboard-settings/main.c:63
-#: ../dialogs/mouse-settings/main.c:1504 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:57
+#: ../dialogs/accessibility-settings/main.c:192
+#: ../dialogs/appearance-settings/main.c:966
+#: ../dialogs/display-settings/main.c:1043
+#: ../dialogs/keyboard-settings/main.c:76
+#: ../dialogs/mime-settings/main.c:62
+#: ../dialogs/mouse-settings/main.c:1515
+#: ../xfce4-settings-editor/main.c:63
+#: ../xfsettingsd/main.c:173
+#: ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "사용방법을 보려면 '%s --help'를 입력합니다."
 
-#: ../dialogs/accessibility-settings/main.c:199
-#: ../dialogs/appearance-settings/main.c:975
-#: ../dialogs/display-settings/main.c:1059
-#: ../dialogs/keyboard-settings/main.c:79
-#: ../dialogs/mouse-settings/main.c:1523 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:70
+#: ../dialogs/accessibility-settings/main.c:211
+#: ../dialogs/appearance-settings/main.c:985
+#: ../dialogs/display-settings/main.c:1062
+#: ../dialogs/keyboard-settings/main.c:92
+#: ../dialogs/mime-settings/main.c:81
+#: ../dialogs/mouse-settings/main.c:1534
+#: ../xfce4-settings-editor/main.c:82
+#: ../xfsettingsd/main.c:189
+#: ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce 개발 팀. All rights reserved."
 
-#: ../dialogs/accessibility-settings/main.c:200
-#: ../dialogs/appearance-settings/main.c:976
-#: ../dialogs/display-settings/main.c:1060
-#: ../dialogs/keyboard-settings/main.c:80
-#: ../dialogs/mouse-settings/main.c:1524 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:71
+#: ../dialogs/accessibility-settings/main.c:212
+#: ../dialogs/appearance-settings/main.c:986
+#: ../dialogs/display-settings/main.c:1063
+#: ../dialogs/keyboard-settings/main.c:93
+#: ../dialogs/mime-settings/main.c:82
+#: ../dialogs/mouse-settings/main.c:1535
+#: ../xfce4-settings-editor/main.c:83
+#: ../xfsettingsd/main.c:190
+#: ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid "Please report bugs to <%s>."
-msgstr "<%s> 로 버그를 보고하여 주시기 바랍니다."
+msgstr "<%s> 로 버그를 알려주시기 바랍니다."
 
 #: ../dialogs/accessibility-settings/xfce4-accessibility-settings.desktop.in.h:2
 msgid "Improve keyboard and mouse accessibility"
 msgstr "키보드와 마우스의 접근성을 향상합니다"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid ""
-"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
-msgstr ""
-"안티 에일리어싱 혹은 글꼴 다듬기를 통해 화면의 본문 글씨의 모양새를 더 보기 "
-"좋게 할 수 있습니다"
+msgid "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgstr "안티 에일리어싱 혹은 글꼴 다듬기를 통해 화면의 본문 글씨의 모양새를 더 보기 좋게 할 수 있습니다"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:1
 msgid "Appearance"
-msgstr "외형"
+msgstr "모양새"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
 #: ../dialogs/display-settings/main.c:82
@@ -315,23 +290,23 @@ msgstr "DPI"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:8
 msgid "Default Fon_t"
-msgstr "기본 글꼴(_t)"
+msgstr "기본 글꼴(_T)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:9
 msgid "Enable _anti-aliasing"
-msgstr "안티 에일리어싱 활성화(_a)"
+msgstr "안티 에일리어싱 활성화(_A)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:10
 msgid "Enable _event sounds"
-msgstr "이벤트 소리 활성화(_e)"
+msgstr "이벤트 소리 활성화(_E)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:11
 msgid "Enable e_ditable accelerators"
-msgstr "편집 가능한 가속기 활성화(_d)"
+msgstr "편집 가능한 가속기 활성화(_D)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:12
 msgid "Enable i_nput feedback sounds"
-msgstr "입력 피드백 소리 활성화(_n)"
+msgstr "입력 반응 소리 활성화(_N)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:13
 msgid "Enable or disable event sounds globally (requires \"Canberra\" support)"
@@ -342,42 +317,28 @@ msgid "Event sounds"
 msgstr "이벤트 소리"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
-msgid ""
-"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
-"correct sub-pixel order of the screen"
-msgstr ""
-"TFT나 LCD화면의 글꼴 품질은 올바른 화면상 서브픽셀 순서를 선택함에 따라 대단"
-"히 향상됩니다"
+msgid "Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen"
+msgstr "TFT나 LCD화면의 글꼴 품질은 올바른 화면상 서브픽셀 순서를 선택함에 따라 상당히 향상됩니다"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
 msgid "Full"
-msgstr "꽉 참"
+msgstr "완전히"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:17
 msgid "Icons"
 msgstr "아이콘"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
-msgid ""
-"If selected, keyboard shortcuts for menu items can be changed by hovering "
-"the mouse over the menu item and pressing the new key combination for the "
-"shortcut"
-msgstr ""
-"만약 이것을 선택한다면 메뉴 항목을 위한 바로 가기 키는 메뉴 항목에 마우스를 "
-"올려다 놓고 바로 가기 키를 설정하기 위해 새로운 키 조합을 눌러서 바꿀 수 있습"
-"니다"
+msgid "If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut"
+msgstr "만약 이 것을 선택한다면 메뉴 항목을 위한 바로 가기 키는 메뉴 항목에 마우스를 올려다 놓고 바로 가기 키를 설정하기 위해 새로운 키 조합을 눌러서 바꿀 수 있습니다"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
-msgid ""
-"Many fonts contain information that provides extra hints as to how best draw "
-"the font; pick whichever looks best according to personal preference"
-msgstr ""
-"수많은 글꼴은 글꼴을 가장 좋게 그려내게 하는 특별한 힌트 정보를 보유하고 있습"
-"니다. 개인 기본 설정에 따라 가장 좋게 보이는 것을 골라냅니다"
+msgid "Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference"
+msgstr "수많은 글꼴은 글꼴을 가장 좋게 그려내게 하는 특별한 힌트 정보를 보유하고 있습니다. 개인 기본 설정에 따라 가장 좋게 보이는 것을 골라냅니다"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
 msgid "Medium"
-msgstr "어중간"
+msgstr "적당히"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:21
 msgid "Menus and Buttons"
@@ -390,10 +351,8 @@ msgid "None"
 msgstr "없음"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
-msgid ""
-"Override the detected monitor resolution if fonts look too large or too small"
-msgstr ""
-"글꼴이 너무 커보이거나 너무 작아보인다면 감지된 모니터 해상도를 무시합니다"
+msgid "Override the detected monitor resolution if fonts look too large or too small"
+msgstr "글꼴이 너무 커보이거나 너무 작아보인다면 감지된 모니터 해상도를 무시합니다"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
 msgid "Rendering"
@@ -405,11 +364,11 @@ msgstr "기본 글꼴 선택"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:26
 msgid "Show images in _menus"
-msgstr "메뉴에 그림 보이기(_m)"
+msgstr "메뉴에 그림 보이기(_M)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:27
 msgid "Show images on _buttons"
-msgstr "단추에 그림 보이기(_b)"
+msgstr "단추에 그림 보이기(_B)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:28
 msgid "Slight"
@@ -417,41 +376,35 @@ msgstr "조금"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:29
 msgid "Specify what should be displayed in toolbar items"
-msgstr "툴바 항목에 표시될 것을 정합니다."
+msgstr "도구 막대 항목에 표시할 것을 정합니다."
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:30
 msgid "Specify whether icons should be displayed next to items in menus"
-msgstr "메뉴의 항목 옆에 표시될 아이콘을 정합니다"
+msgstr "메뉴의 항목 옆에 표시할 아이콘을 정합니다"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:31
 msgid "Specify whether icons should be displayed next to text in buttons"
 msgstr "단추의 글씨 옆에 표시할 아이콘을 정합니다"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
-msgid ""
-"Specify whether mouse clicks and other user input will cause event sounds to "
-"play"
-msgstr ""
-"이벤트 소리가 재생되도록 하는 마우스 누름과 기타 사용자 입력을 정합니다"
+msgid "Specify whether mouse clicks and other user input will cause event sounds to play"
+msgstr "이벤트 소리가 재생되도록 하는 마우스 누름과 기타 사용자 입력을 정합니다"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
 msgid "St_yle"
-msgstr "방식(_y)"
+msgstr "방식(_Y)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:34
 msgid "Sub-_pixel order:"
-msgstr "서브픽셀 순서(_p):"
+msgstr "서브픽셀 순서(_P):"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:35
 msgid "Text"
 msgstr "본문"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
-msgid ""
-"This font will be used as the default font used when drawing user interface "
-"text"
-msgstr ""
-"이 글꼴은 사용자 인터페이스 본문을 나타낼 때 기본 글꼴로 사용될 것입니다"
+msgid "This font will be used as the default font used when drawing user interface text"
+msgstr "이 글꼴은 사용자 인터페이스 본문을 나타낼 때 기본 글꼴로 사용할 것입니다"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
 msgid "_Fonts"
@@ -476,28 +429,28 @@ msgstr "툴바 유형(_T)"
 #: ../dialogs/appearance-settings/main.c:733
 #, c-format
 msgid "File is larger then %d MB, installation aborted"
-msgstr "파일이 %d MB보다 커서 설치가 중단되었습니다."
+msgstr "파일이 %d MB 보다 커서 설치가 중단되었습니다"
 
 #: ../dialogs/appearance-settings/main.c:738
 msgid "Failed to create temporary directory"
-msgstr "임시 디렉터리를 만드는데 실패했습니다"
+msgstr "임시 디렉터리를 만들지 못했습니다"
 
 #: ../dialogs/appearance-settings/main.c:743
 msgid "Failed to extract archive"
-msgstr "아카이브를 푸는데 실패했습니다."
+msgstr "아카이브를 추출하는데 실패했습니다"
 
 #: ../dialogs/appearance-settings/main.c:748
 msgid "Unknown format, only archives and directories are supported"
-msgstr "알 수 없는 형식이며, 아카이브나 디렉터리만 지원합니다."
+msgstr "알 수 없는 형식이며, 아카이브와 디렉토리만 지원합니다"
 
 #: ../dialogs/appearance-settings/main.c:753
 #, c-format
 msgid "An unknown error, exit code is %d"
-msgstr "알 수 없는 오류, 종료 코드는 %d입니다"
+msgstr "알 수 없는 오류, 마침 코드는 %d 입니다"
 
 #: ../dialogs/appearance-settings/main.c:760
 msgid "Failed to install theme"
-msgstr "테마를 설치하는데 실패했습니다"
+msgstr "테마 설치에 실패했습니다"
 
 #: ../dialogs/appearance-settings/main.c:856
 msgid "RGB"
@@ -532,9 +485,7 @@ msgid "Restore the previous configuration"
 msgstr "이전 설정 복원"
 
 #: ../dialogs/display-settings/confirmation-dialog.glade.h:5
-msgid ""
-"The previous configuration will be restored in 10 seconds if you do not "
-"reply to this question."
+msgid "The previous configuration will be restored in 10 seconds if you do not reply to this question."
 msgstr "이 질문에 응답하지 않으면 10초 이후 이전 설정이 복원됩니다."
 
 #: ../dialogs/display-settings/display-dialog.glade.h:1
@@ -549,19 +500,19 @@ msgstr "화면"
 
 #: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
-msgstr "해상도(_e):"
+msgstr "해상도(_E):"
 
 #: ../dialogs/display-settings/display-dialog.glade.h:4
 msgid "Ref_lection:"
-msgstr "뒤집기(_l):"
+msgstr "뒤집기(_L):"
 
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
-msgstr "재생율(_r):"
+msgstr "재생율(_R):"
 
 #: ../dialogs/display-settings/display-dialog.glade.h:6
 msgid "Ro_tation:"
-msgstr "회전(_t):"
+msgstr "회전(_T):"
 
 #: ../dialogs/display-settings/display-dialog.glade.h:7
 msgid "_Use this output"
@@ -613,9 +564,7 @@ msgstr "외부 출력을 설정하기 위한 최소한의 인터페이스"
 
 #: ../dialogs/display-settings/main.c:171
 #, c-format
-msgid ""
-"The previous configuration will be restored in %i seconds if you do not "
-"reply to this question."
+msgid "The previous configuration will be restored in %i seconds if you do not reply to this question."
 msgstr "이 질문에 응답하지 않으면 %i 초 이후 이전 설정이 복원됩니다."
 
 #. Insert the mode
@@ -625,44 +574,37 @@ msgid "%.1f Hz"
 msgstr "%.1f Hz"
 
 #: ../dialogs/display-settings/main.c:651
-msgid ""
-"The last active output must not be disabled, the system would be unusable."
-msgstr ""
-"최근 활성화된 출력이 비활성화 되면 안 됩니다. 시스템이 사용 불가능하게 될 것"
-"입니다."
+msgid "The last active output must not be disabled, the system would be unusable."
+msgstr "최근 활성화된 출력을 비활성화 하면 안 됩니다. 시스템이 사용 불가능하게 될 것입니다."
 
 #: ../dialogs/display-settings/main.c:653
 msgid "Selected output not disabled"
 msgstr "선택된 출력은 비활성화 되지 않았습니다"
 
-#: ../dialogs/display-settings/main.c:1072
+#: ../dialogs/display-settings/main.c:1075
 #: ../dialogs/display-settings/xfce-randr.c:249
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
-msgstr "사용될 RandR 확장의 버전을 요청할 수 없습니다"
+msgstr "사용할 RandR 확장의 버전을 요청할 수 없습니다"
 
-#: ../dialogs/display-settings/main.c:1073
-#: ../dialogs/display-settings/main.c:1109
+#: ../dialogs/display-settings/main.c:1076
+#: ../dialogs/display-settings/main.c:1112
 msgid "Unable to start the Xfce Display Settings"
 msgstr "Xfce 화면 설정을 시작할 수 없습니다"
 
-#: ../dialogs/display-settings/main.c:1104
+#: ../dialogs/display-settings/main.c:1107
 msgid "ATI Settings"
 msgstr "ATI 설정"
 
-#: ../dialogs/display-settings/main.c:1119
+#: ../dialogs/display-settings/main.c:1122
 msgid "Unable to launch the proprietary driver settings"
 msgstr "상업용 드라이버 설정을 실행할 수 없습니다"
 
 #. 1.2 is required
 #: ../dialogs/display-settings/xfce-randr.c:257
 #, c-format
-msgid ""
-"This system is using RandR %d.%d. For the display settings to work version "
-"1.2 is required at least"
-msgstr ""
-"이 시스템은 RandR %d.%d을(를) 사용하고 있습니다. 화면 설정을 동작시키려면 적"
-"어도 1.2 이상의 버전이 필요합니다"
+msgid "This system is using RandR %d.%d. For the display settings to work version 1.2 is required at least"
+msgstr "이 시스템은 RandR %d.%d을(를) 사용하고 있습니다. 화면 설정을 동작시키려면 적어도 1.2 이상의 버전이 필요합니다"
 
 #: ../dialogs/display-settings/xfce-randr.c:536
 msgid "Laptop"
@@ -703,7 +645,7 @@ msgstr "명령:"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:160
 msgid "Use _startup notification"
-msgstr "시작 알리미 사용(_s)"
+msgstr "시작 알리미 사용(_S)"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:207
 msgid "The command may not be empty."
@@ -714,40 +656,46 @@ msgid "Select command"
 msgstr "명령 선택"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:235
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:386
 msgid "All Files"
 msgstr "모든 파일"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:240
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:391
 msgid "Executable Files"
 msgstr "실행 가능한 파일"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:255
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:406
 msgid "Perl Scripts"
 msgstr "펄 스크립트"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:261
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:412
 msgid "Python Scripts"
 msgstr "파이선 스크립트"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:267
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:418
 msgid "Ruby Scripts"
 msgstr "루비 스크립트"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:273
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:424
 msgid "Shell Scripts"
 msgstr "쉘 스크립트"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:1
 msgid "A_pplication Shortcuts"
-msgstr "프로그램 바로 가기(_p)"
+msgstr "프로그램 바로 가기(_P)"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:2
 msgid "Be_havior"
-msgstr "동작(_h)"
+msgstr "동작(_H)"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:3
 msgid "Blink _delay:"
-msgstr "깜빡임 지연시간(_d):"
+msgstr "깜빡임 지연시간(_D):"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:4
 msgid "Cursor"
@@ -755,7 +703,7 @@ msgstr "커서"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5
 msgid "Define _shortcuts for launching applications:"
-msgstr "프로그램 실행을 위한 바로 가기 정의(_s):"
+msgstr "프로그램 실행을 위한 바로 가기 정의(_S):"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:1
@@ -763,147 +711,264 @@ msgid "Edit keyboard settings and application shortcuts"
 msgstr "키보드 설정과 프로그램 바로 가기 편집"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
+msgid "General"
+msgstr "일반"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2
 msgid "Keyboard"
 msgstr "키보드"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
 msgid "Keyboard layout"
 msgstr "키보드 배치"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
 msgid "Keyboard layout selection"
 msgstr "키보드 배치 선택"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
 msgid "Keyboard model"
 msgstr "키보드 모델"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
 msgid "Repeat _speed:"
-msgstr "반복 속도(_s):"
+msgstr "반복 속도(_S):"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13
 msgid "Reset to _Defaults"
 msgstr "기본으로 초기화(_D)"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
+msgid "Restore num l_ock state on startup"
+msgstr "시작히 num lock 상태 복구(_O)"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
 msgid "Select keyboard layout and variant"
 msgstr "키보드 배치 및 변형 선택"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:16
 msgid "Show _blinking"
-msgstr "깜빡임 보이기(_b)"
+msgstr "깜빡임 보이기(_B)"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
-msgid ""
-"Specifies whether the keyboard layout is controlled with this settings "
-"dialog, or by the X server"
-msgstr ""
-"키보드 배치를 설정 대화상자에서 제어할지 X 서버에서 제어할지를 정합니다"
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17
+msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server"
+msgstr "키보드 배치를 설정 대화상자에서 제어할지 X 서버에서 제어할지를 정합니다"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:16
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
 msgid "Specify whether or not the text cursor blinks"
 msgstr "본문 커서를 깜빡이게 할지 여부를 정합니다"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19
 msgid "The delay, in milliseconds, between successive blinks of the cursor"
 msgstr "커서가 완전히 깜빡이는데 걸리는 밀리세컨드 단위 시간입니다"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20
 msgid "The rate at which keystrokes are generated while a key is pressed"
 msgstr "키가 눌려있는 동안 발생하는 키 누름의 시간당 발생 비율입니다"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
 msgid "The time, in milliseconds, before a pressed key begins repeating"
 msgstr "키 입력 반복이 시작되기 전의 밀리세컨드 단위 시간입니다"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
 msgid "Typing Settings"
 msgstr "입력 설정"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
-msgid "Use this area to _test the settings above:"
-msgstr "위 설정을 시험하기 위해 이 영역을 사용합니다(_t):"
-
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
-msgid ""
-"When selected, pressing and holding down a key emits the same character over "
-"and over again"
-msgstr ""
-"이 것이 선택되었을 때, 키를 누른채로 유지하고 있으면 같은 문자가 계속 반복해"
-"서 입력됩니다"
-
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:23
+msgid "When selected, pressing and holding down a key emits the same character over and over again"
+msgstr "이 것을 선택했을 때, 키를 누른채로 유지하고 있으면 같은 문자가 계속 반복해서 입력됩니다"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:24
 msgid "_Enable key repeat"
 msgstr "키 반복 활성화(_E)"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:24
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:25
 msgid "_Layout"
 msgstr "배치(_L)"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:25
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:26
 msgid "_Repeat delay:"
 msgstr "반복 지연(_R):"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:26
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:27
+msgid "_Test area:"
+msgstr "테스트 영역(_T):"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:28
 msgid "_Use system defaults"
 msgstr "시스템 기본값 사용(_U)"
 
-#: ../dialogs/keyboard-settings/main.c:69
+#: ../dialogs/keyboard-settings/main.c:82
 msgid "Unable to initialize GTK+."
 msgstr "GTK+를 초기화 할 수 없습니다."
 
-#: ../dialogs/keyboard-settings/main.c:89
+#: ../dialogs/keyboard-settings/main.c:102
 #, c-format
 msgid "Failed to connect to xfconf daemon. Reason: %s"
 msgstr "xfconf 데몬에 연결하는데 실패했습니다. 이유는 다음과 같습니다: %s"
 
-#: ../dialogs/keyboard-settings/main.c:100
+#: ../dialogs/keyboard-settings/main.c:113
 msgid "Could not create the settings dialog."
 msgstr "설정 대화 상자를 만들 수 없습니다."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:295
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:300
 msgid "Command"
 msgstr "명령"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:300
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:305
 msgid "Shortcut"
 msgstr "바로 가기"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:374
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:380
 msgid "Layout"
 msgstr "배치"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:375
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:381
 msgid "Variant"
 msgstr "변형"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:851
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:857
 msgid "Shortcut command may not be empty."
 msgstr "바로 가기 명령은 비어서는 안됩니다."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:959
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:960
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "기본으로 초기화"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:961
-msgid ""
-"This will reset all shortcuts to their default values. Do you really want to "
-"do this?"
-msgstr ""
-"이 동작은 모든 바로 가기를 기본값으로 초기화 할 것입니다. 이 동작을 정말로 행"
-"하시렵니까?"
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
+msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
+msgstr "이 동작은 모든 바로 가기를 기본값으로 초기화 할 것입니다. 이 동작을 정말로 행하시렵니까?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1026
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
-msgstr "다음 로그인 시 시스템 기본 값이 복원될 것입니다."
+msgstr "다음 로그인 시 시스템 기본값으로 복원할 것입니다."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1028
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "경고"
 
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:128
+msgid "Select Application"
+msgstr "프로그램 선택"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:204
+msgid "Use a c_ustom command:"
+msgstr "사용자 정의 명령을 사용합니다(_U):"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:205
+msgid "Use a custom command for an application that is not available from the above application list."
+msgstr "프로그램 목록에 없는 프로그램에 대해 사용자정의 명령을 사용합니다."
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:223
+msgid "_Browse..."
+msgstr "찾아보기(_B)..."
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:376
+msgid "Select an Application"
+msgstr "프로그램 선택"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:526
+msgid "None available"
+msgstr "가능하지 않음"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:573
+msgid "Recommended Applications"
+msgstr "추천 프로그램"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:591
+msgid "Other Applications"
+msgstr "다른 프로그램"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:611
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "<i>%s</i>과(와) \"%s\" 형식의 파일을 여는 프로그램:"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:647
+#, c-format
+msgid "Failed to add new application \"%s\""
+msgstr "새로운 \"%s\"프로그램을 추가하는데 실패했습니다."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:174
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:2
+msgid "MIME Type Editor"
+msgstr "MIME 형식 편집기"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:178
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:1
+msgid "Associate applications with MIME types"
+msgstr "MIME 형식에 프로그램 연결하기"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:203
+msgid "_Filter:"
+msgstr "필터(_F):"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:211
+msgid "Clear filter"
+msgstr "필터 지우기"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:257
+msgid "MIME Type"
+msgstr "MIME 형식"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:287
+msgid "Status"
+msgstr "상태"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:308
+msgid "Default Application"
+msgstr "기본 프로그램"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:479
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+msgid "User Set"
+msgstr "사용자 셋"
+
+#. sort the names but keep Default on top
+#: ../dialogs/mime-settings/xfce-mime-window.c:481
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+#: ../dialogs/mouse-settings/main.c:372
+#: ../dialogs/mouse-settings/main.c:374
+#: ../dialogs/mouse-settings/main.c:434
+msgid "Default"
+msgstr "기본"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:550
+#, c-format
+msgid "%d MIME type found"
+msgid_plural "%d MIME types found"
+msgstr[0] "%d개의 MIME 형식을 찾았습니다	"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:649
+#, c-format
+msgid "Failed to set application \"%s\" for mime type \"%s\"."
+msgstr "\"%s\"프로그램을 MIME 형식 \"%s\"에 대해 설정하는데 실패했습니다."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:906
+#, c-format
+msgid "Are you sure you want to reset content type \"%s\" to its default value?"
+msgstr "내용 형식 \"%s\"와(과) 이의 기본값들을 초기화 하시렵니까?"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:910
+msgid "Question"
+msgstr "질문"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:913
+msgid "This will remove your custom mime-association and restore the system-wide default."
+msgstr "이는 사용자정의 MIME 연결을 제거할 것이며 시스템 기본 설정으로 복구할 것입니다."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:917
+#: ../dialogs/mime-settings/xfce-mime-window.c:988
+msgid "Reset to Default"
+msgstr "기본값으로 초기화"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:983
+msgid "Choose Application..."
+msgstr "프로그램을 선택하십시오..."
+
 #: ../dialogs/mouse-settings/main.c:96
 msgid "Active device in the dialog"
 msgstr "대화상자에 활성화 된 장리"
@@ -924,215 +989,188 @@ msgstr "%g px"
 msgid "%g ms"
 msgstr "%g ms"
 
-#. sort the names but keep Default on top
-#: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
-#: ../dialogs/mouse-settings/main.c:434
-msgid "Default"
-msgstr "기본"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:1
+msgid "B_uttons and Feedback"
+msgstr "단추와 반응(_U)"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:2
 msgid "Buttons"
 msgstr "단추"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:2
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:3
 msgid "Clockwise"
 msgstr "시계방향"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:3
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:4
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:1
 msgid "Configure pointer device behavior and appearance"
 msgstr "포인터 장치 동작과 표시 설정"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:4
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:5
 msgid "Counterclockwise"
 msgstr "시계 반대방향"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:5
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
 msgid "Cursor _size:"
-msgstr "커서 크기(_s):"
+msgstr "커서 크기(_S):"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
 msgid "D_istance:"
-msgstr "거리(_i):"
+msgstr "거리(_I):"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
 msgid "De_vice:"
-msgstr "장치(_v):"
+msgstr "장치(_V):"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
 msgid "Di_sabled"
-msgstr "비활성화됨(_s)"
+msgstr "비활성화됨(_S)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
 msgid "Disable to_uchpad while typing"
-msgstr "입력하는 동안 터치패드 비활성화(_u)"
+msgstr "입력하는 동안 터치패드 비활성화(_U)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
 msgid "Double Click"
 msgstr "두번 누르기"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
 msgid "Drag and Drop"
 msgstr "끌어 놓기"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
-msgid "Edge scro_lling"
-msgstr "모서리 스크롤(_l)"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
-msgid "Enable hori_zontal scrolling"
-msgstr "수평 스크롤 활성화(_z)"
+msgid "Edge scro_lling"
+msgstr "모서리 스크롤(_L)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:14
-msgid "General"
-msgstr "일반"
+msgid "Enable hori_zontal scrolling"
+msgstr "수평 스크롤 활성화(_Z)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
 msgid "Half (left-handed)"
 msgstr "절반 (왼손잡이)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
 msgid "Mouse (relative)"
 msgstr "마우스 (상대적)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:2
 msgid "Mouse and Touchpad"
 msgstr "마우스와 터치패드"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
 msgid "None (right-handed)"
 msgstr "없음 (오른손잡이)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
 msgid "Pen (absolute)"
 msgstr "펜 (절대적)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
 msgid "Pointer Speed"
 msgstr "포인터 속도"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:22
 msgid "Preview"
 msgstr "미리보기"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:22
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:23
 msgid "Reset to De_faults"
-msgstr "기본값으로 초기화(_f)"
+msgstr "기본값으로 초기화(_F)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:23
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
 msgid "Reverse scroll d_irection"
-msgstr "스크롤 방향 뒤집기(_i)"
+msgstr "스크롤 방향 뒤집기(_I)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
 msgid "Scrolling"
 msgstr "스크롤"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
-msgid ""
-"Set the acceleration and sensitivity for the selected device to the default "
-"values"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:26
+msgid "Set the acceleration and sensitivity for the selected device to the default values"
 msgstr "선택된 장치에 대해 가속값과 민감도를 기본값으로 설정합니다"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:26
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
 msgid "Size"
 msgstr "크기"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
-msgid "T_ap touchpad to click"
-msgstr "누르기 위해 터치패드를 가볍게 두드림(_a)"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:28
-msgid "T_heme"
-msgstr "테마(_h)"
+msgid "T_ap touchpad to click"
+msgstr "누르기 위해 터치패드를 가볍게 두드림(_A)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:29
-msgid "T_ouchpad"
-msgstr "터치패드(_o)"
+msgid "T_heme"
+msgstr "테마(_H)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:30
-msgid "Table_t"
-msgstr "태블릿(_t)"
+msgid "T_ouchpad"
+msgstr "터치패드(_O)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:31
-msgid "Th_reshold:"
-msgstr "임계값(_r):"
+msgid "Table_t"
+msgstr "태블릿(_T)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:32
-msgid ""
-"The factor at which the pointer's speed will increase as the mouse is moved"
-msgstr "마우스가 움직였을때 포인터의 이동속도가 증가하게 될 계수입니다"
+msgid "Th_reshold:"
+msgstr "임계값(_R):"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:33
-msgid ""
-"The mouse pointer cannot move farther than this distance between two clicks "
-"for them to be considered a double click"
-msgstr ""
-"두번 누르기로 간주되기 위해 두번 누르는 동안 마우스 포인터는 이 거리보다 더 "
-"멀리 움직일 수 없습니다"
+msgid "The factor at which the pointer's speed will increase as the mouse is moved"
+msgstr "마우스가 움직였을 때 포인터의 이동속도를 증가할 계수입니다"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:34
-msgid ""
-"The number of pixels the pointer must move before a drag operation will start"
-msgstr "끌기 동작이 시작되기 전 포인터가 반드시 움직여야 할 픽셀의 수 입니다"
+msgid "The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click"
+msgstr "두번 누르기로 간주되기 위해 두번 누르는 동안 마우스 포인터는 이 거리보다 더 멀리 움직일 수 없습니다"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:35
-msgid ""
-"The number of pixels the pointer must move in a short time before it starts "
-"accelerating"
-msgstr ""
-"가속이 시작되기 전 짧은 시간동안 포인터가 반드시 움직여야 할 픽셀의 수 입니다"
+msgid "The number of pixels the pointer must move before a drag operation will start"
+msgstr "끌기 동작이 시작되기 전 포인터가 반드시 움직여야 할 픽셀의 수 입니다"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:36
-msgid "Ti_me:"
-msgstr "시간(_m):"
+msgid "The number of pixels the pointer must move in a short time before it starts accelerating"
+msgstr "가속이 시작되기 전 짧은 시간동안 포인터가 반드시 움직여야 할 픽셀의 수 입니다"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:37
-msgid "Tr_acking mode:"
-msgstr "트래킹 모드(_a):"
+msgid "Ti_me:"
+msgstr "시간(_M):"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:38
-msgid ""
-"Two mouse clicks in less than this length of time (in milliseconds) will be "
-"considered a double click"
-msgstr ""
-"이 시간 (밀리초) 동안 마우스 단추를 두번 누르면 두번 누른 것으로 간주할 것입"
-"니다"
+msgid "Tr_acking mode:"
+msgstr "트래킹 모드(_A):"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:39
-msgid "Two-_finger scrolling"
-msgstr "두 손가락 스크롤(_f)"
+msgid "Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click"
+msgstr "이 시간 (밀리초) 동안 마우스 단추를 두번 누르면 두번 누른 것으로 간주할 것입니다"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:40
-msgid "When selected, the scroll wheel will work in the opposite direction"
-msgstr "이것이 선택되었을 때, 스크롤 휠은 반대로 동작할 것입니다"
+msgid "Two-_finger scrolling"
+msgstr "두 손가락 스크롤(_F)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:41
-msgid ""
-"When selected, the touchpad will be disabled when the keyboard is being used"
-msgstr ""
-"이 것이 선택되었을 때, 키보드가 사용될 떄 터치패드는 비활성화 될 것입니다"
+msgid "When selected, the scroll wheel will work in the opposite direction"
+msgstr "이 것을 선택했을 때, 스크롤 휠은 반대로 동작할 것입니다"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:42
+msgid "When selected, the touchpad will be disabled when the keyboard is being used"
+msgstr "이 것을 선택했을 때, 키보드가 사용중일 때 터치패드는 비활성화 될 것입니다"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:43
 msgid "_Acceleration:"
 msgstr "가속(_A):"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:43
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:44
 msgid "_Behavior"
 msgstr "동작(_B)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:44
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:45
 msgid "_Devices"
 msgstr "장치(_D)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:45
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:46
 msgid "_Enable this device"
 msgstr "이 장치 활성화(_E)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:46
-msgid "_General"
-msgstr "일반(_G)"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:47
 msgid "_Left-handed"
 msgstr "왼손잡이(_L)"
@@ -1149,168 +1187,196 @@ msgstr "회전(_R):"
 msgid "_Sensitivity:"
 msgstr "민감도(_S):"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "설정 편집기"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Xfconf가 저장하는 설정 사용자 정의하기"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "채널"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "속성"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
-msgstr "유형"
+msgstr "형식"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "잠김"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "값"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "비어 있음"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "새 속성"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "이 속성 이름은 잘못되었습니다."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "선택한 속성 편집"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "초기화"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "초기화(_R)"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr "속성의 초기화는 사용자 정의 설정을 영원히 제거할 것입니다."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "선택한 속성 초기화"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "속성 \"%s\"을(를) 정말로 초기화하시렵니까?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "비어 있음"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "속성 이름은 반드시 '/' 문자로 시작되어야 합니다"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "배열%s %s 배열"
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "루트 요소 ('/')는 유효한 속성 이름이 아닙니다"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "문자열"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid ""
-"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
-"'-', '<' and '>', as well as '/' as a separator"
-msgstr ""
-"속성 이름은 A-Z, a-z, 0-9, '_', '-', '<', '>', 그리고 구분 기호로 사용되는 "
-"'/'와 같은 문자들이 포함된 ASCII 문자만 포함됩니다."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "정수"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "속성 이름은 둘 이상의 연속된 '/' 문자를 가질 수 없습니다"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "부울린"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "속성 이름은 '/' 문자로 끝날 수 없습니다"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "배정도 실수"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "초기화(_R)"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "채널 초기화(_R)"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
 msgstr "채널을 초기화 하면 사용자 설정 내용을 영원히 제거하게 됩니다."
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr "채널 \"%s\"와(과) 이의 기본 설정들을 초기화 하시렵니까?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Xfconf를 위한 시각화된 설정 편집기"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "설정 편집기"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "초기화"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "부울린"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "모니터 %s"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Xfconf가 저장하는 설정 사용자 정의하기"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "프로퍼티 바꾸기에 대해 Xfconf 채널 감시하기"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "배정도 실수"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "채널 \"%s\" 감시 시작"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "속성 편집"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "모니터(_M)"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "속성 편집"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr "속성의 초기화는 사용자 정의 설정을 영원히 제거할 것입니다."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "활성화됨"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "속성 \"%s\"을(를) 정말로 초기화하시렵니까?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "정수"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "비부호화 정수"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "64비트 정수"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "이름:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "비부호화 64비트 정수"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
 msgstr "새 속성"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "속성 초기화"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "속성(_P):"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "문자열"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "형식(_T):"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "유형:"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "값(_V):"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "비부호화 정수"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "속성 이름은 반드시 '/' 문자로 시작되어야 합니다"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "비부호화 64비트 정수"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "루트 요소 ('/')는 유효한 속성 이름이 아닙니다"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
+#, c-format
+msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
+msgstr "속성 이름은 A-Z, a-z, 0-9, '_', '-', '<', '>', 그리고 구분 기호로 사용되는 '/'와 같은 문자들이 포함된 ASCII 문자만 포함됩니다."
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr "속성 이름은 둘 이상의 연속된 '/' 문자를 가질 수 없습니다"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "값:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "속성 이름은 '/' 문자로 끝날 수 없습니다"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Xfconf 채널"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "속성 편집"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Xfconf를 위한 시각화된 설정 편집기"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1361,7 +1427,7 @@ msgstr "백그라운드에서 실행하지 않습니다"
 msgid "Replace running xsettings daemon (if any)"
 msgstr "(만약 실행중이라면) 실행 중인 xsettings 데몬으로 바꾸기"
 
-#: ../xfsettingsd/workspaces.c:365
+#: ../xfsettingsd/workspaces.c:385
 #, c-format
 msgid "Workspace %d"
 msgstr "작업공간 %d"
@@ -1370,33 +1436,28 @@ msgstr "작업공간 %d"
 msgid "The Xfce Settings Daemon"
 msgstr "Xfce 설정 데몬"
 
-#: ../xfce4-settings-manager/main.c:41
+#: ../xfce4-settings-manager/main.c:40
 msgid "Settings dialog to show"
 msgstr "표시할 대화상자 설정"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:163
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
+msgid "_All Settings"
+msgstr "전체 설정(_A)"
+
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "설정"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:164
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "데스크톱 사용자 정의"
 
-#. Create back button which takes the user back to the overview
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:271
-msgid "_Overview"
-msgstr "둘러보기(_O)"
-
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:601
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:617
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
 msgstr "\"\"%s\"을(를) 시작할 수 없습니다"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:664
-msgid "Failed to open the documentation"
-msgstr "문서를 여는데 실패했습니다"
-
 #: ../xfce4-settings-manager/xfce-settings-manager.desktop.in.h:1
 msgid "Graphical Settings Manager for Xfce 4"
 msgstr "Xfce4를 위한 시각화된 설정 관리자"
@@ -1405,6 +1466,27 @@ msgstr "Xfce4를 위한 시각화된 설정 관리자"
 msgid "Settings Manager"
 msgstr "설정 관리자"
 
+#~ msgid "Use this area to _test the settings above:"
+#~ msgstr "위 설정을 시험하기 위해 이 영역을 사용합니다(_t):"
+
+#~ msgid "_General"
+#~ msgstr "일반(_G)"
+
+#~ msgid "This property name is not valid."
+#~ msgstr "이 속성 이름은 잘못되었습니다."
+
+#~ msgid "Enabled"
+#~ msgstr "활성화됨"
+
+#~ msgid "Name:"
+#~ msgstr "이름:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Xfconf 채널"
+
+#~ msgid "_Overview"
+#~ msgstr "둘러보기(_O)"
+
 #~ msgid "_Reset to Defaults"
 #~ msgstr "기본값으로 초기화(_R)"
 
diff --git a/po/lt.po b/po/lt.po
index 2f512a1..c12c165 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,21 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 # Algimantas Margevičius <margevicius.algimantas at gmail.com>, 2012.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-28 10:06+0000\n"
+"POT-Creation-Date: 2012-03-26 13:48+0000\n"
 "PO-Revision-Date: 2012-01-28 15:23+0200\n"
 "Last-Translator: Algimantas Margevičius <margevicius.algimantas at gmail.com>\n"
 "Language-Team: Lietuvių <>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"Language: \n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
 msgid "Acceleration _profile:"
@@ -908,12 +907,12 @@ msgstr "Variantas"
 msgid "Shortcut command may not be empty."
 msgstr "Susiejimo komanda negali būti tuščia."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "Atstatyti numatytuosius"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
 msgid ""
 "This will reset all shortcuts to their default values. Do you really want to "
 "do this?"
@@ -921,11 +920,11 @@ msgstr ""
 "Visi susiejimai bus atstatyti į jų numatytąsias reikšmes. Ar tikrai to "
 "norite?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr "Sistemos numatytieji bus atstatyti kitą kart prisijungus."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "Įspėjimas"
 
@@ -1294,168 +1293,200 @@ msgstr "_Pasukimas:"
 msgid "_Sensitivity:"
 msgstr "_Jautrumas:"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Nustatymų redaktorius"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Derinkite Xfconf saugomus nustatymus"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Kanalas"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Savybė"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Tipas"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Užrakinta"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Reikšmė"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "Tuščia"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Nauja savybė"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Šis savybės vardas nėra tinkamas."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Keisti pasirinktą savybę"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Atstatyti"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "A_tstatyti"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr "Atstačius savybę bus prarasti visi pasirinktiniai nustatymai."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Atstatyti pasirinktą savybę"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "Ar tikrai norite atstatyti savybę „%s“?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "Tuščia"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "Savybės vardas turi prasidėti simboliu '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "Masyvas"
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "Šakninis elementas ('/') nėra tinkamas savybės vardas"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "Eilutė"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid ""
-"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
-"'-', '<' and '>', as well as '/' as a separator"
-msgstr ""
-"Savybių vardai gali turėti tik ASCII simbolius A-Z, a-z, 0-9, '_', '-', '<' "
-"ir '>', taipogi '/' kaip skirtuką"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "Skaičius"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "Savybių vardai negali turėti kelių iš eilės einančių '/' simbolių"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Loginė reikšmė"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "Savybių vardai negali baigtis simboliu '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Dviguba"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "A_tstatyti"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "_Atstatyti kanalą"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
 msgstr "Atstačius kanalą bus prarasti visi pasirinktiniai nustatymai."
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr "Ar tikrai norite atstatyti „%s“ kanalą ir visas jo savybes?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Grafinis nustatymų redaktorius skirtas Xfconf"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Nustatymų redaktorius"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "atstatyti"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Loginė reikšmė"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "Monitorius %s"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Derinti nustatymus kuriuos saugo Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "Peržiūrėti Xfconf kanalą savybių pasikeitimam"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Dviguba"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "pradėti stebėti kanalą „%s“"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Keisti savybę"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "_Stebėti"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Keisti savybę"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr "Atstačius savybę bus prarasti visi pasirinktiniai nustatymai."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Įjungta"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "Ar tikrai norite atstatyti savybę „%s“?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "Int"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Unsigned Int"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Pavadinimas:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Unsigned Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:141
+msgid "New Property"
 msgstr "Nauja savybė"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Atstatyti savybę"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:158
+msgid "_Property:"
+msgstr "_Savybė"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "Eilutė"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:173
+msgid "_Type:"
+msgstr "_Tipas:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Tipas:"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:204
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:215
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:227
+msgid "_Value:"
+msgstr "_Reikšmė:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Unsigned Int"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:385
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "Savybės vardas turi prasidėti simboliu '/'"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Unsigned Int64"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:396
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "Šakninis elementas ('/') nėra tinkamas savybės vardas"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:412
+#, c-format
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Savybių vardai gali turėti tik ASCII simbolius A-Z, a-z, 0-9, '_', '-', '<' "
+"ir '>', taipogi '/' kaip skirtuką"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:425
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr "Savybių vardai negali turėti kelių iš eilės einančių '/' simbolių"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Vertė:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:439
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "Savybių vardai negali baigtis simboliu '/'"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:652
+msgid "Edit Property"
+msgstr "Keisti savybę"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Xfconf kanalai"
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Grafinis nustatymų redaktorius skirtas Xfconf"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1545,5 +1576,17 @@ msgstr "Grafinė nustatymų tvarkyklė skirta Xfce 4"
 msgid "Settings Manager"
 msgstr "Nustatymų tvarkyklė"
 
+#~ msgid "This property name is not valid."
+#~ msgstr "Šis savybės vardas nėra tinkamas."
+
+#~ msgid "Enabled"
+#~ msgstr "Įjungta"
+
+#~ msgid "Name:"
+#~ msgstr "Pavadinimas:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Xfconf kanalai"
+
 #~ msgid "_Overview"
 #~ msgstr "_Apžvalga"
diff --git a/po/nn.po b/po/nn.po
index 65c4333..275c2c7 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-23 19:54+0000\n"
+"POT-Creation-Date: 2012-02-08 12:54+0000\n"
 "PO-Revision-Date: 2012-01-17 20:31+0100\n"
 "Last-Translator: Eivind Ødegård <gingermi at yahoo.no>\n"
 "Language-Team: nn_NO <i18n-nn at lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Country: NORWAY\n"
 "Language: \n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "X-Poedit-Language: Norwegian Nynorsk\n"
+"X-Poedit-Country: NORWAY\n"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
 msgid "Acceleration _profile:"
@@ -253,7 +253,7 @@ msgstr "Informasjon om denne utgåva"
 #: ../dialogs/display-settings/main.c:1043
 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:57
+#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Skriv '%s --help' for bruksinstruksjonar"
@@ -263,7 +263,7 @@ msgstr "Skriv '%s --help' for bruksinstruksjonar"
 #: ../dialogs/display-settings/main.c:1062
 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:70
+#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
 msgstr "Utviklingslaget for Xfce. Alle rettar er reserverte."
 
@@ -272,7 +272,7 @@ msgstr "Utviklingslaget for Xfce. Alle rettar er reserverte."
 #: ../dialogs/display-settings/main.c:1063
 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:71
+#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Rapporter feil til <%s>."
@@ -934,7 +934,8 @@ msgstr "Vel ein _eigen kommando"
 msgid ""
 "Use a custom command for an application that is not available from the above "
 "application list."
-msgstr "Bruk ein eigen kommando for eit program som ikkje finst i programlista over."
+msgstr ""
+"Bruk ein eigen kommando for eit program som ikkje finst i programlista over."
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:223
 msgid "_Browse..."
@@ -1036,7 +1037,9 @@ msgstr "Spørsmål"
 msgid ""
 "This will remove your custom mime-association and restore the system-wide "
 "default."
-msgstr "Dette fjernar den eigenlaga mime-innstillinga di og nullstiller til standardinnstillinga."
+msgstr ""
+"Dette fjernar den eigenlaga mime-innstillinga di og nullstiller til "
+"standardinnstillinga."
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:917
 #: ../dialogs/mime-settings/xfce-mime-window.c:988
@@ -1282,170 +1285,202 @@ msgstr "_Rotasjon: "
 msgid "_Sensitivity:"
 msgstr "_Følsemd"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Innstillingar"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Set opp innstillingane som Xfconf lagrar"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "uKanal"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Eigenskap"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Type"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Låst"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Verdi"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "Tom"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Ny eigenskap"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Dette eigenskapnamnet er ikkje gyldig."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Endra denne eigenskapen"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Nullstill"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Nullstill"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr "Å nullstilla ein eigenskap vil fjerna desse eigenlaga innstillingane."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Nullstill denne eigenskapen"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "Er du sikker på at du vil nullstilla eigenskapen «%s»?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "Tom"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "Eigenskapnamn må starta med ein '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "Tabell"
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "Rotelementet ('/') er ikkje eit gyldig eigenskapnamn"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "Streng"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid ""
-"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
-"'-', '<' and '>', as well as '/' as a separator"
-msgstr ""
-"Eigenskapnamn kan berre innehalda ASCII-teikna A-Z, a-z, 0-9, '_', '-', '<' "
-"og '>' og '/' som deleteikn"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "Heiltal"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "Eigenskapnamn kan ikkje ha to eller fleire '/'-teikn etter kvarandre"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Boolsk"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "Eigenskapnamn kan ikkje slutta med eit '/'-teikn"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Dobbel"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_Nullstill"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "_Nullstill kanalen"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
 msgstr ""
 "Viss du nullstiller ein kanal, vil du mista desse eigenlaga innstillingane."
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr ""
 "Er du sikker på at du vil nullstilla kanalen «%s» og alle eigenskapane i han?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Grafisk innstillingsprogram for Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "nullstill"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Innstillingar"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Boolsk"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "Skjerm %s"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Set opp innstillingane som Xfconf lagrar"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "Lytt på ein Xfconf-kanal etter eigenskapsendringar"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Dobbel"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "byrja å lytta på kanalen «%s»"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Endra eigenskap"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "Skjer_m"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Endra eigenskap"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr "Å nullstilla ein eigenskap vil fjerna desse eigenlaga innstillingane."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "På"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "Er du sikker på at du vil nullstilla eigenskapen «%s»?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "Heiltal"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Usignert heiltal"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "64-heiltal"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Namn:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Usignert 64-heiltal"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
 msgstr "Ny eigenskap"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Nullstill eigenskap"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "Eigenska_p:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "Streng"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "_Type:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Type:"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "_Verdi:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Usignert heiltal"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "Eigenskapnamn må starta med ein '/'"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Usignert 64-heiltal"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "Rotelementet ('/') er ikkje eit gyldig eigenskapnamn"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
+#, c-format
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Eigenskapnamn kan berre innehalda ASCII-teikna A-Z, a-z, 0-9, '_', '-', '<' "
+"og '>' og '/' som deleteikn"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr "Eigenskapnamn kan ikkje ha to eller fleire '/'-teikn etter kvarandre"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "Eigenskapnamn kan ikkje slutta med eit '/'-teikn"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Verdi:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "Endra eigenskap"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Xfconf-kanalar"
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Grafisk innstillingsprogram for Xfconf"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1505,25 +1540,24 @@ msgstr "Arbeidsområde %d"
 msgid "The Xfce Settings Daemon"
 msgstr "Xfce-innstillingsnissen"
 
-#: ../xfce4-settings-manager/main.c:41
+#: ../xfce4-settings-manager/main.c:40
 msgid "Settings dialog to show"
 msgstr "Kva innstillingsdialog som skal visast"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:163
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
+msgid "_All Settings"
+msgstr "_Alle innstillingar"
+
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:164
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "Set opp skrivebordet ditt"
 
-#. Create back button which takes the user back to the overview
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:271
-msgid "_Overview"
-msgstr "_Oversyn"
-
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:578
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:594
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
 msgstr "Klarte ikkje starta «%s»"
@@ -1536,5 +1570,20 @@ msgstr "Grafisk innstillingsprogram for Xfce 4"
 msgid "Settings Manager"
 msgstr "Innstillingshandterar"
 
+#~ msgid "This property name is not valid."
+#~ msgstr "Dette eigenskapnamnet er ikkje gyldig."
+
+#~ msgid "Enabled"
+#~ msgstr "På"
+
+#~ msgid "Name:"
+#~ msgstr "Namn:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Xfconf-kanalar"
+
+#~ msgid "_Overview"
+#~ msgstr "_Oversyn"
+
 #~ msgid "_General"
 #~ msgstr "_Generelt"
diff --git a/po/pt.po b/po/pt.po
index fa2c41a..ec460f5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,14 +1,14 @@
 # European Portuguese translations for xfce4_settings package.
 # Copyright (C) 2008 THE xfce'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce4_settings package.
-# Nuno Miguel <nunis at netcabo.pt>, 2008, 2009.
-# 
+# Nuno Miguel <nunomgue at gmail.com>, 2008-2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-02 11:54+0000\n"
-"PO-Revision-Date: 2010-11-09 16:14+0100\n"
+"POT-Creation-Date: 2012-02-08 12:54+0000\n"
+"PO-Revision-Date: 2012-03-09 15:56+0100\n"
 "Last-Translator: Nuno Miguel <nunis at netcabo.pt>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr "_Perfil de aceleração:"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:2
 msgid "Acceleration _time:"
-msgstr "_Tempo de aceleração:"
+msgstr "Te_mpo de aceleração:"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:3
 msgid "Acceptance _delay:"
@@ -41,8 +41,8 @@ msgid ""
 "Assistive technologies will be available the\n"
 "next time you login"
 msgstr ""
-"As tecnologias de acessibilidade estarão disponíveis\n"
-"no próximo início de sessão."
+"As tecnologias de acessibilidade\n"
+"estarão disponíveis na próxima sessão."
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:7
 msgid "Bounce Keys"
@@ -54,15 +54,11 @@ msgstr "Configurar a acessibilidade do teclado e rato"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:9
 msgid "Disable sticky keys if _two keys are pressed"
-msgstr "Desligar teclas fi_xas se duas teclas forem pressionadas"
+msgstr "Desativar teclas fi_xas se duas teclas forem pressionadas"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
-msgid ""
-"If enabled, the session manager will start the required applications for "
-"screen readers and magnifiers"
-msgstr ""
-"Se activadas, o gestor de sessões vai iniciar todas as aplicações "
-"necessárias para o leitores de ecrã e ampliadores."
+msgid "If enabled, the session manager will start the required applications for screen readers and magnifiers"
+msgstr "Se ativo, o gestor de sessões vai iniciar todas as aplicações necessárias para o leitores de ecrã e ampliadores."
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
 msgid "K_eystroke delay:"
@@ -70,7 +66,7 @@ msgstr "Atraso ao pressionar as t_eclas:"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:12
 msgid "Keyboa_rd"
-msgstr "Te_clado"
+msgstr "_Teclado"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:13
 msgid "Maximum _speed:"
@@ -101,12 +97,8 @@ msgid "The amount of time, in milliseconds, required between keystrokes"
 msgstr "O tempo, em milissegundos, necessário entre pressões de teclas"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid ""
-"The amount of time, in milliseconds, that must elapse before a keystroke "
-"will be accepted"
-msgstr ""
-"O tempo, em milissegundos, que deve decorrer antes que uma pressão de tecla "
-"seja aceite"
+msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted"
+msgstr "O tempo, em milissegundos, que deve decorrer antes que uma pressão de tecla seja aceite"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
 msgid "The maximum pointer speed after acceleration"
@@ -114,40 +106,27 @@ msgstr "A velocidade máxima do ponteiro depois da aceleração"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22
 msgid "The ramp used to reach maximum pointer speed"
-msgstr "A rampa usada para atingir a velocidade máxima do ponteiro"
+msgstr "O tempo para atingir a velocidade máxima do ponteiro"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23
 msgid "The time, in milliseconds, between repeated motion events"
 msgstr "O tempo, em milissegundos, entre eventos de movimento repetido"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
-msgid ""
-"The time, in milliseconds, between the initial key press and first repeated "
-"motion event"
-msgstr ""
-"O tempo, em milissegundos, entre o pressionar inicial da tecla e o primeiro "
-"movimento repetido"
+msgid "The time, in milliseconds, between the initial key press and first repeated motion event"
+msgstr "O tempo, em milissegundos, entre o pressionar inicial da tecla e o primeiro movimento repetido"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:25
 msgid "The time, in milliseconds, to get to maximum speed"
 msgstr "O tempo, em milissegundos, para alcançar a velocidade máxima"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:26
-msgid ""
-"To help prevent accidental keystrokes, slow keys requires that a key is held "
-"for a certain minimum amount of time before the keystroke will be accepted"
-msgstr ""
-"Para ajudar a prevenir o pressionar acidental de teclas, as teclas lentas "
-"necessitam que uma tecla seja pressionada por um tempo mínimo antes da "
-"pressão de tecla ser aceite"
+msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted"
+msgstr "Para prevenir o pressionar acidental de teclas, as teclas lentas necessitam que uma tecla seja pressionada por um tempo mínimo antes de ser aceite"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
-msgid ""
-"To help prevent accidental multiple keystrokes, bounce keys imposes a "
-"minimum delay between keystrokes"
-msgstr ""
-"Para ajudar a prevenir o pressionar acidental de múltiplas teclas, as teclas "
-"saltitantes impõem um tempo mínimo entre pressões"
+msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes"
+msgstr "Para prevenir o pressionar acidental de múltiplas teclas, as teclas saltitantes impõem um tempo mínimo entre pressões"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
 msgid "Use _bounce keys"
@@ -155,47 +134,27 @@ msgstr "Utilizar teclas _saltitantes"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:29
 msgid "Use _sticky keys"
-msgstr "Utilizar teclas _fixas"
+msgstr "Utilizar te_clas fixas"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:30
 msgid "Use slow _keys"
-msgstr "Utilizar teclas _lentas"
+msgstr "Utilizar teclas le_ntas"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
-msgid ""
-"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
-"to be held down (they can be pressed and then released) when multiple keys "
-"would normally need to be pressed at the same time"
-msgstr ""
-"Quando seleccionado, as teclas modificadoras (Control, Alt e Shift) não "
-"precisam de ser mantidas pressionadas (podem ser pressionadas e então "
-"soltas) quando múltiplas teclas poderiam normalmente necessitar serem "
-"pressionadas ao mesmo tempo"
+msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time"
+msgstr "Se ativo, as teclas modificadoras (Control, Alt e Shift) não precisam de ser mantidas pressionadas (podem ser pressionadas e então soltas) quando múltiplas teclas poderiam normalmente necessitar serem pressionadas ao mesmo tempo"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:32
-msgid ""
-"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
-"locked in the pressed state until pressed again"
-msgstr ""
-"Quando seleccionado, as teclas modificadoras (Control, Alt e Shift) "
-"permanecerão bloqueads no estado pressionado até que sejam pressionadas "
-"novamente"
+msgid "When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again"
+msgstr "Se ativo, as teclas modificadoras (Control, Alt e Shift) permanecerão bloqueadas no estado pressionado até que sejam pressionadas novamente"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:33
-msgid ""
-"When selected, the \"sticky keys\" feature will be disabled if two keys are "
-"pressed simultaneously"
-msgstr ""
-"Quando seleccionado, a funcionalidade \"teclas fixas\" será desligada se "
-"pressionar duas teclas simultaneamente"
+msgid "When selected, the \"sticky keys\" feature will be disabled if two keys are pressed simultaneously"
+msgstr "Se ativo, a funcionalidade \"teclas fixas\" será desligada se pressionar duas teclas simultaneamente"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:34
-msgid ""
-"When selected, the mouse pointer can be controlled using the keyboard number "
-"pad"
-msgstr ""
-"Quando seleccionado, pode controlar o ponteiro do rato utilizando o teclado "
-"numérico"
+msgid "When selected, the mouse pointer can be controlled using the keyboard number pad"
+msgstr "Se ativo, pode controlar o ponteiro do rato utilizando o teclado numérico"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:35
 msgid "_Acceleration delay:"
@@ -203,15 +162,15 @@ msgstr "_Atraso de aceleração:"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:36
 msgid "_Assistive Technologies"
-msgstr "Tecnologias de _acessibilidade"
+msgstr "T_ecnologias de acessibilidade"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:37
 msgid "_Enable assistive technologies"
-msgstr "Ativar t_ecnologias de acessibilidade"
+msgstr "Ativar te_cnologias de acessibilidade"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:38
 msgid "_Lock sticky keys"
-msgstr "B_loquear teclas fixas"
+msgstr "_Bloquear teclas fixas"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:39
 msgid "_Mouse"
@@ -232,51 +191,65 @@ msgstr "pixeis/seg"
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
 #: ../dialogs/display-settings/main.c:102
-#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:97
+#: ../dialogs/keyboard-settings/main.c:39
+#: ../dialogs/mouse-settings/main.c:97
 msgid "Settings manager socket"
 msgstr "\"Socket\" do gestor de definições"
 
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
 #: ../dialogs/display-settings/main.c:102
-#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:97
+#: ../dialogs/keyboard-settings/main.c:39
+#: ../dialogs/mouse-settings/main.c:97
 msgid "SOCKET ID"
 msgstr "ID de \"SOCKET\""
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:95
 #: ../dialogs/display-settings/main.c:103
-#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40
-#: ../dialogs/mouse-settings/main.c:98 ../xfce4-settings-editor/main.c:43
-#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39
+#: ../dialogs/keyboard-settings/main.c:40
+#: ../dialogs/mime-settings/main.c:40
+#: ../dialogs/mouse-settings/main.c:98
+#: ../xfce4-settings-editor/main.c:43
+#: ../xfsettingsd/main.c:77
+#: ../xfce4-settings-manager/main.c:39
 msgid "Version information"
 msgstr "Informações da versão"
 
 #: ../dialogs/accessibility-settings/main.c:192
 #: ../dialogs/appearance-settings/main.c:966
 #: ../dialogs/display-settings/main.c:1043
-#: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
-#: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
+#: ../dialogs/keyboard-settings/main.c:76
+#: ../dialogs/mime-settings/main.c:62
+#: ../dialogs/mouse-settings/main.c:1515
+#: ../xfce4-settings-editor/main.c:63
+#: ../xfsettingsd/main.c:173
+#: ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid "Type '%s --help' for usage."
-msgstr "Digite \"%s --help\" para informações de utilização"
+msgstr "Digite '%s --help' para informações de utilização."
 
 #: ../dialogs/accessibility-settings/main.c:211
 #: ../dialogs/appearance-settings/main.c:985
 #: ../dialogs/display-settings/main.c:1062
-#: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
-#: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
+#: ../dialogs/keyboard-settings/main.c:92
+#: ../dialogs/mime-settings/main.c:81
+#: ../dialogs/mouse-settings/main.c:1534
+#: ../xfce4-settings-editor/main.c:82
+#: ../xfsettingsd/main.c:189
+#: ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
 msgstr "A equipa de desenvolvimento do Xfce. Todos os direitos reservados."
 
 #: ../dialogs/accessibility-settings/main.c:212
 #: ../dialogs/appearance-settings/main.c:986
 #: ../dialogs/display-settings/main.c:1063
-#: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
-#: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
+#: ../dialogs/keyboard-settings/main.c:93
+#: ../dialogs/mime-settings/main.c:82
+#: ../dialogs/mouse-settings/main.c:1535
+#: ../xfce4-settings-editor/main.c:83
+#: ../xfsettingsd/main.c:190
+#: ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Por favor, reporte os erros em <%s>."
@@ -286,11 +259,8 @@ msgid "Improve keyboard and mouse accessibility"
 msgstr "Melhorar a acessibilidade do teclado e do rato"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid ""
-"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
-msgstr ""
-"\"Anti-aliasing\" ou suavização de fontes pode melhorar a aparência do texto "
-"no ecrã"
+msgid "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgstr "\"Anti-aliasing\" ou suavização de letras pode melhorar a aparência do texto no ecrã"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:1
@@ -325,7 +295,7 @@ msgstr "_Tipo de letra por omissão"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:9
 msgid "Enable _anti-aliasing"
-msgstr "Ativar su_avização"
+msgstr "Ativar s_uavização"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:10
 msgid "Enable _event sounds"
@@ -333,7 +303,7 @@ msgstr "Ativar sons de _evento"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:11
 msgid "Enable e_ditable accelerators"
-msgstr "Ativar edição de acelera_dores"
+msgstr "Ativar edição de acele_radores"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:12
 msgid "Enable i_nput feedback sounds"
@@ -341,21 +311,15 @@ msgstr "Ativar sons de retorno de e_ntrada"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:13
 msgid "Enable or disable event sounds globally (requires \"Canberra\" support)"
-msgstr ""
-"Activar/desactivar globalmente os sons de evento (requer suporte a \"Canberra"
-"\")"
+msgstr "Ativar/desativar globalmente os sons de evento (requer suporte a \"Canberra\")"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:14
 msgid "Event sounds"
 msgstr "Sons de eventos"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
-msgid ""
-"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
-"correct sub-pixel order of the screen"
-msgstr ""
-"A qualidade das letras nos ecrãs TFT ou LCD  pode ser melhorada se escolher "
-"a ordem de sub-pixel correcta do seu monitor"
+msgid "Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen"
+msgstr "A qualidade das letras nos ecrãs TFT ou LCD  pode ser melhorada se escolher a ordem de sub-pixel correta do seu monitor"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
 msgid "Full"
@@ -366,22 +330,12 @@ msgid "Icons"
 msgstr "Ícones"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
-msgid ""
-"If selected, keyboard shortcuts for menu items can be changed by hovering "
-"the mouse over the menu item and pressing the new key combination for the "
-"shortcut"
-msgstr ""
-"Se seleccionado, os atalhos de teclado para itens de menu podem ser "
-"alterados ao passar o cursor do rato sobre o item de menu e pressionar a "
-"nova combinação de teclas do atalho"
+msgid "If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut"
+msgstr "Se ativo, os atalhos de teclado para itens de menu podem ser alterados ao passar o cursor do rato sobre o item de menu e pressionar a nova combinação de teclas do atalho"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
-msgid ""
-"Many fonts contain information that provides extra hints as to how best draw "
-"the font; pick whichever looks best according to personal preference"
-msgstr ""
-"Muitas letras contêm informações que mostram dicas como serem melhoradas; "
-"escolha a que achar melhor, de acordo com o seu gosto"
+msgid "Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference"
+msgstr "Muitas letras contêm informações que mostram dicas como serem melhoradas; escolha a que achar melhor, de acordo com o seu gosto"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
 msgid "Medium"
@@ -398,11 +352,8 @@ msgid "None"
 msgstr "Nenhum"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
-msgid ""
-"Override the detected monitor resolution if fonts look too large or too small"
-msgstr ""
-"Sobrepor a resolução do monitor se as letras forem muito grandes ou muito "
-"pequenas"
+msgid "Override the detected monitor resolution if fonts look too large or too small"
+msgstr "Sobrepor a resolução do monitor se as letras forem muito grandes ou muito pequenas"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
 msgid "Rendering"
@@ -430,21 +381,15 @@ msgstr "Especifica o que deve ser exibido nos itens da barra de ferramentas"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:30
 msgid "Specify whether icons should be displayed next to items in menus"
-msgstr ""
-"Especifica se, nos menus, os ícones devem ser exibidos próximo dos itens"
+msgstr "Especifica se, nos menus, os ícones devem ser exibidos próximo dos itens"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:31
 msgid "Specify whether icons should be displayed next to text in buttons"
-msgstr ""
-"Especifica se, nos botões, os ícones evem ser exibidos próximos do texto"
+msgstr "Especifica se, nos botões, os ícones evem ser exibidos próximos do texto"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
-msgid ""
-"Specify whether mouse clicks and other user input will cause event sounds to "
-"play"
-msgstr ""
-"Especifica se os cliques do rato e outras entradas do utilizador devem "
-"provocar os sons de eventos"
+msgid "Specify whether mouse clicks and other user input will cause event sounds to play"
+msgstr "Especifica se os cliques do rato e outras entradas do utilizador devem provocar os sons de eventos"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
 msgid "St_yle"
@@ -459,16 +404,12 @@ msgid "Text"
 msgstr "Texto"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
-msgid ""
-"This font will be used as the default font used when drawing user interface "
-"text"
-msgstr ""
-"Este tipo de letra será utilizado por omissão ao desenhar a interface de "
-"utilizador"
+msgid "This font will be used as the default font used when drawing user interface text"
+msgstr "Este tipo de letra será utilizado por omissão ao processar a interface de utilizador"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
 msgid "_Fonts"
-msgstr "Tipo de l_etra"
+msgstr "Tipo de _letra"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:38
 msgid "_Hinting:"
@@ -545,12 +486,8 @@ msgid "Restore the previous configuration"
 msgstr "Restaurar configuração anterior"
 
 #: ../dialogs/display-settings/confirmation-dialog.glade.h:5
-msgid ""
-"The previous configuration will be restored in 10 seconds if you do not "
-"reply to this question."
-msgstr ""
-"Se não responder à pergunta, a configuração anterior será restaurada em 10 "
-"segundos."
+msgid "The previous configuration will be restored in 10 seconds if you do not reply to this question."
+msgstr "Se não responder à pergunta, a configuração anterior será restaurada em 10 segundos."
 
 #: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
@@ -580,7 +517,7 @@ msgstr "Ro_tação:"
 
 #: ../dialogs/display-settings/display-dialog.glade.h:7
 msgid "_Use this output"
-msgstr "_Utilizar esta saída"
+msgstr "_Utilizar este escrã"
 
 #: ../dialogs/display-settings/minimal-display-dialog.glade.h:1
 msgid "Both displays cloned"
@@ -628,12 +565,8 @@ msgstr "Interface minimal para configurar um ecrã externo"
 
 #: ../dialogs/display-settings/main.c:171
 #, c-format
-msgid ""
-"The previous configuration will be restored in %i seconds if you do not "
-"reply to this question."
-msgstr ""
-"Se não responder à pergunta, a configuração anterior será restaurada em %i "
-"segundos"
+msgid "The previous configuration will be restored in %i seconds if you do not reply to this question."
+msgstr "Se não responder à pergunta, a configuração anterior será restaurada em %i segundos"
 
 #. Insert the mode
 #: ../dialogs/display-settings/main.c:505
@@ -642,11 +575,8 @@ msgid "%.1f Hz"
 msgstr "%.1f Hz"
 
 #: ../dialogs/display-settings/main.c:651
-msgid ""
-"The last active output must not be disabled, the system would be unusable."
-msgstr ""
-"A última saída activa não pode ser desactivada pois o sistema ficaria "
-"inutilizado."
+msgid "The last active output must not be disabled, the system would be unusable."
+msgstr "A última saída ativa não pode ser desativada pois o sistema ficaria inutilizado."
 
 #: ../dialogs/display-settings/main.c:653
 msgid "Selected output not disabled"
@@ -674,12 +604,8 @@ msgstr "Incapaz de iniciar as definições do controlador proprietário"
 #. 1.2 is required
 #: ../dialogs/display-settings/xfce-randr.c:257
 #, c-format
-msgid ""
-"This system is using RandR %d.%d. For the display settings to work version "
-"1.2 is required at least"
-msgstr ""
-"Esta sistema utiliza o RandR %d.%d. Para que as definições do ecrã "
-"funcionem, deve utilizar a versão 1.2"
+msgid "This system is using RandR %d.%d. For the display settings to work version 1.2 is required at least"
+msgstr "Esta sistema utiliza o RandR %d.%d. Para que as definições do ecrã funcionem deve usar a versão 1.2"
 
 #: ../dialogs/display-settings/xfce-randr.c:536
 msgid "Laptop"
@@ -766,7 +692,7 @@ msgstr "Atalhos de ap_licações"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:2
 msgid "Be_havior"
-msgstr "Comp_ortamento"
+msgstr "_Comportamento"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:3
 msgid "Blink _delay:"
@@ -778,7 +704,7 @@ msgstr "Cursor"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5
 msgid "Define _shortcuts for launching applications:"
-msgstr "Definir atalho_s para iniciar as aplicações:"
+msgstr "Definir atal_hos para iniciar as aplicações:"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:1
@@ -828,12 +754,8 @@ msgid "Show _blinking"
 msgstr "_Mostrar intermitência"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17
-msgid ""
-"Specifies whether the keyboard layout is controlled with this settings "
-"dialog, or by the X server"
-msgstr ""
-"Especifica se a disposição do teclado é controlada por este diálogo de "
-"definições ou pelo servidor X"
+msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server"
+msgstr "Especifica se o esquema do teclado é controlada por este diálogo de definições ou pelo servidor X"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
 msgid "Specify whether or not the text cursor blinks"
@@ -845,26 +767,19 @@ msgstr "O atraso, em milissegundos, entre intermitências sucessivas de cursor"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20
 msgid "The rate at which keystrokes are generated while a key is pressed"
-msgstr ""
-"A cadência a que as teclas de atalho são geradas enquanto uma tecla é "
-"pressionada"
+msgstr "A cadência a que as teclas de atalho são geradas enquanto uma tecla é pressionada"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
 msgid "The time, in milliseconds, before a pressed key begins repeating"
-msgstr ""
-"O tempo, em milissegundos, antes que uma tecla pressionada inicie a repetição"
+msgstr "O tempo, em milissegundos, antes que uma tecla pressionada inicie a repetição"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
 msgid "Typing Settings"
 msgstr "Definições de digitação"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:23
-msgid ""
-"When selected, pressing and holding down a key emits the same character over "
-"and over again"
-msgstr ""
-"Quando seleccionado, pressionar uma tecla e mantê-la pressionada emite o "
-"mesmo carácter eternamente"
+msgid "When selected, pressing and holding down a key emits the same character over and over again"
+msgstr "Se ativo, pressionar uma tecla e mantê-la pressionada emite o mesmo carácter eternamente"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:24
 msgid "_Enable key repeat"
@@ -925,17 +840,12 @@ msgid "Reset to Defaults"
 msgstr "Repor omissões"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
-msgid ""
-"This will reset all shortcuts to their default values. Do you really want to "
-"do this?"
-msgstr ""
-"Isto irá repor todos os atalhos para os seus valores por omissão. Deseja "
-"realmente fazê-lo?"
+msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
+msgstr "Vai repor todos os atalhos para os seus valores originais. Continuar?"
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
 msgid "The system defaults will be restored next time you log in."
-msgstr ""
-"As omissões do sistema serão repostas da próxima vez que iniciar sessão."
+msgstr "As omissões do sistema serão repostas na próxima sessão."
 
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
 msgid "Warning"
@@ -950,9 +860,7 @@ msgid "Use a c_ustom command:"
 msgstr "_Utilizar um comando personalizado"
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:205
-msgid ""
-"Use a custom command for an application that is not available from the above "
-"application list."
+msgid "Use a custom command for an application that is not available from the above application list."
 msgstr "Utilizar um comando personalizado para uma aplicação não disponível na lista acima exibida."
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:223
@@ -1023,7 +931,8 @@ msgstr "Definido pelo utilizador"
 #. sort the names but keep Default on top
 #: ../dialogs/mime-settings/xfce-mime-window.c:481
 #: ../dialogs/mime-settings/xfce-mime-window.c:604
-#: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
+#: ../dialogs/mouse-settings/main.c:372
+#: ../dialogs/mouse-settings/main.c:374
 #: ../dialogs/mouse-settings/main.c:434
 msgid "Default"
 msgstr "Por omissão"
@@ -1041,21 +950,17 @@ msgid "Failed to set application \"%s\" for mime type \"%s\"."
 msgstr "Falha ao definir a aplicação \"%s\" para o tipo MIME \"%s\"."
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:906
-#, fuzzy, c-format
-msgid ""
-"Are you sure you want to reset content type \"%s\" to its default value?"
-msgstr ""
-"Tem certeza que quer repor o canal \"%s\" e todas as suas propriedades?"
+#, c-format
+msgid "Are you sure you want to reset content type \"%s\" to its default value?"
+msgstr "Tem certeza que quer repor o canal \"%s\" e todas as suas propriedades?"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:910
 msgid "Question"
 msgstr "Questão"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:913
-msgid ""
-"This will remove your custom mime-association and restore the system-wide "
-"default."
-msgstr ""
+msgid "This will remove your custom mime-association and restore the system-wide default."
+msgstr "Vai remover a associação personalizada e restaurar as definições gerais do sistema."
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:917
 #: ../dialogs/mime-settings/xfce-mime-window.c:988
@@ -1088,7 +993,7 @@ msgstr "%g ms"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:1
 msgid "B_uttons and Feedback"
-msgstr "B_otões e \"feedback\""
+msgstr "B_otões e resposta"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:2
 msgid "Buttons"
@@ -1121,11 +1026,11 @@ msgstr "Dispositi_vo:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
 msgid "Di_sabled"
-msgstr "Ina_ctivo"
+msgstr "Ina_tivo"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
 msgid "Disable to_uchpad while typing"
-msgstr "Inactivar painel de toq_ue ao escrever"
+msgstr "Desativar painel de toq_ue ao escrever"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
 msgid "Double Click"
@@ -1141,11 +1046,11 @@ msgstr "Des_locação nos limites"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:14
 msgid "Enable hori_zontal scrolling"
-msgstr "Activar deslocação hori_zontal"
+msgstr "Ativar deslocação hori_zontal"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
 msgid "Half (left-handed)"
-msgstr "Canhoto"
+msgstr "Metade (canhoto)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
 msgid "Mouse (relative)"
@@ -1158,7 +1063,7 @@ msgstr "Rato e painel de toque"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
 msgid "None (right-handed)"
-msgstr "Destro"
+msgstr "Nenhum (destro)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
 msgid "Pen (absolute)"
@@ -1178,17 +1083,15 @@ msgstr "Repor o_missões"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
 msgid "Reverse scroll d_irection"
-msgstr "_Inverter a direcção do deslocamento"
+msgstr "_Inverter a direção do deslocamento"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
 msgid "Scrolling"
 msgstr "Deslocamento"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:26
-msgid ""
-"Set the acceleration and sensitivity for the selected device to the default "
-"values"
-msgstr "Repor omissões do dispositvo em relação à rapidez e sensibilidade"
+msgid "Set the acceleration and sensitivity for the selected device to the default values"
+msgstr "Repor as omissões de aceleração e sensibilidade do dispositivo selecionado"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
 msgid "Size"
@@ -1215,33 +1118,20 @@ msgid "Th_reshold:"
 msgstr "_Limite:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:33
-msgid ""
-"The factor at which the pointer's speed will increase as the mouse is moved"
-msgstr ""
-"O factor em que a velocidade do ponteiro aumentará quando o rato é movido"
+msgid "The factor at which the pointer's speed will increase as the mouse is moved"
+msgstr "O fator em que a velocidade do ponteiro aumentará ao mover o rato"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:34
-msgid ""
-"The mouse pointer cannot move farther than this distance between two clicks "
-"for them to be considered a double click"
-msgstr ""
-"O ponteiro do rato não pode mover-se para além desta distância entre os dois "
-"cliques para serem considerados um duplo clique"
+msgid "The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click"
+msgstr "O ponteiro do rato não pode mover-se para além desta distância entre os dois cliques para serem considerados um duplo clique"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:35
-msgid ""
-"The number of pixels the pointer must move before a drag operation will start"
-msgstr ""
-"O número de pixeis que o ponteiro deve mover antes de iniciar uma operação "
-"de arrasto"
+msgid "The number of pixels the pointer must move before a drag operation will start"
+msgstr "O número de pixeis que o ponteiro deve mover antes de iniciar uma operação de arrasto"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:36
-msgid ""
-"The number of pixels the pointer must move in a short time before it starts "
-"accelerating"
-msgstr ""
-"O número de pixeis que o ponteiro deve mover num curto espaço de tempo antes "
-"de iniciar a aceleração"
+msgid "The number of pixels the pointer must move in a short time before it starts accelerating"
+msgstr "O número de pixeis que o ponteiro deve mover num curto espaço de tempo antes de iniciar a aceleração"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:37
 msgid "Ti_me:"
@@ -1252,32 +1142,24 @@ msgid "Tr_acking mode:"
 msgstr "_Acompanhamento:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:39
-msgid ""
-"Two mouse clicks in less than this length of time (in milliseconds) will be "
-"considered a double click"
-msgstr ""
-"Dois cliques do rato em menos desse tempo (em milissegundos) serão "
-"considerados um clique duplo"
+msgid "Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click"
+msgstr "Dois cliques do rato em menos desse tempo (em milissegundos) serão considerados um clique duplo"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:40
 msgid "Two-_finger scrolling"
-msgstr "Deslocação com dois dedos"
+msgstr "Deslocação com _dois dedos"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:41
 msgid "When selected, the scroll wheel will work in the opposite direction"
-msgstr ""
-"Quando seleccionado, a roda de deslocamento funcionará na direcção oposta"
+msgstr "Se ativo, a roda de deslocamento funcionará na direção oposta"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:42
-msgid ""
-"When selected, the touchpad will be disabled when the keyboard is being used"
-msgstr ""
-"Quando seleccionado, o painel de toque ficará inactivo se estiver a utilizar "
-"o teclado"
+msgid "When selected, the touchpad will be disabled when the keyboard is being used"
+msgstr "Se ativo, o painel de toque ficará inativo se estiver a utilizar o teclado"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:43
 msgid "_Acceleration:"
-msgstr "_Aceleração:"
+msgstr "Acelera_ção:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:44
 msgid "_Behavior"
@@ -1289,7 +1171,7 @@ msgstr "_Dispositivos"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:46
 msgid "_Enable this device"
-msgstr "Activar _este dispositivo"
+msgstr "Ativar _este dispositivo"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:47
 msgid "_Left-handed"
@@ -1307,183 +1189,204 @@ msgstr "_Rotação"
 msgid "_Sensitivity:"
 msgstr "_Sensibilidade:"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Editor de definições"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Personalizar definições guardadas pelo Xfconf"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Canal"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Propriedade"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Tipo"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Valor"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "Vazio"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Nova propriedade"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Este nome de propriedade é inválido."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Editar propriedade selecionada"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Repor"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Repor"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr ""
-"A reposição de uma propriedade irá remover permanentemente as definições "
-"personalizadas."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Repor propriedade selecionada"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "Tem certeza que quer repor a propriedade \"%s\"?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "Vazio"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "Os nomes das propriedades devem começar com \"/\""
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "\"Array\""
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "O elemento \"root\" \"(/)\" não é um nome de propriedade válido"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "String"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid ""
-"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
-"'-', '<' and '>', as well as '/' as a separator"
-msgstr ""
-"Os nomes das propriedades apenas podem incluir os caracteres A-Z, a-z, 0-9, "
-"'_', '-', '<' e '>', bem como \"/\" como separador"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "Inteiro"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr ""
-"Os nomes de propriedades não podem ter dois ou mais caracteres \"/\" "
-"consecutivos"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Booleano"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "Os nomes de propriedades não podem terminar com  \"/\""
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Duplo"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_Repor"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "_Repor canal"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
-msgstr ""
-"A reposição de um canal irá remover permanentemente as definições "
-"personalizadas."
+msgstr "A reposição de um canal remove permanentemente as definições personalizadas."
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
-msgstr ""
-"Tem certeza que quer repor o canal \"%s\" e todas as suas propriedades?"
+msgstr "Tem certeza que quer repor o canal \"%s\" e todas as suas propriedades?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Editor gráfico de definições para o Xfconf"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Editor de definições"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "repor"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Booleano"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "Monitorizar %s"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Personalizar definições armazenadas pelo Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "Monitorizar as alterações das propriedades de um canal Xfconf"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Duplo"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "iniciar monitorização do canal \"%s\""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Editar propriedade"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "_Monitorizar"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Editar propriedade"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr "A reposição de uma propriedade remove permanentemente estas definições personalizadas."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Activo"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "Tem certeza que quer repor a propriedade \"%s\"?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "Int"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Int não assinado"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Nome:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Int64 não assinado"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
 msgstr "Nova propriedade"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Repor propriedade"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "_Propriedade:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "\"String\""
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "_Tipo:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Tipo:"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "_Valor:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Int não assinado"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "Os nomes das propriedades devem começar com '/'"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Int64 não assinado"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "O elemento \"root\" ('/') não é um nome de propriedade válido"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Valor:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
+#, c-format
+msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
+msgstr "Os nomes das propriedades só podem incluir os caracteres A-Z, a-z, 0-9, '_', '-', '<' e '>', bem como '/' como separador"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Canais Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr "Os nomes de propriedades não podem ter dois ou mais caracteres '/' consecutivos"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "Os nomes de propriedades não podem terminar com  '/'"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "Editar propriedade"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Editor gráfico para as definições Xfconf"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
-msgstr "Teclas fixas estão activas"
+msgstr "As teclas fixas estão ativas"
 
 #: ../xfsettingsd/accessibility.c:392
 msgid "Sticky keys are disabled"
-msgstr "Teclas fixas estão inactivas"
+msgstr "As teclas fixas estão inativas"
 
 #: ../xfsettingsd/accessibility.c:394
 msgid "Sticky keys"
@@ -1491,11 +1394,11 @@ msgstr "Teclas fixas"
 
 #: ../xfsettingsd/accessibility.c:399
 msgid "Slow keys are enabled"
-msgstr "Teclas lentas estão activas"
+msgstr "As teclas lentas estão ativas"
 
 #: ../xfsettingsd/accessibility.c:401
 msgid "Slow keys are disabled"
-msgstr "Teclas lentas estão inactivas"
+msgstr "As teclas lentas estão inativas"
 
 #: ../xfsettingsd/accessibility.c:403
 msgid "Slow keys"
@@ -1503,11 +1406,11 @@ msgstr "Teclas lentas"
 
 #: ../xfsettingsd/accessibility.c:408
 msgid "Bounce keys are enabled"
-msgstr "Teclas saltitantes estão activas"
+msgstr "As teclas saltitantes estão ativas"
 
 #: ../xfsettingsd/accessibility.c:410
 msgid "Bounce keys are disabled"
-msgstr "Teclas saltitantes estão inactivas"
+msgstr "As teclas saltitantes estão inativas"
 
 #: ../xfsettingsd/accessibility.c:412
 msgid "Bounce keys"
@@ -1540,9 +1443,8 @@ msgid "Settings dialog to show"
 msgstr "Diálogo de definições a mostrar"
 
 #: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
-#, fuzzy
 msgid "_All Settings"
-msgstr "_Definições"
+msgstr "Todas as defini_ções"
 
 #: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
@@ -1550,7 +1452,7 @@ msgstr "Definições"
 
 #: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
-msgstr "Personalizar o seu ambiente"
+msgstr "Personalizar o seu ambiente de trabalho"
 
 #: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
 #: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
@@ -1566,72 +1468,3 @@ msgstr "Gestor gráfico de definições do Xfce 4"
 msgid "Settings Manager"
 msgstr "Gestor de definições"
 
-#~ msgid "_Overview"
-#~ msgstr "_Visão geral"
-
-#~ msgid "_General"
-#~ msgstr "_Geral"
-
-#~ msgid "Use this area to _test the settings above:"
-#~ msgstr "Utilize esta área para _testar as definições acima:"
-
-#~ msgid "_Reset to Defaults"
-#~ msgstr "_Repor omissões"
-
-#~ msgid "Feedback"
-#~ msgstr "Retorno"
-
-#~ msgid "Mouse"
-#~ msgstr "Rato"
-
-#~ msgid "Re_set to Defaults"
-#~ msgstr "Repor as omi_ssões"
-
-#~ msgid "Verbose output"
-#~ msgstr "Saída detalhada"
-
-#~ msgid ""
-#~ "%s: %s\n"
-#~ "Try %s --help to see a full list of available command line options.\n"
-#~ msgstr ""
-#~ "%s: %s\n"
-#~ "Tente %s --help para ver uma lista completa das opções de linha de "
-#~ "comandos.\n"
-
-#~ msgid "NVIDIA Settings"
-#~ msgstr "Definições NVIDIA"
-
-#~ msgid "The video driver does not support video outputs"
-#~ msgstr "O controlador de vídeo não suporta saídas de vídeo"
-
-#~ msgid "Active"
-#~ msgstr "Activo"
-
-#~ msgid "%d Hz"
-#~ msgstr "%d Hz"
-
-#~ msgid "Screen %d"
-#~ msgstr "Ecrã %d"
-
-#~ msgid "RandR extension missing on display \"%s\""
-#~ msgstr "Extensão RandR não encontrada no ecrã \"%s\""
-
-#~ msgid ""
-#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
-#~ "Try to enable it and run the dialog again."
-#~ msgstr ""
-#~ "A extensão Redimensionar e Rodar (RandR) não está activada neste ecrã. "
-#~ "Tente activa-la e execute o diálogo novamente."
-
-#~ msgid "Failed to use the RandR extension"
-#~ msgstr "Falhou ao usar a extensão RandR"
-
-#~ msgid "Second monitor"
-#~ msgstr "Segundo monitor"
-
-#~ msgid "Second digital display"
-#~ msgstr "Segundo ecrã digital"
-
-#~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
-#~ msgstr ""
-#~ "A propriedade \"<b>%s</b>\" não pode ser reiniciada porque está bloqueada"
diff --git a/po/ru.po b/po/ru.po
index 5b5428d..b5171ef 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-05 03:42+0000\n"
+"POT-Creation-Date: 2012-02-16 12:27+0000\n"
 "PO-Revision-Date: 2011-08-23 14:43+0300\n"
 "Last-Translator: Artem Zolochevskiy <artem.zolochevskiy at gmail.com>\n"
 "Language-Team: Russian\n"
@@ -913,12 +913,12 @@ msgstr "Вариант"
 msgid "Shortcut command may not be empty."
 msgstr "Команда не может быть пустым полем."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "Сбросить настройки"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
 msgid ""
 "This will reset all shortcuts to their default values. Do you really want to "
 "do this?"
@@ -926,12 +926,12 @@ msgstr ""
 "Это действие сбросит все настройки комбинаций клавиш на их стандартное "
 "значение. Вы действительно хотите сделать это?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr ""
 "Настройки по умолчанию будут восстановлены при следующем входе в систему."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "Внимание"
 
@@ -1039,7 +1039,9 @@ msgstr "Не удалось связать приложение «%s» с тип
 #, c-format
 msgid ""
 "Are you sure you want to reset content type \"%s\" to its default value?"
-msgstr "Вы действительно хотите сбросить настройки для типа «%s» к значениям по умолчанию?"
+msgstr ""
+"Вы действительно хотите сбросить настройки для типа «%s» к значениям по "
+"умолчанию?"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:910
 msgid "Question"
@@ -1049,7 +1051,9 @@ msgstr "Вопрос"
 msgid ""
 "This will remove your custom mime-association and restore the system-wide "
 "default."
-msgstr "Выбранная вами связь для типа MIME будет заменена на используемую системой по умолчанию."
+msgstr ""
+"Выбранная вами связь для типа MIME будет заменена на используемую системой "
+"по умолчанию."
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:917
 #: ../dialogs/mime-settings/xfce-mime-window.c:988
@@ -1301,170 +1305,202 @@ msgstr "_Поворот:"
 msgid "_Sensitivity:"
 msgstr "_Чувствительность:"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Редактор настроек"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Изменение настроек хранимых в Xfconf"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Канал"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Свойство"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Тип"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Заблокировано"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Значение"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "Пусто"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Новое свойство"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Это имя свойства не является правильным."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Изменить выделенное свойство"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Сбросить"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Сбросить"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr "Сброс значения свойства навсегда удалит ваши настройки для него."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Сбросить выделенное свойство"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "Вы действительно хотите сбросить свойство «%s»?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "Пусто"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "Названия свойств должны начинаться с символа «/»"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "Массив"
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "Корневой элемент («/») не является верным названием свойства"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "Строка"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid ""
-"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
-"'-', '<' and '>', as well as '/' as a separator"
-msgstr ""
-"Имена свойств могут содержать только ASCII-символы A-Z, a-z, 0-9, «_», «-», "
-"«<» и «>», а так же элемент «/» как разделитель"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "Целое"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "Имена свойств не могут содержать два элемента «/» идущих подряд"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Логическое"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "Названия свойств не могут заканчиваться символом «/»"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Двойной точности"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_Сбросить"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "С_бросить канал"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
 msgstr ""
 "Возврат значения канала к первоначальному состоянию немедленно удалит его "
 "текущие настройки."
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr "Вы действительно хотите сбросить канал «%s» и все его свойства?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Графический редактор настроек для Xfconf"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Редактор настроек"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "сброшено"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Логическое"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "Наблюдение за %s"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Изменение настроек хранимых в Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "Следить за изменениями свойств в канале Xfconf"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Двойной точности"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "начато наблюдение за каналом \"%s\""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Изменить Свойство"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "_Наблюдение"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Изменить свойство"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr "Сброс значения свойства навсегда удалит ваши настройки для него."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Включено"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "Вы действительно хотите сбросить свойство «%s»?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "Целочисленный"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Беззнаковое целое"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "Большой целочисленный"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Название:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Большое беззнаковое целое"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
 msgstr "Новое свойство"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Сбросить свойство"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "_Свойство:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "Строка"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "_Тип:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Тип:"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "_Значение:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Беззнаковое целое"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "Названия свойств должны начинаться с символа «/»"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Большое беззнаковое целое"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "Корневой элемент («/») не является верным названием свойства"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Значение:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
+#, c-format
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Имена свойств могут содержать только ASCII-символы A-Z, a-z, 0-9, «_», «-», "
+"«<» и «>», а так же элемент «/» как разделитель"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Каналы Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr "Имена свойств не могут содержать два элемента «/» идущих подряд"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "Названия свойств не могут заканчиваться символом «/»"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "Изменить Свойство"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Графический редактор настроек для Xfconf"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1554,6 +1590,18 @@ msgstr "Графический диспетчер настроек для Xfce 4
 msgid "Settings Manager"
 msgstr "Диспетчер настроек"
 
+#~ msgid "This property name is not valid."
+#~ msgstr "Это имя свойства не является правильным."
+
+#~ msgid "Enabled"
+#~ msgstr "Включено"
+
+#~ msgid "Name:"
+#~ msgstr "Название:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Каналы Xfconf"
+
 #~ msgid "Use this area to _test the settings above:"
 #~ msgstr "Используйте это поле для _тестирования указанных выше настроек:"
 
diff --git a/po/sk.po b/po/sk.po
index ea65e05..c455876 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,20 +1,20 @@
 # Slovak translations for xfce package.
 # Copyright (C) 2009 THE xfce'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce package.
-# Tomáš Vadina <kyberdev at gmail.com>, 2011.
-# 
+# Tomáš Vadina <kyberdev at gmail.com>, 2011, 2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-06 06:36+0000\n"
-"PO-Revision-Date: 2011-06-11 23:14+0100\n"
+"POT-Creation-Date: 2012-02-13 08:54+0000\n"
+"PO-Revision-Date: 2012-02-13 11:08+0100\n"
 "Last-Translator: Tomáš Vadina <kyberdev at gmail.com>\n"
-"Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
+"Language-Team: slovenčina <slovenska-lokalizacia-xfce at googlegroups.com>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 "X-Poedit-Language: Slovak\n"
 "X-Poedit-Country: SLOVAKIA\n"
@@ -228,51 +228,51 @@ msgstr "pixely/s"
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
 #: ../dialogs/display-settings/main.c:102
-#: ../dialogs/keyboard-settings/main.c:38 ../dialogs/mouse-settings/main.c:97
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:97
 msgid "Settings manager socket"
 msgstr "Soket správcu nastavení"
 
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
 #: ../dialogs/display-settings/main.c:102
-#: ../dialogs/keyboard-settings/main.c:38 ../dialogs/mouse-settings/main.c:97
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:97
 msgid "SOCKET ID"
 msgstr "SOCKET ID"
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:95
 #: ../dialogs/display-settings/main.c:103
-#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:98
-#: ../xfce4-settings-editor/main.c:43 ../xfsettingsd/main.c:77
-#: ../xfce4-settings-manager/main.c:39
+#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40
+#: ../dialogs/mouse-settings/main.c:98 ../xfce4-settings-editor/main.c:43
+#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39
 msgid "Version information"
 msgstr "Informácie o verzii"
 
-#: ../dialogs/accessibility-settings/main.c:180
-#: ../dialogs/appearance-settings/main.c:956
-#: ../dialogs/display-settings/main.c:1040
-#: ../dialogs/keyboard-settings/main.c:63
-#: ../dialogs/mouse-settings/main.c:1504 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:57
+#: ../dialogs/accessibility-settings/main.c:192
+#: ../dialogs/appearance-settings/main.c:966
+#: ../dialogs/display-settings/main.c:1043
+#: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
+#: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63
+#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Informácie o použití získate príkazom '%s --help'"
 
-#: ../dialogs/accessibility-settings/main.c:199
-#: ../dialogs/appearance-settings/main.c:975
-#: ../dialogs/display-settings/main.c:1059
-#: ../dialogs/keyboard-settings/main.c:79
-#: ../dialogs/mouse-settings/main.c:1523 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:70
+#: ../dialogs/accessibility-settings/main.c:211
+#: ../dialogs/appearance-settings/main.c:985
+#: ../dialogs/display-settings/main.c:1062
+#: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
+#: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82
+#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
 msgstr "Vývojársky tím Xfce. Všetky práva vyhradené."
 
-#: ../dialogs/accessibility-settings/main.c:200
-#: ../dialogs/appearance-settings/main.c:976
-#: ../dialogs/display-settings/main.c:1060
-#: ../dialogs/keyboard-settings/main.c:80
-#: ../dialogs/mouse-settings/main.c:1524 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:71
+#: ../dialogs/accessibility-settings/main.c:212
+#: ../dialogs/appearance-settings/main.c:986
+#: ../dialogs/display-settings/main.c:1063
+#: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
+#: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83
+#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Prosím, chyby nahláste na <%s>."
@@ -640,22 +640,22 @@ msgstr ""
 msgid "Selected output not disabled"
 msgstr "Vybraný výstup nie je zakázaný"
 
-#: ../dialogs/display-settings/main.c:1072
+#: ../dialogs/display-settings/main.c:1075
 #: ../dialogs/display-settings/xfce-randr.c:249
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Nie je možné zistiť používanú verziu rozšírenia RandR"
 
-#: ../dialogs/display-settings/main.c:1073
-#: ../dialogs/display-settings/main.c:1109
+#: ../dialogs/display-settings/main.c:1076
+#: ../dialogs/display-settings/main.c:1112
 msgid "Unable to start the Xfce Display Settings"
 msgstr "Nie je možné spustiť nastavenia displeja Xfce"
 
-#: ../dialogs/display-settings/main.c:1104
+#: ../dialogs/display-settings/main.c:1107
 msgid "ATI Settings"
 msgstr "Nastavenie grafickej karty ATI"
 
-#: ../dialogs/display-settings/main.c:1119
+#: ../dialogs/display-settings/main.c:1122
 msgid "Unable to launch the proprietary driver settings"
 msgstr "Nie je možné spustiť nastavenie proprietárneho ovládača"
 
@@ -719,26 +719,32 @@ msgid "Select command"
 msgstr "Vyberte príkaz"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:235
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:386
 msgid "All Files"
 msgstr "Všetky súbory"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:240
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:391
 msgid "Executable Files"
 msgstr "Spustiteľné súbory"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:255
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:406
 msgid "Perl Scripts"
 msgstr "Skripty jazyka Perl"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:261
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:412
 msgid "Python Scripts"
 msgstr "Skripty jazyka Python"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:267
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:418
 msgid "Ruby Scripts"
 msgstr "Skripty jazyka Ruby"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:273
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:424
 msgid "Shell Scripts"
 msgstr "Shellové skripty"
 
@@ -768,7 +774,7 @@ msgid "Edit keyboard settings and application shortcuts"
 msgstr "Úprava nastavení klávesnice a klávesových skratiek"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:14
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
 msgid "General"
 msgstr "Všeobecné"
 
@@ -865,16 +871,16 @@ msgstr "Oblasť pre _testovanie:"
 msgid "_Use system defaults"
 msgstr "Po_užiť predvolené nastavenie systému"
 
-#: ../dialogs/keyboard-settings/main.c:69
+#: ../dialogs/keyboard-settings/main.c:82
 msgid "Unable to initialize GTK+."
 msgstr "Nie je možné inicializovať GTK+."
 
-#: ../dialogs/keyboard-settings/main.c:89
+#: ../dialogs/keyboard-settings/main.c:102
 #, c-format
 msgid "Failed to connect to xfconf daemon. Reason: %s"
 msgstr "Zlyhalo pripojenie na démona xfconf. Dôvod: %s"
 
-#: ../dialogs/keyboard-settings/main.c:100
+#: ../dialogs/keyboard-settings/main.c:113
 msgid "Could not create the settings dialog."
 msgstr "Nie je možné vytvoriť dialógové okno nastavení."
 
@@ -898,12 +904,12 @@ msgstr "Variant"
 msgid "Shortcut command may not be empty."
 msgstr "Klávesová skratka príkazu nemôže byť prázdna."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "Obnoviť predvolené"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
 msgid ""
 "This will reset all shortcuts to their default values. Do you really want to "
 "do this?"
@@ -911,15 +917,145 @@ msgstr ""
 "Touto akciou nastavíte všetky klávesové skratky na predvolené hodnoty. "
 "Naozaj si želáte pokračovať?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr ""
 "Predvolené nastavenie systému bude obnovené pri nasledujúcom prihlásení."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "Varovanie"
 
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:128
+msgid "Select Application"
+msgstr "Vyberte aplikáciu"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:204
+msgid "Use a c_ustom command:"
+msgstr "Použiť _vlastný príkaz:"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:205
+msgid ""
+"Use a custom command for an application that is not available from the above "
+"application list."
+msgstr ""
+"Použiť vlastný príkaz pre aplikáciu, ktorá nie je dostupná v hornom zozname "
+"aplikácií."
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:223
+msgid "_Browse..."
+msgstr "_Prechádzať..."
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:376
+msgid "Select an Application"
+msgstr "Vybrať aplikáciu"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:526
+msgid "None available"
+msgstr "Žiadna dostupná"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:573
+msgid "Recommended Applications"
+msgstr "Odporúčané aplikácie"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:591
+msgid "Other Applications"
+msgstr "Ostatné aplikácie"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:611
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "Otvoriť <i>%s</i> a ostatné súbory typu \"%s\" s:"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:647
+#, c-format
+msgid "Failed to add new application \"%s\""
+msgstr "Pridanie novej aplikácie \"%s\" zlyhalo"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:174
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:2
+msgid "MIME Type Editor"
+msgstr "Editor typu súborov"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:178
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:1
+msgid "Associate applications with MIME types"
+msgstr "Priradiť aplikáciu s typom súboru"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:203
+msgid "_Filter:"
+msgstr "_Filter:"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:211
+msgid "Clear filter"
+msgstr "Vyčistiť filter"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:257
+msgid "MIME Type"
+msgstr "Typ súboru"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:287
+msgid "Status"
+msgstr "Stav"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:308
+msgid "Default Application"
+msgstr "Predvolená aplikácia"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:479
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+msgid "User Set"
+msgstr "Nastavené používateľom"
+
+#. sort the names but keep Default on top
+#: ../dialogs/mime-settings/xfce-mime-window.c:481
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+#: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
+#: ../dialogs/mouse-settings/main.c:434
+msgid "Default"
+msgstr "Predvolené"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:550
+#, c-format
+msgid "%d MIME type found"
+msgid_plural "%d MIME types found"
+msgstr[0] "Nájdených %d typov súborov"
+msgstr[1] "Nájdený %d typ súboru"
+msgstr[2] "Nájdené %d typy súborov"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:649
+#, c-format
+msgid "Failed to set application \"%s\" for mime type \"%s\"."
+msgstr "Nastavenie aplikácie \"%s\" pre typ súboru \"%s\" zlyhalo."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:906
+#, c-format
+msgid ""
+"Are you sure you want to reset content type \"%s\" to its default value?"
+msgstr ""
+"Ste si istí, že chcete obnoviť typ obsahu \"%s\" na jeho predvolenú hodnotu?"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:910
+msgid "Question"
+msgstr "Otázka"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:913
+msgid ""
+"This will remove your custom mime-association and restore the system-wide "
+"default."
+msgstr ""
+"Toto odstráni vaše vlastné asociácie typov súborov a obnoví ich na "
+"predvolené hodnoty."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:917
+#: ../dialogs/mime-settings/xfce-mime-window.c:988
+msgid "Reset to Default"
+msgstr "Obnoviť predvolené"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:983
+msgid "Choose Application..."
+msgstr "Vyberte aplikáciu..."
+
 #: ../dialogs/mouse-settings/main.c:96
 msgid "Active device in the dialog"
 msgstr "Aktívne zariadenie v dialógovom okne"
@@ -940,143 +1076,141 @@ msgstr "%g px"
 msgid "%g ms"
 msgstr "%g ms"
 
-#. sort the names but keep Default on top
-#: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
-#: ../dialogs/mouse-settings/main.c:434
-msgid "Default"
-msgstr "Predvolené"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:1
+msgid "B_uttons and Feedback"
+msgstr "_Tlačidlá a odozva"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:2
 msgid "Buttons"
 msgstr "Tlačidlá"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:2
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:3
 msgid "Clockwise"
 msgstr "Pravotočivo"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:3
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:4
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:1
 msgid "Configure pointer device behavior and appearance"
 msgstr "Konfiguruje správanie a vzhľad kurzora"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:4
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:5
 msgid "Counterclockwise"
 msgstr "Ľavotočivo"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:5
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
 msgid "Cursor _size:"
 msgstr "Veľko_sť kurzora:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
 msgid "D_istance:"
 msgstr "Vzd_ialenosť:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
 msgid "De_vice:"
 msgstr "Zari_adenie:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
 msgid "Di_sabled"
 msgstr "Za_kázané"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
 msgid "Disable to_uchpad while typing"
 msgstr "Zakázať to_uchpad počas písania"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
 msgid "Double Click"
 msgstr "Dvojité kliknutie"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
 msgid "Drag and Drop"
 msgstr "Ťahať a pustiť"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
 msgid "Edge scro_lling"
 msgstr "Posun o_krajom"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:14
 msgid "Enable hori_zontal scrolling"
 msgstr "Povoliť vodo_rovný posun"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
 msgid "Half (left-handed)"
 msgstr "Polovične (pre ľaváka)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
 msgid "Mouse (relative)"
 msgstr "Myš (relatívne)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:2
 msgid "Mouse and Touchpad"
 msgstr "Myš a touchpad"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
 msgid "None (right-handed)"
 msgstr "Žiadne (pre praváka)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
 msgid "Pen (absolute)"
 msgstr "Pero (priamo)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
 msgid "Pointer Speed"
 msgstr "Rýchlosť kurzora"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:22
 msgid "Preview"
 msgstr "Náhľad"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:22
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:23
 msgid "Reset to De_faults"
 msgstr "Obnoviť pre_dvolené"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:23
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
 msgid "Reverse scroll d_irection"
 msgstr "Obrát_iť smer posunu"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
 msgid "Scrolling"
 msgstr "Posun"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:26
 msgid ""
 "Set the acceleration and sensitivity for the selected device to the default "
 "values"
 msgstr ""
 "Nastaví akceleráciu a citlivosť pre vybrané zariadenie na predvolené hodnoty"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:26
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
 msgid "Size"
 msgstr "Veľkosť"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:28
 msgid "T_ap touchpad to click"
 msgstr "Poklep_anie na touchpad ako klik myšou"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:28
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:29
 msgid "T_heme"
 msgstr "_Téma"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:29
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:30
 msgid "T_ouchpad"
 msgstr "T_ouchpad"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:30
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:31
 msgid "Table_t"
 msgstr "Table_t"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:31
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:32
 msgid "Th_reshold:"
 msgstr "P_rah:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:32
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:33
 msgid ""
 "The factor at which the pointer's speed will increase as the mouse is moved"
 msgstr "Faktor, pri ktorom kurzor myši zvýši rýchlosť pri pohybe"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:33
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:34
 msgid ""
 "The mouse pointer cannot move farther than this distance between two clicks "
 "for them to be considered a double click"
@@ -1084,12 +1218,12 @@ msgstr ""
 "Najvyššia povolená vzdialenosť medzi dvoma kliknutiami v pixeloch "
 "považovaných za dvojité kliknutie"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:34
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:35
 msgid ""
 "The number of pixels the pointer must move before a drag operation will start"
 msgstr "Počet pixelov, o ktoré sa musí kurzor posunúť pred začatím ťahania"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:35
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:36
 msgid ""
 "The number of pixels the pointer must move in a short time before it starts "
 "accelerating"
@@ -1097,15 +1231,15 @@ msgstr ""
 "Počet pixelov, o ktoré sa musí kurzor v krátkom časovom úseku posunúť pred "
 "zahájením akcelerácie"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:36
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:37
 msgid "Ti_me:"
 msgstr "Č_as:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:37
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:38
 msgid "Tr_acking mode:"
 msgstr "Režim sledov_ania:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:38
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:39
 msgid ""
 "Two mouse clicks in less than this length of time (in milliseconds) will be "
 "considered a double click"
@@ -1113,40 +1247,36 @@ msgstr ""
 "Najdlhšia povolená doba medzi dvoma kliknutiami v milisekundách považovaná "
 "za dvojité kliknutie"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:39
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:40
 msgid "Two-_finger scrolling"
 msgstr "Posun dvoma prstami"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:40
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:41
 msgid "When selected, the scroll wheel will work in the opposite direction"
 msgstr "Ak je táto voľba povolená, bude koliesko myši pracovať opačne"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:41
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:42
 msgid ""
 "When selected, the touchpad will be disabled when the keyboard is being used"
 msgstr ""
 "Ak vyberiete túto možnosť, touchpad bude počas používania klávesnice vypnutý"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:42
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:43
 msgid "_Acceleration:"
 msgstr "Z_rýchlenie:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:43
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:44
 msgid "_Behavior"
 msgstr "Správa_nie"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:44
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:45
 msgid "_Devices"
 msgstr "_Zariadenia"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:45
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:46
 msgid "_Enable this device"
 msgstr "Povoliť toto zariad_enie"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:46
-msgid "_General"
-msgstr "Vš_eobecné"
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:47
 msgid "_Left-handed"
 msgstr "Pre ľavá_ka"
@@ -1163,168 +1293,200 @@ msgstr "O_točenie:"
 msgid "_Sensitivity:"
 msgstr "_Citlivosť:"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Editor nastavení"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Prispôsobenie nastavení uloženého s Xfconf"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Kanál"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Vlastnosť"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Typ"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Uzamknuté"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "Prázdne"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Nová vlastnosť"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Toto nie je platný názov vlastnosti."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "Úprava vybranej vlastnosti"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Reštartovať"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Reštartovať"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr "Reštartovanie vlastnosti natrvalo odstráni vlastné nastavenia."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "Obnoviť vybranú vlastnosť"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "Naozaj si želáte reštartovať vlastnosť \"%s\"?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "Prázdne"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "Názvy vlastností musia začínať znakom '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "Pole"
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "Koreňový element ('/') nie je platným názvom vlastnosti"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "String"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid ""
-"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
-"'-', '<' and '>', as well as '/' as a separator"
-msgstr ""
-"Názvy vlastností môžu obsahovať iba znaky ASCII: A-Z, a-z, 0-9, '_', '-', "
-"'<' a '>', a znak '/' ako oddeľovač"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "Integer"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "Názvy vlastností nemôžu obsahovať dva po sebe idúce znaky '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Boolean"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "Názvy vlastností nemôžu končiť znakom '/'"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Double"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_Reštartovať"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "_Obnoviť kanál"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
 msgstr "Reštartovanie kanála natrvalo odstráni vlastné nastavenia."
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr "Naozaj si želáte reštartovať kanál \"%s\" a všetky jeho vlastnosti?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Grafický editor nastavení pre Xfconf"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Editor nastavení"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "obnoviť"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Boolean"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "Monitor %s"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Prispôsobenie nastavení uloženého s Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "Sledovať kanál Xfconf pre zmeny vlastnosti"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Double"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "spustiť sledovanie kanála \"%s\""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Úprava vlastnosti"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "_Monitor"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Úprava vlastnosti"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr "Reštartovanie vlastnosti natrvalo odstráni vlastné nastavenia."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Povolené"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "Naozaj si želáte reštartovať vlastnosť \"%s\"?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "Int"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Unsigned Int"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Názov:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Unsigned Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
 msgstr "Nová vlastnosť"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Obnoviť vlastnosť"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "_Vlastnosť:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "String"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "_Typ:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "Typ:"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "_Hodnota:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Unsigned Int"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "Názvy vlastností musia začínať znakom '/'"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Unsigned Int64"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "Koreňový element ('/') nie je platným názvom vlastnosti"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Hodnota:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
+#, c-format
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Názvy vlastností môžu obsahovať iba znaky ASCII: A-Z, a-z, 0-9, '_', '-', "
+"'<' a '>', a znak '/' ako oddeľovač"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Kanály Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr "Názvy vlastností nemôžu obsahovať dva po sebe idúce znaky '/'"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "Názvy vlastností nemôžu končiť znakom '/'"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "Úprava vlastnosti"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Grafický editor nastavení pre Xfconf"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1384,33 +1546,28 @@ msgstr "Pracovná plocha %d"
 msgid "The Xfce Settings Daemon"
 msgstr "Démon nastavenia Xfce"
 
-#: ../xfce4-settings-manager/main.c:41
+#: ../xfce4-settings-manager/main.c:40
 msgid "Settings dialog to show"
 msgstr "Zobrazené dialógové okno nastavení"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:163
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
+msgid "_All Settings"
+msgstr "_Všetky nastavenia"
+
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:164
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "Prispôsobte si pracovné prostredie"
 
-#. Create back button which takes the user back to the overview
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:271
-msgid "_Overview"
-msgstr "Pre_hľad"
-
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:601
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:617
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
 msgstr "Nie je možné spustiť '%s'"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:664
-msgid "Failed to open the documentation"
-msgstr "Nepodarilo sa otvoriť dokumentáciu"
-
 #: ../xfce4-settings-manager/xfce-settings-manager.desktop.in.h:1
 msgid "Graphical Settings Manager for Xfce 4"
 msgstr "Grafický správca nastavení pre prostredie Xfce 4"
@@ -1419,6 +1576,27 @@ msgstr "Grafický správca nastavení pre prostredie Xfce 4"
 msgid "Settings Manager"
 msgstr "Správca nastavení"
 
+#~ msgid "_General"
+#~ msgstr "Vš_eobecné"
+
+#~ msgid "This property name is not valid."
+#~ msgstr "Toto nie je platný názov vlastnosti."
+
+#~ msgid "Enabled"
+#~ msgstr "Povolené"
+
+#~ msgid "Name:"
+#~ msgstr "Názov:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Kanály Xfconf"
+
+#~ msgid "_Overview"
+#~ msgstr "Pre_hľad"
+
+#~ msgid "Failed to open the documentation"
+#~ msgstr "Nepodarilo sa otvoriť dokumentáciu"
+
 #~ msgid "Use this area to _test the settings above:"
 #~ msgstr "Použi_te túto oblasť pre vyskúšanie nastavení:"
 
diff --git a/po/sv.po b/po/sv.po
index 70d8eca..350c27b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-21 05:12+0000\n"
+"POT-Creation-Date: 2012-03-24 15:24+0000\n"
 "PO-Revision-Date: 2010-10-17 17:58+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -55,8 +55,12 @@ msgid "Disable sticky keys if _two keys are pressed"
 msgstr "Inaktivera klistriga tangenter _om två tangenter trycks ner"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
-msgid "If enabled, the session manager will start the required applications for screen readers and magnifiers"
-msgstr "Om aktiverat kommer sessionshanteraren att starta de nödvändiga programmen för skärmläsare och -förstorare"
+msgid ""
+"If enabled, the session manager will start the required applications for "
+"screen readers and magnifiers"
+msgstr ""
+"Om aktiverat kommer sessionshanteraren att starta de nödvändiga programmen "
+"för skärmläsare och -förstorare"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
 msgid "K_eystroke delay:"
@@ -95,8 +99,12 @@ msgid "The amount of time, in milliseconds, required between keystrokes"
 msgstr "Mängden tid, i millisekunder, som krävs mellan tangenttryckningar"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted"
-msgstr "Mängden tid, i millisekunder, som måste förflyta innan en tangenttryckning kan tas emot"
+msgid ""
+"The amount of time, in milliseconds, that must elapse before a keystroke "
+"will be accepted"
+msgstr ""
+"Mängden tid, i millisekunder, som måste förflyta innan en tangenttryckning "
+"kan tas emot"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
 msgid "The maximum pointer speed after acceleration"
@@ -111,20 +119,34 @@ msgid "The time, in milliseconds, between repeated motion events"
 msgstr "Tiden, i millisekunder, mellan upprepade rörelsehändelser"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
-msgid "The time, in milliseconds, between the initial key press and first repeated motion event"
-msgstr "Tiden, i millisekunder, mellan en initial tangenttryckning och första upprepade rörelsehändelsen"
+msgid ""
+"The time, in milliseconds, between the initial key press and first repeated "
+"motion event"
+msgstr ""
+"Tiden, i millisekunder, mellan en initial tangenttryckning och första "
+"upprepade rörelsehändelsen"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:25
 msgid "The time, in milliseconds, to get to maximum speed"
 msgstr "Tiden, i millisekunder, för att komma till maximal hastighet"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:26
-msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted"
-msgstr "För att hjälpa till att förhindra oavsiktliga tangenttryckningar så kräver tröga tangenter att en tangent hålls nere i viss tidsperiod innan tangenttryckningen kommer att tas emot"
+msgid ""
+"To help prevent accidental keystrokes, slow keys requires that a key is held "
+"for a certain minimum amount of time before the keystroke will be accepted"
+msgstr ""
+"För att hjälpa till att förhindra oavsiktliga tangenttryckningar så kräver "
+"tröga tangenter att en tangent hålls nere i viss tidsperiod innan "
+"tangenttryckningen kommer att tas emot"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
-msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes"
-msgstr "För att hjälpa till att förhindra oavsiktliga multipla tangenttryckningar så förelägger studsande tangenter en minimal fördröjning mellan tangenttryckningar"
+msgid ""
+"To help prevent accidental multiple keystrokes, bounce keys imposes a "
+"minimum delay between keystrokes"
+msgstr ""
+"För att hjälpa till att förhindra oavsiktliga multipla tangenttryckningar så "
+"förelägger studsande tangenter en minimal fördröjning mellan "
+"tangenttryckningar"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
 msgid "Use _bounce keys"
@@ -139,20 +161,37 @@ msgid "Use slow _keys"
 msgstr "Använd tröga _tangenter"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time"
-msgstr "När vald så behöver inte modifierartangenter (såsom Control, Alt och Skift) hållas ner (de kan tryckas och sedan släppas) när flera tangenter normalt sett behöver tryckas ner samtidigt"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
+"to be held down (they can be pressed and then released) when multiple keys "
+"would normally need to be pressed at the same time"
+msgstr ""
+"När vald så behöver inte modifierartangenter (såsom Control, Alt och Skift) "
+"hållas ner (de kan tryckas och sedan släppas) när flera tangenter normalt "
+"sett behöver tryckas ner samtidigt"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:32
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again"
-msgstr "När vald så kommer modifierartangenter (såsom Control, Alt och Skift) att kvarstå i nedtryckt tillstånd tills den trycks ner igen"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
+"locked in the pressed state until pressed again"
+msgstr ""
+"När vald så kommer modifierartangenter (såsom Control, Alt och Skift) att "
+"kvarstå i nedtryckt tillstånd tills den trycks ner igen"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:33
-msgid "When selected, the \"sticky keys\" feature will be disabled if two keys are pressed simultaneously"
-msgstr "När vald kommer funktionen \"klistra tangenter\" att inaktiveras om två tangenter trycks ner samtidigt"
+msgid ""
+"When selected, the \"sticky keys\" feature will be disabled if two keys are "
+"pressed simultaneously"
+msgstr ""
+"När vald kommer funktionen \"klistra tangenter\" att inaktiveras om två "
+"tangenter trycks ner samtidigt"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:34
-msgid "When selected, the mouse pointer can be controlled using the keyboard number pad"
-msgstr "När vald kan muspekaren kontrolleras med den numeriska delen av tangentbordet"
+msgid ""
+"When selected, the mouse pointer can be controlled using the keyboard number "
+"pad"
+msgstr ""
+"När vald kan muspekaren kontrolleras med den numeriska delen av tangentbordet"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:35
 msgid "_Acceleration delay:"
@@ -186,54 +225,54 @@ msgstr "ms"
 msgid "pixels/sec"
 msgstr "bildpunkter/s"
 
-#: ../dialogs/accessibility-settings/main.c:44
-#: ../dialogs/appearance-settings/main.c:87
-#: ../dialogs/display-settings/main.c:103
-#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:100
+#: ../dialogs/accessibility-settings/main.c:43
+#: ../dialogs/appearance-settings/main.c:94
+#: ../dialogs/display-settings/main.c:102
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:97
 msgid "Settings manager socket"
 msgstr "Uttag för inställningshanterare"
 
-#: ../dialogs/accessibility-settings/main.c:44
-#: ../dialogs/appearance-settings/main.c:87
-#: ../dialogs/display-settings/main.c:103
-#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:100
+#: ../dialogs/accessibility-settings/main.c:43
+#: ../dialogs/appearance-settings/main.c:94
+#: ../dialogs/display-settings/main.c:102
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:97
 msgid "SOCKET ID"
 msgstr "UTTAGS-ID"
 
-#: ../dialogs/accessibility-settings/main.c:45
-#: ../dialogs/appearance-settings/main.c:88
-#: ../dialogs/display-settings/main.c:104
-#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:101
-#: ../xfce4-settings-editor/main.c:43 ../xfsettingsd/main.c:77
-#: ../xfce4-settings-manager/main.c:40
+#: ../dialogs/accessibility-settings/main.c:44
+#: ../dialogs/appearance-settings/main.c:95
+#: ../dialogs/display-settings/main.c:103
+#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40
+#: ../dialogs/mouse-settings/main.c:98 ../xfce4-settings-editor/main.c:43
+#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39
 msgid "Version information"
 msgstr "Versionsinformation"
 
-#: ../dialogs/accessibility-settings/main.c:181
-#: ../dialogs/appearance-settings/main.c:828
-#: ../dialogs/display-settings/main.c:1046
-#: ../dialogs/keyboard-settings/main.c:64
-#: ../dialogs/mouse-settings/main.c:1188 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:130 ../xfce4-settings-manager/main.c:58
+#: ../dialogs/accessibility-settings/main.c:192
+#: ../dialogs/appearance-settings/main.c:966
+#: ../dialogs/display-settings/main.c:1043
+#: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
+#: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63
+#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Ange \"%s --help\" för användningsinformation."
 
-#: ../dialogs/accessibility-settings/main.c:200
-#: ../dialogs/appearance-settings/main.c:847
-#: ../dialogs/display-settings/main.c:1065
-#: ../dialogs/keyboard-settings/main.c:80
-#: ../dialogs/mouse-settings/main.c:1207 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:146 ../xfce4-settings-manager/main.c:71
+#: ../dialogs/accessibility-settings/main.c:211
+#: ../dialogs/appearance-settings/main.c:985
+#: ../dialogs/display-settings/main.c:1062
+#: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
+#: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82
+#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
 msgstr "The Xfce development team. Alla rättigheter är reserverade."
 
-#: ../dialogs/accessibility-settings/main.c:201
-#: ../dialogs/appearance-settings/main.c:848
-#: ../dialogs/display-settings/main.c:1066
-#: ../dialogs/keyboard-settings/main.c:81
-#: ../dialogs/mouse-settings/main.c:1208 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:147 ../xfce4-settings-manager/main.c:72
+#: ../dialogs/accessibility-settings/main.c:212
+#: ../dialogs/appearance-settings/main.c:986
+#: ../dialogs/display-settings/main.c:1063
+#: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
+#: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83
+#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Rapportera fel till <%s>."
@@ -243,8 +282,11 @@ msgid "Improve keyboard and mouse accessibility"
 msgstr "Förbättra hjälpfunktioner för tangentbord och mus"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
-msgstr "Kantutjämning, eller mjukare typsnitt, kan förbättra utseendet för text på skärmen"
+msgid ""
+"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgstr ""
+"Kantutjämning, eller mjukare typsnitt, kan förbättra utseendet för text på "
+"skärmen"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:1
@@ -252,7 +294,7 @@ msgid "Appearance"
 msgstr "Utseende"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
-#: ../dialogs/display-settings/main.c:83
+#: ../dialogs/display-settings/main.c:82
 msgid "Both"
 msgstr "Båda"
 
@@ -295,15 +337,20 @@ msgstr "Aktivera återkopplingsljud för _inmatning"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:13
 msgid "Enable or disable event sounds globally (requires \"Canberra\" support)"
-msgstr "Aktivera eller inaktivera allmänna händelseljud (kräver \"Canberra\"-stöd)"
+msgstr ""
+"Aktivera eller inaktivera allmänna händelseljud (kräver \"Canberra\"-stöd)"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:14
 msgid "Event sounds"
 msgstr "Händelseljud"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
-msgid "Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen"
-msgstr "Typsnittskvalitet på en TFT- eller LCD-skärm kan avsevärt förbättras genom att välja den korrekta sub-pixel-ordningen för skärmen"
+msgid ""
+"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
+"correct sub-pixel order of the screen"
+msgstr ""
+"Typsnittskvalitet på en TFT- eller LCD-skärm kan avsevärt förbättras genom "
+"att välja den korrekta sub-pixel-ordningen för skärmen"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
 msgid "Full"
@@ -314,12 +361,22 @@ msgid "Icons"
 msgstr "Ikoner"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
-msgid "If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut"
-msgstr "Om vald kan tangentbordsgenvägar för menyobjekt ändras genom att dra ut muspekaren över menyobjektet och trycka på den nya tangentkombinationen för genvägen"
+msgid ""
+"If selected, keyboard shortcuts for menu items can be changed by hovering "
+"the mouse over the menu item and pressing the new key combination for the "
+"shortcut"
+msgstr ""
+"Om vald kan tangentbordsgenvägar för menyobjekt ändras genom att dra ut "
+"muspekaren över menyobjektet och trycka på den nya tangentkombinationen för "
+"genvägen"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
-msgid "Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference"
-msgstr "Många typsnitt innehåller information som ger extra tips för hur den bäst ritas ut; välj vilken som du personligen tycker ser bäst ut"
+msgid ""
+"Many fonts contain information that provides extra hints as to how best draw "
+"the font; pick whichever looks best according to personal preference"
+msgstr ""
+"Många typsnitt innehåller information som ger extra tips för hur den bäst "
+"ritas ut; välj vilken som du personligen tycker ser bäst ut"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
 msgid "Medium"
@@ -330,14 +387,17 @@ msgid "Menus and Buttons"
 msgstr "Menyer och knappar"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
-#: ../dialogs/appearance-settings/main.c:724
-#: ../dialogs/display-settings/main.c:80
+#: ../dialogs/appearance-settings/main.c:852
+#: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "Ingen"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
-msgid "Override the detected monitor resolution if fonts look too large or too small"
-msgstr "Åsidosätt den upptäckta skärmupplösningen om typsnitten ser för stora eller för små ut"
+msgid ""
+"Override the detected monitor resolution if fonts look too large or too small"
+msgstr ""
+"Åsidosätt den upptäckta skärmupplösningen om typsnitten ser för stora eller "
+"för små ut"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
 msgid "Rendering"
@@ -372,8 +432,11 @@ msgid "Specify whether icons should be displayed next to text in buttons"
 msgstr "Ange huruvida ikoner ska visas bredvid text i knappar"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
-msgid "Specify whether mouse clicks and other user input will cause event sounds to play"
-msgstr "Ange huruvida musklick och annan användarinmatning ska spela upp händelseljud"
+msgid ""
+"Specify whether mouse clicks and other user input will cause event sounds to "
+"play"
+msgstr ""
+"Ange huruvida musklick och annan användarinmatning ska spela upp händelseljud"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
 msgid "St_yle"
@@ -388,8 +451,12 @@ msgid "Text"
 msgstr "Text"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
-msgid "This font will be used as the default font used when drawing user interface text"
-msgstr "Detta typsnitt kommer att användas som standardtypsnitt när text ritas ut i användargränssnittet"
+msgid ""
+"This font will be used as the default font used when drawing user interface "
+"text"
+msgstr ""
+"Detta typsnitt kommer att användas som standardtypsnitt när text ritas ut i "
+"användargränssnittet"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
 msgid "_Fonts"
@@ -411,19 +478,46 @@ msgstr "In_ställningar"
 msgid "_Toolbar Style"
 msgstr "_Verktygsradsstil"
 
-#: ../dialogs/appearance-settings/main.c:728
+#: ../dialogs/appearance-settings/main.c:733
+#, c-format
+msgid "File is larger then %d MB, installation aborted"
+msgstr "Filen är större än %d MB, installation avbruten"
+
+#: ../dialogs/appearance-settings/main.c:738
+msgid "Failed to create temporary directory"
+msgstr "Misslyckades med att skapa temporär mapp"
+
+#: ../dialogs/appearance-settings/main.c:743
+msgid "Failed to extract archive"
+msgstr "Misslyckades med att extrahera arkiv"
+
+#: ../dialogs/appearance-settings/main.c:748
+#, fuzzy
+msgid "Unknown format, only archives and directories are supported"
+msgstr "Okänt format, finns bara stöd för arkiv och mappar "
+
+#: ../dialogs/appearance-settings/main.c:753
+#, c-format
+msgid "An unknown error, exit code is %d"
+msgstr "Ökänt fel, felkod %d"
+
+#: ../dialogs/appearance-settings/main.c:760
+msgid "Failed to install theme"
+msgstr "Misslyckades med att installera tema"
+
+#: ../dialogs/appearance-settings/main.c:856
 msgid "RGB"
 msgstr "RGB"
 
-#: ../dialogs/appearance-settings/main.c:732
+#: ../dialogs/appearance-settings/main.c:860
 msgid "BGR"
 msgstr "BGR"
 
-#: ../dialogs/appearance-settings/main.c:736
+#: ../dialogs/appearance-settings/main.c:864
 msgid "Vertical RGB"
 msgstr "Vertikal RGB"
 
-#: ../dialogs/appearance-settings/main.c:740
+#: ../dialogs/appearance-settings/main.c:868
 msgid "Vertical BGR"
 msgstr "Vertikal BGR"
 
@@ -444,8 +538,12 @@ msgid "Restore the previous configuration"
 msgstr "Återställ tidigare konfiguration"
 
 #: ../dialogs/display-settings/confirmation-dialog.glade.h:5
-msgid "The previous configuration will be restored in 10 seconds if you do not reply to this question."
-msgstr "Den tidigare konfigurationen kommer att återställas om 10 sekunder om du inte svarar på denna fråga."
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
+msgstr ""
+"Den tidigare konfigurationen kommer att återställas om 10 sekunder om du "
+"inte svarar på denna fråga."
 
 #: ../dialogs/display-settings/display-dialog.glade.h:1
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1
@@ -493,91 +591,102 @@ msgstr "Flera skärmar finns tillgängliga. Använd:\n"
 msgid "Use both displays to show the same contents"
 msgstr "Använd båda skärmar till att visa samma innehåll"
 
-#: ../dialogs/display-settings/main.c:69
+#: ../dialogs/display-settings/main.c:68
 msgid "Normal"
 msgstr "Normal"
 
-#: ../dialogs/display-settings/main.c:70
+#: ../dialogs/display-settings/main.c:69
 msgid "Left"
 msgstr "Vänster"
 
-#: ../dialogs/display-settings/main.c:71
+#: ../dialogs/display-settings/main.c:70
 msgid "Inverted"
 msgstr "Inverterad"
 
-#: ../dialogs/display-settings/main.c:72
+#: ../dialogs/display-settings/main.c:71
 msgid "Right"
 msgstr "Höger"
 
-#: ../dialogs/display-settings/main.c:81
+#: ../dialogs/display-settings/main.c:80
 msgid "Horizontal"
 msgstr "Horisontell"
 
-#: ../dialogs/display-settings/main.c:82
+#: ../dialogs/display-settings/main.c:81
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: ../dialogs/display-settings/main.c:105
+#: ../dialogs/display-settings/main.c:104
 msgid "Minimal interface to set up an external output"
 msgstr "Minimalt gränssnitt för att konfigurera en extern utgång"
 
-#: ../dialogs/display-settings/main.c:172
+#: ../dialogs/display-settings/main.c:171
 #, c-format
-msgid "The previous configuration will be restored in %i seconds if you do not reply to this question."
-msgstr "Den tidigare konfigurationen kommer att återställas om %i sekunder om du inte svarar på denna fråga."
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
+msgstr ""
+"Den tidigare konfigurationen kommer att återställas om %i sekunder om du "
+"inte svarar på denna fråga."
 
 #. Insert the mode
-#: ../dialogs/display-settings/main.c:506
+#: ../dialogs/display-settings/main.c:505
 #, c-format
 msgid "%.1f Hz"
 msgstr "%.1f Hz"
 
-#: ../dialogs/display-settings/main.c:652
-msgid "The last active output must not be disabled, the system would be unusable."
-msgstr "Senast aktiva utgången får inte vara inaktiverad. Systemet kommer då inte vara möjligt att använda."
+#: ../dialogs/display-settings/main.c:651
+msgid ""
+"The last active output must not be disabled, the system would be unusable."
+msgstr ""
+"Senast aktiva utgången får inte vara inaktiverad. Systemet kommer då inte "
+"vara möjligt att använda."
 
-#: ../dialogs/display-settings/main.c:654
+#: ../dialogs/display-settings/main.c:653
 msgid "Selected output not disabled"
 msgstr "Vald utgång är inte inaktiverad"
 
-#: ../dialogs/display-settings/main.c:1078
-#: ../dialogs/display-settings/xfce-randr.c:250
+#: ../dialogs/display-settings/main.c:1075
+#: ../dialogs/display-settings/xfce-randr.c:249
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr "Kunde inte fråga efter vilken version av RandR-utökningen som används"
 
-#: ../dialogs/display-settings/main.c:1079
-#: ../dialogs/display-settings/main.c:1115
+#: ../dialogs/display-settings/main.c:1076
+#: ../dialogs/display-settings/main.c:1112
 msgid "Unable to start the Xfce Display Settings"
 msgstr "Kunde inte starta skärminställningar för Xfce"
 
-#: ../dialogs/display-settings/main.c:1110
+#: ../dialogs/display-settings/main.c:1107
 msgid "ATI Settings"
 msgstr "ATI-inställningar"
 
-#: ../dialogs/display-settings/main.c:1125
+#: ../dialogs/display-settings/main.c:1122
 msgid "Unable to launch the proprietary driver settings"
 msgstr "Kunde inte starta inställningar för proprietär drivrutin"
 
 #. 1.2 is required
-#: ../dialogs/display-settings/xfce-randr.c:258
+#: ../dialogs/display-settings/xfce-randr.c:257
 #, c-format
-msgid "This system is using RandR %d.%d. For the display settings to work version 1.2 is required at least"
-msgstr "Detta system använder RandR %d.%d. För att skärminställningarna ska fungera krävs minst version 1.2"
+msgid ""
+"This system is using RandR %d.%d. For the display settings to work version "
+"1.2 is required at least"
+msgstr ""
+"Detta system använder RandR %d.%d. För att skärminställningarna ska fungera "
+"krävs minst version 1.2"
 
-#: ../dialogs/display-settings/xfce-randr.c:537
+#: ../dialogs/display-settings/xfce-randr.c:536
 msgid "Laptop"
 msgstr "Bärbar dator"
 
-#: ../dialogs/display-settings/xfce-randr.c:558
+#: ../dialogs/display-settings/xfce-randr.c:557
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../dialogs/display-settings/xfce-randr.c:561
+#: ../dialogs/display-settings/xfce-randr.c:560
 msgid "Television"
 msgstr "Television"
 
-#: ../dialogs/display-settings/xfce-randr.c:565
+#: ../dialogs/display-settings/xfce-randr.c:564
 msgid "Digital display"
 msgstr "Digital skärm"
 
@@ -590,56 +699,63 @@ msgid "Unknown"
 msgstr "Okänd"
 
 #. Set dialog title and icon
-#: ../dialogs/keyboard-settings/command-dialog.c:108
+#: ../dialogs/keyboard-settings/command-dialog.c:106
 msgid "Shortcut Command"
 msgstr "Genvägskommando"
 
-#: ../dialogs/keyboard-settings/command-dialog.c:132
+#: ../dialogs/keyboard-settings/command-dialog.c:130
 msgid "Shortcut:"
 msgstr "Genväg:"
 
-#: ../dialogs/keyboard-settings/command-dialog.c:142
+#: ../dialogs/keyboard-settings/command-dialog.c:140
 msgid "Command:"
 msgstr "Kommando:"
 
-#: ../dialogs/keyboard-settings/command-dialog.c:162
+#: ../dialogs/keyboard-settings/command-dialog.c:160
 msgid "Use _startup notification"
 msgstr "Använd _uppstartsnotifieringar"
 
-#: ../dialogs/keyboard-settings/command-dialog.c:209
+#: ../dialogs/keyboard-settings/command-dialog.c:207
 msgid "The command may not be empty."
 msgstr "Kommandot får inte vara tomt."
 
-#: ../dialogs/keyboard-settings/command-dialog.c:229
+#: ../dialogs/keyboard-settings/command-dialog.c:227
 msgid "Select command"
 msgstr "Välj kommando"
 
-#: ../dialogs/keyboard-settings/command-dialog.c:237
+#: ../dialogs/keyboard-settings/command-dialog.c:235
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:386
 msgid "All Files"
 msgstr "Alla filer"
 
-#: ../dialogs/keyboard-settings/command-dialog.c:242
+#: ../dialogs/keyboard-settings/command-dialog.c:240
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:391
 msgid "Executable Files"
 msgstr "Körbara filer"
 
-#: ../dialogs/keyboard-settings/command-dialog.c:257
+#: ../dialogs/keyboard-settings/command-dialog.c:255
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:406
 msgid "Perl Scripts"
 msgstr "Perl-skript"
 
-#: ../dialogs/keyboard-settings/command-dialog.c:263
+#: ../dialogs/keyboard-settings/command-dialog.c:261
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:412
 msgid "Python Scripts"
 msgstr "Python-skript"
 
-#: ../dialogs/keyboard-settings/command-dialog.c:269
+#: ../dialogs/keyboard-settings/command-dialog.c:267
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:418
 msgid "Ruby Scripts"
 msgstr "Ruby-skript"
 
-#: ../dialogs/keyboard-settings/command-dialog.c:275
+#: ../dialogs/keyboard-settings/command-dialog.c:273
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:424
 msgid "Shell Scripts"
 msgstr "Skalskript"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:1
-msgid "Appli_cation Shortcuts"
+#, fuzzy
+msgid "A_pplication Shortcuts"
 msgstr "Progra_mgenvägar"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:2
@@ -664,456 +780,794 @@ msgid "Edit keyboard settings and application shortcuts"
 msgstr "Redigera tangentbordsinställningar och programgenvägar"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
+#, fuzzy
+msgid "General"
+msgstr "Generellt"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2
 msgid "Keyboard"
 msgstr "Tangentbord"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
 msgid "Keyboard layout"
 msgstr "Tangentbordslayout"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
 msgid "Keyboard layout selection"
 msgstr "Val av tangentbordslayout"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
 msgid "Keyboard model"
 msgstr "Tangentbordsmodell"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
 msgid "Repeat _speed:"
 msgstr "Upprepnings_hastighet:"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13
+#, fuzzy
+msgid "Reset to _Defaults"
+msgstr "Återställ till standardvärden"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
+msgid "Restore num l_ock state on startup"
+msgstr "Återställ num l_ock vid uppstart"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
 msgid "Select keyboard layout and variant"
 msgstr "Välj tangentbordslayout och variant"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:16
 msgid "Show _blinking"
 msgstr "Visa _blinkning"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
-msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server"
-msgstr "Ange huruvida tangentbordslayouten kontrolleras med denna inställningsdialog eller av X-servern"
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17
+msgid ""
+"Specifies whether the keyboard layout is controlled with this settings "
+"dialog, or by the X server"
+msgstr ""
+"Ange huruvida tangentbordslayouten kontrolleras med denna inställningsdialog "
+"eller av X-servern"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
 msgid "Specify whether or not the text cursor blinks"
 msgstr "Ange huruvida textmarkören blinkar eller inte"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:16
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19
 msgid "The delay, in milliseconds, between successive blinks of the cursor"
 msgstr "Fördröjningen, i millisekunder, mellan markörens blinkningar"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20
 msgid "The rate at which keystrokes are generated while a key is pressed"
-msgstr "Frekvensen med vilken tangenttryckningar genereras när en tangent trycks ner"
+msgstr ""
+"Frekvensen med vilken tangenttryckningar genereras när en tangent trycks ner"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
 msgid "The time, in milliseconds, before a pressed key begins repeating"
 msgstr "Tiden, i millisekunder, innan en nedtryckt tangent upprepas"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
 msgid "Typing Settings"
 msgstr "Skrivinställningar"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20
-msgid "Use this area to _test the settings above:"
-msgstr "Använd detta utrymme för att _testa ovanstående inställningar:"
-
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
-msgid "When selected, pressing and holding down a key emits the same character over and over again"
-msgstr "När vald kommer trycka och hålla ner en tangent att skicka ut samma tecken om och om igen"
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:23
+msgid ""
+"When selected, pressing and holding down a key emits the same character over "
+"and over again"
+msgstr ""
+"När vald kommer trycka och hålla ner en tangent att skicka ut samma tecken "
+"om och om igen"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:24
 msgid "_Enable key repeat"
 msgstr "_Aktivera tangentupprepning"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:23
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:25
 msgid "_Layout"
 msgstr "_Layout"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:24
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:26
 msgid "_Repeat delay:"
 msgstr "Uppr_epningsfördröjning:"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:25
-msgid "_Reset to Defaults"
-msgstr "Å_terställ till standardvärden"
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:27
+msgid "_Test area:"
+msgstr "_Test yta"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:26
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:28
 msgid "_Use system defaults"
 msgstr "_Använd systemets standardvärden"
 
-#: ../dialogs/keyboard-settings/main.c:70
+#: ../dialogs/keyboard-settings/main.c:82
 msgid "Unable to initialize GTK+."
 msgstr "Kunde inte initiera GTK+."
 
-#: ../dialogs/keyboard-settings/main.c:90
+#: ../dialogs/keyboard-settings/main.c:102
 #, c-format
 msgid "Failed to connect to xfconf daemon. Reason: %s"
 msgstr "Misslyckades med att ansluta till xfconf-demonen. Anledning: %s"
 
-#: ../dialogs/keyboard-settings/main.c:101
+#: ../dialogs/keyboard-settings/main.c:113
 msgid "Could not create the settings dialog."
 msgstr "Kunde inte skapa inställningsdialogen."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:296
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:300
 msgid "Command"
 msgstr "Kommando"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:301
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:305
 msgid "Shortcut"
 msgstr "Genväg"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:375
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:380
 msgid "Layout"
 msgstr "Layout"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:376
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:381
 msgid "Variant"
 msgstr "Variant"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:852
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:857
 msgid "Shortcut command may not be empty."
 msgstr "Genvägskommandon får inte vara tomma."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:960
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:961
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "Återställ till standardvärden"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:962
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
-msgstr "Detta kommer att återställa alla genvägar till sin standardvärden. Vill du verkligen göra detta?"
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
+msgstr ""
+"Detta kommer att återställa alla genvägar till sin standardvärden. Vill du "
+"verkligen göra detta?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1027
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
-msgstr "Systemets standardvärden kommer att återställas nästa gång du loggar in."
+msgstr ""
+"Systemets standardvärden kommer att återställas nästa gång du loggar in."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1029
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "Varning"
 
-#: ../dialogs/mouse-settings/main.c:99
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:128
+#, fuzzy
+msgid "Select Application"
+msgstr "Välj kommando"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:204
+#, fuzzy
+msgid "Use a c_ustom command:"
+msgstr "Välj kommando"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:205
+msgid ""
+"Use a custom command for an application that is not available from the above "
+"application list."
+msgstr "Använd ett kommando för ett program som inte finns i programlistan ovan."
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:223
+msgid "_Browse..."
+msgstr "_Bläddra..."
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:376
+msgid "Select an Application"
+msgstr "Välj ett program"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:526
+msgid "None available"
+msgstr "Inga tillgängliga"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:573
+msgid "Recommended Applications"
+msgstr "Rekommenderade program"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:591
+msgid "Other Applications"
+msgstr "Andra program"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:611
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr "Öppna <i>%s</i> och andra filer av typ \"%s\" med:"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:647
+#, c-format
+msgid "Failed to add new application \"%s\""
+msgstr "Kunde inte lägga till nytt program \"%s\""
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:174
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:2
+msgid "MIME Type Editor"
+msgstr "MIME typ redigerare"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:178
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:1
+msgid "Associate applications with MIME types"
+msgstr "Förknippade program med MIME typer"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:203
+msgid "_Filter:"
+msgstr "_Filter"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:211
+msgid "Clear filter"
+msgstr "Rensa filter"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:257
+#, fuzzy
+msgid "MIME Type"
+msgstr "Typ"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:287
+msgid "Status"
+msgstr "Status"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:308
+#, fuzzy
+msgid "Default Application"
+msgstr "Standardtyps_nitt"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:479
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+msgid "User Set"
+msgstr "Användar satt"
+
+#. sort the names but keep Default on top
+#: ../dialogs/mime-settings/xfce-mime-window.c:481
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+#: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
+#: ../dialogs/mouse-settings/main.c:434
+msgid "Default"
+msgstr "Standard"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:550
+#, c-format
+msgid "%d MIME type found"
+msgid_plural "%d MIME types found"
+msgstr[0] "%d MIME typ funnen"
+msgstr[1] "%d MIME typer funna"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:649
+#, c-format
+msgid "Failed to set application \"%s\" for mime type \"%s\"."
+msgstr "Misslyckades med att sätta program \"%s\" för mime typ \"%s\"."
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:906
+#, fuzzy, c-format
+msgid ""
+"Are you sure you want to reset content type \"%s\" to its default value?"
+msgstr ""
+"Är du säker på att du vill återställa kanalen \"%s\" och alla dess "
+"egenskaper?"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:910
+msgid "Question"
+msgstr "Fråga"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:913
+msgid ""
+"This will remove your custom mime-association and restore the system-wide "
+"default."
+msgstr ""
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:917
+#: ../dialogs/mime-settings/xfce-mime-window.c:988
+#, fuzzy
+msgid "Reset to Default"
+msgstr "Återställ till standardvärden"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:983
+msgid "Choose Application..."
+msgstr "Välj program..."
+
+#: ../dialogs/mouse-settings/main.c:96
 msgid "Active device in the dialog"
 msgstr "Aktiv enhet i dialogrutan"
 
-#: ../dialogs/mouse-settings/main.c:99
+#: ../dialogs/mouse-settings/main.c:96
 msgid "DEVICE NAME"
 msgstr "ENHETSNAMN"
 
-#. sort the names but keep Default on top
-#: ../dialogs/mouse-settings/main.c:355 ../dialogs/mouse-settings/main.c:357
-#: ../dialogs/mouse-settings/main.c:417
-msgid "Default"
-msgstr "Standard"
+#. pixel value for some of the scales in the dialog
+#: ../dialogs/mouse-settings/main.c:142
+#, c-format
+msgid "%g px"
+msgstr "%g px"
+
+#. miliseconds value for some of the scales in the dialog
+#: ../dialogs/mouse-settings/main.c:152
+#, c-format
+msgid "%g ms"
+msgstr "%g ms"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:1
-msgid "Button Order"
-msgstr "Knappordning"
+msgid "B_uttons and Feedback"
+msgstr "Knappar och Feedback"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:2
+#, fuzzy
+msgid "Buttons"
+msgstr "Knappordning"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:3
+msgid "Clockwise"
+msgstr "Medurs"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:4
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:1
 msgid "Configure pointer device behavior and appearance"
 msgstr "Konfigurera muspekarens beteende och utseende"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:3
-msgid "Cursor _Size:"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:5
+msgid "Counterclockwise"
+msgstr "Moturs"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
+#, fuzzy
+msgid "Cursor _size:"
 msgstr "Pekarens _storlek:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:4
-msgid "De_vices"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
+#, fuzzy
+msgid "D_istance:"
+msgstr "_Avstånd:"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
+#, fuzzy
+msgid "De_vice:"
 msgstr "En_heter"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:5
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
+msgid "Di_sabled"
+msgstr "Inaktiverad"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
+msgid "Disable to_uchpad while typing"
+msgstr "Inaktivera pekplatta när du skriver"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
 msgid "Double Click"
 msgstr "Dubbelklick"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
 msgid "Drag and Drop"
 msgstr "Dra och släpp"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
-msgid "Feedback"
-msgstr "Återkoppling"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
+msgid "Edge scro_lling"
+msgstr "Kant ru_llning"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:14
+msgid "Enable hori_zontal scrolling"
+msgstr "Aktivera hori_sontell rullning"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
+#, fuzzy
+msgid "Half (left-handed)"
+msgstr "_Vänsterhänt"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
+#, fuzzy
+msgid "Mouse (relative)"
+msgstr "Musemulering"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:2
-msgid "Mouse"
-msgstr "Mus"
+msgid "Mouse and Touchpad"
+msgstr "Mus och pekplatta"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
+#, fuzzy
+msgid "None (right-handed)"
+msgstr "_Högerhänt"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
+msgid "Pen (absolute)"
+msgstr "Penna (absolut)"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
+msgid "Pointer Speed"
+msgstr "Muspekar hastighet"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:22
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
-msgid "Re_set to Defaults"
-msgstr "Återställ till standard_värden"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:23
+#, fuzzy
+msgid "Reset to De_faults"
+msgstr "Återställ till standardvärden"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
-msgid "Re_verse scroll direction"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
+#, fuzzy
+msgid "Reverse scroll d_irection"
 msgstr "Motsatt r_ullningsriktning"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
-msgid "Set the acceleration and threshold for the selected device to the default values"
-msgstr "Ställ in acceleration och tröskelnivå för markerad enhet till standardvärden"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
+msgid "Scrolling"
+msgstr ""
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:26
+#, fuzzy
+msgid ""
+"Set the acceleration and sensitivity for the selected device to the default "
+"values"
+msgstr ""
+"Ställ in acceleration och tröskelnivå för markerad enhet till standardvärden"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
 msgid "Size"
 msgstr "Storlek"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:14
-msgid "T_hreshold:"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:28
+msgid "T_ap touchpad to click"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:29
+#, fuzzy
+msgid "T_heme"
+msgstr "_Tema"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:30
+msgid "T_ouchpad"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:31
+msgid "Table_t"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:32
+#, fuzzy
+msgid "Th_reshold:"
 msgstr "T_röskelnivå:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
-msgid "The factor at which the pointer's speed will increase as the mouse is moved"
-msgstr "Faktorn med vilken pekarens hastighet kommer att öka när musen förflyttas"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:33
+msgid ""
+"The factor at which the pointer's speed will increase as the mouse is moved"
+msgstr ""
+"Faktorn med vilken pekarens hastighet kommer att öka när musen förflyttas"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
-msgid "The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click"
-msgstr "Muspekaren kan inte förflyttas längre än detta avstånd mellan två klickningar för att de ska anses vara en dubbelklickning"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:34
+msgid ""
+"The mouse pointer cannot move farther than this distance between two clicks "
+"for them to be considered a double click"
+msgstr ""
+"Muspekaren kan inte förflyttas längre än detta avstånd mellan två "
+"klickningar för att de ska anses vara en dubbelklickning"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
-msgid "The number of pixels the pointer must move before a drag operation will start"
-msgstr "Antal bildpunkter som pekaren måste förflyttas innan en dragåtgärd påbörjas"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:35
+msgid ""
+"The number of pixels the pointer must move before a drag operation will start"
+msgstr ""
+"Antal bildpunkter som pekaren måste förflyttas innan en dragåtgärd påbörjas"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
-msgid "The number of pixels the pointer must move in a short time before it starts accelerating"
-msgstr "Antal bildpunkter som pekaren måste förflyttas på en kort tid innan den börjar accelerera"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:36
+msgid ""
+"The number of pixels the pointer must move in a short time before it starts "
+"accelerating"
+msgstr ""
+"Antal bildpunkter som pekaren måste förflyttas på en kort tid innan den "
+"börjar accelerera"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:37
 msgid "Ti_me:"
 msgstr "Ti_d:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
-msgid "Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click"
-msgstr "Två musklick på mindre än denna tidsperiod (i millisekunder) kommer att anses vara en dubbelklickning"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:38
+msgid "Tr_acking mode:"
+msgstr ""
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:39
+msgid ""
+"Two mouse clicks in less than this length of time (in milliseconds) will be "
+"considered a double click"
+msgstr ""
+"Två musklick på mindre än denna tidsperiod (i millisekunder) kommer att "
+"anses vara en dubbelklickning"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:40
+msgid "Two-_finger scrolling"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:41
 msgid "When selected, the scroll wheel will work in the opposite direction"
 msgstr "När vald kommer rullhjulet att fungera i motsatt riktning"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:22
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:42
+#, fuzzy
+msgid ""
+"When selected, the touchpad will be disabled when the keyboard is being used"
+msgstr ""
+"När vald kan muspekaren kontrolleras med den numeriska delen av tangentbordet"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:43
 msgid "_Acceleration:"
 msgstr "_Acceleration:"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:23
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:44
 msgid "_Behavior"
 msgstr "_Beteende"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
-msgid "_Distance:"
-msgstr "_Avstånd:"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:45
+#, fuzzy
+msgid "_Devices"
+msgstr "En_heter"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
-msgid "_Left handed"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:46
+msgid "_Enable this device"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:47
+#, fuzzy
+msgid "_Left-handed"
 msgstr "_Vänsterhänt"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:26
-msgid "_Right handed"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:48
+#, fuzzy
+msgid "_Right-handed"
 msgstr "_Högerhänt"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
-msgid "_Theme"
-msgstr "_Tema"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:49
+#, fuzzy
+msgid "_Rotation:"
+msgstr "Ro_tation:"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:50
+msgid "_Sensitivity:"
+msgstr "Känslighet"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Inställningsredigerare"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Anpassa inställningar lagrade av Xfconf"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Egenskap"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Typ"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Låst"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Värde"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "Tom"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Ny egenskap"
 
-#: ../xfce4-settings-editor/main_window.c:700
-#: ../xfce4-settings-editor/main_window.c:892
-msgid "This property name is not valid."
-msgstr "Detta egenskapsnamn är inte giltigt."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+#, fuzzy
+msgid "Edit selected property"
+msgstr "Redigera egenskap"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#: ../xfce4-settings-editor/main_window.c:1080
-msgid "Reset"
-msgstr "Återställ"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "Å_terställ"
 
-#: ../xfce4-settings-editor/main_window.c:928
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr "Återställning av en egenskap kommer permanent att ta bort dessa anpassade inställningar."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+#, fuzzy
+msgid "Reset selected property"
+msgstr "Återställ egenskap"
 
-#: ../xfce4-settings-editor/main_window.c:929
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "Är du säker på att du vill återställa egenskapen \"%s\"?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "Tom"
 
-#: ../xfce4-settings-editor/main_window.c:985
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "Egenskapsnamn måste börja med tecknet \"/\""
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+#, fuzzy
+msgid "Array"
+msgstr "Fält"
 
-#: ../xfce4-settings-editor/main_window.c:994
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "Rotelementet (\"/\") är inte ett giltigt egenskapsnamn"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "String"
 
-#: ../xfce4-settings-editor/main_window.c:1008
-#, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
-msgstr "Egenskapsnamn får endast innehålla ASCII-tecknen A-Z, a-z, 0-9, \"_\", \"-\", \"<\" och \">\", samt \"/\" som avgränsare"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "Heltal"
 
-#: ../xfce4-settings-editor/main_window.c:1017
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "Egenskapsnamn får inte ha två eller flera efterföljande \"/\"-tecken"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Boolean"
 
-#: ../xfce4-settings-editor/main_window.c:1028
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "Egenskapsnamn får inte avslutas med tecknet \"/\""
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Double"
 
-#: ../xfce4-settings-editor/main_window.c:1047
-msgid "_Reset"
-msgstr "Å_terställ"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "Återställ Kanal"
 
-#: ../xfce4-settings-editor/main_window.c:1081
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
-msgstr "Återställning av en kanal kommer permanent att ta bort dessa anpassade inställningar."
+msgstr ""
+"Återställning av en kanal kommer permanent att ta bort dessa anpassade "
+"inställningar."
 
-#: ../xfce4-settings-editor/main_window.c:1082
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
-msgstr "Är du säker på att du vill återställa kanalen \"%s\" och alla dess egenskaper?"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Grafisk inställningsredigerare för Xfconf"
+msgstr ""
+"Är du säker på att du vill återställa kanalen \"%s\" och alla dess "
+"egenskaper?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Inställningsredigerare"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "Återställ"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Boolean"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, fuzzy, c-format
+msgid "Monitor %s"
+msgstr "Monitor"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Anpassa inställningar lagrade av Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr ""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Double"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "börja övervaka kanal \"%s\""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Redigera egenskap"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+#, fuzzy
+msgid "_Monitor"
+msgstr "Monitor"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Redigera egenskap"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr ""
+"Återställning av en egenskap kommer permanent att ta bort dessa anpassade "
+"inställningar."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Aktiverad"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "Är du säker på att du vill återställa egenskapen \"%s\"?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "Int"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Unsigned Int"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "Namn:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Unsigned Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:141
+#, fuzzy
+msgid "New Property"
 msgstr "Ny egenskap"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Återställ egenskap"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "String"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:158
+#, fuzzy
+msgid "_Property:"
+msgstr "Egenskap"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:173
+#, fuzzy
+msgid "_Type:"
 msgstr "Typ:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Unsigned Int"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:204
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:215
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:227
+#, fuzzy
+msgid "_Value:"
+msgstr "Värde:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Unsigned Int64"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:385
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "Egenskapsnamn måste börja med tecknet \"/\""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Värde:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:396
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "Rotelementet (\"/\") är inte ett giltigt egenskapsnamn"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Xfconf-kanaler"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:412
+#, c-format
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Egenskapsnamn får endast innehålla ASCII-tecknen A-Z, a-z, 0-9, \"_\", \"-"
+"\", \"<\" och \">\", samt \"/\" som avgränsare"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:425
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr "Egenskapsnamn får inte ha två eller flera efterföljande \"/\"-tecken"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:439
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "Egenskapsnamn får inte avslutas med tecknet \"/\""
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:652
+msgid "Edit Property"
+msgstr "Redigera egenskap"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Grafisk inställningsredigerare för Xfconf"
 
-#: ../xfsettingsd/accessibility.c:379
+#: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
 msgstr "Klistriga tangenter är aktiverade"
 
-#: ../xfsettingsd/accessibility.c:381
+#: ../xfsettingsd/accessibility.c:392
 msgid "Sticky keys are disabled"
 msgstr "Klistriga tangenter är inaktiverade"
 
-#: ../xfsettingsd/accessibility.c:383
+#: ../xfsettingsd/accessibility.c:394
 msgid "Sticky keys"
 msgstr "Klistriga tangenter"
 
-#: ../xfsettingsd/accessibility.c:388
+#: ../xfsettingsd/accessibility.c:399
 msgid "Slow keys are enabled"
 msgstr "Tröga tangenter är aktiverade"
 
-#: ../xfsettingsd/accessibility.c:390
+#: ../xfsettingsd/accessibility.c:401
 msgid "Slow keys are disabled"
 msgstr "Tröga tangenter är inaktiverade"
 
-#: ../xfsettingsd/accessibility.c:392
+#: ../xfsettingsd/accessibility.c:403
 msgid "Slow keys"
 msgstr "Tröga tangenter"
 
-#: ../xfsettingsd/accessibility.c:397
+#: ../xfsettingsd/accessibility.c:408
 msgid "Bounce keys are enabled"
 msgstr "Studsande tangenter är aktiverat"
 
-#: ../xfsettingsd/accessibility.c:399
+#: ../xfsettingsd/accessibility.c:410
 msgid "Bounce keys are disabled"
 msgstr "Studsande tangenter är inaktiverat"
 
-#: ../xfsettingsd/accessibility.c:401
+#: ../xfsettingsd/accessibility.c:412
 msgid "Bounce keys"
 msgstr "Studsande tangenter"
 
-#: ../xfsettingsd/keyboard-shortcuts.c:246
+#: ../xfsettingsd/keyboard-shortcuts.c:244
 #, c-format
 msgid "Failed to launch shortcut \"%s\""
 msgstr "Kunde inte starta genvägen \"%s\""
@@ -1126,7 +1580,7 @@ msgstr "Grena inte processen till bakgrunden"
 msgid "Replace running xsettings daemon (if any)"
 msgstr "Ersätt körande xsettings-demon (om någon)"
 
-#: ../xfsettingsd/workspaces.c:365
+#: ../xfsettingsd/workspaces.c:385
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbetsyta %d"
@@ -1135,33 +1589,29 @@ msgstr "Arbetsyta %d"
 msgid "The Xfce Settings Daemon"
 msgstr "Inställningshanteraren för Xfce"
 
-#: ../xfce4-settings-manager/main.c:42
+#: ../xfce4-settings-manager/main.c:40
 msgid "Settings dialog to show"
 msgstr "Inställningsdialog att visa"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:163
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
+#, fuzzy
+msgid "_All Settings"
+msgstr "In_ställningar"
+
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "Inställningar"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:164
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "Anpassa ditt skrivbord"
 
-#. Create back button which takes the user back to the overview
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:271
-msgid "_Overview"
-msgstr "_Översikt"
-
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:598
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:614
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
 msgstr "Kunde inte starta \"%s\""
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:661
-msgid "Failed to open the documentation"
-msgstr "Misslyckades med att öppna dokumentationen"
-
 #: ../xfce4-settings-manager/xfce-settings-manager.desktop.in.h:1
 msgid "Graphical Settings Manager for Xfce 4"
 msgstr "Grafisk inställningshanterare för Xfce 4"
@@ -1170,6 +1620,33 @@ msgstr "Grafisk inställningshanterare för Xfce 4"
 msgid "Settings Manager"
 msgstr "Inställningshanterare"
 
+#~ msgid "Use this area to _test the settings above:"
+#~ msgstr "Använd detta utrymme för att _testa ovanstående inställningar:"
+
+#~ msgid "_Reset to Defaults"
+#~ msgstr "Å_terställ till standardvärden"
+
+#~ msgid "Feedback"
+#~ msgstr "Återkoppling"
+
+#~ msgid "Mouse"
+#~ msgstr "Mus"
+
+#~ msgid "Re_set to Defaults"
+#~ msgstr "Återställ till standard_värden"
+
+#~ msgid "This property name is not valid."
+#~ msgstr "Detta egenskapsnamn är inte giltigt."
+
+#~ msgid "Name:"
+#~ msgstr "Namn:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Xfconf-kanaler"
+
+#~ msgid "_Overview"
+#~ msgstr "_Översikt"
+
 #~ msgid "Verbose output"
 #~ msgstr "Informativ utmatning"
 
@@ -1178,7 +1655,8 @@ msgstr "Inställningshanterare"
 #~ "Try %s --help to see a full list of available command line options.\n"
 #~ msgstr ""
 #~ "%s: %s\n"
-#~ "Prova %s --help för att se en komplett lista över tillgängliga kommandoradsflaggor.\n"
+#~ "Prova %s --help för att se en komplett lista över tillgängliga "
+#~ "kommandoradsflaggor.\n"
 
 #~ msgid "NVIDIA Settings"
 #~ msgstr "NVIDIA-inställningar"
@@ -1201,8 +1679,12 @@ msgstr "Inställningshanterare"
 #~ msgid "RandR extension missing on display \"%s\""
 #~ msgstr "RandR-utökningen saknas på display \"%s\""
 
-#~ msgid "The Resize and Rotate extension (RandR) is not enabled on this display. Try to enable it and run the dialog again."
-#~ msgstr "Utökningen Resize and Rotate (RandR) är inte aktiverad på denna display. Prova att aktivera den och kör dialogrutan igen."
+#~ msgid ""
+#~ "The Resize and Rotate extension (RandR) is not enabled on this display. "
+#~ "Try to enable it and run the dialog again."
+#~ msgstr ""
+#~ "Utökningen Resize and Rotate (RandR) är inte aktiverad på denna display. "
+#~ "Prova att aktivera den och kör dialogrutan igen."
 
 #~ msgid "Failed to use the RandR extension"
 #~ msgstr "Misslyckades med att använda RandR-utökningen"
@@ -1214,7 +1696,8 @@ msgstr "Inställningshanterare"
 #~ msgstr "Sekundär digital skärm"
 
 #~ msgid "Property \"<b>%s</b>\" cannot be reset because it is locked"
-#~ msgstr "Egenskapen \"<b>%s</b>\" kan inte återställas därför att den är låst"
+#~ msgstr ""
+#~ "Egenskapen \"<b>%s</b>\" kan inte återställas därför att den är låst"
 
 #~ msgid "<b>Bounce Keys</b>"
 #~ msgstr "<b>Studsande tangenter</b>"
diff --git a/po/te.po b/po/te.po
index 66663d8..3ec70e1 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-05 22:13+0000\n"
+"POT-Creation-Date: 2012-03-11 14:12+0000\n"
 "PO-Revision-Date: 2011-04-16 07:43+0530\n"
 "Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
 "Language-Team: Telugu <ubuntu-l10n-te at lists.launchpad.net>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Country: INDIA\n"
+"Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Telugu\n"
 "X-Poedit-SourceCharset: 8bit\n"
@@ -56,7 +57,9 @@ msgid "Disable sticky keys if _two keys are pressed"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10
-msgid "If enabled, the session manager will start the required applications for screen readers and magnifiers"
+msgid ""
+"If enabled, the session manager will start the required applications for "
+"screen readers and magnifiers"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
@@ -96,7 +99,9 @@ msgid "The amount of time, in milliseconds, required between keystrokes"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid "The amount of time, in milliseconds, that must elapse before a keystroke will be accepted"
+msgid ""
+"The amount of time, in milliseconds, that must elapse before a keystroke "
+"will be accepted"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
@@ -112,7 +117,9 @@ msgid "The time, in milliseconds, between repeated motion events"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24
-msgid "The time, in milliseconds, between the initial key press and first repeated motion event"
+msgid ""
+"The time, in milliseconds, between the initial key press and first repeated "
+"motion event"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:25
@@ -120,11 +127,15 @@ msgid "The time, in milliseconds, to get to maximum speed"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:26
-msgid "To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted"
+msgid ""
+"To help prevent accidental keystrokes, slow keys requires that a key is held "
+"for a certain minimum amount of time before the keystroke will be accepted"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
-msgid "To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes"
+msgid ""
+"To help prevent accidental multiple keystrokes, bounce keys imposes a "
+"minimum delay between keystrokes"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
@@ -140,19 +151,28 @@ msgid "Use slow _keys"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:31
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) do not need "
+"to be held down (they can be pressed and then released) when multiple keys "
+"would normally need to be pressed at the same time"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:32
-msgid "When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again"
+msgid ""
+"When selected, modifier keys (such as Control, Alt, and Shift) will remain "
+"locked in the pressed state until pressed again"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:33
-msgid "When selected, the \"sticky keys\" feature will be disabled if two keys are pressed simultaneously"
+msgid ""
+"When selected, the \"sticky keys\" feature will be disabled if two keys are "
+"pressed simultaneously"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:34
-msgid "When selected, the mouse pointer can be controlled using the keyboard number pad"
+msgid ""
+"When selected, the mouse pointer can be controlled using the keyboard number "
+"pad"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:35
@@ -188,53 +208,53 @@ msgid "pixels/sec"
 msgstr "పిక్సెల్/సెకను"
 
 #: ../dialogs/accessibility-settings/main.c:43
-#: ../dialogs/appearance-settings/main.c:86
+#: ../dialogs/appearance-settings/main.c:94
 #: ../dialogs/display-settings/main.c:102
-#: ../dialogs/keyboard-settings/main.c:38 ../dialogs/mouse-settings/main.c:97
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:97
 msgid "Settings manager socket"
 msgstr ""
 
 #: ../dialogs/accessibility-settings/main.c:43
-#: ../dialogs/appearance-settings/main.c:86
+#: ../dialogs/appearance-settings/main.c:94
 #: ../dialogs/display-settings/main.c:102
-#: ../dialogs/keyboard-settings/main.c:38 ../dialogs/mouse-settings/main.c:97
+#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:97
 msgid "SOCKET ID"
 msgstr "సాకెట్ ఐడి"
 
 #: ../dialogs/accessibility-settings/main.c:44
-#: ../dialogs/appearance-settings/main.c:87
+#: ../dialogs/appearance-settings/main.c:95
 #: ../dialogs/display-settings/main.c:103
-#: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:98
-#: ../xfce4-settings-editor/main.c:43 ../xfsettingsd/main.c:77
-#: ../xfce4-settings-manager/main.c:39
+#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40
+#: ../dialogs/mouse-settings/main.c:98 ../xfce4-settings-editor/main.c:43
+#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39
 msgid "Version information"
 msgstr "రూపాంతర సమాచారం"
 
-#: ../dialogs/accessibility-settings/main.c:180
-#: ../dialogs/appearance-settings/main.c:826
-#: ../dialogs/display-settings/main.c:1040
-#: ../dialogs/keyboard-settings/main.c:63
-#: ../dialogs/mouse-settings/main.c:1504 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:57
+#: ../dialogs/accessibility-settings/main.c:192
+#: ../dialogs/appearance-settings/main.c:966
+#: ../dialogs/display-settings/main.c:1043
+#: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
+#: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63
+#: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:60
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr ""
 
-#: ../dialogs/accessibility-settings/main.c:199
-#: ../dialogs/appearance-settings/main.c:845
-#: ../dialogs/display-settings/main.c:1059
-#: ../dialogs/keyboard-settings/main.c:79
-#: ../dialogs/mouse-settings/main.c:1523 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:70
+#: ../dialogs/accessibility-settings/main.c:211
+#: ../dialogs/appearance-settings/main.c:985
+#: ../dialogs/display-settings/main.c:1062
+#: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
+#: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82
+#: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:76
 msgid "The Xfce development team. All rights reserved."
 msgstr ""
 
-#: ../dialogs/accessibility-settings/main.c:200
-#: ../dialogs/appearance-settings/main.c:846
-#: ../dialogs/display-settings/main.c:1060
-#: ../dialogs/keyboard-settings/main.c:80
-#: ../dialogs/mouse-settings/main.c:1524 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:71
+#: ../dialogs/accessibility-settings/main.c:212
+#: ../dialogs/appearance-settings/main.c:986
+#: ../dialogs/display-settings/main.c:1063
+#: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
+#: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83
+#: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:77
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr ""
@@ -244,7 +264,8 @@ msgid "Improve keyboard and mouse accessibility"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
-msgid "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
+msgid ""
+"Anti-aliasing, or font smoothing, can improve the look of text on the screen"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
@@ -303,7 +324,9 @@ msgid "Event sounds"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:15
-msgid "Font quality on a TFT or LCD screen can be greatly improved by choosing the correct sub-pixel order of the screen"
+msgid ""
+"Font quality on a TFT or LCD screen can be greatly improved by choosing the "
+"correct sub-pixel order of the screen"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
@@ -315,11 +338,16 @@ msgid "Icons"
 msgstr "ప్రతీక"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:18
-msgid "If selected, keyboard shortcuts for menu items can be changed by hovering the mouse over the menu item and pressing the new key combination for the shortcut"
+msgid ""
+"If selected, keyboard shortcuts for menu items can be changed by hovering "
+"the mouse over the menu item and pressing the new key combination for the "
+"shortcut"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
-msgid "Many fonts contain information that provides extra hints as to how best draw the font; pick whichever looks best according to personal preference"
+msgid ""
+"Many fonts contain information that provides extra hints as to how best draw "
+"the font; pick whichever looks best according to personal preference"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:20
@@ -331,13 +359,14 @@ msgid "Menus and Buttons"
 msgstr "మెనూలు మరియు బటన్లు"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22
-#: ../dialogs/appearance-settings/main.c:722
+#: ../dialogs/appearance-settings/main.c:852
 #: ../dialogs/display-settings/main.c:79
 msgid "None"
 msgstr "ఏదీకాదు"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:23
-msgid "Override the detected monitor resolution if fonts look too large or too small"
+msgid ""
+"Override the detected monitor resolution if fonts look too large or too small"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:24
@@ -373,7 +402,9 @@ msgid "Specify whether icons should be displayed next to text in buttons"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:32
-msgid "Specify whether mouse clicks and other user input will cause event sounds to play"
+msgid ""
+"Specify whether mouse clicks and other user input will cause event sounds to "
+"play"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:33
@@ -389,7 +420,9 @@ msgid "Text"
 msgstr "పాఠ్యం"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:36
-msgid "This font will be used as the default font used when drawing user interface text"
+msgid ""
+"This font will be used as the default font used when drawing user interface "
+"text"
 msgstr ""
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:37
@@ -412,19 +445,45 @@ msgstr "అమరికలు (_S)"
 msgid "_Toolbar Style"
 msgstr ""
 
-#: ../dialogs/appearance-settings/main.c:726
+#: ../dialogs/appearance-settings/main.c:733
+#, c-format
+msgid "File is larger then %d MB, installation aborted"
+msgstr ""
+
+#: ../dialogs/appearance-settings/main.c:738
+msgid "Failed to create temporary directory"
+msgstr ""
+
+#: ../dialogs/appearance-settings/main.c:743
+msgid "Failed to extract archive"
+msgstr ""
+
+#: ../dialogs/appearance-settings/main.c:748
+msgid "Unknown format, only archives and directories are supported"
+msgstr ""
+
+#: ../dialogs/appearance-settings/main.c:753
+#, c-format
+msgid "An unknown error, exit code is %d"
+msgstr ""
+
+#: ../dialogs/appearance-settings/main.c:760
+msgid "Failed to install theme"
+msgstr "థీముని స్థాపించుటలో విఫలమైంది"
+
+#: ../dialogs/appearance-settings/main.c:856
 msgid "RGB"
 msgstr "RGB"
 
-#: ../dialogs/appearance-settings/main.c:730
+#: ../dialogs/appearance-settings/main.c:860
 msgid "BGR"
 msgstr "BGR"
 
-#: ../dialogs/appearance-settings/main.c:734
+#: ../dialogs/appearance-settings/main.c:864
 msgid "Vertical RGB"
 msgstr ""
 
-#: ../dialogs/appearance-settings/main.c:738
+#: ../dialogs/appearance-settings/main.c:868
 msgid "Vertical BGR"
 msgstr ""
 
@@ -445,7 +504,9 @@ msgid "Restore the previous configuration"
 msgstr ""
 
 #: ../dialogs/display-settings/confirmation-dialog.glade.h:5
-msgid "The previous configuration will be restored in 10 seconds if you do not reply to this question."
+msgid ""
+"The previous configuration will be restored in 10 seconds if you do not "
+"reply to this question."
 msgstr ""
 
 #: ../dialogs/display-settings/display-dialog.glade.h:1
@@ -456,7 +517,7 @@ msgstr "తెర అమరికలను మరియు రూపురేఖ
 #: ../dialogs/display-settings/display-dialog.glade.h:2
 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2
 msgid "Display"
-msgstr ""
+msgstr "ప్రదర్శన"
 
 #: ../dialogs/display-settings/display-dialog.glade.h:3
 msgid "R_esolution:"
@@ -464,15 +525,15 @@ msgstr "విభాజకత (_e):"
 
 #: ../dialogs/display-settings/display-dialog.glade.h:4
 msgid "Ref_lection:"
-msgstr ""
+msgstr "పరావర్తనము (_l):"
 
 #: ../dialogs/display-settings/display-dialog.glade.h:5
 msgid "Refresh _rate:"
-msgstr ""
+msgstr "తాజాకరణ రేటు(_r):"
 
 #: ../dialogs/display-settings/display-dialog.glade.h:6
 msgid "Ro_tation:"
-msgstr ""
+msgstr "భ్రమణం (_t):"
 
 #: ../dialogs/display-settings/display-dialog.glade.h:7
 msgid "_Use this output"
@@ -524,46 +585,51 @@ msgstr ""
 
 #: ../dialogs/display-settings/main.c:171
 #, c-format
-msgid "The previous configuration will be restored in %i seconds if you do not reply to this question."
+msgid ""
+"The previous configuration will be restored in %i seconds if you do not "
+"reply to this question."
 msgstr ""
 
 #. Insert the mode
 #: ../dialogs/display-settings/main.c:505
 #, c-format
 msgid "%.1f Hz"
-msgstr ""
+msgstr "%.1f Hz"
 
 #: ../dialogs/display-settings/main.c:651
-msgid "The last active output must not be disabled, the system would be unusable."
+msgid ""
+"The last active output must not be disabled, the system would be unusable."
 msgstr ""
 
 #: ../dialogs/display-settings/main.c:653
 msgid "Selected output not disabled"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:1072
+#: ../dialogs/display-settings/main.c:1075
 #: ../dialogs/display-settings/xfce-randr.c:249
 #, c-format
 msgid "Unable to query the version of the RandR extension being used"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:1073
-#: ../dialogs/display-settings/main.c:1109
+#: ../dialogs/display-settings/main.c:1076
+#: ../dialogs/display-settings/main.c:1112
 msgid "Unable to start the Xfce Display Settings"
 msgstr ""
 
-#: ../dialogs/display-settings/main.c:1104
+#: ../dialogs/display-settings/main.c:1107
 msgid "ATI Settings"
 msgstr "ATI అమరికలు"
 
-#: ../dialogs/display-settings/main.c:1119
+#: ../dialogs/display-settings/main.c:1122
 msgid "Unable to launch the proprietary driver settings"
 msgstr ""
 
 #. 1.2 is required
 #: ../dialogs/display-settings/xfce-randr.c:257
 #, c-format
-msgid "This system is using RandR %d.%d. For the display settings to work version 1.2 is required at least"
+msgid ""
+"This system is using RandR %d.%d. For the display settings to work version "
+"1.2 is required at least"
 msgstr ""
 
 #: ../dialogs/display-settings/xfce-randr.c:536
@@ -580,7 +646,7 @@ msgstr "టెలివిజన్"
 
 #: ../dialogs/display-settings/xfce-randr.c:564
 msgid "Digital display"
-msgstr ""
+msgstr "డిజిటల్ ప్రదర్శన"
 
 #. Translators: "Unknown" here is used to identify a monitor for which
 #. * we don't know the vendor. When a vendor is known, the name of the
@@ -616,26 +682,32 @@ msgid "Select command"
 msgstr "ఆదేశాన్ని ఎంచుకొను"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:235
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:386
 msgid "All Files"
 msgstr "అన్ని ఫైళ్ళు"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:240
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:391
 msgid "Executable Files"
-msgstr ""
+msgstr "ఎక్జిక్యూటబుల్ ఫైళ్లు"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:255
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:406
 msgid "Perl Scripts"
 msgstr "పెర్ల్ స్క్రిప్టులు"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:261
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:412
 msgid "Python Scripts"
 msgstr "పైథాన్ స్క్రిప్టులు"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:267
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:418
 msgid "Ruby Scripts"
 msgstr "రుబి స్క్రిప్టులు"
 
 #: ../dialogs/keyboard-settings/command-dialog.c:273
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:424
 msgid "Shell Scripts"
 msgstr "షెల్ స్క్రిప్టులు"
 
@@ -665,136 +737,276 @@ msgid "Edit keyboard settings and application shortcuts"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
+msgid "General"
+msgstr "సాధారణ"
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2
 msgid "Keyboard"
 msgstr "కీబోర్డు"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
 msgid "Keyboard layout"
 msgstr "కీబోర్డు నమూనా"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
 msgid "Keyboard layout selection"
 msgstr "కీబోర్డు నమూనా ఎంపిక"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
 msgid "Keyboard model"
 msgstr "కీబోర్డు మోడల్"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
 msgid "Repeat _speed:"
 msgstr "పునరావృత వేగం (_s):"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13
 msgid "Reset to _Defaults"
 msgstr "అప్రమేయమునకు తిరిగిఅమర్చు (_D)"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13
-msgid "Select keyboard layout and variant"
-msgstr ""
-
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14
-msgid "Show _blinking"
+msgid "Restore num l_ock state on startup"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15
-msgid "Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server"
+msgid "Select keyboard layout and variant"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:16
-msgid "Specify whether or not the text cursor blinks"
+msgid "Show _blinking"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17
-msgid "The delay, in milliseconds, between successive blinks of the cursor"
+msgid ""
+"Specifies whether the keyboard layout is controlled with this settings "
+"dialog, or by the X server"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
-msgid "The rate at which keystrokes are generated while a key is pressed"
+msgid "Specify whether or not the text cursor blinks"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19
-msgid "The time, in milliseconds, before a pressed key begins repeating"
+msgid "The delay, in milliseconds, between successive blinks of the cursor"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20
-msgid "Typing Settings"
-msgstr "టైపింగు అమరికలు"
+msgid "The rate at which keystrokes are generated while a key is pressed"
+msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21
-msgid "Use this area to _test the settings above:"
+msgid "The time, in milliseconds, before a pressed key begins repeating"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22
-msgid "When selected, pressing and holding down a key emits the same character over and over again"
-msgstr ""
+msgid "Typing Settings"
+msgstr "టైపింగు అమరికలు"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:23
-msgid "_Enable key repeat"
+msgid ""
+"When selected, pressing and holding down a key emits the same character over "
+"and over again"
 msgstr ""
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:24
+msgid "_Enable key repeat"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:25
 msgid "_Layout"
 msgstr "నమూనా (_L)"
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:25
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:26
 msgid "_Repeat delay:"
 msgstr ""
 
-#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:26
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:27
+msgid "_Test area:"
+msgstr ""
+
+#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:28
 msgid "_Use system defaults"
 msgstr "వ్యవస్థ అప్రమేయాలను వాడు (_U)"
 
-#: ../dialogs/keyboard-settings/main.c:69
+#: ../dialogs/keyboard-settings/main.c:82
 msgid "Unable to initialize GTK+."
 msgstr ""
 
-#: ../dialogs/keyboard-settings/main.c:89
+#: ../dialogs/keyboard-settings/main.c:102
 #, c-format
 msgid "Failed to connect to xfconf daemon. Reason: %s"
 msgstr ""
 
-#: ../dialogs/keyboard-settings/main.c:100
+#: ../dialogs/keyboard-settings/main.c:113
 msgid "Could not create the settings dialog."
 msgstr ""
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:295
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:300
 msgid "Command"
 msgstr "ఆదేశం"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:300
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:305
 msgid "Shortcut"
 msgstr "లఘువు"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:374
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:380
 msgid "Layout"
 msgstr "నమూనా"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:375
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:381
 msgid "Variant"
 msgstr ""
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:851
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:857
 msgid "Shortcut command may not be empty."
 msgstr ""
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:959
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:960
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "అప్రమేయమునకు తిరిగిఅమర్చు"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:961
-msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
+msgid ""
+"This will reset all shortcuts to their default values. Do you really want to "
+"do this?"
 msgstr ""
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1026
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr ""
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1028
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "హెచ్చరిక"
 
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:128
+msgid "Select Application"
+msgstr "అనువర్తనాన్ని ఎంచుకోండి"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:204
+msgid "Use a c_ustom command:"
+msgstr "ఒక అనురూపిత ఆదేశాన్ని వాడుము"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:205
+msgid ""
+"Use a custom command for an application that is not available from the above "
+"application list."
+msgstr ""
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:223
+msgid "_Browse..."
+msgstr "విహరించండి...(_B)"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:376
+msgid "Select an Application"
+msgstr "ఒక అనువర్తనాన్ని ఎంచుకోండి"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:526
+msgid "None available"
+msgstr "ఏవీ అందుబాటులో లేవు"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:573
+msgid "Recommended Applications"
+msgstr "సిఫారసుచేయబడిన అనువర్తనాలు"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:591
+msgid "Other Applications"
+msgstr "ఇతర అనువర్తనాలు"
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:611
+#, c-format
+msgid "Open <i>%s</i> and other files of type \"%s\" with:"
+msgstr ""
+
+#: ../dialogs/mime-settings/xfce-mime-chooser.c:647
+#, c-format
+msgid "Failed to add new application \"%s\""
+msgstr ""
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:174
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:2
+msgid "MIME Type Editor"
+msgstr "MIME రకపు కూర్పకము"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:178
+#: ../dialogs/mime-settings/xfce4-mime-settings.desktop.in.h:1
+msgid "Associate applications with MIME types"
+msgstr ""
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:203
+msgid "_Filter:"
+msgstr "వడబోతకం (_F):"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:211
+msgid "Clear filter"
+msgstr "వడబోతను శుభ్రపరుచు"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:257
+msgid "MIME Type"
+msgstr "MIME రకం"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:287
+msgid "Status"
+msgstr "స్థితి"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:308
+msgid "Default Application"
+msgstr "అప్రమేయ అనువర్తనము"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:479
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+msgid "User Set"
+msgstr "వాడుకరి అమర్పు"
+
+#. sort the names but keep Default on top
+#: ../dialogs/mime-settings/xfce-mime-window.c:481
+#: ../dialogs/mime-settings/xfce-mime-window.c:604
+#: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
+#: ../dialogs/mouse-settings/main.c:434
+msgid "Default"
+msgstr "అప్రమేయం"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:550
+#, c-format
+msgid "%d MIME type found"
+msgid_plural "%d MIME types found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:649
+#, c-format
+msgid "Failed to set application \"%s\" for mime type \"%s\"."
+msgstr ""
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:906
+#, c-format
+msgid ""
+"Are you sure you want to reset content type \"%s\" to its default value?"
+msgstr ""
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:910
+msgid "Question"
+msgstr "ప్రశ్న"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:913
+msgid ""
+"This will remove your custom mime-association and restore the system-wide "
+"default."
+msgstr ""
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:917
+#: ../dialogs/mime-settings/xfce-mime-window.c:988
+#, fuzzy
+msgid "Reset to Default"
+msgstr "అప్రమేయమునకు తిరిగిఅమర్చు"
+
+#: ../dialogs/mime-settings/xfce-mime-window.c:983
+msgid "Choose Application..."
+msgstr "అనువర్తనాన్ని ఎన్నుకోండి..."
+
 #: ../dialogs/mouse-settings/main.c:96
 msgid "Active device in the dialog"
 msgstr ""
@@ -807,213 +1019,214 @@ msgstr "పరికరం పేరు"
 #: ../dialogs/mouse-settings/main.c:142
 #, c-format
 msgid "%g px"
-msgstr ""
+msgstr "%g px"
 
 #. miliseconds value for some of the scales in the dialog
 #: ../dialogs/mouse-settings/main.c:152
 #, c-format
 msgid "%g ms"
-msgstr ""
-
-#. sort the names but keep Default on top
-#: ../dialogs/mouse-settings/main.c:372 ../dialogs/mouse-settings/main.c:374
-#: ../dialogs/mouse-settings/main.c:434
-msgid "Default"
-msgstr "అప్రమేయం"
+msgstr "%g ms"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:1
-msgid "Buttons"
+msgid "B_uttons and Feedback"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:2
-msgid "Clockwise"
-msgstr ""
+msgid "Buttons"
+msgstr "బొత్తాలు"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:3
+msgid "Clockwise"
+msgstr "సవ్యదిశ"
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:4
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:1
 msgid "Configure pointer device behavior and appearance"
 msgstr ""
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:4
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:5
 msgid "Counterclockwise"
-msgstr ""
+msgstr "అపసవ్యదిశ"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:5
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
 msgid "Cursor _size:"
 msgstr "కర్సర్ పరిమాణం (_s):"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:6
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
 msgid "D_istance:"
 msgstr "దూరం (_i):"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:7
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
 msgid "De_vice:"
 msgstr "పరికరాలు (_v)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:8
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
 msgid "Di_sabled"
 msgstr "అచేతనమయింది (_s)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:9
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
 msgid "Disable to_uchpad while typing"
-msgstr ""
+msgstr "టైపుచేసేటపుడు టచ్‌ప్యాడును అచేతనపరుచు (_u)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:10
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
 msgid "Double Click"
 msgstr "డబుల్ క్లిక్"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:11
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
 msgid "Drag and Drop"
 msgstr "లాగుట మరియు వదులుట"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:12
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
 msgid "Edge scro_lling"
 msgstr ""
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:13
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:14
 msgid "Enable hori_zontal scrolling"
 msgstr ""
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:14
-msgid "General"
-msgstr "సాధారణ"
-
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:15
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
 msgid "Half (left-handed)"
 msgstr ""
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:16
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
 msgid "Mouse (relative)"
 msgstr ""
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:17
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
 #: ../dialogs/mouse-settings/xfce-mouse-settings.desktop.in.h:2
 msgid "Mouse and Touchpad"
-msgstr ""
+msgstr "మౌస్ మరియు టచ్‌ప్యాడ్"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:18
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
 msgid "None (right-handed)"
 msgstr ""
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:19
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
 msgid "Pen (absolute)"
 msgstr ""
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:20
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
 msgid "Pointer Speed"
 msgstr "పాయింటరు వేగం"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:21
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:22
 msgid "Preview"
 msgstr "మునుజూపు"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:22
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:23
 msgid "Reset to De_faults"
 msgstr "అప్రమేయమునకు తిరిగిఅమర్చు (_f)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:23
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
 msgid "Reverse scroll d_irection"
 msgstr ""
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:24
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
 msgid "Scrolling"
 msgstr ""
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:25
-msgid "Set the acceleration and sensitivity for the selected device to the default values"
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:26
+msgid ""
+"Set the acceleration and sensitivity for the selected device to the default "
+"values"
 msgstr ""
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:26
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
 msgid "Size"
 msgstr "పరిమాణం"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:27
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:28
 msgid "T_ap touchpad to click"
 msgstr ""
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:28
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:29
 msgid "T_heme"
 msgstr "థీమ్ (_h)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:29
-msgid "T_ouchpad"
-msgstr ""
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:30
-msgid "Table_t"
-msgstr ""
+msgid "T_ouchpad"
+msgstr "టచ్‌ప్యాడ్ (_o)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:31
-msgid "Th_reshold:"
-msgstr ""
+msgid "Table_t"
+msgstr "ట్యాబ్లెట్ (_t)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:32
-msgid "The factor at which the pointer's speed will increase as the mouse is moved"
+msgid "Th_reshold:"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:33
-msgid "The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click"
+msgid ""
+"The factor at which the pointer's speed will increase as the mouse is moved"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:34
-msgid "The number of pixels the pointer must move before a drag operation will start"
+msgid ""
+"The mouse pointer cannot move farther than this distance between two clicks "
+"for them to be considered a double click"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:35
-msgid "The number of pixels the pointer must move in a short time before it starts accelerating"
+msgid ""
+"The number of pixels the pointer must move before a drag operation will start"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:36
-msgid "Ti_me:"
-msgstr "సమయం(_m):"
+msgid ""
+"The number of pixels the pointer must move in a short time before it starts "
+"accelerating"
+msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:37
-msgid "Tr_acking mode:"
-msgstr ""
+msgid "Ti_me:"
+msgstr "సమయం(_m):"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:38
-msgid "Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click"
+msgid "Tr_acking mode:"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:39
-msgid "Two-_finger scrolling"
+msgid ""
+"Two mouse clicks in less than this length of time (in milliseconds) will be "
+"considered a double click"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:40
-msgid "When selected, the scroll wheel will work in the opposite direction"
+msgid "Two-_finger scrolling"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:41
-msgid "When selected, the touchpad will be disabled when the keyboard is being used"
+msgid "When selected, the scroll wheel will work in the opposite direction"
 msgstr ""
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:42
+msgid ""
+"When selected, the touchpad will be disabled when the keyboard is being used"
+msgstr ""
+
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:43
 msgid "_Acceleration:"
 msgstr "త్వరణం (_A):"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:43
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:44
 msgid "_Behavior"
 msgstr "ప్రవర్తన (_B)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:44
+#: ../dialogs/mouse-settings/mouse-dialog.glade.h:45
 msgid "_Devices"
 msgstr "పరికరాలు (_D)"
 
-#: ../dialogs/mouse-settings/mouse-dialog.glade.h:45
-msgid "_Enable this device"
-msgstr ""
-
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:46
-msgid "_General"
-msgstr "సాధారణ (_G)"
+msgid "_Enable this device"
+msgstr "ఈ పరికరాన్ని చేతనపరుచు (_E)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:47
 msgid "_Left-handed"
-msgstr ""
+msgstr "ఎడమ చేతి వాటం (_L)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:48
 msgid "_Right-handed"
-msgstr ""
+msgstr "కుడి చేతి వాటం (_R)"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:49
 msgid "_Rotation:"
@@ -1021,166 +1234,201 @@ msgstr "విభాజకత (_R):"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:50
 msgid "_Sensitivity:"
-msgstr ""
+msgstr "సున్నితత్వం (_S):"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "అమరికల కూర్పరి"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Xfconf చే భద్రపరుచబడిన అమరికలను అనురూపించు"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "ఛానల్"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
-msgstr ""
+msgstr "లక్షణం"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "రకం"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
-msgstr ""
+msgstr "తాళంవేయబడింది"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "విలువ"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr ""
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "కొత్త లక్షణం"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr ""
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "ఎంపికచేసిన లక్షణాన్ని సవరించు"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr ""
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "తిరిగి అమర్చు (_R)"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr ""
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "ఎంపికచేసిన లక్షణాన్ని తిరిగి అమర్చు"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr ""
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "ఖాళీ"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
 msgstr ""
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr ""
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "పదబందం"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
 msgstr ""
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr ""
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "బూలియన్"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
 msgstr ""
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr ""
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+#, fuzzy
+msgid "_Reset Channel"
+msgstr "ఛానల్"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
 msgstr ""
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr ""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Xfconf కొరకు గ్రాఫికల్ అమరికల కూర్పరి"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "అమరికల కూర్పరి"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "తిరిగి అమర్చు"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "బూలియన్"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "మానిటర్ %s"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
 msgstr ""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
 msgstr ""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr ""
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "మానిటర్ (_M)"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
 msgstr ""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "చేతనమయింది"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr ""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "Int"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr ""
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "పేరు:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
 msgstr ""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:141
+msgid "New Property"
+msgstr "కొత్త లక్షణం"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:158
+msgid "_Property:"
+msgstr "లక్షణం (_P):"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:173
+msgid "_Type:"
+msgstr "రకం (_T):"
+
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:204
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:215
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:227
+msgid "_Value:"
+msgstr "విలువ (_V):"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:385
+#, c-format
+msgid "Property names must start with a '/' character"
 msgstr ""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:396
+#, c-format
+msgid "The root element ('/') is not a valid property name"
 msgstr ""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "రకం:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:412
+#, c-format
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:425
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
 msgstr ""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:439
+#, c-format
+msgid "Property names cannot end with a '/' character"
 msgstr ""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "విలువ:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:652
+msgid "Edit Property"
+msgstr "లక్షణాన్ని సవరించు"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Xfconf ఛానళ్ళు"
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Xfconf కొరకు గ్రాఫికల్ అమరికల కూర్పరి"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1192,7 +1440,7 @@ msgstr ""
 
 #: ../xfsettingsd/accessibility.c:394
 msgid "Sticky keys"
-msgstr ""
+msgstr "అంటివుండే మీటలు"
 
 #: ../xfsettingsd/accessibility.c:399
 msgid "Slow keys are enabled"
@@ -1204,7 +1452,7 @@ msgstr ""
 
 #: ../xfsettingsd/accessibility.c:403
 msgid "Slow keys"
-msgstr ""
+msgstr "నెమ్మది మీటలు"
 
 #: ../xfsettingsd/accessibility.c:408
 msgid "Bounce keys are enabled"
@@ -1216,7 +1464,7 @@ msgstr ""
 
 #: ../xfsettingsd/accessibility.c:412
 msgid "Bounce keys"
-msgstr ""
+msgstr "బౌన్స్ మీటలు"
 
 #: ../xfsettingsd/keyboard-shortcuts.c:244
 #, c-format
@@ -1231,7 +1479,7 @@ msgstr ""
 msgid "Replace running xsettings daemon (if any)"
 msgstr ""
 
-#: ../xfsettingsd/workspaces.c:365
+#: ../xfsettingsd/workspaces.c:385
 #, c-format
 msgid "Workspace %d"
 msgstr "కార్యక్షేత్రం %d"
@@ -1240,32 +1488,27 @@ msgstr "కార్యక్షేత్రం %d"
 msgid "The Xfce Settings Daemon"
 msgstr "Xfce అమరికల డెమోన్"
 
-#: ../xfce4-settings-manager/main.c:41
+#: ../xfce4-settings-manager/main.c:40
 msgid "Settings dialog to show"
-msgstr ""
+msgstr "చూపించవలసిన అమరికల డైలాగు"
+
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
+msgid "_All Settings"
+msgstr "అన్ని అమరికలు (_S)"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:163
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:164
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "మీ డెస్క్‍టాపును మలచుకోండి"
 
-#. Create back button which takes the user back to the overview
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:271
-msgid "_Overview"
-msgstr "స్థూల దృష్టి (_O)"
-
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:601
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:617
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
-msgstr ""
-
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:664
-msgid "Failed to open the documentation"
-msgstr "పత్రీకరణ తెరుచుటలో విఫలమైంది"
+msgstr "\"%s\" ప్రారంభించలేకపోతుంది"
 
 #: ../xfce4-settings-manager/xfce-settings-manager.desktop.in.h:1
 msgid "Graphical Settings Manager for Xfce 4"
@@ -1275,6 +1518,21 @@ msgstr "Xfce 4 కొరకు గ్రాఫికల్ అమరికల 
 msgid "Settings Manager"
 msgstr "అమరికల నిర్వాహకం"
 
+#~ msgid "_General"
+#~ msgstr "సాధారణ (_G)"
+
+#~ msgid "Enabled"
+#~ msgstr "చేతనమయింది"
+
+#~ msgid "Name:"
+#~ msgstr "పేరు:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Xfconf ఛానళ్ళు"
+
+#~ msgid "_Overview"
+#~ msgstr "స్థూల దృష్టి (_O)"
+
 #~ msgid "_Reset to Defaults"
 #~ msgstr "అప్రమేయాలకు తిరిగి అమర్చు (_R)"
 
diff --git a/po/tr.po b/po/tr.po
index 4d85ccb..0dfb0ba 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings 0.0.1-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 20:06+0000\n"
+"POT-Creation-Date: 2012-03-25 08:48+0000\n"
 "PO-Revision-Date: 2009-01-30 20:57+0200\n"
 "Last-Translator: Gökmen Görgen <gkmngrgn at gmail.com>\n"
 "Language-Team: Turkish <turkce at pardus.org.tr>\n"
@@ -63,7 +63,9 @@ msgstr "Eğer i_ki tuş basılmışsa, yapışkan tuşları çalıştırma"
 msgid ""
 "If enabled, the session manager will start the required applications for "
 "screen readers and magnifiers"
-msgstr "Etkinleştirildiği taktirde oturum yöneticisi ekran okuyucuları ve büyüteçleri için gerekli uygulamarı başlatacak"
+msgstr ""
+"Etkinleştirildiği taktirde oturum yöneticisi ekran okuyucuları ve "
+"büyüteçleri için gerekli uygulamarı başlatacak"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
 msgid "K_eystroke delay:"
@@ -935,12 +937,12 @@ msgstr "Varyans"
 msgid "Shortcut command may not be empty."
 msgstr "Kısayol komutu boşta olmayabilir."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "Öntanımlı Ayarlara Dön"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
 msgid ""
 "This will reset all shortcuts to their default values. Do you really want to "
 "do this?"
@@ -948,13 +950,13 @@ msgstr ""
 "Bu, tüm kısayolları ilk değerlerine döndürecek. Bunu yapmak istediğinizden "
 "emin misiniz?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr ""
 "Sistem öntanımlı ayarları sisteme tekrar giriş yaptığınızda geri "
 "yüklenecektir."
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "Uyarı"
 
@@ -969,14 +971,18 @@ msgid "Use a c_ustom command:"
 msgstr "Komut seç"
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:205
+#, fuzzy
 msgid ""
 "Use a custom command for an application that is not available from the above "
 "application list."
 msgstr ""
+"Yukarıdaki uygulama listesinde olmayan bir uygulama için özel bir komut "
+"kullan."
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:223
+#, fuzzy
 msgid "_Browse..."
-msgstr ""
+msgstr "_Göz at..."
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:376
 #, fuzzy
@@ -1055,7 +1061,7 @@ msgid "Default"
 msgstr "Öntanımlı"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:550
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid "%d MIME type found"
 msgid_plural "%d MIME types found"
 msgstr[0] "%d MIME tipi bulundu"
@@ -1077,10 +1083,13 @@ msgid "Question"
 msgstr "Soru"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:913
+#, fuzzy
 msgid ""
 "This will remove your custom mime-association and restore the system-wide "
 "default."
 msgstr ""
+"Bu sizin özel dosya türü eşleştirmelerinizi kaldıracak ve sistemin bütününü "
+"geri yükleyecek."
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:917
 #: ../dialogs/mime-settings/xfce-mime-window.c:988
@@ -1231,8 +1240,9 @@ msgid "Size"
 msgstr "Boyut"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:28
+#, fuzzy
 msgid "T_ap touchpad to click"
-msgstr ""
+msgstr "Tıkl_amak için dokunmatik pede taplayınız"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:29
 msgid "T_heme"
@@ -1284,8 +1294,9 @@ msgid "Ti_me:"
 msgstr "Za_man:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:38
+#, fuzzy
 msgid "Tr_acking mode:"
-msgstr ""
+msgstr "İzl_eme kipi:"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:39
 msgid ""
@@ -1296,8 +1307,9 @@ msgstr ""
 "olarak algılanacaktır"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:40
+#, fuzzy
 msgid "Two-_finger scrolling"
-msgstr ""
+msgstr "İki-_parmak kaydırma"
 
 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:41
 msgid "When selected, the scroll wheel will work in the opposite direction"
@@ -1345,174 +1357,218 @@ msgstr "Dön_dürme:"
 msgid "_Sensitivity:"
 msgstr "_Duyarlılık:"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "Ayarlar Düzenleyicisi"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "Özelleştirilen ayarlar Xfconf tarafından kaydedildi"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "Özellik"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "Tür:"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "Kilitli"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "Değer"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "Boş"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "Yeni özellik"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "Bu özellik ismi geçersiz."
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+#, fuzzy
+msgid "Edit selected property"
+msgstr "Özelliği düzenle"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "Sıfırla"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "_Sıfırla"
 
-#: ../xfce4-settings-editor/main_window.c:926
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
 #, fuzzy
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr ""
-"Bir özelliği sıfırlamak bu kişiye özel ayarları kalıcı olarak ortadan "
-"kaldıracaktır."
+msgid "Reset selected property"
+msgstr "Özelliği sıfırla "
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "\"%s\" özelliğini sıfırlamak istediğinize emin misiniz?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "Boş"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "Özellik isimleri '/' karakteriyle başlamalı"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+#, fuzzy
+msgid "Array"
+msgstr "Düzen"
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "Kök eleman ('/') geçerli bir özellik ismi değil"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "String"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, fuzzy, c-format
-msgid ""
-"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
-"'-', '<' and '>', as well as '/' as a separator"
-msgstr ""
-"Özellik isimleri sadece ASCII karakterleri olan A-Z, a-z, 0-9, '_', '-', '<' "
-"ve '>' ve  '/' ayırıcısını içerebilir"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+#, fuzzy
+msgid "Integer"
+msgstr "Tamsayı"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "Özellik isimleri ardarda iki veya daha fazla '/' karakteri içeremez"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "Boolean"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "Özellik isimleri '/' karakteriyle bitemez"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "Double"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "_Sıfırla"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+#, fuzzy
+msgid "_Reset Channel"
+msgstr "Kanal"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 #, fuzzy
 msgid "Resetting a channel will permanently remove those custom settings."
 msgstr ""
 "Bir kanalı sıfırlamak bu kişiye özel ayarları kalıcı olarak ortadan "
 "kaldıracaktır."
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, fuzzy, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr "\"<b>%s</b>\" özelliğini sıfırlamak istediğinize emin misiniz?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Xfconf için grafik ayarlar düzenleyicisi"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "Ayarlar Düzenleyicisi"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+#, fuzzy
+msgid "reset"
+msgstr "Sıfırla"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "Boolean"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, fuzzy, c-format
+msgid "Monitor %s"
+msgstr "Ekran"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "Özelleştirilen ayarlar Xfconf tarafından kaydedildi"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+#, fuzzy
+msgid "Watch an Xfconf channel for property changes"
+msgstr "Özellik değişiklikleri için Xfconf kanalını izleyin"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "Double"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, fuzzy, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "izleme kanalını başlat \"%s\""
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "Özelliği Düzenle"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+#, fuzzy
+msgid "_Monitor"
+msgstr "Ekran"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "Özelliği düzenle"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+#, fuzzy
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr ""
+"Bir özelliği sıfırlamak bu kişiye özel ayarları kalıcı olarak ortadan "
+"kaldıracaktır."
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "Etkinleştirilmiş"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "\"%s\" özelliğini sıfırlamak istediğinize emin misiniz?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "Int"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "Unsigned Int"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "İsim:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "Unsigned Int64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:141
+#, fuzzy
+msgid "New Property"
 msgstr "Yeni özellik"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "Özelliği sıfırla "
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "String"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:158
+#, fuzzy
+msgid "_Property:"
+msgstr "Özellik"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:173
+#, fuzzy
+msgid "_Type:"
 msgstr "Tür:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "Unsigned Int"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:204
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:215
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:227
+#, fuzzy
+msgid "_Value:"
+msgstr "Değer:"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "Unsigned Int64"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:385
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "Özellik isimleri '/' karakteriyle başlamalı"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "Değer:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:396
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "Kök eleman ('/') geçerli bir özellik ismi değil"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Xfconf kanalları"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:412
+#, fuzzy, c-format
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
+msgstr ""
+"Özellik isimleri sadece ASCII karakterleri olan A-Z, a-z, 0-9, '_', '-', '<' "
+"ve '>' ve  '/' ayırıcısını içerebilir"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:425
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr "Özellik isimleri ardarda iki veya daha fazla '/' karakteri içeremez"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:439
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "Özellik isimleri '/' karakteriyle bitemez"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:652
+msgid "Edit Property"
+msgstr "Özelliği Düzenle"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Xfconf için grafik ayarlar düzenleyicisi"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1604,6 +1660,18 @@ msgstr "Xfce 4 İçin Grafik Ayarları Yöneticisi"
 msgid "Settings Manager"
 msgstr "Ayarlar Yöneticisi"
 
+#~ msgid "This property name is not valid."
+#~ msgstr "Bu özellik ismi geçersiz."
+
+#~ msgid "Enabled"
+#~ msgstr "Etkinleştirilmiş"
+
+#~ msgid "Name:"
+#~ msgstr "İsim:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Xfconf kanalları"
+
 #~ msgid "Use this area to _test the settings above:"
 #~ msgstr "Yu_karıdaki ayarları denemek için bu alanı kullanın:"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5708437..7cc6be4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,20 +5,21 @@
 # Chris K. Zhang <plutino at gmail.com>, 2009.
 # Aron Xu <aronmalache at 163.com>, 2009.
 # Hunt Xu <huntxu at live.cn>, 2009, 2010.
-# Chipong Luo <chipong_l at yahoo.com>, 2011, 2012.
+# Chipong Luo <chipong.luo at yahoo.com>, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-27 05:06+0000\n"
+"POT-Creation-Date: 2012-02-27 11:42+0000\n"
 "PO-Revision-Date: 2010-11-27 21:48+0800\n"
-"Last-Translator: Chipong Luo <chipong_l at yahoo.com>\n"
+"Last-Translator: Chipong Luo <chipong.luo at yahoo.com>\n"
 "Language-Team: Chinese (Simplified) <xfce-i18n at xfce.org>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
 msgid "Acceleration _profile:"
@@ -83,7 +84,7 @@ msgstr "在您的系统上未发现 AT-SPI 提供者"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
 msgid "R_epeat interval:"
-msgstr "重复间隔(_R):"
+msgstr "重复间隔(_E):"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
 msgid "Slow Keys"
@@ -268,7 +269,7 @@ msgstr "改善键盘和鼠标的辅助功能"
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
 msgid ""
 "Anti-aliasing, or font smoothing, can improve the look of text on the screen"
-msgstr "反锯齿或平滑字体会改善屏幕上文本的外观"
+msgstr "反锯齿或平滑字体会改善屏幕上文字的外观"
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:1
@@ -453,7 +454,7 @@ msgstr "工具栏样式(_T)"
 #: ../dialogs/appearance-settings/main.c:733
 #, c-format
 msgid "File is larger then %d MB, installation aborted"
-msgstr "文件大于 %d MB,安装中止"
+msgstr "文件大于 %d M,安装中止"
 
 #: ../dialogs/appearance-settings/main.c:738
 msgid "Failed to create temporary directory"
@@ -494,7 +495,7 @@ msgstr "竖直 BGR"
 
 #: ../dialogs/display-settings/confirmation-dialog.glade.h:1
 msgid "<big><b>Would you like to keep this configuration?</b></big>"
-msgstr "<big><b>您愿意保存此配置吗?</b></big>"
+msgstr "<big><b>您想要保存此配置吗?</b></big>"
 
 #: ../dialogs/display-settings/confirmation-dialog.glade.h:2
 msgid "Confirmation"
@@ -554,7 +555,7 @@ msgstr "显示设置"
 
 #: ../dialogs/display-settings/minimal-display-dialog.glade.h:3
 msgid "Several displays are available. Use:\n"
-msgstr "多个显示器可用。使用:\n"
+msgstr "若干显示器可用。使用:\n"
 
 #: ../dialogs/display-settings/minimal-display-dialog.glade.h:5
 msgid "Use both displays to show the same contents"
@@ -619,7 +620,7 @@ msgstr "未能查询正在使用的 RandR 扩展的版本"
 #: ../dialogs/display-settings/main.c:1076
 #: ../dialogs/display-settings/main.c:1112
 msgid "Unable to start the Xfce Display Settings"
-msgstr "无法启动 Xfce 显示设置"
+msgstr "未能启动 Xfce 显示设置"
 
 #: ../dialogs/display-settings/main.c:1107
 msgid "ATI Settings"
@@ -791,7 +792,7 @@ msgstr "指定是由此设置对话框还是由 X 服务器控制键盘布局"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18
 msgid "Specify whether or not the text cursor blinks"
-msgstr "指定文本光标是否闪烁"
+msgstr "指定文字光标是否闪烁"
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19
 msgid "The delay, in milliseconds, between successive blinks of the cursor"
@@ -868,22 +869,22 @@ msgstr "变体"
 msgid "Shortcut command may not be empty."
 msgstr "快捷键命令不能为空"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "重置为默认"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
 msgid ""
 "This will reset all shortcuts to their default values. Do you really want to "
 "do this?"
 msgstr "这会把所有快捷键重置为它们的默认值,您真的要这样做吗?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr "在您下次登录时将恢复系统默认"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "警告"
 
@@ -893,7 +894,7 @@ msgstr "选择应用程序"
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:204
 msgid "Use a c_ustom command:"
-msgstr "选择自定义命令(_U):"
+msgstr "使用自定义命令(_U):"
 
 #: ../dialogs/mime-settings/xfce-mime-chooser.c:205
 msgid ""
@@ -979,7 +980,6 @@ msgstr "默认"
 msgid "%d MIME type found"
 msgid_plural "%d MIME types found"
 msgstr[0] "找到了 %d 个 MIME 类型"
-msgstr[1] "找到了 %d 个 MIME 类型"
 
 #: ../dialogs/mime-settings/xfce-mime-window.c:649
 #, c-format
@@ -1240,61 +1240,175 @@ msgstr "旋转(_R):"
 msgid "_Sensitivity:"
 msgstr "灵敏度(_S):"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "设置编辑器"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "自定义 Xfconf 存储的设置"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "频道"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "属性"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "类型"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
-msgstr "锁定"
+msgstr "已锁定"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "值"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "新建属性"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "编辑选中的属性"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "重置(_R)"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "重置选中的属性"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
 msgid "Empty"
 msgstr "空"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "此属性名无效。"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "数组"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "字符串"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "整型"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "真假值"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "双精度"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "重置频道(_R)"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
+msgid "Resetting a channel will permanently remove those custom settings."
+msgstr "重置频道会永远移除那些自定义设置。"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
+#, c-format
+msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
+msgstr "您确定要重置 “%s” 频道和它的所有属性吗?"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
 msgstr "重置"
 
-#: ../xfce4-settings-editor/main_window.c:926
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "显示器 %s"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "监视 Xfconf 频道的属性更改"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "开始监视频道 “%s”"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "显示器(_M)"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
 msgid "Resetting a property will permanently remove those custom settings."
 msgstr "重置属性会永远移除那些自定义设置。"
 
-#: ../xfce4-settings-editor/main_window.c:927
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
 #, c-format
 msgid "Are you sure you want to reset property \"%s\"?"
 msgstr "您确定要重置属性 “%s” 吗?"
 
-#: ../xfce4-settings-editor/main_window.c:983
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
+msgid "Int"
+msgstr "整型"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "无符号整型"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
+msgid "Int64"
+msgstr "64 位整型"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "无符号 64 位整型"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:140
+msgid "New Property"
+msgstr "新建属性"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:154
+msgid "_Property:"
+msgstr "属性(_P):"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:169
+msgid "_Type:"
+msgstr "类型(_T):"
+
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:200
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:211
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:223
+msgid "_Value:"
+msgstr "值(_V):"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:381
 #, c-format
 msgid "Property names must start with a '/' character"
 msgstr "属性名必须以 ‘/’ 字符开头"
 
-#: ../xfce4-settings-editor/main_window.c:992
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:392
 #, c-format
 msgid "The root element ('/') is not a valid property name"
 msgstr "根元素(‘/’) 不是一个有效的属性名"
 
-#: ../xfce4-settings-editor/main_window.c:1006
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:408
 #, c-format
 msgid ""
 "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
@@ -1303,106 +1417,24 @@ msgstr ""
 "属性名称只能包含 ASCII 字符:A 至 Z、a 至 z、0 至 9、‘_’、‘-’、‘<’ 和 ‘>’,此"
 "外 ‘/’ 作为分隔符"
 
-#: ../xfce4-settings-editor/main_window.c:1015
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:421
 #, c-format
 msgid "Property names cannot have two or more consecutive '/' characters"
 msgstr "属性名称中不能包含两个或更多连续的 ‘/’ 字符"
 
-#: ../xfce4-settings-editor/main_window.c:1026
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:435
 #, c-format
 msgid "Property names cannot end with a '/' character"
 msgstr "属性名称不能以 ‘/’ 结束"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "重置(_R)"
-
-#: ../xfce4-settings-editor/main_window.c:1079
-msgid "Resetting a channel will permanently remove those custom settings."
-msgstr "重置频道会永远移除那些自定义设置。"
-
-#: ../xfce4-settings-editor/main_window.c:1080
-#, c-format
-msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
-msgstr "您确定要重设 “%s” 频道和它的所有属性吗?"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:648
+msgid "Edit Property"
+msgstr "编辑属性"
 
 #: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
 msgid "Graphical settings editor for Xfconf"
 msgstr "Xfconf 的图形设置编辑器"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "设置编辑器"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "真假值"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "自定义 Xfconf 存储的设置"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "双倍"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "编辑属性"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "编辑属性"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "已启用"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
-msgid "Int"
-msgstr "整型"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
-msgid "Int64"
-msgstr "64 位整型"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "名称:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
-msgstr "新建属性"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "重置属性"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "字符串"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "类型:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "无符号整型"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "无符号 64 位整型"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "值:"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Xfconf 频道"
-
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
 msgstr "已启用粘滞键"
@@ -1421,7 +1453,7 @@ msgstr "已启用慢速键"
 
 #: ../xfsettingsd/accessibility.c:401
 msgid "Slow keys are disabled"
-msgstr "慢速按键已取消"
+msgstr "已禁用慢速按键"
 
 #: ../xfsettingsd/accessibility.c:403
 msgid "Slow keys"
@@ -1465,20 +1497,20 @@ msgstr "Xfce 设置守护进程"
 msgid "Settings dialog to show"
 msgstr "要显示的设置对话框"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:184
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:186
 msgid "_All Settings"
 msgstr "所有设置(_A)"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:364
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
 msgid "Settings"
 msgstr "设置"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:366
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:368
 msgid "Customize your desktop"
 msgstr "自定义桌面"
 
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:850
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:861
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:858
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:869
 #, c-format
 msgid "Unable to start \"%s\""
 msgstr "未能启动 “%s”"
@@ -1490,6 +1522,3 @@ msgstr "Xfce 4 的图形设置管理器"
 #: ../xfce4-settings-manager/xfce-settings-manager.desktop.in.h:2
 msgid "Settings Manager"
 msgstr "设置管理器"
-
-#~ msgid "_Overview"
-#~ msgstr "概览(_O)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 594ad65..3996b06 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-04 04:30+0000\n"
-"PO-Revision-Date: 2012-02-04 17:22+0800\n"
+"POT-Creation-Date: 2012-03-10 09:12+0000\n"
+"PO-Revision-Date: 2012-03-10 17:56+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 at gmail.com>\n"
 "Language-Team: chinese-l10n <chinese-l10n at googlegroups.com>\n"
 "Language: \n"
@@ -833,20 +833,20 @@ msgstr "類型"
 msgid "Shortcut command may not be empty."
 msgstr "捷徑指令不能是空白的。"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968
 msgid "Reset to Defaults"
 msgstr "重設為預設值"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969
 msgid "This will reset all shortcuts to their default values. Do you really want to do this?"
 msgstr "這會將所有捷徑設定回它們的預設值。您真的想要這麼做嗎?"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042
 msgid "The system defaults will be restored next time you log in."
 msgstr "下次您登入時將還原系統預設值。"
 
-#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044
 msgid "Warning"
 msgstr "警告"
 
@@ -1188,164 +1188,196 @@ msgstr "旋轉(_R):"
 msgid "_Sensitivity:"
 msgstr "靈敏度(_S):"
 
-#: ../xfce4-settings-editor/main_window.c:157
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:184
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
+msgid "Settings Editor"
+msgstr "設定值編輯器"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:185
+msgid "Customize settings stored by Xfconf"
+msgstr "自訂 Xfconf 儲存的設定值"
+
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:230
 msgid "Channel"
 msgstr "通道"
 
-#: ../xfce4-settings-editor/main_window.c:170
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:264
 msgid "Property"
 msgstr "屬性"
 
-#: ../xfce4-settings-editor/main_window.c:173
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:271
 msgid "Type"
 msgstr "類型"
 
-#: ../xfce4-settings-editor/main_window.c:176
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:278
 msgid "Locked"
 msgstr "鎖上"
 
-#: ../xfce4-settings-editor/main_window.c:179
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:285
 msgid "Value"
 msgstr "值"
 
-#: ../xfce4-settings-editor/main_window.c:310
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:6
-msgid "Empty"
-msgstr "空"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:302
+msgid "New property"
+msgstr "新增屬性"
 
-#: ../xfce4-settings-editor/main_window.c:698
-#: ../xfce4-settings-editor/main_window.c:890
-msgid "This property name is not valid."
-msgstr "此屬性名稱無效。"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:313
+msgid "Edit selected property"
+msgstr "編輯所選的屬性"
 
-#: ../xfce4-settings-editor/main_window.c:925
-#: ../xfce4-settings-editor/main_window.c:1078
-msgid "Reset"
-msgstr "重設"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:321
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1026
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1369
+msgid "_Reset"
+msgstr "重設(_R)"
 
-#: ../xfce4-settings-editor/main_window.c:926
-msgid "Resetting a property will permanently remove those custom settings."
-msgstr "重設屬性將永久移除那些自訂過的設定值。"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:324
+msgid "Reset selected property"
+msgstr "重設所選的屬性"
 
-#: ../xfce4-settings-editor/main_window.c:927
-#, c-format
-msgid "Are you sure you want to reset property \"%s\"?"
-msgstr "您確定要重設屬性「%s」嗎?"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:448
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:539
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:658
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:90
+msgid "Empty"
+msgstr "空"
 
-#: ../xfce4-settings-editor/main_window.c:983
-#, c-format
-msgid "Property names must start with a '/' character"
-msgstr "屬性名稱必須以 '/' 字元作開頭"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:451
+msgid "Array"
+msgstr "陣列"
 
-#: ../xfce4-settings-editor/main_window.c:992
-#, c-format
-msgid "The root element ('/') is not a valid property name"
-msgstr "根元素 ('/') 不是有效的屬性名稱"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:456
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:91
+msgid "String"
+msgstr "字串"
 
-#: ../xfce4-settings-editor/main_window.c:1006
-#, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
-msgstr "屬性名稱只能包含 ASCII 字元 A-Z、a-z、0-9、'_'、'-'、'<'、'>',而 '/' 作為分隔符"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:464
+msgid "Integer"
+msgstr "整數"
 
-#: ../xfce4-settings-editor/main_window.c:1015
-#, c-format
-msgid "Property names cannot have two or more consecutive '/' characters"
-msgstr "屬性名稱無法擁有兩個或多個連續的 '/' 字元"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:467
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:92
+msgid "Boolean"
+msgstr "真假值"
 
-#: ../xfce4-settings-editor/main_window.c:1026
-#, c-format
-msgid "Property names cannot end with a '/' character"
-msgstr "屬性名稱無法以 '/' 字元作結尾"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:470
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:94
+msgid "Double"
+msgstr "倍精度"
 
-#: ../xfce4-settings-editor/main_window.c:1045
-msgid "_Reset"
-msgstr "重設(_R)"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:804
+msgid "_Reset Channel"
+msgstr "重設通道(_R)"
 
-#: ../xfce4-settings-editor/main_window.c:1079
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:805
 msgid "Resetting a channel will permanently remove those custom settings."
 msgstr "重設通道將永久移除那些自訂過的設定值。"
 
-#: ../xfce4-settings-editor/main_window.c:1080
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:806
 #, c-format
 msgid "Are you sure you want to reset channel \"%s\" and all its properties?"
 msgstr "您確定要重設「%s」通道與其全部屬性?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
-msgid "Graphical settings editor for Xfconf"
-msgstr "Xfconf 的圖形化設定值編輯器"
-
-#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:2
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:13
-msgid "Settings Editor"
-msgstr "設定值編輯器"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:881
+msgid "reset"
+msgstr "重設"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:1
-msgid "Boolean"
-msgstr "真假值"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:938
+#, c-format
+msgid "Monitor %s"
+msgstr "螢幕  %s"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:2
-msgid "Customize settings stored by Xfconf"
-msgstr "自訂 Xfconf 儲存的設定值"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:946
+msgid "Watch an Xfconf channel for property changes"
+msgstr "監看 Xfconf 通道以瞭解屬性變動"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:3
-msgid "Double"
-msgstr "倍精度"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:982
+#, c-format
+msgid "start monitoring channel \"%s\""
+msgstr "停止監視「%s」通道"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:4
-msgid "Edit Property"
-msgstr "編輯屬性"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1036
+msgid "_Monitor"
+msgstr "螢幕(_M)"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:5
-msgid "Edit property"
-msgstr "編輯屬性"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1370
+msgid "Resetting a property will permanently remove those custom settings."
+msgstr "重設屬性將永久移除那些自訂過的設定值。"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:7
-msgid "Enabled"
-msgstr "啟用"
+#: ../xfce4-settings-editor/xfce-settings-editor-dialog.c:1371
+#, c-format
+msgid "Are you sure you want to reset property \"%s\"?"
+msgstr "您確定要重設屬性「%s」嗎?"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:8
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:93
 msgid "Int"
 msgstr "整數"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:9
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:95
+msgid "Unsigned Int"
+msgstr "無負號整數"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:96
 msgid "Int64"
 msgstr "整數64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:10
-msgid "Name:"
-msgstr "名稱:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:97
+msgid "Unsigned Int64"
+msgstr "無負號整數64"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:11
-msgid "New property"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:141
+msgid "New Property"
 msgstr "新增屬性"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:12
-msgid "Reset property"
-msgstr "重設屬性"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:158
+msgid "_Property:"
+msgstr "屬性(_P):"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:14
-msgid "String"
-msgstr "字串"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:173
+msgid "_Type:"
+msgstr "類型(_T):"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:15
-msgid "Type:"
-msgstr "類型:"
+#. strings
+#. integers
+#. bool
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:204
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:215
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:227
+msgid "_Value:"
+msgstr "值(_V):"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:16
-msgid "Unsigned Int"
-msgstr "無負號整數"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:385
+#, c-format
+msgid "Property names must start with a '/' character"
+msgstr "屬性名稱必須以 '/' 字元作開頭"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:17
-msgid "Unsigned Int64"
-msgstr "無負號整數64"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:396
+#, c-format
+msgid "The root element ('/') is not a valid property name"
+msgstr "根元素 ('/') 不是有效的屬性名稱"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:18
-msgid "Value:"
-msgstr "值:"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:412
+#, c-format
+msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '<' and '>', as well as '/' as a separator"
+msgstr "屬性名稱只能包含 ASCII 字元 A-Z、a-z、0-9、'_'、'-'、'<'、'>',而 '/' 作為分隔符"
 
-#: ../xfce4-settings-editor/xfce4-settings-editor.glade.h:19
-msgid "Xfconf channels"
-msgstr "Xfconf 通道"
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:425
+#, c-format
+msgid "Property names cannot have two or more consecutive '/' characters"
+msgstr "屬性名稱無法擁有兩個或多個連續的 '/' 字元"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:439
+#, c-format
+msgid "Property names cannot end with a '/' character"
+msgstr "屬性名稱無法以 '/' 字元作結尾"
+
+#: ../xfce4-settings-editor/xfce-settings-prop-dialog.c:652
+msgid "Edit Property"
+msgstr "編輯屬性"
+
+#: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1
+msgid "Graphical settings editor for Xfconf"
+msgstr "Xfconf 的圖形化設定值編輯器"
 
 #: ../xfsettingsd/accessibility.c:390
 msgid "Sticky keys are enabled"
@@ -1435,6 +1467,18 @@ msgstr "Xfce 4 的圖形設定值管理員"
 msgid "Settings Manager"
 msgstr "設定值管理員"
 
+#~ msgid "This property name is not valid."
+#~ msgstr "此屬性名稱無效。"
+
+#~ msgid "Enabled"
+#~ msgstr "啟用"
+
+#~ msgid "Name:"
+#~ msgstr "名稱:"
+
+#~ msgid "Xfconf channels"
+#~ msgstr "Xfconf 通道"
+
 #~ msgid "_General"
 #~ msgstr "一般(_G)"
 
diff --git a/xfce4-settings-editor/xfce-settings-prop-dialog.c b/xfce4-settings-editor/xfce-settings-prop-dialog.c
index 4a137ba..c69e423 100644
--- a/xfce4-settings-editor/xfce-settings-prop-dialog.c
+++ b/xfce4-settings-editor/xfce-settings-prop-dialog.c
@@ -136,6 +136,7 @@ xfce_settings_prop_dialog_init (XfceSettingsPropDialog *dialog)
     GtkListStore    *store;
     guint            i;
     GtkCellRenderer *render;
+    GtkWidget       *save_button;
 
     gtk_window_set_title (GTK_WINDOW (dialog), _("New Property"));
     gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 200);
@@ -144,6 +145,9 @@ xfce_settings_prop_dialog_init (XfceSettingsPropDialog *dialog)
                             GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL);
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
+    save_button = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+    gtk_widget_set_sensitive (save_button, FALSE);
+
     table = gtk_table_new (5, 2, FALSE);
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
     gtk_box_pack_start (GTK_BOX (content_area), table, TRUE, TRUE, 0);
diff --git a/xfce4-settings-manager/xfce-settings-manager.menu b/xfce4-settings-manager/xfce-settings-manager.menu
index 521c6c4..4c6e8c5 100644
--- a/xfce4-settings-manager/xfce-settings-manager.menu
+++ b/xfce4-settings-manager/xfce-settings-manager.menu
@@ -42,6 +42,7 @@
         <Category>X-XFCE-SettingsDialog</Category>
         <Category>X-XFCE-PersonalSettings</Category>
       </And>
+      <Filename>xscreensaver-properties.desktop</Filename>
     </Include>
   </Menu>
 
diff --git a/xfsettingsd/Makefile.am b/xfsettingsd/Makefile.am
index 0adaa5d..8850d07 100644
--- a/xfsettingsd/Makefile.am
+++ b/xfsettingsd/Makefile.am
@@ -71,7 +71,8 @@ xfsettingsd_LDADD = \
 	$(XI_LIBS) \
 	$(LIBX11_LIBS) \
 	$(LIBNOTIFY_LIBS) \
-	$(FONTCONFIG_LIBS)
+	$(FONTCONFIG_LIBS) \
+	-lm
 
 #
 # Optional support for the display settings
diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 2e41a35..0728b91 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -24,6 +24,9 @@
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
 
 #include <glib.h>
 #include <gdk/gdkx.h>
@@ -613,7 +616,7 @@ xfce_displays_helper_channel_apply (XfceDisplaysHelper *helper,
                     continue;
 
                 /* calculate the refresh rate */
-                rate = (gfloat) mode_info->dotClock / ((gfloat) mode_info->hTotal * (gfloat) mode_info->vTotal);
+                rate = rint ((gdouble) mode_info->dotClock / ((gdouble) mode_info->hTotal * (gdouble) mode_info->vTotal));
 
                 /* find the mode corresponding to the saved values */
                 if (((int) rate == (int) output_rate)
diff --git a/xfsettingsd/xsettings.c b/xfsettingsd/xsettings.c
index 4619d7e..c7eb4b2 100644
--- a/xfsettingsd/xsettings.c
+++ b/xfsettingsd/xsettings.c
@@ -615,7 +615,7 @@ xfce_xsettings_helper_notify_xft_update (GString      *resource,
 
             /* special case for dpi */
             if (strcmp (name, "Xft.dpi:") == 0)
-                num = CLAMP (num, DPI_LOW_REASONABLE, DPI_HIGH_REASONABLE) * 1024;
+                num = CLAMP (num, DPI_LOW_REASONABLE, DPI_HIGH_REASONABLE);
 
             g_snprintf  (s, sizeof (s), "%d", num);
             str = s;


More information about the Xfce4-commits mailing list